/[escript]/trunk/escript/test/DataExpandedTestCase.cpp
ViewVC logotype

Diff of /trunk/escript/test/DataExpandedTestCase.cpp

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

revision 148 by jgs, Tue Apr 12 04:45:05 2005 UTC revision 149 by jgs, Thu Sep 1 03:31:39 2005 UTC
# Line 219  void DataExpandedTestCase::testSlicing() Line 219  void DataExpandedTestCase::testSlicing()
219    cout << "\tTest slicing (whole object)." << endl;    cout << "\tTest slicing (whole object)." << endl;
220    DataArrayView::RegionType region;    DataArrayView::RegionType region;
221    region.push_back(DataArrayView::RegionType::value_type(0,shape[0]));    region.push_back(DataArrayView::RegionType::value_type(0,shape[0]));
222    
223    DataAbstract* testData2=testData.getSlice(region);    DataAbstract* testData2=testData.getSlice(region);
224    
225    //    //
# Line 234  void DataExpandedTestCase::testSlicing() Line 235  void DataExpandedTestCase::testSlicing()
235    assert(dataView.noValues()==shape[0]*1);    assert(dataView.noValues()==shape[0]*1);
236    assert(dataView.getShape()[0]==shape[0]);    assert(dataView.getShape()[0]==shape[0]);
237    
238      delete testData2;
239  }  }
240    
241  void DataExpandedTestCase::testSlicing2() {  void DataExpandedTestCase::testSlicing2() {
# Line 309  void DataExpandedTestCase::testSlicing2( Line 311  void DataExpandedTestCase::testSlicing2(
311    assert(dataView.getShape()[0]==(region2[0].second-region2[0].first));    assert(dataView.getShape()[0]==(region2[0].second-region2[0].first));
312    assert(dataView.getShape()[1]==(region2[1].second-region2[1].first));    assert(dataView.getShape()[1]==(region2[1].second-region2[1].first));
313    
314      delete testData2;
315      delete testData3;
316    
317  }  }
318    
319  void DataExpandedTestCase::testSlicing3() {  void DataExpandedTestCase::testSlicing3() {
# Line 421  void DataExpandedTestCase::testSlicing3( Line 426  void DataExpandedTestCase::testSlicing3(
426    assert(dataView.getShape()[1]==(region[1].second-region[1].first));    assert(dataView.getShape()[1]==(region[1].second-region[1].first));
427    assert(dataView.getShape()[2]==(region[2].second-region[2].first));    assert(dataView.getShape()[2]==(region[2].second-region[2].first));
428    
429      delete testData2;
430      delete testData3;
431    
432  }  }
433    
434    
# Line 496  void DataExpandedTestCase::testSliceSett Line 504  void DataExpandedTestCase::testSliceSett
504      }      }
505     }     }
506    
507      delete testData3;
508    
509  }  }
510    
511  void DataExpandedTestCase::testSliceSetting2() {  void DataExpandedTestCase::testSliceSetting2() {
# Line 563  void DataExpandedTestCase::testSliceSett Line 573  void DataExpandedTestCase::testSliceSett
573      }      }
574     }     }
575    
576      delete testData3;
577    
578  }  }
579    
580  void DataExpandedTestCase::testRefValue() {  void DataExpandedTestCase::testRefValue() {

Legend:
Removed from v.148  
changed lines
  Added in v.149

  ViewVC Help
Powered by ViewVC 1.1.26