/[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 82 by jgs, Tue Oct 26 06:53:54 2004 UTC trunk/escript/src/DataExpanded.cpp revision 474 by jgs, Mon Jan 30 04:23:44 2006 UTC
# Line 1  Line 1 
1    // $Id$
2  /*  /*
3   ******************************************************************************   ******************************************************************************
4   *                                                                            *   *                                                                            *
# Line 12  Line 13 
13   ******************************************************************************   ******************************************************************************
14  */  */
15    
16  #include "escript/Data/DataException.h"  #include "DataException.h"
17  #include "escript/Data/DataExpanded.h"  #include "DataExpanded.h"
18  #include "escript/Data/DataConstant.h"  #include "DataConstant.h"
19  #include "escript/Data/DataTagged.h"  #include "DataTagged.h"
20  #include "escript/Data/DataArrayView.h"  #include "DataArrayView.h"
21    
22  #include <boost/python/extract.hpp>  #include <boost/python/extract.hpp>
23    
# Line 28  using namespace boost; Line 29  using namespace boost;
29    
30  namespace escript {  namespace escript {
31    
32    DataExpanded::DataExpanded(const boost::python::numeric::array& value, const FunctionSpace& what) : DataAbstract(what)  DataExpanded::DataExpanded(const boost::python::numeric::array& value,
33    {                             const FunctionSpace& what)
34      //cout << "Calling DataExpanded constructor 1." << endl;    : DataAbstract(what)
35      DataArrayView::ShapeType tempShape;  {
36      //    DataArrayView::ShapeType tempShape;
37      // extract the shape from the python array    //
38      for (int i=0; i<value.getrank(); ++i) {    // extract the shape of the python numarray
39        cout << extract<int>(value.getshape()[i]) << endl;    for (int i=0; i<value.getrank(); i++) {
40        tempShape.push_back(extract<int>(value.getshape()[i]));      tempShape.push_back(extract<int>(value.getshape()[i]));
41      }    }
42      initialise(tempShape,what.getNumSamples(),what.getNumDPPSample());    //
43      //    // initialise the data array for this object
44      // copy the given value to every data point    initialise(tempShape,what.getNumSamples(),what.getNumDPPSample());
45      copy(value);    //
46    }    // copy the given value to every data point
47      copy(value);
48    DataExpanded::DataExpanded(const DataExpanded& other) : DataAbstract(other.getFunctionSpace()), m_data(other.m_data)  }
49    {      
50      //cout << "Calling DataExpanded copy constructor." << endl;  DataExpanded::DataExpanded(const DataExpanded& other)
51      //    : DataAbstract(other.getFunctionSpace()),
52      // create the view for the data    m_data(other.m_data)
53      DataArrayView temp(m_data.getData(),other.getPointDataView().getShape());  {
54      setPointDataView(temp);    //
55    }    // create the view for the data
56      DataArrayView temp(m_data.getData(),other.getPointDataView().getShape());
57    DataExpanded::DataExpanded(const DataConstant& other) : DataAbstract(other.getFunctionSpace())    setPointDataView(temp);
58    {      }
59      //cout << "Creating DataExpanded from DataConstant." << endl;  
60      initialise(other.getPointDataView().getShape(),other.getNumSamples(), other.getNumDPPSample());  DataExpanded::DataExpanded(const DataConstant& other)
61      //    : DataAbstract(other.getFunctionSpace())
62      // DataConstant only has one value  {
63      copy(other.getPointDataView());    //
64    }    // initialise the data array for this object
65      initialise(other.getPointDataView().getShape(),other.getNumSamples(),other.getNumDPPSample());
66    DataExpanded::DataExpanded(const DataTagged& other) : DataAbstract(other.getFunctionSpace())    //
67    {        // DataConstant only has one value, copy this to every data point
68      //cout << "Creating DataExpanded from DataTagged." << endl;    copy(other.getPointDataView());
69      initialise(other.getPointDataView().getShape(),other.getNumSamples(), other.getNumDPPSample());  }
70      int i,j;  
71      DataArrayView::ValueType::size_type numRows=m_data.getNumRows();  DataExpanded::DataExpanded(const DataTagged& other)
72      DataArrayView::ValueType::size_type numCols=m_data.getNumCols();    : DataAbstract(other.getFunctionSpace())
73  #pragma omp parallel for private(i,j) schedule(static)  {
74      for (i=0;i<numRows;++i) {    //
75        for (j=0;j<numCols;++j) {    // initialise the data array for this object
76      try {    initialise(other.getPointDataView().getShape(),other.getNumSamples(),other.getNumDPPSample());
77        getPointDataView().copy(getPointOffset(i,j), other.getPointDataView(), other.getPointOffset(i,j));    //
78      }    // for each data point in this object, extract and copy the corresponding data
79      catch (std::exception& e) {    // value from the given DataTagged object
80        cout << e.what() << endl;    int i,j;
81      }    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();
82      DataArrayView::ValueType::size_type numCols=m_data.getNumCols();
83      #pragma omp parallel for private(i,j) schedule(static)
84      for (i=0;i<numRows;i++) {
85        for (j=0;j<numCols;j++) {
86          try {
87            getPointDataView().copy(getPointOffset(i,j),
88                                    other.getPointDataView(),
89                                    other.getPointOffset(i,j));
90        }        }
91      }        catch (std::exception& e) {
92    }          cout << e.what() << endl;
   
   DataExpanded::DataExpanded(const DataExpanded& other, const DataArrayView::RegionType& region) : DataAbstract(other.getFunctionSpace())  
   {  
     //cout << "Creating DataExpanded by slicing from another DataExpanded." << endl;  
     //  
     // get the shape of the slice  
     DataArrayView::ShapeType shape(DataArrayView::getResultSliceShape(region));  
     initialise(shape,other.getNumSamples(),other.getNumDPPSample());  
     //  
     // copy the data  
     DataArrayView::ValueType::size_type numRows=m_data.getNumRows();  
     DataArrayView::ValueType::size_type numCols=m_data.getNumCols();  
     int i,j;  
 #pragma omp parallel for private(i,j) schedule(static)  
     for (i=0;i<numRows;++i) {  
       for (j=0;j<numCols;++j) {  
     try {  
       getPointDataView().copySlice(getPointOffset(i,j), other.getPointDataView(), other.getPointOffset(i,j), region);  
     }  
     catch (std::exception& e) {  
       cout << e.what() << endl;  
     }  
93        }        }
94      }      }
95    }    }
96    }
97    
98    DataExpanded::DataExpanded(const DataArrayView& value,const FunctionSpace& what): DataAbstract(what)  DataExpanded::DataExpanded(const DataExpanded& other,
99    {                             const DataArrayView::RegionType& region)
100      //cout << "Calling DataExpanded constructor 2." << endl;    : DataAbstract(other.getFunctionSpace())
101      DataArrayView::ShapeType tempShape=value.getShape();  {
102      initialise(tempShape,what.getNumSamples(),what.getNumDPPSample());    //
103      copy(value);    // get the shape of the slice
104    }    DataArrayView::ShapeType shape(DataArrayView::getResultSliceShape(region));
105      //
106    DataExpanded::~DataExpanded()    // initialise this Data object to the shape of the slice
107    {    initialise(shape,other.getNumSamples(),other.getNumDPPSample());
108      //cout << "Destructing DataExpanded." << endl;    //
109    }    // copy the data
110      DataArrayView::RegionLoopRangeType region_loop_range=getSliceRegionLoopRange(region);
111    DataAbstract* DataExpanded::getSlice(const DataArrayView::RegionType& region) const    DataArrayView::ValueType::size_type numRows=m_data.getNumRows();
112    {    DataArrayView::ValueType::size_type numCols=m_data.getNumCols();
113      return new DataExpanded(*this,region);    int i,j;
114    }    #pragma omp parallel for private(i,j) schedule(static)
115      for (i=0;i<numRows;i++) {
116    void DataExpanded::reshapeDataPoint(const DataArrayView::ShapeType& shape)      for (j=0;j<numCols;j++) {
117    {        try {
118      //          getPointDataView().copySlice(getPointOffset(i,j),
119      // reshape a rank zero data point                                       other.getPointDataView(),
120      if (getPointDataView().getRank()!=0) {                                       other.getPointOffset(i,j),
121        stringstream temp;                                       region_loop_range);
       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());  
     }  
     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) {  
     //  
     // Copy the data into the specified offset  
     // 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.getData()[m_data.index(i,j)]);  
122        }        }
123      }        catch (std::exception& e) {
124      m_data.Swap(newData);          cout << e.what() << endl;
     DataArrayView temp(m_data.getData(),shape);  
     setPointDataView(temp);  
   }  
   
   void DataExpanded::setSlice(const DataAbstract* value, const DataArrayView::RegionType& region)  
   {  
     const DataExpanded* tempDataExp=dynamic_cast<const DataExpanded*>(value);  
     if (tempDataExp==0) {  
       throw DataException("Programming error - casting to DataExpanded.");  
     }  
     if (getPointDataView().getRank()!=region.size()) {  
       throw DataException("Error - Invalid slice region.");  
     }  
     if (!value->getPointDataView().checkShape(DataArrayView::getResultSliceShape(region))) {  
       throw DataException (value->getPointDataView().createShapeErrorMessage(  
                 "Error - Couldn't copy slice due to shape mismatch.",DataArrayView::getResultSliceShape(region)));  
     }  
     //  
     // copy the data  
     DataArrayView::ValueType::size_type numRows=m_data.getNumRows();  
     DataArrayView::ValueType::size_type numCols=m_data.getNumCols();  
     int i,j;  
 #pragma omp parallel for private(i,j) schedule(static)  
     for (i=0;i<numRows;++i) {  
       for (j=0;j<numCols;++j) {  
     getPointDataView().copySliceFrom(getPointOffset(i,j), tempDataExp->getPointDataView(), tempDataExp->getPointOffset(i,j), region);  
125        }        }
126      }      }
127    }    }
128    }
129    
130    void DataExpanded::copy(const DataArrayView& value)  DataExpanded::DataExpanded(const DataArrayView& value,
131    {                             const FunctionSpace& what)
132      //    : DataAbstract(what)
133      // Copy a single value to every data point  {
134      int i,j;    //
135      int nRows=m_data.getNumRows();    // get the shape of the given data value
136      int nCols=m_data.getNumCols();    DataArrayView::ShapeType tempShape=value.getShape();
137      #pragma omp parallel for private(i,j) schedule(static)    //
138      for (i=0;i<nRows;++i) {    // initialise this Data object to the shape of the given data value
139        for (j=0;j<nCols;++j) {    initialise(tempShape,what.getNumSamples(),what.getNumDPPSample());
140      //    //
141      // Copy the data into the specified offset    // copy the given value to every data point
142      // NOTE: An exception may be thown from this call if    copy(value);
143      // DOASSERT is on which of course will play  }
144      // havoc with the omp threads. Run single threaded  
145      // if using DOASSERT.  DataExpanded::DataExpanded(const FunctionSpace& what,
146      getPointDataView().copy(m_data.index(i,j),value);                             const DataArrayView::ShapeType &shape,
147                               const DataArrayView::ValueType &data)
148      : DataAbstract(what)
149    {
150      //
151      // create the view of the data
152      initialise(shape,what.getNumSamples(),what.getNumDPPSample());
153      //
154      // copy the data in the correct format
155      m_data.getData()=data;
156    }
157    
158    DataExpanded::~DataExpanded()
159    {
160    }
161    
162    void
163    DataExpanded::reshapeDataPoint(const DataArrayView::ShapeType& shape)
164    {
165      if (getPointDataView().getRank()!=0) {
166        stringstream temp;
167        temp << "Error - Can only reshape Data with data points of rank 0. "
168             << "This Data has data points with rank: "
169             << getPointDataView().getRank();
170        throw DataException(temp.str());
171      }
172      //
173      // create the new DataBlocks2D data array, and a corresponding DataArrayView
174      DataBlocks2D newData(getNumSamples(),getNumDPPSample(),DataArrayView::noValues(shape));
175      DataArrayView newView(newData.getData(),shape);
176      //
177      // Copy the original data to every value for the new shape
178      int i,j;
179      int nRows=m_data.getNumRows();
180      int nCols=m_data.getNumCols();
181      #pragma omp parallel for private(i,j) schedule(static)
182      for (i=0;i<nRows;i++) {
183        for (j=0;j<nCols;j++) {
184          // NOTE: An exception may be thown from this call if
185          // DOASSERT is on which of course will play
186          // havoc with the omp threads. Run single threaded
187          // if using DOASSERT.
188          newView.copy(newData.index(i,j),m_data(i,j));
189        }
190      }
191      // swap the new data array for the original
192      m_data.Swap(newData);
193      // set the corresponding DataArrayView
194      DataArrayView temp(m_data.getData(),shape);
195      setPointDataView(temp);
196    }
197    
198    DataAbstract*
199    DataExpanded::getSlice(const DataArrayView::RegionType& region) const
200    {
201      return new DataExpanded(*this,region);
202    }
203    
204    void
205    DataExpanded::setSlice(const DataAbstract* value,
206                           const DataArrayView::RegionType& region)
207    {
208      const DataExpanded* tempDataExp=dynamic_cast<const DataExpanded*>(value);
209      if (tempDataExp==0) {
210        throw DataException("Programming error - casting to DataExpanded.");
211      }
212      //
213      // get shape of slice
214      DataArrayView::ShapeType shape(DataArrayView::getResultSliceShape(region));
215      DataArrayView::RegionLoopRangeType region_loop_range=getSliceRegionLoopRange(region);
216      //
217      // check shape
218      if (getPointDataView().getRank()!=region.size()) {
219        throw DataException("Error - Invalid slice region.");
220      }
221      if (tempDataExp->getPointDataView().getRank()>0 and !value->getPointDataView().checkShape(shape)) {
222        throw DataException (value->getPointDataView().createShapeErrorMessage(
223            "Error - Couldn't copy slice due to shape mismatch.",shape));
224      }
225      //
226      // copy the data from the slice into this object
227      DataArrayView::ValueType::size_type numRows=m_data.getNumRows();
228      DataArrayView::ValueType::size_type numCols=m_data.getNumCols();
229      int i, j;
230      #pragma omp parallel for private(i,j) schedule(static)
231      for (i=0;i<numRows;i++) {
232        for (j=0;j<numCols;j++) {
233          getPointDataView().copySliceFrom(getPointOffset(i,j),
234                                           tempDataExp->getPointDataView(),
235                                           tempDataExp->getPointOffset(i,j),
236                                           region_loop_range);
237        }
238      }
239    }
240    
241    void
242    DataExpanded::copy(const DataArrayView& value)
243    {
244      //
245      // copy a single value to every data point in this object
246      int nRows=m_data.getNumRows();
247      int nCols=m_data.getNumCols();
248      int i,j;
249      #pragma omp parallel for private(i,j) schedule(static)
250      for (i=0;i<nRows;i++) {
251        for (j=0;j<nCols;j++) {
252          // NOTE: An exception may be thown from this call if
253          // DOASSERT is on which of course will play
254          // havoc with the omp threads. Run single threaded
255          // if using DOASSERT.
256          getPointDataView().copy(m_data.index(i,j),value);
257        }
258      }
259    }
260    
261    void
262    DataExpanded::copy(const boost::python::numeric::array& value)
263    {
264      //
265      // first convert the numarray into a DataArray object
266      DataArray temp(value);
267      //
268      // check the input shape matches this shape
269      if (!getPointDataView().checkShape(temp.getView().getShape())) {
270        throw DataException(getPointDataView().createShapeErrorMessage(
271                            "Error - (DataExpanded) Cannot copy due to shape mismatch.",
272                            temp.getView().getShape()));
273      }
274      //
275      // now copy over the data
276      copy(temp.getView());
277    }
278    
279    void
280    DataExpanded::initialise(const DataArrayView::ShapeType& shape,
281                             int noSamples,
282                             int noDataPointsPerSample)
283    {
284      //
285      // resize data array to the required size
286      m_data.resize(noSamples,noDataPointsPerSample,DataArrayView::noValues(shape));
287      //
288      // create the data view of the data array
289      DataArrayView temp(m_data.getData(),shape);
290      setPointDataView(temp);
291    }
292    
293    string
294    DataExpanded::toString() const
295    {
296      stringstream temp;
297      //
298      // create a temporary view as the offset will be changed
299      DataArrayView tempView(getPointDataView().getData(),getPointDataView().getShape(),getPointDataView().getOffset());
300      for (int i=0;i<m_data.getNumRows();i++) {
301        for (int j=0;j<m_data.getNumCols();j++) {
302          tempView.setOffset(m_data.index(i,j));
303          stringstream suffix;
304          suffix << "(" << i << "," << j << ")";
305          temp << tempView.toString(suffix.str());
306          if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {
307            temp << endl;
308        }        }
309      }      }
310    }    }
311      return temp.str();
312    }
313    
314    void DataExpanded::copy(const boost::python::numeric::array& value)  DataArrayView::ValueType::size_type
315    {  DataExpanded::getPointOffset(int sampleNo,
316      //                               int dataPointNo) const
317      // first convert the numarray into a DataArrayView format  {
318      DataArray temp(value);    return m_data.index(sampleNo,dataPointNo);
319      //  }
320      // check the input shape matches this shape, this will throw an exception  
321      if (!getPointDataView().checkShape(temp.getView().getShape())) {  DataArrayView
322        throw DataException(getPointDataView().createShapeErrorMessage(  DataExpanded::getDataPoint(int sampleNo,
323           "Error - (DataExpanded) Cannot copy due to shape mismatch.",                             int dataPointNo)
324           temp.getView().getShape()));  {
325      }    DataArrayView temp(m_data.getData(),getPointDataView().getShape(),m_data.index(sampleNo,dataPointNo));
326      //    return temp;
327      // now copy over the entire data structure  }
328      copy(temp.getView());  
329    }  DataArrayView::ValueType::size_type
330    DataExpanded::getLength() const
331    void DataExpanded::initialise(const DataArrayView::ShapeType& shape, int noSamples, int noDataPointsPerSample)  {
332    {    return m_data.size();
333      //  }
334      // resize data to the required size  
335      //cout << "noDataPointsPerSample=" << noDataPointsPerSample  void
336      //     << " noSamples=" << noSamples  DataExpanded::setRefValue(int ref,
337      //     << " noValuesPerDataPoint=" << DataArrayView::noValues(shape) << endl;                            const DataArray& value)
338      m_data.resize(noSamples,noDataPointsPerSample, DataArrayView::noValues(shape));  {
339      //    //
340      // create a point data viewer of the data    // Get the number of samples and data-points per sample.
341      DataArrayView temp(m_data.getData(),shape);    int numSamples = getNumSamples();
342      setPointDataView(temp);    int numDPPSample = getNumDPPSample();
343      //cout << "leaving initialise." << endl;  
344    }    //
345      // Determine the sample number which corresponds to this reference number.
346    string DataExpanded::toString() const    int sampleNo = -1;
347    {    int tempRef = -1;
348      stringstream temp;    for (int n=0; n<numSamples; n++) {
349      //      tempRef = getFunctionSpace().getReferenceNoFromSampleNo(n);
350      // create a temporary view as the offset will be changed      if (tempRef == ref) {
351      DataArrayView tempView(getPointDataView().getData(), getPointDataView().getShape(), getPointDataView().getOffset());        sampleNo = n;
352      for (int i=0;i<m_data.getNumRows();++i) {        break;
353        for (int j=0;j<m_data.getNumCols();++j) {      }
354          tempView.setOffset(m_data.index(i,j));    }
355      stringstream suffix;    if (sampleNo == -1) {
356      suffix << "(" << i << "," << j << ")";      throw DataException("DataExpanded::setRefValue error: invalid ref number supplied.");
357      temp << tempView.toString(suffix.str());    }
358      if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {  
359        temp << endl;    for (int n=0; n<numDPPSample; n++) {
360      }      //
361        // Get *each* data-point in the sample in turn.
362        DataArrayView pointView = getDataPoint(sampleNo, n);
363        //
364        // Assign the values in the DataArray to this data-point.
365        pointView.copy(value.getView());
366      }
367    }
368    
369    void
370    DataExpanded::getRefValue(int ref,
371                              DataArray& value)
372    {
373      //
374      // Get the number of samples and data-points per sample.
375      int numSamples = getNumSamples();
376      int numDPPSample = getNumDPPSample();
377    
378      //
379      // Determine the sample number which corresponds to this reference number
380      int sampleNo = -1;
381      int tempRef = -1;
382      for (int n=0; n<numSamples; n++) {
383        tempRef = getFunctionSpace().getReferenceNoFromSampleNo(n);
384        if (tempRef == ref) {
385          sampleNo = n;
386          break;
387        }
388      }
389      if (sampleNo == -1) {
390        throw DataException("DataExpanded::getRefValue error: invalid ref number supplied.");
391      }
392    
393      //
394      // Get the *first* data-point associated with this sample number.
395      DataArrayView pointView = getDataPoint(sampleNo, 0);
396    
397      //
398      // Load the values from this data-point into the DataArray
399      value.getView().copy(pointView);
400    }
401    
402    int
403    DataExpanded::archiveData(ofstream& archiveFile,
404                              const DataArrayView::ValueType::size_type noValues) const
405    {
406      return(m_data.archiveData(archiveFile, noValues));
407    }
408    
409    int
410    DataExpanded::extractData(ifstream& archiveFile,
411                              const DataArrayView::ValueType::size_type noValues)
412    {
413      return(m_data.extractData(archiveFile, noValues));
414    }
415    
416    void
417    DataExpanded::copyAll(const boost::python::numeric::array& value) {
418      //
419      // Get the number of samples and data-points per sample.
420      int numSamples = getNumSamples();
421      int numDataPointsPerSample = getNumDPPSample();
422      int dataPointRank = getPointDataView().getRank();
423      ShapeType dataPointShape = getPointDataView().getShape();
424      //
425      // check rank:
426      if (value.getrank()!=dataPointRank+1)
427           throw DataException("Rank of numarray does not match Data object rank");
428      if (value.getshape()[0]!=numSamples*numDataPointsPerSample)
429           throw DataException("leading dimension of numarray is too small");
430      //
431      int dataPoint = 0;
432      for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
433        for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
434          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
435          if (dataPointRank==0) {
436             dataPointView()=extract<double>(value[dataPoint]);
437          } else if (dataPointRank==1) {
438             for (int i=0; i<dataPointShape[0]; i++) {
439                dataPointView(i)=extract<double>(value[dataPoint][i]);
440             }
441          } else if (dataPointRank==2) {
442             for (int i=0; i<dataPointShape[0]; i++) {
443               for (int j=0; j<dataPointShape[1]; j++) {
444                 dataPointView(i,j)=extract<double>(value[dataPoint][i][j]);
445               }
446             }
447           } else if (dataPointRank==3) {
448             for (int i=0; i<dataPointShape[0]; i++) {
449               for (int j=0; j<dataPointShape[1]; j++) {
450                 for (int k=0; k<dataPointShape[2]; k++) {
451                     dataPointView(i,j,k)=extract<double>(value[dataPoint][i][j][k]);
452                 }
453               }
454             }
455           } else if (dataPointRank==4) {
456             for (int i=0; i<dataPointShape[0]; i++) {
457               for (int j=0; j<dataPointShape[1]; j++) {
458                 for (int k=0; k<dataPointShape[2]; k++) {
459                   for (int l=0; l<dataPointShape[3]; l++) {
460                     dataPointView(i,j,k,l)=extract<double>(value[dataPoint][i][j][k][l]);
461                   }
462                 }
463               }
464             }
465        }        }
466          dataPoint++;
467      }      }
     return temp.str();  
468    }    }
469    }
   DataArrayView::ValueType::size_type DataExpanded::getPointOffset(int sampleNo, int dataPointNo) const  
   {  
     return m_data.index(sampleNo,dataPointNo);  
   }  
   
   DataArrayView DataExpanded::getDataPoint(int sampleNo, int dataPointNo)  
   {  
     DataArrayView temp(m_data.getData(), getPointDataView().getShape(), m_data.index(sampleNo,dataPointNo));  
     return temp;  
   }  
   
   DataArrayView::ValueType::size_type DataExpanded::getLength() const  
   {  
     return m_data.getData().size();  
   }  
   
470  }  // end of namespace  }  // end of namespace

Legend:
Removed from v.82  
changed lines
  Added in v.474

  ViewVC Help
Powered by ViewVC 1.1.26