/[escript]/branches/arrayview_from_1695_trunk/escript/test/DataTestCase.cpp
ViewVC logotype

Diff of /branches/arrayview_from_1695_trunk/escript/test/DataTestCase.cpp

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

revision 1720 by jfenwick, Tue Aug 12 01:13:16 2008 UTC revision 1721 by jfenwick, Fri Aug 22 00:39:32 2008 UTC
# Line 193  void DataTestCase::testSlicing() { Line 193  void DataTestCase::testSlicing() {
193      for (int i=0;i<viewData.size();i++) {      for (int i=0;i<viewData.size();i++) {
194        viewData[i]=i;        viewData[i]=i;
195      }      }
196      DataArrayView dataView(viewData,viewShape);  //    DataArrayView dataView(viewData,viewShape);
197    
198    //     data.setTaggedValueFromCPP(1, dataView);
199        data.setTaggedValueFromCPP(1, viewShape, viewData);
200    
     data.setTaggedValueFromCPP(1, dataView);  
201    
202      //      //
203      // create a full slice      // create a full slice
# Line 269  void DataTestCase::testSlicing() { Line 271  void DataTestCase::testSlicing() {
271      for (int i=0;i<viewData.size();i++) {      for (int i=0;i<viewData.size();i++) {
272        viewData[i]=i;        viewData[i]=i;
273      }      }
274      DataArrayView dataView(viewData,viewShape);  //     DataArrayView dataView(viewData,viewShape);
275    //
276      target.setTaggedValueFromCPP(1, dataView);  //     target.setTaggedValueFromCPP(1, dataView);
277        target.setTaggedValueFromCPP(1, viewShape, viewData);
278    
279      //cout << "target:\n" << target.toString() << endl;      //cout << "target:\n" << target.toString() << endl;
280    
# Line 301  void DataTestCase::testSlicing() { Line 304  void DataTestCase::testSlicing() {
304      DataTypes::ShapeType viewShape2;      DataTypes::ShapeType viewShape2;
305      DataTypes::ValueType viewData2(1);      DataTypes::ValueType viewData2(1);
306      viewData2[0]=6;      viewData2[0]=6;
307      DataArrayView dataView2(viewData2,viewShape2);  //     DataArrayView dataView2(viewData2,viewShape2);
308    //
309      source.setTaggedValueFromCPP(2, dataView2);  //     source.setTaggedValueFromCPP(2, dataView2);
310        source.setTaggedValueFromCPP(2, viewShape2, viewData2);
311    
312      //cout << "source:\n" << source.toString() << endl;      //cout << "source:\n" << source.toString() << endl;
313    
# Line 597  void DataTestCase::testDataTagged() { Line 601  void DataTestCase::testDataTagged() {
601        eTwoView(i)=i+2.0;        eTwoView(i)=i+2.0;
602      }      }
603    
604      myData.setTaggedValueFromCPP(1,eTwoView);      myData.setTaggedValueFromCPP(1,viewShape, eTwoView.getData());
605    
606      assert(myData.getLength()==6);      assert(myData.getLength()==6);
607    
# Line 688  void DataTestCase::testDataTaggedExcepti Line 692  void DataTestCase::testDataTaggedExcepti
692    }    }
693    
694    try {    try {
695        myData.setTaggedValueFromCPP(0,myView);;        myData.setTaggedValueFromCPP(0,DataTypes::ShapeType(), DataTypes::ValueType());;
696        assert(false);        assert(false);
697    }    }
698    catch (EsysException&) {    catch (EsysException&) {
Legend:
Removed from v.1720  
changed lines
  Added in v.1721
  ViewVC Help
Powered by ViewVC 1.1.26