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

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

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

revision 100 by jgs, Wed Dec 15 03:48:48 2004 UTC revision 117 by jgs, Fri Apr 1 05:48:57 2005 UTC
# Line 17  Line 17 
17  #include "escript/Data/UnaryOp.h"  #include "escript/Data/UnaryOp.h"
18  #include "esysUtils/EsysException.h"  #include "esysUtils/EsysException.h"
19    
20    /*
21  #include "finley/CPPAdapter/MeshAdapter.h"  #include "finley/CPPAdapter/MeshAdapter.h"
22  #include "finley/CPPAdapter/MeshAdapterFactory.h"  #include "finley/CPPAdapter/MeshAdapterFactory.h"
23  #include "escript/Data/AbstractContinuousDomain.h"  #include "escript/Data/AbstractContinuousDomain.h"
24    */
25    
26  #include "escript/Data/FunctionSpaceFactory.h"  #include "escript/Data/FunctionSpaceFactory.h"
27  #include "escript/Data/DataFactory.h"  #include "escript/Data/DataFactory.h"
# Line 35  using namespace escript; Line 37  using namespace escript;
37  using namespace esysUtils;  using namespace esysUtils;
38  using namespace std;  using namespace std;
39    
40  using namespace finley;  //using namespace finley;
41    
42  void DataTaggedTestCase::setUp() {  void DataTaggedTestCase::setUp() {
43    //    //
# Line 228  void DataTaggedTestCase::testAll() { Line 230  void DataTaggedTestCase::testAll() {
230      myData.addTaggedValues(keys,values);      myData.addTaggedValues(keys,values);
231      assert(myData.getDataPointByTag(1)==myView);      assert(myData.getDataPointByTag(1)==myView);
232      cout << "\tTest addition of further tags." << endl;      cout << "\tTest addition of further tags." << endl;
233      keys.clear();      keys.resize(0);
234      keys.push_back(3);      keys.push_back(3);
235      for (int i=0;i<myView.getShape()[0];++i) {      for (int i=0;i<myView.getShape()[0];++i) {
236        myView(i)=i+1.5;        myView(i)=i+1.5;
# Line 291  void DataTaggedTestCase::testAll() { Line 293  void DataTaggedTestCase::testAll() {
293      viewShape.push_back(1);      viewShape.push_back(1);
294      keys.clear();      keys.clear();
295      values.clear();      values.clear();
296      viewData.clear();      viewData.resize(0);
297      for (int i=0;i<viewShape[0];++i) {      for (int i=0;i<viewShape[0];++i) {
298        viewData.push_back(0.0);        viewData.push_back(0.0);
299      }      }

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

  ViewVC Help
Powered by ViewVC 1.1.26