/[escript]/trunk/escript/src/Data/Data.cpp
ViewVC logotype

Diff of /trunk/escript/src/Data/Data.cpp

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

revision 121 by jgs, Fri May 6 04:26:16 2005 UTC revision 147 by jgs, Fri Aug 12 01:45:47 2005 UTC
# Line 35  Line 35 
35  #include "escript/Data/DataTagged.h"  #include "escript/Data/DataTagged.h"
36  #include "escript/Data/DataEmpty.h"  #include "escript/Data/DataEmpty.h"
37  #include "escript/Data/DataArray.h"  #include "escript/Data/DataArray.h"
38  #include "escript/Data/DataAlgorithm.h"  #include "escript/Data/DataProf.h"
39  #include "escript/Data/FunctionSpaceFactory.h"  #include "escript/Data/FunctionSpaceFactory.h"
40  #include "escript/Data/AbstractContinuousDomain.h"  #include "escript/Data/AbstractContinuousDomain.h"
41  #include "escript/Data/UnaryFuncs.h"  #include "escript/Data/UnaryFuncs.h"
# Line 45  using namespace boost::python; Line 45  using namespace boost::python;
45  using namespace boost;  using namespace boost;
46  using namespace escript;  using namespace escript;
47    
48    //
49    // global table of profiling data for all Data objects
50    DataProf dataProfTable;
51    
52  Data::Data()  Data::Data()
53  {  {
54    //    //
# Line 52  Data::Data() Line 56  Data::Data()
56    DataAbstract* temp=new DataEmpty();    DataAbstract* temp=new DataEmpty();
57    shared_ptr<DataAbstract> temp_data(temp);    shared_ptr<DataAbstract> temp_data(temp);
58    m_data=temp_data;    m_data=temp_data;
59      // create entry in global profiling table for this object
60      profData = dataProfTable.newData();
61  }  }
62    
63  Data::Data(double value,  Data::Data(double value,
# Line 65  Data::Data(double value, Line 71  Data::Data(double value,
71    }    }
72    DataArray temp(dataPointShape,value);    DataArray temp(dataPointShape,value);
73    initialise(temp.getView(),what,expanded);    initialise(temp.getView(),what,expanded);
74      // create entry in global profiling table for this object
75      profData = dataProfTable.newData();
76  }  }
77    
78  Data::Data(double value,  Data::Data(double value,
# Line 75  Data::Data(double value, Line 83  Data::Data(double value,
83    DataArray temp(dataPointShape,value);    DataArray temp(dataPointShape,value);
84    pair<int,int> dataShape=what.getDataShape();    pair<int,int> dataShape=what.getDataShape();
85    initialise(temp.getView(),what,expanded);    initialise(temp.getView(),what,expanded);
86      // create entry in global profiling table for this object
87      profData = dataProfTable.newData();
88  }  }
89    
90  Data::Data(const Data& inData)  Data::Data(const Data& inData)
91  {  {
92    m_data=inData.m_data;    m_data=inData.m_data;
93      // create entry in global profiling table for this object
94      profData = dataProfTable.newData();
95  }  }
96    
97  Data::Data(const Data& inData,  Data::Data(const Data& inData,
# Line 90  Data::Data(const Data& inData, Line 102  Data::Data(const Data& inData,
102    DataAbstract* tmp = inData.m_data->getSlice(region);    DataAbstract* tmp = inData.m_data->getSlice(region);
103    shared_ptr<DataAbstract> temp_data(tmp);    shared_ptr<DataAbstract> temp_data(tmp);
104    m_data=temp_data;    m_data=temp_data;
105      // create entry in global profiling table for this object
106      profData = dataProfTable.newData();
107  }  }
108    
109  Data::Data(const Data& inData,  Data::Data(const Data& inData,
# Line 99  Data::Data(const Data& inData, Line 113  Data::Data(const Data& inData,
113      m_data=inData.m_data;      m_data=inData.m_data;
114    } else {    } else {
115      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);
116      // Note for Lutz, Must use a reference or pointer to a derived object      // Note: Must use a reference or pointer to a derived object
117      // in order to get polymorphic behaviour. Shouldn't really      // in order to get polymorphic behaviour. Shouldn't really
118      // be able to create an instance of AbstractDomain but that was done      // be able to create an instance of AbstractDomain but that was done
119      // as a boost python work around which may no longer be required.      // as a boost:python work around which may no longer be required.
120      const AbstractDomain& inDataDomain=inData.getDomain();      const AbstractDomain& inDataDomain=inData.getDomain();
121      if  (inDataDomain==functionspace.getDomain()) {      if  (inDataDomain==functionspace.getDomain()) {
122        inDataDomain.interpolateOnDomain(tmp,inData);        inDataDomain.interpolateOnDomain(tmp,inData);
# Line 111  Data::Data(const Data& inData, Line 125  Data::Data(const Data& inData,
125      }      }
126      m_data=tmp.m_data;      m_data=tmp.m_data;
127    }    }
128      // create entry in global profiling table for this object
129      profData = dataProfTable.newData();
130  }  }
131    
132  Data::Data(const DataTagged::TagListType& tagKeys,  Data::Data(const DataTagged::TagListType& tagKeys,
# Line 125  Data::Data(const DataTagged::TagListType Line 141  Data::Data(const DataTagged::TagListType
141    if (expanded) {    if (expanded) {
142      expand();      expand();
143    }    }
144      // create entry in global profiling table for this object
145      profData = dataProfTable.newData();
146  }  }
147    
148  Data::Data(const numeric::array& value,  Data::Data(const numeric::array& value,
# Line 132  Data::Data(const numeric::array& value, Line 150  Data::Data(const numeric::array& value,
150             bool expanded)             bool expanded)
151  {  {
152    initialise(value,what,expanded);    initialise(value,what,expanded);
153      // create entry in global profiling table for this object
154      profData = dataProfTable.newData();
155  }  }
156    
157  Data::Data(const DataArrayView& value,  Data::Data(const DataArrayView& value,
# Line 139  Data::Data(const DataArrayView& value, Line 159  Data::Data(const DataArrayView& value,
159             bool expanded)             bool expanded)
160  {  {
161    initialise(value,what,expanded);    initialise(value,what,expanded);
162      // create entry in global profiling table for this object
163      profData = dataProfTable.newData();
164  }  }
165    
166  Data::Data(const object& value,  Data::Data(const object& value,
# Line 147  Data::Data(const object& value, Line 169  Data::Data(const object& value,
169  {  {
170    numeric::array asNumArray(value);    numeric::array asNumArray(value);
171    initialise(asNumArray,what,expanded);    initialise(asNumArray,what,expanded);
172      // create entry in global profiling table for this object
173      profData = dataProfTable.newData();
174  }  }
175    
176  Data::Data(const object& value,  Data::Data(const object& value,
# Line 167  Data::Data(const object& value, Line 191  Data::Data(const object& value,
191      // Create a DataConstant with the same sample shape as other      // Create a DataConstant with the same sample shape as other
192      initialise(temp.getView(),other.getFunctionSpace(),false);      initialise(temp.getView(),other.getFunctionSpace(),false);
193    }    }
194      // create entry in global profiling table for this object
195      profData = dataProfTable.newData();
196  }  }
197    
198  escriptDataC  escriptDataC
# Line 353  Data::reshapeDataPoint(const DataArrayVi Line 379  Data::reshapeDataPoint(const DataArrayVi
379  Data  Data
380  Data::wherePositive() const  Data::wherePositive() const
381  {  {
382      profData->where++;
383    return escript::unaryOp(*this,bind2nd(greater<double>(),0.0));    return escript::unaryOp(*this,bind2nd(greater<double>(),0.0));
384  }  }
385    
386  Data  Data
387  Data::whereNegative() const  Data::whereNegative() const
388  {  {
389      profData->where++;
390    return escript::unaryOp(*this,bind2nd(less<double>(),0.0));    return escript::unaryOp(*this,bind2nd(less<double>(),0.0));
391  }  }
392    
393  Data  Data
394  Data::whereNonNegative() const  Data::whereNonNegative() const
395  {  {
396      profData->where++;
397    return escript::unaryOp(*this,bind2nd(greater_equal<double>(),0.0));    return escript::unaryOp(*this,bind2nd(greater_equal<double>(),0.0));
398  }  }
399    
400  Data  Data
401  Data::whereNonPositive() const  Data::whereNonPositive() const
402  {  {
403      profData->where++;
404    return escript::unaryOp(*this,bind2nd(less_equal<double>(),0.0));    return escript::unaryOp(*this,bind2nd(less_equal<double>(),0.0));
405  }  }
406    
407  Data  Data
408  Data::whereZero() const  Data::whereZero() const
409  {  {
410      profData->where++;
411    return escript::unaryOp(*this,bind2nd(equal_to<double>(),0.0));    return escript::unaryOp(*this,bind2nd(equal_to<double>(),0.0));
412  }  }
413    
414  Data  Data
415  Data::whereNonZero() const  Data::whereNonZero() const
416  {  {
417      profData->where++;
418    return escript::unaryOp(*this,bind2nd(not_equal_to<double>(),0.0));    return escript::unaryOp(*this,bind2nd(not_equal_to<double>(),0.0));
419  }  }
420    
421  Data  Data
422  Data::interpolate(const FunctionSpace& functionspace) const  Data::interpolate(const FunctionSpace& functionspace) const
423  {  {
424      profData->interpolate++;
425    return Data(*this,functionspace);    return Data(*this,functionspace);
426  }  }
427    
# Line 410  Data::probeInterpolation(const FunctionS Line 443  Data::probeInterpolation(const FunctionS
443  Data  Data
444  Data::gradOn(const FunctionSpace& functionspace) const  Data::gradOn(const FunctionSpace& functionspace) const
445  {  {
446      profData->grad++;
447    if (functionspace.getDomain()!=getDomain())    if (functionspace.getDomain()!=getDomain())
448      throw DataException("Error - gradient cannot be calculated on different domains.");      throw DataException("Error - gradient cannot be calculated on different domains.");
449    DataArrayView::ShapeType grad_shape=getPointDataView().getShape();    DataArrayView::ShapeType grad_shape=getPointDataView().getShape();
# Line 443  Data::getDataPointShape() const Line 477  Data::getDataPointShape() const
477    return getPointDataView().getShape();    return getPointDataView().getShape();
478  }  }
479    
480    void
481    Data::fillFromNumArray(const boost::python::numeric::array num_array)
482    {
483      //
484      // check rank:
485      if (num_array.getrank()<getDataPointRank())
486          throw DataException("Rank of numarray does not match Data object rank");
487      //
488      // check rank of num_array
489      for (int i=0; i<getDataPointRank(); i++) {
490        if (extract<int>(num_array.getshape()[i+1])!=getDataPointShape()[i])
491           throw DataException("Shape of numarray does not match Data object rank");
492      }
493      //
494      // make sure data is expanded:
495      if (! isExpanded()) expand();
496      //
497      // and copy over:
498      m_data->copyAll(num_array);
499      //
500      // the rank of the returned numeric array will be the rank of
501      // the data points, plus one. Where the rank of the array is n,
502      // the last n-1 dimensions will be equal to the shape of the
503      // data points, whilst the first dimension will be equal to the
504      // total number of data points. Thus the array will consist of
505      // a serial vector of the data points.
506      // int arrayRank = dataPointRank + 1;
507      // DataArrayView::ShapeType arrayShape;
508      // arrayShape.push_back(numDataPoints);
509      // for (int d=0; d<dataPointRank; d++) {
510      //    arrayShape.push_back(dataPointShape[d]);
511      // }
512    
513      //
514      // resize the numeric array to the shape just calculated
515      // if (arrayRank==1) {
516      //   numArray.resize(arrayShape[0]);
517      // }
518      // if (arrayRank==2) {
519      //   numArray.resize(arrayShape[0],arrayShape[1]);
520      // }
521      // if (arrayRank==3) {
522      //   numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2]);
523      // }
524      // if (arrayRank==4) {
525      //   numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);
526      // }
527      // if (arrayRank==5) {
528      //   numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3],arrayShape[4]);
529      // }
530    
531      //
532      // loop through each data point in turn, loading the values for that data point
533      // into the numeric array.
534      // int dataPoint = 0;
535      // for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
536      //   for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
537      //     DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
538      //     if (dataPointRank==0) {
539      //       dataPointView()=numArray[dataPoint];
540      //     }
541      //     if (dataPointRank==1) {
542      //       for (int i=0; i<dataPointShape[0]; i++) {
543      //         dataPointView(i)=numArray[dataPoint][i];
544      //       }
545      //     }
546      //     if (dataPointRank==2) {
547      //       for (int i=0; i<dataPointShape[0]; i++) {
548      //         for (int j=0; j<dataPointShape[1]; j++) {
549      //           numArray[dataPoint][i][j] = dataPointView(i,j);
550      //         }
551      //       }
552      //     }
553      //     if (dataPointRank==3) {
554      //       for (int i=0; i<dataPointShape[0]; i++) {
555      //         for (int j=0; j<dataPointShape[1]; j++) {
556      //           for (int k=0; k<dataPointShape[2]; k++) {
557      //             numArray[dataPoint][i][j][k]=dataPointView(i,j,k);
558      //           }
559      //         }
560      //       }
561      //     }
562      //     if (dataPointRank==4) {
563      //       for (int i=0; i<dataPointShape[0]; i++) {
564      //         for (int j=0; j<dataPointShape[1]; j++) {
565      //           for (int k=0; k<dataPointShape[2]; k++) {
566      //             for (int l=0; l<dataPointShape[3]; l++) {
567      //               numArray[dataPoint][i][j][k][l]=dataPointView(i,j,k,l);
568      //             }
569      //           }
570      //         }
571      //       }
572      //     }
573      //     dataPoint++;
574      //   }
575      // }
576    
577      //
578      // return the loaded array
579      // return numArray;
580    
581    }
582    
583  const  const
584  boost::python::numeric::array  boost::python::numeric::array
585  Data::convertToNumArray()  Data::convertToNumArray()
# Line 748  Data::integrate() const Line 885  Data::integrate() const
885    int rank = getDataPointRank();    int rank = getDataPointRank();
886    DataArrayView::ShapeType shape = getDataPointShape();    DataArrayView::ShapeType shape = getDataPointShape();
887    
888      profData->integrate++;
889    
890    //    //
891    // calculate the integral values    // calculate the integral values
892    vector<double> integrals(getDataPointSize());    vector<double> integrals(getDataPointSize());
# Line 811  Data::integrate() const Line 950  Data::integrate() const
950  Data  Data
951  Data::sin() const  Data::sin() const
952  {  {
953      profData->unary++;
954    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sin);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sin);
955  }  }
956    
957  Data  Data
958  Data::cos() const  Data::cos() const
959  {  {
960      profData->unary++;
961    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::cos);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::cos);
962  }  }
963    
964  Data  Data
965  Data::tan() const  Data::tan() const
966  {  {
967      profData->unary++;
968    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tan);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tan);
969  }  }
970    
971  Data  Data
972  Data::log() const  Data::log() const
973  {  {
974      profData->unary++;
975    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log10);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log10);
976  }  }
977    
978  Data  Data
979  Data::ln() const  Data::ln() const
980  {  {
981      profData->unary++;
982    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log);
983  }  }
984    
985  Data  Data
986  Data::sign() const  Data::sign() const
987  {  {
988      profData->unary++;
989    return escript::unaryOp(*this,escript::fsign);    return escript::unaryOp(*this,escript::fsign);
990  }  }
991    
992  Data  Data
993  Data::abs() const  Data::abs() const
994  {  {
995      profData->unary++;
996    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::fabs);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::fabs);
997  }  }
998    
999  Data  Data
1000  Data::neg() const  Data::neg() const
1001  {  {
1002      profData->unary++;
1003    return escript::unaryOp(*this,negate<double>());    return escript::unaryOp(*this,negate<double>());
1004  }  }
1005    
1006  Data  Data
1007  Data::pos() const  Data::pos() const
1008  {  {
1009      profData->unary++;
1010    return (*this);    return (*this);
1011  }  }
1012    
1013  Data  Data
1014  Data::exp() const  Data::exp() const
1015  {  {
1016      profData->unary++;
1017    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::exp);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::exp);
1018  }  }
1019    
1020  Data  Data
1021  Data::sqrt() const  Data::sqrt() const
1022  {  {
1023      profData->unary++;
1024    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sqrt);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sqrt);
1025  }  }
1026    
1027  double  double
1028  Data::Lsup() const  Data::Lsup() const
1029  {  {
1030      profData->reduction1++;
1031    //    //
1032    // set the initial absolute maximum value to zero    // set the initial absolute maximum value to zero
1033    return algorithm(DataAlgorithmAdapter<AbsMax>(0));    AbsMax abs_max_func;
1034      return algorithm(abs_max_func,0);
1035  }  }
1036    
1037  double  double
1038  Data::Linf() const  Data::Linf() const
1039  {  {
1040      profData->reduction1++;
1041    //    //
1042    // set the initial absolute minimum value to max double    // set the initial absolute minimum value to max double
1043    return algorithm(DataAlgorithmAdapter<AbsMin>(numeric_limits<double>::max()));    AbsMin abs_min_func;
1044      return algorithm(abs_min_func,numeric_limits<double>::max());
1045  }  }
1046    
1047  double  double
1048  Data::sup() const  Data::sup() const
1049  {  {
1050      profData->reduction1++;
1051    //    //
1052    // set the initial maximum value to min possible double    // set the initial maximum value to min possible double
1053    return algorithm(DataAlgorithmAdapter<FMax>(numeric_limits<double>::max()*-1));    FMax fmax_func;
1054      return algorithm(fmax_func,numeric_limits<double>::max()*-1);
1055  }  }
1056    
1057  double  double
1058  Data::inf() const  Data::inf() const
1059  {  {
1060      profData->reduction1++;
1061    //    //
1062    // set the initial minimum value to max possible double    // set the initial minimum value to max possible double
1063    return algorithm(DataAlgorithmAdapter<FMin>(numeric_limits<double>::max()));    FMin fmin_func;
1064      return algorithm(fmin_func,numeric_limits<double>::max());
1065  }  }
1066    
1067  Data  Data
1068  Data::maxval() const  Data::maxval() const
1069  {  {
1070      profData->reduction2++;
1071    //    //
1072    // set the initial maximum value to min possible double    // set the initial maximum value to min possible double
1073    return dp_algorithm(DataAlgorithmAdapter<FMax>(numeric_limits<double>::max()*-1));    FMax fmax_func;
1074      return dp_algorithm(fmax_func,numeric_limits<double>::max()*-1);
1075  }  }
1076    
1077  Data  Data
1078  Data::minval() const  Data::minval() const
1079  {  {
1080      profData->reduction2++;
1081    //    //
1082    // set the initial minimum value to max possible double    // set the initial minimum value to max possible double
1083    return dp_algorithm(DataAlgorithmAdapter<FMin>(numeric_limits<double>::max()));    FMin fmin_func;
1084      return dp_algorithm(fmin_func,numeric_limits<double>::max());
1085    }
1086    
1087    Data
1088    Data::length() const
1089    {
1090      profData->reduction2++;
1091      Length len_func;
1092      return dp_algorithm(len_func,0);
1093    }
1094    
1095    Data
1096    Data::trace() const
1097    {
1098      profData->reduction2++;
1099      Trace trace_func;
1100      return dp_algorithm(trace_func,0);
1101    }
1102    
1103    Data
1104    Data::transpose(int axis) const
1105    {
1106      profData->reduction2++;
1107      // not implemented
1108      throw DataException("Error - Data::transpose not implemented yet.");
1109      return Data();
1110  }  }
1111    
1112  const boost::python::tuple  const boost::python::tuple
# Line 947  Data::mindp() const Line 1134  Data::mindp() const
1134    return make_tuple(lowi,lowj);    return make_tuple(lowi,lowj);
1135  }  }
1136    
 Data  
 Data::length() const  
 {  
   return dp_algorithm(DataAlgorithmAdapter<Length>(0));  
 }  
   
 Data  
 Data::trace() const  
 {  
   return dp_algorithm(DataAlgorithmAdapter<Trace>(0));  
 }  
   
 Data  
 Data::transpose(int axis) const  
 {  
   // not implemented  
   throw DataException("Error - Data::transpose not implemented yet.");  
   return Data();  
 }  
   
1137  void  void
1138  Data::saveDX(std::string fileName) const  Data::saveDX(std::string fileName) const
1139  {  {
# Line 984  Data::saveVTK(std::string fileName) cons Line 1151  Data::saveVTK(std::string fileName) cons
1151  Data&  Data&
1152  Data::operator+=(const Data& right)  Data::operator+=(const Data& right)
1153  {  {
1154      profData->binary++;
1155    binaryOp(right,plus<double>());    binaryOp(right,plus<double>());
1156    return (*this);    return (*this);
1157  }  }
# Line 991  Data::operator+=(const Data& right) Line 1159  Data::operator+=(const Data& right)
1159  Data&  Data&
1160  Data::operator+=(const boost::python::object& right)  Data::operator+=(const boost::python::object& right)
1161  {  {
1162      profData->binary++;
1163    binaryOp(right,plus<double>());    binaryOp(right,plus<double>());
1164    return (*this);    return (*this);
1165  }  }
# Line 998  Data::operator+=(const boost::python::ob Line 1167  Data::operator+=(const boost::python::ob
1167  Data&  Data&
1168  Data::operator-=(const Data& right)  Data::operator-=(const Data& right)
1169  {  {
1170      profData->binary++;
1171    binaryOp(right,minus<double>());    binaryOp(right,minus<double>());
1172    return (*this);    return (*this);
1173  }  }
# Line 1005  Data::operator-=(const Data& right) Line 1175  Data::operator-=(const Data& right)
1175  Data&  Data&
1176  Data::operator-=(const boost::python::object& right)  Data::operator-=(const boost::python::object& right)
1177  {  {
1178      profData->binary++;
1179    binaryOp(right,minus<double>());    binaryOp(right,minus<double>());
1180    return (*this);    return (*this);
1181  }  }
# Line 1012  Data::operator-=(const boost::python::ob Line 1183  Data::operator-=(const boost::python::ob
1183  Data&  Data&
1184  Data::operator*=(const Data& right)  Data::operator*=(const Data& right)
1185  {  {
1186      profData->binary++;
1187    binaryOp(right,multiplies<double>());    binaryOp(right,multiplies<double>());
1188    return (*this);    return (*this);
1189  }  }
# Line 1019  Data::operator*=(const Data& right) Line 1191  Data::operator*=(const Data& right)
1191  Data&  Data&
1192  Data::operator*=(const boost::python::object& right)  Data::operator*=(const boost::python::object& right)
1193  {  {
1194      profData->binary++;
1195    binaryOp(right,multiplies<double>());    binaryOp(right,multiplies<double>());
1196    return (*this);    return (*this);
1197  }  }
# Line 1026  Data::operator*=(const boost::python::ob Line 1199  Data::operator*=(const boost::python::ob
1199  Data&  Data&
1200  Data::operator/=(const Data& right)  Data::operator/=(const Data& right)
1201  {  {
1202      profData->binary++;
1203    binaryOp(right,divides<double>());    binaryOp(right,divides<double>());
1204    return (*this);    return (*this);
1205  }  }
# Line 1033  Data::operator/=(const Data& right) Line 1207  Data::operator/=(const Data& right)
1207  Data&  Data&
1208  Data::operator/=(const boost::python::object& right)  Data::operator/=(const boost::python::object& right)
1209  {  {
1210      profData->binary++;
1211    binaryOp(right,divides<double>());    binaryOp(right,divides<double>());
1212    return (*this);    return (*this);
1213  }  }
# Line 1040  Data::operator/=(const boost::python::ob Line 1215  Data::operator/=(const boost::python::ob
1215  Data  Data
1216  Data::powO(const boost::python::object& right) const  Data::powO(const boost::python::object& right) const
1217  {  {
1218      profData->binary++;
1219    Data result;    Data result;
1220    result.copy(*this);    result.copy(*this);
1221    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);
# Line 1049  Data::powO(const boost::python::object& Line 1225  Data::powO(const boost::python::object&
1225  Data  Data
1226  Data::powD(const Data& right) const  Data::powD(const Data& right) const
1227  {  {
1228      profData->binary++;
1229    Data result;    Data result;
1230    result.copy(*this);    result.copy(*this);
1231    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);
# Line 1056  Data::powD(const Data& right) const Line 1233  Data::powD(const Data& right) const
1233  }  }
1234    
1235  //  //
1236  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1237  Data  Data
1238  escript::operator+(const Data& left, const Data& right)  escript::operator+(const Data& left, const Data& right)
1239  {  {
# Line 1069  escript::operator+(const Data& left, con Line 1246  escript::operator+(const Data& left, con
1246  }  }
1247    
1248  //  //
1249  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1250  Data  Data
1251  escript::operator-(const Data& left, const Data& right)  escript::operator-(const Data& left, const Data& right)
1252  {  {
# Line 1082  escript::operator-(const Data& left, con Line 1259  escript::operator-(const Data& left, con
1259  }  }
1260    
1261  //  //
1262  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1263  Data  Data
1264  escript::operator*(const Data& left, const Data& right)  escript::operator*(const Data& left, const Data& right)
1265  {  {
# Line 1095  escript::operator*(const Data& left, con Line 1272  escript::operator*(const Data& left, con
1272  }  }
1273    
1274  //  //
1275  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1276  Data  Data
1277  escript::operator/(const Data& left, const Data& right)  escript::operator/(const Data& left, const Data& right)
1278  {  {
# Line 1108  escript::operator/(const Data& left, con Line 1285  escript::operator/(const Data& left, con
1285  }  }
1286    
1287  //  //
1288  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1289  Data  Data
1290  escript::operator+(const Data& left, const boost::python::object& right)  escript::operator+(const Data& left, const boost::python::object& right)
1291  {  {
# Line 1124  escript::operator+(const Data& left, con Line 1301  escript::operator+(const Data& left, con
1301  }  }
1302    
1303  //  //
1304  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1305  Data  Data
1306  escript::operator-(const Data& left, const boost::python::object& right)  escript::operator-(const Data& left, const boost::python::object& right)
1307  {  {
# Line 1140  escript::operator-(const Data& left, con Line 1317  escript::operator-(const Data& left, con
1317  }  }
1318    
1319  //  //
1320  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1321  Data  Data
1322  escript::operator*(const Data& left, const boost::python::object& right)  escript::operator*(const Data& left, const boost::python::object& right)
1323  {  {
# Line 1156  escript::operator*(const Data& left, con Line 1333  escript::operator*(const Data& left, con
1333  }  }
1334    
1335  //  //
1336  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1337  Data  Data
1338  escript::operator/(const Data& left, const boost::python::object& right)  escript::operator/(const Data& left, const boost::python::object& right)
1339  {  {
# Line 1172  escript::operator/(const Data& left, con Line 1349  escript::operator/(const Data& left, con
1349  }  }
1350    
1351  //  //
1352  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1353  Data  Data
1354  escript::operator+(const boost::python::object& left, const Data& right)  escript::operator+(const boost::python::object& left, const Data& right)
1355  {  {
# Line 1185  escript::operator+(const boost::python:: Line 1362  escript::operator+(const boost::python::
1362  }  }
1363    
1364  //  //
1365  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1366  Data  Data
1367  escript::operator-(const boost::python::object& left, const Data& right)  escript::operator-(const boost::python::object& left, const Data& right)
1368  {  {
# Line 1198  escript::operator-(const boost::python:: Line 1375  escript::operator-(const boost::python::
1375  }  }
1376    
1377  //  //
1378  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1379  Data  Data
1380  escript::operator*(const boost::python::object& left, const Data& right)  escript::operator*(const boost::python::object& left, const Data& right)
1381  {  {
# Line 1211  escript::operator*(const boost::python:: Line 1388  escript::operator*(const boost::python::
1388  }  }
1389    
1390  //  //
1391  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1392  Data  Data
1393  escript::operator/(const boost::python::object& left, const Data& right)  escript::operator/(const boost::python::object& left, const Data& right)
1394  {  {
# Line 1224  escript::operator/(const boost::python:: Line 1401  escript::operator/(const boost::python::
1401  }  }
1402    
1403  //  //
 // NOTE: It is essential to specify the namepsace this operator belongs to  
1404  //bool escript::operator==(const Data& left, const Data& right)  //bool escript::operator==(const Data& left, const Data& right)
1405  //{  //{
1406  //  /*  //  /*
# Line 1286  Data::getItem(const boost::python::objec Line 1462  Data::getItem(const boost::python::objec
1462  Data  Data
1463  Data::getSlice(const DataArrayView::RegionType& region) const  Data::getSlice(const DataArrayView::RegionType& region) const
1464  {  {
1465      profData->slicing++;
1466    return Data(*this,region);    return Data(*this,region);
1467  }  }
1468    
# Line 1302  Data::setItemD(const boost::python::obje Line 1479  Data::setItemD(const boost::python::obje
1479                 const Data& value)                 const Data& value)
1480  {  {
1481    const DataArrayView& view=getPointDataView();    const DataArrayView& view=getPointDataView();
1482    
1483    DataArrayView::RegionType slice_region=view.getSliceRegion(key);    DataArrayView::RegionType slice_region=view.getSliceRegion(key);
1484    if (slice_region.size()!=view.getRank()) {    if (slice_region.size()!=view.getRank()) {
1485      throw DataException("Error - slice size does not match Data rank.");      throw DataException("Error - slice size does not match Data rank.");
# Line 1317  void Line 1495  void
1495  Data::setSlice(const Data& value,  Data::setSlice(const Data& value,
1496                 const DataArrayView::RegionType& region)                 const DataArrayView::RegionType& region)
1497  {  {
1498      profData->slicing++;
1499    Data tempValue(value);    Data tempValue(value);
1500    typeMatchLeft(tempValue);    typeMatchLeft(tempValue);
1501    typeMatchRight(tempValue);    typeMatchRight(tempValue);
# Line 1428  Data::getRefValue(int ref, Line 1607  Data::getRefValue(int ref,
1607    DataArrayView valueView = valueDataArray.getView();    DataArrayView valueView = valueDataArray.getView();
1608    
1609    if (rank==0) {    if (rank==0) {
1610      throw DataException("Data::getRefValue error: only rank 1 data handled for now.");        boost::python::numeric::array temp_numArray(valueView());
1611          value = temp_numArray;
1612    }    }
1613    if (rank==1) {    if (rank==1) {
1614      for (int i=0; i < shape[0]; i++) {      for (int i=0; i < shape[0]; i++) {
# Line 1436  Data::getRefValue(int ref, Line 1616  Data::getRefValue(int ref,
1616      }      }
1617    }    }
1618    if (rank==2) {    if (rank==2) {
1619      throw DataException("Data::getRefValue error: only rank 1 data handled for now.");      for (int i=0; i < shape[0]; i++) {
1620          for (int j=0; j < shape[1]; j++) {
1621            value[i][j] = valueView(i,j);
1622          }
1623        }
1624    }    }
1625    if (rank==3) {    if (rank==3) {
1626      throw DataException("Data::getRefValue error: only rank 1 data handled for now.");      for (int i=0; i < shape[0]; i++) {
1627          for (int j=0; j < shape[1]; j++) {
1628            for (int k=0; k < shape[2]; k++) {
1629              value[i][j][k] = valueView(i,j,k);
1630            }
1631          }
1632        }
1633    }    }
1634    if (rank==4) {    if (rank==4) {
1635      throw DataException("Data::getRefValue error: only rank 1 data handled for now.");      for (int i=0; i < shape[0]; i++) {
1636          for (int j=0; j < shape[1]; j++) {
1637            for (int k=0; k < shape[2]; k++) {
1638              for (int l=0; l < shape[3]; l++) {
1639                value[i][j][k][l] = valueView(i,j,k,l);
1640              }
1641            }
1642          }
1643        }
1644    }    }
1645    
1646  }  }
# Line 1472  Data::archiveData(const std::string file Line 1670  Data::archiveData(const std::string file
1670      dataType = 3;      dataType = 3;
1671      cout << "\tdataType: DataExpanded" << endl;      cout << "\tdataType: DataExpanded" << endl;
1672    }    }
1673    
1674    if (dataType == -1) {    if (dataType == -1) {
1675      throw DataException("archiveData Error: undefined dataType");      throw DataException("archiveData Error: undefined dataType");
1676    }    }
# Line 1511  Data::archiveData(const std::string file Line 1710  Data::archiveData(const std::string file
1710    cout << ">" << endl;    cout << ">" << endl;
1711    
1712    //    //
1713    // Write common data items to archive file    // Open archive file
1714    ofstream archiveFile;    ofstream archiveFile;
1715    archiveFile.open(fileName.data(), ios::out);    archiveFile.open(fileName.data(), ios::out);
1716    
# Line 1519  Data::archiveData(const std::string file Line 1718  Data::archiveData(const std::string file
1718      throw DataException("archiveData Error: problem opening archive file");      throw DataException("archiveData Error: problem opening archive file");
1719    }    }
1720    
1721      //
1722      // Write common data items to archive file
1723    archiveFile.write(reinterpret_cast<char *>(&dataType),sizeof(int));    archiveFile.write(reinterpret_cast<char *>(&dataType),sizeof(int));
1724    archiveFile.write(reinterpret_cast<char *>(&noSamples),sizeof(int));    archiveFile.write(reinterpret_cast<char *>(&noSamples),sizeof(int));
1725    archiveFile.write(reinterpret_cast<char *>(&noDPPSample),sizeof(int));    archiveFile.write(reinterpret_cast<char *>(&noDPPSample),sizeof(int));
# Line 1542  Data::archiveData(const std::string file Line 1743  Data::archiveData(const std::string file
1743      throw DataException("archiveData Error: problem writing to archive file");      throw DataException("archiveData Error: problem writing to archive file");
1744    }    }
1745    
   archiveFile.close();  
   
   if (!archiveFile.good()) {  
     throw DataException("archiveData Error: problem closing archive file");  
   }  
   
1746    //    //
1747    // Collect and archive underlying data values for each Data type    // Archive underlying data values for each Data type
1748      int noValues;
1749    switch (dataType) {    switch (dataType) {
1750      case 0:      case 0:
1751        // DataEmpty        // DataEmpty
1752          noValues = 0;
1753          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1754          cout << "\tnoValues: " << noValues << endl;
1755        break;        break;
1756      case 1:      case 1:
1757        // DataConstant        // DataConstant
1758          noValues = m_data->getLength();
1759          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1760          cout << "\tnoValues: " << noValues << endl;
1761          if (m_data->archiveData(archiveFile,noValues)) {
1762            throw DataException("archiveData Error: problem writing data to archive file");
1763          }
1764        break;        break;
1765      case 2:      case 2:
1766        // DataTagged        // DataTagged
1767          noValues = m_data->getLength();
1768          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1769          cout << "\tnoValues: " << noValues << endl;
1770          if (m_data->archiveData(archiveFile,noValues)) {
1771            throw DataException("archiveData Error: problem writing data to archive file");
1772          }
1773        break;        break;
1774      case 3:      case 3:
1775        // DataExpanded        // DataExpanded
1776          noValues = m_data->getLength();
1777          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1778          cout << "\tnoValues: " << noValues << endl;
1779          if (m_data->archiveData(archiveFile,noValues)) {
1780            throw DataException("archiveData Error: problem writing data to archive file");
1781          }
1782        break;        break;
1783    }    }
1784    
1785      if (!archiveFile.good()) {
1786        throw DataException("archiveData Error: problem writing data to archive file");
1787      }
1788    
1789      //
1790      // Close archive file
1791      archiveFile.close();
1792    
1793      if (!archiveFile.good()) {
1794        throw DataException("archiveData Error: problem closing archive file");
1795      }
1796    
1797  }  }
1798    
1799  void  void
# Line 1590  Data::extractData(const std::string file Line 1819  Data::extractData(const std::string file
1819    int flatShape[4];    int flatShape[4];
1820    
1821    //    //
1822    // Open the archive file and read common data items    // Open the archive file
1823    ifstream archiveFile;    ifstream archiveFile;
1824    archiveFile.open(fileName.data(), ios::in);    archiveFile.open(fileName.data(), ios::in);
1825    
# Line 1598  Data::extractData(const std::string file Line 1827  Data::extractData(const std::string file
1827      throw DataException("extractData Error: problem opening archive file");      throw DataException("extractData Error: problem opening archive file");
1828    }    }
1829    
1830      //
1831      // Read common data items from archive file
1832    archiveFile.read(reinterpret_cast<char *>(&dataType),sizeof(int));    archiveFile.read(reinterpret_cast<char *>(&dataType),sizeof(int));
1833    archiveFile.read(reinterpret_cast<char *>(&noSamples),sizeof(int));    archiveFile.read(reinterpret_cast<char *>(&noSamples),sizeof(int));
1834    archiveFile.read(reinterpret_cast<char *>(&noDPPSample),sizeof(int));    archiveFile.read(reinterpret_cast<char *>(&noDPPSample),sizeof(int));
# Line 1626  Data::extractData(const std::string file Line 1857  Data::extractData(const std::string file
1857      throw DataException("extractData Error: problem reading from archive file");      throw DataException("extractData Error: problem reading from archive file");
1858    }    }
1859    
1860    archiveFile.close();    //
1861      // Verify the values just read from the archive file
   if (!archiveFile.good()) {  
     throw DataException("extractData Error: problem closing archive file");  
   }  
   
1862    switch (dataType) {    switch (dataType) {
1863      case 0:      case 0:
1864        cout << "\tdataType: DataEmpty" << endl;        cout << "\tdataType: DataEmpty" << endl;
# Line 1686  Data::extractData(const std::string file Line 1913  Data::extractData(const std::string file
1913    
1914    //    //
1915    // Load this DataVector with the appropriate values    // Load this DataVector with the appropriate values
1916      int noValues;
1917      archiveFile.read(reinterpret_cast<char *>(&noValues),sizeof(int));
1918      cout << "\tnoValues: " << noValues << endl;
1919    switch (dataType) {    switch (dataType) {
1920      case 0:      case 0:
1921        // DataEmpty        // DataEmpty
1922          if (noValues != 0) {
1923            throw DataException("extractData Error: problem reading data from archive file");
1924          }
1925        break;        break;
1926      case 1:      case 1:
1927        // DataConstant        // DataConstant
1928          if (dataVec.extractData(archiveFile,noValues)) {
1929            throw DataException("extractData Error: problem reading data from archive file");
1930          }
1931        break;        break;
1932      case 2:      case 2:
1933        // DataTagged        // DataTagged
1934          if (dataVec.extractData(archiveFile,noValues)) {
1935            throw DataException("extractData Error: problem reading data from archive file");
1936          }
1937        break;        break;
1938      case 3:      case 3:
1939        // DataExpanded        // DataExpanded
1940          if (dataVec.extractData(archiveFile,noValues)) {
1941            throw DataException("extractData Error: problem reading data from archive file");
1942          }
1943        break;        break;
1944    }    }
1945    
1946      if (!archiveFile.good()) {
1947        throw DataException("extractData Error: problem reading from archive file");
1948      }
1949    
1950      //
1951      // Close archive file
1952      archiveFile.close();
1953    
1954      if (!archiveFile.good()) {
1955        throw DataException("extractData Error: problem closing archive file");
1956      }
1957    
1958    //    //
1959    // Construct an appropriate Data object    // Construct an appropriate Data object
1960    DataAbstract* tempData;    DataAbstract* tempData;
# Line 1724  Data::extractData(const std::string file Line 1978  Data::extractData(const std::string file
1978    }    }
1979    shared_ptr<DataAbstract> temp_data(tempData);    shared_ptr<DataAbstract> temp_data(tempData);
1980    m_data=temp_data;    m_data=temp_data;
   
1981  }  }
1982    
1983  ostream& escript::operator<<(ostream& o, const Data& data)  ostream& escript::operator<<(ostream& o, const Data& data)

Legend:
Removed from v.121  
changed lines
  Added in v.147

  ViewVC Help
Powered by ViewVC 1.1.26