/[escript]/trunk/escript/src/DataExpanded.cpp
ViewVC logotype

Diff of /trunk/escript/src/DataExpanded.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/esys2/escript/src/Data/DataExpanded.cpp revision 117 by jgs, Fri Apr 1 05:48:57 2005 UTC trunk/escript/src/DataExpanded.cpp revision 922 by gross, Fri Jan 5 04:23:05 2007 UTC
# Line 1  Line 1 
1  // $Id$  // $Id$
2  /*  /*
3   ******************************************************************************   ************************************************************
4   *                                                                            *   *          Copyright 2006 by ACcESS MNRF                   *
5   *       COPYRIGHT  ACcESS 2004 -  All Rights Reserved                        *   *                                                          *
6   *                                                                            *   *              http://www.access.edu.au                    *
7   * This software is the property of ACcESS. No part of this code              *   *       Primary Business: Queensland, Australia            *
8   * may be copied in any form or by any means without the expressed written    *   *  Licensed under the Open Software License version 3.0    *
9   * consent of ACcESS.  Copying, use or modification of this software          *   *     http://www.opensource.org/licenses/osl-3.0.php       *
10   * by any unauthorised person is illegal unless that person has a software    *   *                                                          *
11   * license agreement with ACcESS.                                             *   ************************************************************
  *                                                                            *  
  ******************************************************************************  
12  */  */
13    
14  #include "escript/Data/DataException.h"  #include "DataExpanded.h"
15  #include "escript/Data/DataExpanded.h"  #include "DataException.h"
16  #include "escript/Data/DataConstant.h"  #include "DataConstant.h"
17  #include "escript/Data/DataTagged.h"  #include "DataTagged.h"
 #include "escript/Data/DataArrayView.h"  
18    
19  #include <boost/python/extract.hpp>  #include <boost/python/extract.hpp>
20    
 #include <iostream>  
   
21  using namespace std;  using namespace std;
22  using namespace boost::python;  using namespace boost::python;
23  using namespace boost;  using namespace boost;
# Line 72  DataExpanded::DataExpanded(const DataTag Line 67  DataExpanded::DataExpanded(const DataTag
67    : DataAbstract(other.getFunctionSpace())    : DataAbstract(other.getFunctionSpace())
68  {  {
69    //    //
70    // initialise the data for this object    // initialise the data array for this object
71    initialise(other.getPointDataView().getShape(),other.getNumSamples(),other.getNumDPPSample());    initialise(other.getPointDataView().getShape(),other.getNumSamples(),other.getNumDPPSample());
72    //    //
73    // for each data point in this object, extract and copy the corresponding data    // for each data point in this object, extract and copy the corresponding data
# Line 80  DataExpanded::DataExpanded(const DataTag Line 75  DataExpanded::DataExpanded(const DataTag
75    int i,j;    int i,j;
76    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();
77    DataArrayView::ValueType::size_type numCols=m_data.getNumCols();    DataArrayView::ValueType::size_type numCols=m_data.getNumCols();
78  #pragma omp parallel for private(i,j) schedule(static)    #pragma omp parallel for private(i,j) schedule(static)
79    for (i=0;i<numRows;i++) {    for (i=0;i<numRows;i++) {
80      for (j=0;j<numCols;j++) {      for (j=0;j<numCols;j++) {
81        try {        try {
82          getPointDataView().copy(getPointOffset(i,j),other.getPointDataView(),other.getPointOffset(i,j));          getPointDataView().copy(getPointOffset(i,j),
83                                    other.getPointDataView(),
84                                    other.getPointOffset(i,j));
85        }        }
86        catch (std::exception& e) {        catch (std::exception& e) {
87          cout << e.what() << endl;          cout << e.what() << endl;
# Line 109  DataExpanded::DataExpanded(const DataExp Line 106  DataExpanded::DataExpanded(const DataExp
106    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();
107    DataArrayView::ValueType::size_type numCols=m_data.getNumCols();    DataArrayView::ValueType::size_type numCols=m_data.getNumCols();
108    int i,j;    int i,j;
109  #pragma omp parallel for private(i,j) schedule(static)    #pragma omp parallel for private(i,j) schedule(static)
110    for (i=0;i<numRows;i++) {    for (i=0;i<numRows;i++) {
111      for (j=0;j<numCols;j++) {      for (j=0;j<numCols;j++) {
112        try {        try {
113          getPointDataView().copySlice(getPointOffset(i,j),other.getPointDataView(),other.getPointOffset(i,j),region_loop_range);          getPointDataView().copySlice(getPointOffset(i,j),
114                                         other.getPointDataView(),
115                                         other.getPointOffset(i,j),
116                                         region_loop_range);
117        }        }
118        catch (std::exception& e) {        catch (std::exception& e) {
119          cout << e.what() << endl;          cout << e.what() << endl;
# Line 137  DataExpanded::DataExpanded(const DataArr Line 137  DataExpanded::DataExpanded(const DataArr
137    copy(value);    copy(value);
138  }  }
139    
140  DataExpanded::~DataExpanded()  DataExpanded::DataExpanded(const FunctionSpace& what,
141                               const DataArrayView::ShapeType &shape,
142                               const DataArrayView::ValueType &data)
143      : DataAbstract(what)
144  {  {
145      //
146      // create the view of the data
147      initialise(shape,what.getNumSamples(),what.getNumDPPSample());
148      //
149      // copy the data in the correct format
150      m_data.getData()=data;
151  }  }
152    
153  void  DataExpanded::~DataExpanded()
 DataExpanded::reshapeDataPoint(const DataArrayView::ShapeType& shape)  
154  {  {
   if (getPointDataView().getRank()!=0) {  
     stringstream temp;  
     temp << "Error - Can only reshape Data with data points of rank 0. "  
          << "This Data has data points with rank: "  
          << getPointDataView().getRank();  
     throw DataException(temp.str());  
   }  
   //  
   // create the new DataBlocks2D data array, and a corresponding DataArrayView  
   DataBlocks2D newData(getNumSamples(),getNumDPPSample(),DataArrayView::noValues(shape));  
   DataArrayView newView(newData.getData(),shape);  
   //  
   // Copy the original data to every value for the new shape  
   int i,j;  
   int nRows=m_data.getNumRows();  
   int nCols=m_data.getNumCols();  
 #pragma omp parallel for private(i,j) schedule(static)  
   for (i=0;i<nRows;i++) {  
     for (j=0;j<nCols;j++) {  
       // NOTE: An exception may be thown from this call if  
       // DOASSERT is on which of course will play  
       // havoc with the omp threads. Run single threaded  
       // if using DOASSERT.  
       newView.copy(newData.index(i,j),m_data(i,j));  
     }  
   }  
   // swap the new data array for the original  
   m_data.Swap(newData);  
   // set the corresponding DataArrayView  
   DataArrayView temp(m_data.getData(),shape);  
   setPointDataView(temp);  
155  }  }
156    
157  DataAbstract*  DataAbstract*
# Line 200  DataExpanded::setSlice(const DataAbstrac Line 177  DataExpanded::setSlice(const DataAbstrac
177    if (getPointDataView().getRank()!=region.size()) {    if (getPointDataView().getRank()!=region.size()) {
178      throw DataException("Error - Invalid slice region.");      throw DataException("Error - Invalid slice region.");
179    }    }
180    if (tempDataExp->getPointDataView().getRank()>0 and !value->getPointDataView().checkShape(shape)) {    if (tempDataExp->getPointDataView().getRank()>0 && !value->getPointDataView().checkShape(shape)) {
181      throw DataException (value->getPointDataView().createShapeErrorMessage(      throw DataException (value->getPointDataView().createShapeErrorMessage(
182          "Error - Couldn't copy slice due to shape mismatch.",shape));          "Error - Couldn't copy slice due to shape mismatch.",shape));
183    }    }
# Line 209  DataExpanded::setSlice(const DataAbstrac Line 186  DataExpanded::setSlice(const DataAbstrac
186    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();
187    DataArrayView::ValueType::size_type numCols=m_data.getNumCols();    DataArrayView::ValueType::size_type numCols=m_data.getNumCols();
188    int i, j;    int i, j;
189  #pragma omp parallel for private(i,j) schedule(static)    #pragma omp parallel for private(i,j) schedule(static)
190    for (i=0;i<numRows;i++) {    for (i=0;i<numRows;i++) {
191      for (j=0;j<numCols;j++) {      for (j=0;j<numCols;j++) {
192        getPointDataView().copySliceFrom(getPointOffset(i,j),tempDataExp->getPointDataView(),tempDataExp->getPointOffset(i,j),region_loop_range);        getPointDataView().copySliceFrom(getPointOffset(i,j),
193                                           tempDataExp->getPointDataView(),
194                                           tempDataExp->getPointOffset(i,j),
195                                           region_loop_range);
196      }      }
197    }    }
198  }  }
# Line 225  DataExpanded::copy(const DataArrayView& Line 205  DataExpanded::copy(const DataArrayView&
205    int nRows=m_data.getNumRows();    int nRows=m_data.getNumRows();
206    int nCols=m_data.getNumCols();    int nCols=m_data.getNumCols();
207    int i,j;    int i,j;
208  #pragma omp parallel for private(i,j) schedule(static)    #pragma omp parallel for private(i,j) schedule(static)
209    for (i=0;i<nRows;i++) {    for (i=0;i<nRows;i++) {
210      for (j=0;j<nCols;j++) {      for (j=0;j<nCols;j++) {
211        // NOTE: An exception may be thown from this call if        // NOTE: An exception may be thown from this call if
# Line 273  string Line 253  string
253  DataExpanded::toString() const  DataExpanded::toString() const
254  {  {
255    stringstream temp;    stringstream temp;
256      FunctionSpace fs=getFunctionSpace();
257    //    //
258    // create a temporary view as the offset will be changed    // create a temporary view as the offset will be changed
259    DataArrayView tempView(getPointDataView().getData(),getPointDataView().getShape(),getPointDataView().getOffset());    DataArrayView tempView(getPointDataView().getData(),getPointDataView().getShape(),getPointDataView().getOffset());
# Line 280  DataExpanded::toString() const Line 261  DataExpanded::toString() const
261      for (int j=0;j<m_data.getNumCols();j++) {      for (int j=0;j<m_data.getNumCols();j++) {
262        tempView.setOffset(m_data.index(i,j));        tempView.setOffset(m_data.index(i,j));
263        stringstream suffix;        stringstream suffix;
264        suffix << "(" << i << "," << j << ")";        suffix << "( id: " << i << ", ref: " << fs.getReferenceNoFromSampleNo(i) << ", pnt: " << j << ")";
265        temp << tempView.toString(suffix.str());        temp << tempView.toString(suffix.str());
266        if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {        if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {
267          temp << endl;          temp << endl;
# Line 337  DataExpanded::setRefValue(int ref, Line 318  DataExpanded::setRefValue(int ref,
318    
319    for (int n=0; n<numDPPSample; n++) {    for (int n=0; n<numDPPSample; n++) {
320      //      //
321      // Get each data-point in the sample in turn.      // Get *each* data-point in the sample in turn.
322      DataArrayView pointView = getDataPoint(sampleNo, n);      DataArrayView pointView = getDataPoint(sampleNo, n);
323      //      //
324      // Assign the values in the DataArray to this data-point.      // Assign the values in the DataArray to this data-point.
# Line 370  DataExpanded::getRefValue(int ref, Line 351  DataExpanded::getRefValue(int ref,
351    }    }
352    
353    //    //
354    // Get the first data-point associated with this sample number.    // Get the *first* data-point associated with this sample number.
355    DataArrayView pointView = getDataPoint(sampleNo, 0);    DataArrayView pointView = getDataPoint(sampleNo, 0);
356    
357    //    //
# Line 378  DataExpanded::getRefValue(int ref, Line 359  DataExpanded::getRefValue(int ref,
359    value.getView().copy(pointView);    value.getView().copy(pointView);
360  }  }
361    
362    int
363    DataExpanded::archiveData(ofstream& archiveFile,
364                              const DataArrayView::ValueType::size_type noValues) const
365    {
366      return(m_data.archiveData(archiveFile, noValues));
367    }
368    
369    int
370    DataExpanded::extractData(ifstream& archiveFile,
371                              const DataArrayView::ValueType::size_type noValues)
372    {
373      return(m_data.extractData(archiveFile, noValues));
374    }
375    
376    void
377    DataExpanded::copyToDataPoint(const int sampleNo, const int dataPointNo, const double value) {
378      //
379      // Get the number of samples and data-points per sample.
380      int numSamples = getNumSamples();
381      int numDataPointsPerSample = getNumDPPSample();
382      int dataPointRank = getPointDataView().getRank();
383      ShapeType dataPointShape = getPointDataView().getShape();
384      if (numSamples*numDataPointsPerSample > 0) {
385         //TODO: global error handling
386         if (sampleNo >= numSamples or sampleNo < 0 ) {
387              throw DataException("Error - DataExpanded::copyDataPoint invalid sampleNo.");
388         }
389         if (dataPointNo >= numDataPointsPerSample or dataPointNo < 0) {
390               throw DataException("Error - DataExpanded::copyDataPoint invalid dataPointNoInSample.");
391         }
392         DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
393         if (dataPointRank==0) {
394             dataPointView()=value;
395         } else if (dataPointRank==1) {
396            for (int i=0; i<dataPointShape[0]; i++) {
397                dataPointView(i)=value;
398            }
399         } else if (dataPointRank==2) {
400            for (int i=0; i<dataPointShape[0]; i++) {
401               for (int j=0; j<dataPointShape[1]; j++) {
402                  dataPointView(i,j)=value;
403               }
404            }
405         } else if (dataPointRank==3) {
406            for (int i=0; i<dataPointShape[0]; i++) {
407               for (int j=0; j<dataPointShape[1]; j++) {
408                  for (int k=0; k<dataPointShape[2]; k++) {
409                     dataPointView(i,j,k)=value;
410                  }
411               }
412            }
413         } else if (dataPointRank==4) {
414             for (int i=0; i<dataPointShape[0]; i++) {
415               for (int j=0; j<dataPointShape[1]; j++) {
416                 for (int k=0; k<dataPointShape[2]; k++) {
417                   for (int l=0; l<dataPointShape[3]; l++) {
418                      dataPointView(i,j,k,l)=value;
419                   }
420                 }
421               }
422             }
423         }
424      }
425    }
426    void
427    DataExpanded::copyToDataPoint(const int sampleNo, const int dataPointNo, const boost::python::numeric::array& value) {
428      //
429      // Get the number of samples and data-points per sample.
430      int numSamples = getNumSamples();
431      int numDataPointsPerSample = getNumDPPSample();
432      int dataPointRank = getPointDataView().getRank();
433      ShapeType dataPointShape = getPointDataView().getShape();
434      //
435      // check rank:
436      if (value.getrank()!=dataPointRank)
437           throw DataException("Rank of numarray does not match Data object rank");
438      if (numSamples*numDataPointsPerSample > 0) {
439         //TODO: global error handling
440         if (sampleNo >= numSamples or sampleNo < 0 ) {
441              throw DataException("Error - DataExpanded::copyDataPoint invalid sampleNo.");
442         }
443         if (dataPointNo >= numDataPointsPerSample or dataPointNo < 0) {
444               throw DataException("Error - DataExpanded::copyDataPoint invalid dataPointNoInSample.");
445         }
446         DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
447         if (dataPointRank==0) {
448             dataPointView()=extract<double>(value[0]);
449         } else if (dataPointRank==1) {
450            for (int i=0; i<dataPointShape[0]; i++) {
451                dataPointView(i)=extract<double>(value[i]);
452            }
453         } else if (dataPointRank==2) {
454            for (int i=0; i<dataPointShape[0]; i++) {
455               for (int j=0; j<dataPointShape[1]; j++) {
456                  dataPointView(i,j)=extract<double>(value[i][j]);
457               }
458            }
459         } else if (dataPointRank==3) {
460            for (int i=0; i<dataPointShape[0]; i++) {
461               for (int j=0; j<dataPointShape[1]; j++) {
462                  for (int k=0; k<dataPointShape[2]; k++) {
463                     dataPointView(i,j,k)=extract<double>(value[i][j][k]);
464                  }
465               }
466            }
467         } else if (dataPointRank==4) {
468             for (int i=0; i<dataPointShape[0]; i++) {
469               for (int j=0; j<dataPointShape[1]; j++) {
470                 for (int k=0; k<dataPointShape[2]; k++) {
471                   for (int l=0; l<dataPointShape[3]; l++) {
472                      dataPointView(i,j,k,l)=extract<double>(value[i][j][k][l]);
473                   }
474                 }
475               }
476             }
477         }
478      }
479    }
480    void
481    DataExpanded::copyAll(const boost::python::numeric::array& value) {
482      //
483      // Get the number of samples and data-points per sample.
484      int numSamples = getNumSamples();
485      int numDataPointsPerSample = getNumDPPSample();
486      int dataPointRank = getPointDataView().getRank();
487      ShapeType dataPointShape = getPointDataView().getShape();
488      //
489      // check rank:
490      if (value.getrank()!=dataPointRank+1)
491           throw DataException("Rank of numarray does not match Data object rank");
492      if (value.getshape()[0]!=numSamples*numDataPointsPerSample)
493           throw DataException("leading dimension of numarray is too small");
494      //
495      int dataPoint = 0;
496      for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
497        for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
498          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
499          if (dataPointRank==0) {
500             dataPointView()=extract<double>(value[dataPoint]);
501          } else if (dataPointRank==1) {
502             for (int i=0; i<dataPointShape[0]; i++) {
503                dataPointView(i)=extract<double>(value[dataPoint][i]);
504             }
505          } else if (dataPointRank==2) {
506             for (int i=0; i<dataPointShape[0]; i++) {
507               for (int j=0; j<dataPointShape[1]; j++) {
508                 dataPointView(i,j)=extract<double>(value[dataPoint][i][j]);
509               }
510             }
511           } else if (dataPointRank==3) {
512             for (int i=0; i<dataPointShape[0]; i++) {
513               for (int j=0; j<dataPointShape[1]; j++) {
514                 for (int k=0; k<dataPointShape[2]; k++) {
515                     dataPointView(i,j,k)=extract<double>(value[dataPoint][i][j][k]);
516                 }
517               }
518             }
519           } else if (dataPointRank==4) {
520             for (int i=0; i<dataPointShape[0]; i++) {
521               for (int j=0; j<dataPointShape[1]; j++) {
522                 for (int k=0; k<dataPointShape[2]; k++) {
523                   for (int l=0; l<dataPointShape[3]; l++) {
524                     dataPointView(i,j,k,l)=extract<double>(value[dataPoint][i][j][k][l]);
525                   }
526                 }
527               }
528             }
529          }
530          dataPoint++;
531        }
532      }
533    }
534    void
535    DataExpanded::symmetric(DataAbstract* ev)
536    {
537      int sampleNo,dataPointNo;
538      int numSamples = getNumSamples();
539      int numDataPointsPerSample = getNumDPPSample();
540      DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
541      if (temp_ev==0) {
542        throw DataException("Error - DataExpanded::symmetric: casting to DataExpanded failed (propably a programming error).");
543      }
544      DataArrayView& thisView=getPointDataView();
545      DataArrayView& evView=ev->getPointDataView();
546      #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
547      for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
548        for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
549             DataArrayView::symmetric(thisView,getPointOffset(sampleNo,dataPointNo),
550                                        evView,ev->getPointOffset(sampleNo,dataPointNo));
551        }
552      }
553    }
554    void
555    DataExpanded::nonsymmetric(DataAbstract* ev)
556    {
557      int sampleNo,dataPointNo;
558      int numSamples = getNumSamples();
559      int numDataPointsPerSample = getNumDPPSample();
560      DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
561      if (temp_ev==0) {
562        throw DataException("Error - DataExpanded::nonsymmetric: casting to DataExpanded failed (propably a programming error).");
563      }
564      DataArrayView& thisView=getPointDataView();
565      DataArrayView& evView=ev->getPointDataView();
566      #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
567      for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
568        for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
569             DataArrayView::nonsymmetric(thisView,getPointOffset(sampleNo,dataPointNo),
570                                        evView,ev->getPointOffset(sampleNo,dataPointNo));
571        }
572      }
573    }
574    void
575    DataExpanded::trace(DataAbstract* ev, int axis_offset)
576    {
577      int sampleNo,dataPointNo;
578      int numSamples = getNumSamples();
579      int numDataPointsPerSample = getNumDPPSample();
580      DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
581      if (temp_ev==0) {
582        throw DataException("Error - DataExpanded::trace: casting to DataExpanded failed (propably a programming error).");
583      }
584      DataArrayView& thisView=getPointDataView();
585      DataArrayView& evView=ev->getPointDataView();
586      #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
587      for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
588        for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
589             DataArrayView::trace(thisView,getPointOffset(sampleNo,dataPointNo),
590                                        evView,ev->getPointOffset(sampleNo,dataPointNo),axis_offset);
591        }
592      }
593    }
594    
595    void
596    DataExpanded::transpose(DataAbstract* ev, int axis_offset)
597    {
598      int sampleNo,dataPointNo;
599      int numSamples = getNumSamples();
600      int numDataPointsPerSample = getNumDPPSample();
601      DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
602      if (temp_ev==0) {
603        throw DataException("Error - DataExpanded::transpose: casting to DataExpanded failed (propably a programming error).");
604      }
605      DataArrayView& thisView=getPointDataView();
606      DataArrayView& evView=ev->getPointDataView();
607      #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
608      for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
609        for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
610             DataArrayView::transpose(thisView,getPointOffset(sampleNo,dataPointNo),
611                                        evView,ev->getPointOffset(sampleNo,dataPointNo),axis_offset);
612        }
613      }
614    }
615    
616    void
617    DataExpanded::swapaxes(DataAbstract* ev, int axis0, int axis1)
618    {
619      int sampleNo,dataPointNo;
620      int numSamples = getNumSamples();
621      int numDataPointsPerSample = getNumDPPSample();
622      DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
623      if (temp_ev==0) {
624        throw DataException("Error - DataExpanded::swapaxes: casting to DataExpanded failed (propably a programming error).");
625      }
626      DataArrayView& thisView=getPointDataView();
627      DataArrayView& evView=ev->getPointDataView();
628      #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
629      for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
630        for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
631             DataArrayView::swapaxes(thisView,getPointOffset(sampleNo,dataPointNo),
632                                        evView,ev->getPointOffset(sampleNo,dataPointNo),axis0,axis1);
633        }
634      }
635    }
636    void
637    DataExpanded::eigenvalues(DataAbstract* ev)
638    {
639      int sampleNo,dataPointNo;
640      int numSamples = getNumSamples();
641      int numDataPointsPerSample = getNumDPPSample();
642      DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
643      if (temp_ev==0) {
644        throw DataException("Error - DataExpanded::eigenvalues: casting to DataExpanded failed (propably a programming error).");
645      }
646      DataArrayView& thisView=getPointDataView();
647      DataArrayView& evView=ev->getPointDataView();
648      #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
649      for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
650        for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
651             DataArrayView::eigenvalues(thisView,getPointOffset(sampleNo,dataPointNo),
652                                        evView,ev->getPointOffset(sampleNo,dataPointNo));
653        }
654      }
655    }
656    void
657    DataExpanded::eigenvalues_and_eigenvectors(DataAbstract* ev,DataAbstract* V,const double tol)
658    {
659      int numSamples = getNumSamples();
660      int numDataPointsPerSample = getNumDPPSample();
661      int sampleNo,dataPointNo;
662      DataExpanded* temp_ev=dynamic_cast<DataExpanded*>(ev);
663      if (temp_ev==0) {
664        throw DataException("Error - DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (propably a programming error).");
665      }
666      DataExpanded* temp_V=dynamic_cast<DataExpanded*>(V);
667      if (temp_V==0) {
668        throw DataException("Error - DataExpanded::eigenvalues_and_eigenvectors: casting to DataExpanded failed (propably a programming error).");
669      }
670      DataArrayView& thisView=getPointDataView();
671      DataArrayView& evView=ev->getPointDataView();
672      DataArrayView& VView=V->getPointDataView();
673      #pragma omp parallel for private(sampleNo,dataPointNo) schedule(static)
674      for (sampleNo = 0; sampleNo < numSamples; sampleNo++) {
675        for (dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
676             DataArrayView::eigenvalues_and_eigenvectors(thisView,getPointOffset(sampleNo,dataPointNo),
677                                                         evView,ev->getPointOffset(sampleNo,dataPointNo),
678                                                         VView,V->getPointOffset(sampleNo,dataPointNo),
679                                                         tol);
680        }
681      }
682    }
683    
684  }  // end of namespace  }  // end of namespace

Legend:
Removed from v.117  
changed lines
  Added in v.922

  ViewVC Help
Powered by ViewVC 1.1.26