/[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 100 by jgs, Wed Dec 15 03:48:48 2004 UTC trunk/escript/src/Data/DataExpanded.cpp revision 155 by jgs, Wed Nov 9 02:02:19 2005 UTC
# Line 1  Line 1 
1    // $Id$
2  /*  /*
3   ******************************************************************************   ******************************************************************************
4   *                                                                            *   *                                                                            *
# 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      // copy the data in the correct format
152      m_data.getData()=data;
153      //
154      // create the view of the data
155      DataArrayView tempView(m_data.getData(),shape);
156      setPointDataView(tempView);
157    }
158    
159    DataExpanded::~DataExpanded()
160    {
161    }
162    
163    void
164    DataExpanded::reshapeDataPoint(const DataArrayView::ShapeType& shape)
165    {
166      if (getPointDataView().getRank()!=0) {
167        stringstream temp;
168        temp << "Error - Can only reshape Data with data points of rank 0. "
169             << "This Data has data points with rank: "
170             << getPointDataView().getRank();
171        throw DataException(temp.str());
172      }
173      //
174      // create the new DataBlocks2D data array, and a corresponding DataArrayView
175      DataBlocks2D newData(getNumSamples(),getNumDPPSample(),DataArrayView::noValues(shape));
176      DataArrayView newView(newData.getData(),shape);
177      //
178      // Copy the original data to every value for the new shape
179      int i,j;
180      int nRows=m_data.getNumRows();
181      int nCols=m_data.getNumCols();
182      #pragma omp parallel for private(i,j) schedule(static)
183      for (i=0;i<nRows;i++) {
184        for (j=0;j<nCols;j++) {
185          // NOTE: An exception may be thown from this call if
186          // DOASSERT is on which of course will play
187          // havoc with the omp threads. Run single threaded
188          // if using DOASSERT.
189          newView.copy(newData.index(i,j),m_data(i,j));
190        }
191      }
192      // swap the new data array for the original
193      m_data.Swap(newData);
194      // set the corresponding DataArrayView
195      DataArrayView temp(m_data.getData(),shape);
196      setPointDataView(temp);
197    }
198    
199    DataAbstract*
200    DataExpanded::getSlice(const DataArrayView::RegionType& region) const
201    {
202      return new DataExpanded(*this,region);
203    }
204    
205    void
206    DataExpanded::setSlice(const DataAbstract* value,
207                           const DataArrayView::RegionType& region)
208    {
209      const DataExpanded* tempDataExp=dynamic_cast<const DataExpanded*>(value);
210      if (tempDataExp==0) {
211        throw DataException("Programming error - casting to DataExpanded.");
212      }
213      //
214      // get shape of slice
215      DataArrayView::ShapeType shape(DataArrayView::getResultSliceShape(region));
216      DataArrayView::RegionLoopRangeType region_loop_range=getSliceRegionLoopRange(region);
217      //
218      // check shape
219      if (getPointDataView().getRank()!=region.size()) {
220        throw DataException("Error - Invalid slice region.");
221      }
222      if (tempDataExp->getPointDataView().getRank()>0 and !value->getPointDataView().checkShape(shape)) {
223        throw DataException (value->getPointDataView().createShapeErrorMessage(
224            "Error - Couldn't copy slice due to shape mismatch.",shape));
225      }
226      //
227      // copy the data from the slice into this object
228      DataArrayView::ValueType::size_type numRows=m_data.getNumRows();
229      DataArrayView::ValueType::size_type numCols=m_data.getNumCols();
230      int i, j;
231      #pragma omp parallel for private(i,j) schedule(static)
232      for (i=0;i<numRows;i++) {
233        for (j=0;j<numCols;j++) {
234          getPointDataView().copySliceFrom(getPointOffset(i,j),
235                                           tempDataExp->getPointDataView(),
236                                           tempDataExp->getPointOffset(i,j),
237                                           region_loop_range);
238        }
239      }
240    }
241    
242    void
243    DataExpanded::copy(const DataArrayView& value)
244    {
245      //
246      // copy a single value to every data point in this object
247      int nRows=m_data.getNumRows();
248      int nCols=m_data.getNumCols();
249      int i,j;
250      #pragma omp parallel for private(i,j) schedule(static)
251      for (i=0;i<nRows;i++) {
252        for (j=0;j<nCols;j++) {
253          // NOTE: An exception may be thown from this call if
254          // DOASSERT is on which of course will play
255          // havoc with the omp threads. Run single threaded
256          // if using DOASSERT.
257          getPointDataView().copy(m_data.index(i,j),value);
258        }
259      }
260    }
261    
262    void
263    DataExpanded::copy(const boost::python::numeric::array& value)
264    {
265      //
266      // first convert the numarray into a DataArray object
267      DataArray temp(value);
268      //
269      // check the input shape matches this shape
270      if (!getPointDataView().checkShape(temp.getView().getShape())) {
271        throw DataException(getPointDataView().createShapeErrorMessage(
272                            "Error - (DataExpanded) Cannot copy due to shape mismatch.",
273                            temp.getView().getShape()));
274      }
275      //
276      // now copy over the data
277      copy(temp.getView());
278    }
279    
280    void
281    DataExpanded::initialise(const DataArrayView::ShapeType& shape,
282                             int noSamples,
283                             int noDataPointsPerSample)
284    {
285      //
286      // resize data array to the required size
287      m_data.resize(noSamples,noDataPointsPerSample,DataArrayView::noValues(shape));
288      //
289      // create the data view of the data array
290      DataArrayView temp(m_data.getData(),shape);
291      setPointDataView(temp);
292    }
293    
294    string
295    DataExpanded::toString() const
296    {
297      stringstream temp;
298      //
299      // create a temporary view as the offset will be changed
300      DataArrayView tempView(getPointDataView().getData(),getPointDataView().getShape(),getPointDataView().getOffset());
301      for (int i=0;i<m_data.getNumRows();i++) {
302        for (int j=0;j<m_data.getNumCols();j++) {
303          tempView.setOffset(m_data.index(i,j));
304          stringstream suffix;
305          suffix << "(" << i << "," << j << ")";
306          temp << tempView.toString(suffix.str());
307          if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {
308            temp << endl;
309        }        }
310      }      }
311    }    }
312      return temp.str();
313    }
314    
315    void DataExpanded::copy(const boost::python::numeric::array& value)  DataArrayView::ValueType::size_type
316    {  DataExpanded::getPointOffset(int sampleNo,
317      //                               int dataPointNo) const
318      // first convert the numarray into a DataArrayView format  {
319      DataArray temp(value);    return m_data.index(sampleNo,dataPointNo);
320      //  }
321      // check the input shape matches this shape, this will throw an exception  
322      if (!getPointDataView().checkShape(temp.getView().getShape())) {  DataArrayView
323        throw DataException(getPointDataView().createShapeErrorMessage(  DataExpanded::getDataPoint(int sampleNo,
324           "Error - (DataExpanded) Cannot copy due to shape mismatch.",                             int dataPointNo)
325           temp.getView().getShape()));  {
326      }    DataArrayView temp(m_data.getData(),getPointDataView().getShape(),m_data.index(sampleNo,dataPointNo));
327      //    return temp;
328      // now copy over the entire data structure  }
329      copy(temp.getView());  
330    }  DataArrayView::ValueType::size_type
331    DataExpanded::getLength() const
332    void DataExpanded::initialise(const DataArrayView::ShapeType& shape, int noSamples, int noDataPointsPerSample)  {
333    {    return m_data.size();
334      //  }
335      // resize data to the required size  
336      //cout << "noDataPointsPerSample=" << noDataPointsPerSample  void
337      //     << " noSamples=" << noSamples  DataExpanded::setRefValue(int ref,
338      //     << " noValuesPerDataPoint=" << DataArrayView::noValues(shape) << endl;                            const DataArray& value)
339      m_data.resize(noSamples,noDataPointsPerSample, DataArrayView::noValues(shape));  {
340      //    //
341      // create a point data viewer of the data    // Get the number of samples and data-points per sample.
342      DataArrayView temp(m_data.getData(),shape);    int numSamples = getNumSamples();
343      setPointDataView(temp);    int numDPPSample = getNumDPPSample();
344      //cout << "leaving initialise." << endl;  
345    }    //
346      // Determine the sample number which corresponds to this reference number.
347    string DataExpanded::toString() const    int sampleNo = -1;
348    {    int tempRef = -1;
349      stringstream temp;    for (int n=0; n<numSamples; n++) {
350      //      tempRef = getFunctionSpace().getReferenceNoFromSampleNo(n);
351      // create a temporary view as the offset will be changed      if (tempRef == ref) {
352      DataArrayView tempView(getPointDataView().getData(), getPointDataView().getShape(), getPointDataView().getOffset());        sampleNo = n;
353      for (int i=0;i<m_data.getNumRows();++i) {        break;
354        for (int j=0;j<m_data.getNumCols();++j) {      }
355          tempView.setOffset(m_data.index(i,j));    }
356      stringstream suffix;    if (sampleNo == -1) {
357      suffix << "(" << i << "," << j << ")";      throw DataException("DataExpanded::setRefValue error: invalid ref number supplied.");
358      temp << tempView.toString(suffix.str());    }
359      if (!(i==(m_data.getNumRows()-1) && j==(m_data.getNumCols()-1))) {  
360        temp << endl;    for (int n=0; n<numDPPSample; n++) {
361      }      //
362        // Get *each* data-point in the sample in turn.
363        DataArrayView pointView = getDataPoint(sampleNo, n);
364        //
365        // Assign the values in the DataArray to this data-point.
366        pointView.copy(value.getView());
367      }
368    }
369    
370    void
371    DataExpanded::getRefValue(int ref,
372                              DataArray& value)
373    {
374      //
375      // Get the number of samples and data-points per sample.
376      int numSamples = getNumSamples();
377      int numDPPSample = getNumDPPSample();
378    
379      //
380      // Determine the sample number which corresponds to this reference number
381      int sampleNo = -1;
382      int tempRef = -1;
383      for (int n=0; n<numSamples; n++) {
384        tempRef = getFunctionSpace().getReferenceNoFromSampleNo(n);
385        if (tempRef == ref) {
386          sampleNo = n;
387          break;
388        }
389      }
390      if (sampleNo == -1) {
391        throw DataException("DataExpanded::getRefValue error: invalid ref number supplied.");
392      }
393    
394      //
395      // Get the *first* data-point associated with this sample number.
396      DataArrayView pointView = getDataPoint(sampleNo, 0);
397    
398      //
399      // Load the values from this data-point into the DataArray
400      value.getView().copy(pointView);
401    }
402    
403    int
404    DataExpanded::archiveData(ofstream& archiveFile,
405                              const DataArrayView::ValueType::size_type noValues) const
406    {
407      return(m_data.archiveData(archiveFile, noValues));
408    }
409    
410    int
411    DataExpanded::extractData(ifstream& archiveFile,
412                              const DataArrayView::ValueType::size_type noValues)
413    {
414      return(m_data.extractData(archiveFile, noValues));
415    }
416    
417    void
418    DataExpanded::copyAll(const boost::python::numeric::array& value) {
419      //
420      // Get the number of samples and data-points per sample.
421      int numSamples = getNumSamples();
422      int numDataPointsPerSample = getNumDPPSample();
423      int dataPointRank = getPointDataView().getRank();
424      ShapeType dataPointShape = getPointDataView().getShape();
425      //
426      // check rank:
427      if (value.getrank()!=dataPointRank+1)
428           throw DataException("Rank of numarray does not match Data object rank");
429      if (value.getshape()[0]!=numSamples*numDataPointsPerSample)
430           throw DataException("leading dimension of numarray is too small");
431      //
432      int dataPoint = 0;
433      for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
434        for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
435          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
436          if (dataPointRank==0) {
437             dataPointView()=extract<double>(value[dataPoint]);
438          } else if (dataPointRank==1) {
439             for (int i=0; i<dataPointShape[0]; i++) {
440                dataPointView(i)=extract<double>(value[dataPoint][i]);
441             }
442          } else if (dataPointRank==2) {
443             for (int i=0; i<dataPointShape[0]; i++) {
444               for (int j=0; j<dataPointShape[1]; j++) {
445                 dataPointView(i,j)=extract<double>(value[dataPoint][i][j]);
446               }
447             }
448           } else if (dataPointRank==3) {
449             for (int i=0; i<dataPointShape[0]; i++) {
450               for (int j=0; j<dataPointShape[1]; j++) {
451                 for (int k=0; k<dataPointShape[2]; k++) {
452                     dataPointView(i,j,k)=extract<double>(value[dataPoint][i][j][k]);
453                 }
454               }
455             }
456           } else if (dataPointRank==4) {
457             for (int i=0; i<dataPointShape[0]; i++) {
458               for (int j=0; j<dataPointShape[1]; j++) {
459                 for (int k=0; k<dataPointShape[2]; k++) {
460                   for (int l=0; l<dataPointShape[3]; l++) {
461                     dataPointView(i,j,k,l)=extract<double>(value[dataPoint][i][j][k][l]);
462                   }
463                 }
464               }
465             }
466        }        }
467          dataPoint++;
468      }      }
     return temp.str();  
469    }    }
470    }
   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();  
   }  
   
471  }  // end of namespace  }  // end of namespace

Legend:
Removed from v.100  
changed lines
  Added in v.155

  ViewVC Help
Powered by ViewVC 1.1.26