/[escript]/trunk/escript/test/Data/DataTestCase.cpp
ViewVC logotype

Diff of /trunk/escript/test/Data/DataTestCase.cpp

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

revision 113 by jgs, Mon Feb 28 07:06:33 2005 UTC revision 123 by jgs, Fri Jul 8 04:08:13 2005 UTC
# Line 151  void DataTestCase::testSlicing() { Line 151  void DataTestCase::testSlicing() {
151      DataArrayView::ShapeType viewShape;      DataArrayView::ShapeType viewShape;
152      Data source(10.0,viewShape,FunctionSpace(),true);      Data source(10.0,viewShape,FunctionSpace(),true);
153      //      //
154      // weak tests for setting a slice of DataConstant      // weak tests for setting a slice of DataExpanded
155      viewShape.push_back(2);      viewShape.push_back(2);
156      viewShape.push_back(3);      viewShape.push_back(3);
157      Data target(1.3,viewShape,FunctionSpace(),true);      Data target(1.3,viewShape,FunctionSpace(),true);
# Line 190  void DataTestCase::testMore() { Line 190  void DataTestCase::testMore() {
190    
191    cout << "\tCreate a Data object from a DataArrayView" << endl;    cout << "\tCreate a Data object from a DataArrayView" << endl;
192    
   DataArrayView::ValueType viewData;  
193    DataArrayView::ShapeType viewShape;    DataArrayView::ShapeType viewShape;
194    viewShape.push_back(3);    viewShape.push_back(3);
195      DataArrayView::ValueType viewData(3);
196    for (int i=0;i<viewShape[0];++i) {    for (int i=0;i<viewShape[0];++i) {
197      viewData.push_back(i);      viewData[i]=i;
198    }    }
199    DataArrayView myView(viewData,viewShape);    DataArrayView myView(viewData,viewShape);
200    
# Line 221  void DataTestCase::testMore() { Line 221  void DataTestCase::testMore() {
221    
222    cout << "\tExercise wherePositive method" << endl;    cout << "\tExercise wherePositive method" << endl;
223    assert(!exData.wherePositive().isEmpty());    assert(!exData.wherePositive().isEmpty());
   //assert(exData.wherePositive()==exData.wherePositive());  
224    
225    cout << "\tExercise copyWithMask method" << endl;    cout << "\tExercise copyWithMask method" << endl;
226    exData.copyWithMask(result, exData.wherePositive());    exData.copyWithMask(result, exData.wherePositive());
# Line 235  void DataTestCase::testAll() { Line 234  void DataTestCase::testAll() {
234    
235    cout << "\tCreate a Data object from a DataArrayView" << endl;    cout << "\tCreate a Data object from a DataArrayView" << endl;
236    
   DataArrayView::ValueType viewData;  
237    DataArrayView::ShapeType viewShape;    DataArrayView::ShapeType viewShape;
238    viewShape.push_back(3);    viewShape.push_back(3);
239      DataArrayView::ValueType viewData(3);
240    for (int i=0;i<viewShape[0];++i) {    for (int i=0;i<viewShape[0];++i) {
241      viewData.push_back(i);      viewData[i]=i;
242    }    }
243    DataArrayView myView(viewData,viewShape);    DataArrayView myView(viewData,viewShape);
244    
# Line 248  void DataTestCase::testAll() { Line 247  void DataTestCase::testAll() {
247    Data exData(myView,FunctionSpace(),expanded);    Data exData(myView,FunctionSpace(),expanded);
248    Data cData(myView);    Data cData(myView);
249    Data result;    Data result;
250    
251    assert(exData.isExpanded());    assert(exData.isExpanded());
252    assert(cData.isConstant());    assert(cData.isConstant());
253    assert(result.isEmpty());    assert(result.isEmpty());
# Line 264  void DataTestCase::testDataConstant() { Line 264  void DataTestCase::testDataConstant() {
264    
265    cout << "\tCreate a DataConstant object from a DataArrayView" << endl;    cout << "\tCreate a DataConstant object from a DataArrayView" << endl;
266    
   DataArrayView::ValueType viewData;  
267    DataArrayView::ShapeType viewShape;    DataArrayView::ShapeType viewShape;
268    viewShape.push_back(2);    viewShape.push_back(2);
269    viewShape.push_back(3);    viewShape.push_back(3);
270    viewShape.push_back(4);    viewShape.push_back(4);
271      DataArrayView::ValueType viewData(2*3*4);
272    for (int i=0;i<DataArrayView::noValues(viewShape);++i) {    for (int i=0;i<DataArrayView::noValues(viewShape);++i) {
273      viewData.push_back(i);      viewData[i]=i;
274    }    }
275    DataArrayView myView(viewData,viewShape);    DataArrayView myView(viewData,viewShape);
276    
# Line 302  void DataTestCase::testDataTaggedExcepti Line 302  void DataTestCase::testDataTaggedExcepti
302    cout << endl;    cout << endl;
303    
304    cout << "\tTest DataTagged operations exceptions." << endl;    cout << "\tTest DataTagged operations exceptions." << endl;
305    
306    Data myData;    Data myData;
307    DataArrayView myView;    DataArrayView myView;
308    
309    try {    try {
310        myData.getSampleDataByTag(0);;        myData.getSampleDataByTag(0);;
311        assert(false);        assert(false);
# Line 312  void DataTestCase::testDataTaggedExcepti Line 314  void DataTestCase::testDataTaggedExcepti
314        //cout << e.what() << endl;        //cout << e.what() << endl;
315        assert(true);        assert(true);
316    }    }
317    
318    /*    /*
319    try {    try {
320        myData.setTaggedValue(0,myView);;        myData.setTaggedValue(0,myView);;
# Line 333  void DataTestCase::testDataTagged() { Line 336  void DataTestCase::testDataTagged() {
336    
337    DataTagged::TagListType keys;    DataTagged::TagListType keys;
338    DataTagged::ValueListType values;    DataTagged::ValueListType values;
   DataArrayView::ValueType viewData;  
339    DataArrayView::ShapeType viewShape;    DataArrayView::ShapeType viewShape;
340    viewShape.push_back(3);    viewShape.push_back(3);
341      DataArrayView::ValueType viewData(3);
342    for (int i=0;i<viewShape[0];++i) {    for (int i=0;i<viewShape[0];++i) {
343      viewData.push_back(i);      viewData[i]=i;
344    }    }
345    DataArrayView myView(viewData,viewShape);    DataArrayView myView(viewData,viewShape);
346    
# Line 369  void DataTestCase::testConstructors() { Line 372  void DataTestCase::testConstructors() {
372      viewShape.push_back(2);      viewShape.push_back(2);
373      viewShape.push_back(3);      viewShape.push_back(3);
374      Data temp(1.3,viewShape,FunctionSpace(),false);      Data temp(1.3,viewShape,FunctionSpace(),false);
     cout << "\tDump it toString:" << endl;  
     cout << temp.toString() << endl;  
375    }    }
376  }  }
377    
# Line 503  void DataTestCase::testRefValue() { Line 504  void DataTestCase::testRefValue() {
504    cout << "\tTest Data object RefValue methods." << endl;    cout << "\tTest Data object RefValue methods." << endl;
505    
506    // Create three Data object - DataExpanded, DataConstant and DataEmpty    // Create three Data object - DataExpanded, DataConstant and DataEmpty
   DataArrayView::ValueType viewData;  
507    DataArrayView::ShapeType viewShape;    DataArrayView::ShapeType viewShape;
508    viewShape.push_back(3);    viewShape.push_back(3);
509      DataArrayView::ValueType viewData(3);
510    for (int i=0;i<viewShape[0];++i) {    for (int i=0;i<viewShape[0];++i) {
511      viewData.push_back(i);      viewData[i]=i;
512    }    }
513    DataArrayView myView(viewData,viewShape);    DataArrayView myView(viewData,viewShape);
514    

Legend:
Removed from v.113  
changed lines
  Added in v.123

  ViewVC Help
Powered by ViewVC 1.1.26