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

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

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

revision 1977 by jfenwick, Thu Nov 6 03:54:35 2008 UTC revision 2005 by jfenwick, Mon Nov 10 01:21:39 2008 UTC
# Line 18  Line 18 
18  #include "DataConstant.h"  #include "DataConstant.h"
19  #include "DataTagged.h"  #include "DataTagged.h"
20  #include "DataEmpty.h"  #include "DataEmpty.h"
21    #include "DataLazy.h"
22  #include "FunctionSpaceFactory.h"  #include "FunctionSpaceFactory.h"
23  #include "AbstractContinuousDomain.h"  #include "AbstractContinuousDomain.h"
24  #include "UnaryFuncs.h"  #include "UnaryFuncs.h"
# Line 42  using namespace boost::python; Line 43  using namespace boost::python;
43  using namespace boost;  using namespace boost;
44  using namespace escript;  using namespace escript;
45    
46    // ensure the current object is not a DataLazy
47    // The idea was that we could add an optional warning whenever a resolve is forced
48    #define FORCERESOLVE if (isLazy()) {resolve();}
49    
50  Data::Data()  Data::Data()
51  {  {
52    //    //
# Line 93  Data::Data(const Data& inData) Line 98  Data::Data(const Data& inData)
98  Data::Data(const Data& inData,  Data::Data(const Data& inData,
99             const DataTypes::RegionType& region)             const DataTypes::RegionType& region)
100  {  {
101      DataAbstract_ptr dat=inData.m_data;
102      if (inData.isLazy())
103      {
104        dat=inData.m_data->resolve();
105      }
106      else
107      {
108        dat=inData.m_data;
109      }
110    //    //
111    // Create Data which is a slice of another Data    // Create Data which is a slice of another Data
112    DataAbstract* tmp = inData.m_data->getSlice(region);    DataAbstract* tmp = dat->getSlice(region);
113    m_data=DataAbstract_ptr(tmp);    m_data=DataAbstract_ptr(tmp);
114    m_protected=false;    m_protected=false;
115  }  }
# Line 109  Data::Data(const Data& inData, Line 123  Data::Data(const Data& inData,
123    }    }
124    if (inData.getFunctionSpace()==functionspace) {    if (inData.getFunctionSpace()==functionspace) {
125      m_data=inData.m_data;      m_data=inData.m_data;
126    } else if (inData.isConstant()) { // for a constant function, we just need to use the new function space    }
127      if (!inData.probeInterpolation(functionspace))    else
128      {           // Even though this is constant, we still need to check whether interpolation is allowed    {
129    
130        if (inData.isConstant()) {  // for a constant function, we just need to use the new function space
131          if (!inData.probeInterpolation(functionspace))
132          {           // Even though this is constant, we still need to check whether interpolation is allowed
133      throw FunctionSpaceException("Call to probeInterpolation returned false for DataConstant.");      throw FunctionSpaceException("Call to probeInterpolation returned false for DataConstant.");
134      }        }
135      DataConstant* dc=new DataConstant(functionspace,inData.m_data->getShape(),inData.m_data->getVector());          // if the data is not lazy, this will just be a cast to DataReady
136      m_data=DataAbstract_ptr(dc);        DataReady_ptr dr=inData.m_data->resolve();
137    } else {        DataConstant* dc=new DataConstant(functionspace,inData.m_data->getShape(),dr->getVector());  
138      Data tmp(0,inData.getDataPointShape(),functionspace,true);        m_data=DataAbstract_ptr(dc);
     // Note: Must use a reference or pointer to a derived object  
     // in order to get polymorphic behaviour. Shouldn't really  
     // be able to create an instance of AbstractDomain but that was done  
     // as a boost:python work around which may no longer be required.  
     /*const AbstractDomain& inDataDomain=inData.getDomain();*/  
     const_Domain_ptr inDataDomain=inData.getDomain();  
     if  (inDataDomain==functionspace.getDomain()) {  
       inDataDomain->interpolateOnDomain(tmp,inData);  
139      } else {      } else {
140        inDataDomain->interpolateACross(tmp,inData);        Data tmp(0,inData.getDataPointShape(),functionspace,true);
141          // Note: Must use a reference or pointer to a derived object
142          // in order to get polymorphic behaviour. Shouldn't really
143          // be able to create an instance of AbstractDomain but that was done
144          // as a boost:python work around which may no longer be required.
145          /*const AbstractDomain& inDataDomain=inData.getDomain();*/
146          const_Domain_ptr inDataDomain=inData.getDomain();
147          if  (inDataDomain==functionspace.getDomain()) {
148            inDataDomain->interpolateOnDomain(tmp,inData);
149          } else {
150            inDataDomain->interpolateACross(tmp,inData);
151          }
152          m_data=tmp.m_data;
153      }      }
     m_data=tmp.m_data;  
154    }    }
155    m_protected=false;    m_protected=false;
156  }  }
# Line 141  Data::Data(DataAbstract* underlyingdata) Line 162  Data::Data(DataAbstract* underlyingdata)
162      m_protected=false;      m_protected=false;
163  }  }
164    
165    Data::Data(DataAbstract_ptr underlyingdata)
166    {
167        m_data=underlyingdata;
168        m_protected=false;
169    }
170    
171    
172  Data::Data(const numeric::array& value,  Data::Data(const numeric::array& value,
173         const FunctionSpace& what,         const FunctionSpace& what,
174             bool expanded)             bool expanded)
# Line 423  Data::copy(const Data& other) Line 451  Data::copy(const Data& other)
451  }  }
452    
453    
454    Data
455    Data::delay()
456    {
457      DataLazy* dl=new DataLazy(m_data);
458      return Data(dl);
459    }
460    
461    void
462    Data::delaySelf()
463    {
464      if (!isLazy())
465      {
466        m_data=(new DataLazy(m_data))->getPtr();
467      }
468    }
469    
470  void  void
471  Data::setToZero()  Data::setToZero()
472  {  {
# Line 430  Data::setToZero() Line 474  Data::setToZero()
474    {    {
475       throw DataException("Error - Operations not permitted on instances of DataEmpty.");       throw DataException("Error - Operations not permitted on instances of DataEmpty.");
476    }    }
477    {    m_data->setToZero();
     DataExpanded* temp=dynamic_cast<DataExpanded*>(m_data.get());  
     if (temp!=0) {  
        temp->setToZero();  
        return;  
     }  
   }  
   {  
     DataTagged* temp=dynamic_cast<DataTagged*>(m_data.get());  
     if (temp!=0) {  
       temp->setToZero();  
       return;  
     }  
   }  
   {  
     DataConstant* temp=dynamic_cast<DataConstant*>(m_data.get());  
     if (temp!=0) {  
       temp->setToZero();  
       return;  
     }  
   }  
   throw DataException("Error - Data can not be set to zero.");  
478  }  }
479    
 // void  
 // Data::copyWithMask(const Data& other,  
 //                    const Data& mask)  
 // {  
 //   if (other.isEmpty() || mask.isEmpty())  
 //   {  
 //  throw DataException("Error - copyWithMask not permitted using instances of DataEmpty.");  
 //   }  
 //   Data mask1;  
 //   Data mask2;  
 //   mask1 = mask.wherePositive();  
 //  
 //   mask2.copy(mask1);  
 //   mask1 *= other;  
 //  
 //   mask2 *= *this;  
 //   mask2 = *this - mask2;  
 //   *this = mask1 + mask2;  
 // }  
   
480  void  void
481  Data::copyWithMask(const Data& other,  Data::copyWithMask(const Data& other,
482                     const Data& mask)                     const Data& mask)
# Line 487  Data::copyWithMask(const Data& other, Line 490  Data::copyWithMask(const Data& other,
490    }    }
491    Data other2(other);    Data other2(other);
492    Data mask2(mask);    Data mask2(mask);
493      other2.resolve();
494      mask2.resolve();
495      this->resolve();
496    FunctionSpace myFS=getFunctionSpace();    FunctionSpace myFS=getFunctionSpace();
497    FunctionSpace oFS=other2.getFunctionSpace();    FunctionSpace oFS=other2.getFunctionSpace();
498    FunctionSpace mFS=mask2.getFunctionSpace();    FunctionSpace mFS=mask2.getFunctionSpace();
# Line 533  Data::copyWithMask(const Data& other, Line 539  Data::copyWithMask(const Data& other,
539      throw DataException("Error - Unknown DataAbstract passed to copyWithMask.");      throw DataException("Error - Unknown DataAbstract passed to copyWithMask.");
540    }    }
541    // Now we iterate over the elements    // Now we iterate over the elements
542    DataVector& self=m_data->getVector();    DataVector& self=getReadyPtr()->getVector();
543    const DataVector& ovec=other2.m_data->getVector();    const DataVector& ovec=other2.getReadyPtr()->getVector();
544    const DataVector& mvec=mask2.m_data->getVector();    const DataVector& mvec=mask2.getReadyPtr()->getVector();
545    if ((self.size()!=ovec.size()) || (self.size()!=mvec.size()))    if ((self.size()!=ovec.size()) || (self.size()!=mvec.size()))
546    {    {
547      throw DataException("Error - size mismatch in arguments to copyWithMask.");      throw DataException("Error - size mismatch in arguments to copyWithMask.");
# Line 588  Data::isConstant() const Line 594  Data::isConstant() const
594    return (temp!=0);    return (temp!=0);
595  }  }
596    
597    bool
598    Data::isLazy() const
599    {
600      return m_data->isLazy();
601    }
602    
603    // at the moment this is synonymous with !isLazy() but that could change
604    bool
605    Data::isReady() const
606    {
607      return (dynamic_cast<DataReady*>(m_data.get())!=0);
608    }
609    
610    
611  void  void
612  Data::setProtection()  Data::setProtection()
613  {  {
# Line 622  Data::expand() Line 642  Data::expand()
642      // do nothing      // do nothing
643    } else if (isEmpty()) {    } else if (isEmpty()) {
644      throw DataException("Error - Expansion of DataEmpty not possible.");      throw DataException("Error - Expansion of DataEmpty not possible.");
645      } else if (isLazy()) {
646        resolve();
647        expand();       // resolve might not give us expanded data
648    } else {    } else {
649      throw DataException("Error - Expansion not implemented for this Data type.");      throw DataException("Error - Expansion not implemented for this Data type.");
650    }    }
# Line 642  Data::tag() Line 665  Data::tag()
665      throw DataException("Error - Creating tag data from DataExpanded not possible.");      throw DataException("Error - Creating tag data from DataExpanded not possible.");
666    } else if (isEmpty()) {    } else if (isEmpty()) {
667      throw DataException("Error - Creating tag data from DataEmpty not possible.");      throw DataException("Error - Creating tag data from DataEmpty not possible.");
668      } else if (isLazy()) {
669         DataAbstract_ptr res=m_data->resolve();
670         if (m_data->isExpanded())
671         {
672        throw DataException("Error - data would resolve to DataExpanded, tagging is not possible.");
673         }
674         m_data=res;    
675         tag();
676    } else {    } else {
677      throw DataException("Error - Tagging not implemented for this Data type.");      throw DataException("Error - Tagging not implemented for this Data type.");
678    }    }
679  }  }
680    
681    void
682    Data::resolve()
683    {
684      if (isLazy())
685      {
686         m_data=m_data->resolve();
687      }
688    }
689    
690    
691  Data  Data
692  Data::oneOver() const  Data::oneOver() const
693  {  {
694      if (isLazy())
695      {
696        DataLazy* c=new DataLazy(borrowDataPtr(),RECIP);
697        return Data(c);
698      }
699    return C_TensorUnaryOperation(*this, bind1st(divides<double>(),1.));    return C_TensorUnaryOperation(*this, bind1st(divides<double>(),1.));
700  }  }
701    
702  Data  Data
703  Data::wherePositive() const  Data::wherePositive() const
704  {  {
705      if (isLazy())
706      {
707        DataLazy* c=new DataLazy(borrowDataPtr(),GZ);
708        return Data(c);
709      }
710    return C_TensorUnaryOperation(*this, bind2nd(greater<double>(),0.0));    return C_TensorUnaryOperation(*this, bind2nd(greater<double>(),0.0));
711  }  }
712    
713  Data  Data
714  Data::whereNegative() const  Data::whereNegative() const
715  {  {
716      if (isLazy())
717      {
718        DataLazy* c=new DataLazy(borrowDataPtr(),LZ);
719        return Data(c);
720      }
721    return C_TensorUnaryOperation(*this, bind2nd(less<double>(),0.0));    return C_TensorUnaryOperation(*this, bind2nd(less<double>(),0.0));
722  }  }
723    
724  Data  Data
725  Data::whereNonNegative() const  Data::whereNonNegative() const
726  {  {
727      if (isLazy())
728      {
729        DataLazy* c=new DataLazy(borrowDataPtr(),GEZ);
730        return Data(c);
731      }
732    return C_TensorUnaryOperation(*this, bind2nd(greater_equal<double>(),0.0));    return C_TensorUnaryOperation(*this, bind2nd(greater_equal<double>(),0.0));
733  }  }
734    
735  Data  Data
736  Data::whereNonPositive() const  Data::whereNonPositive() const
737  {  {
738      if (isLazy())
739      {
740        DataLazy* c=new DataLazy(borrowDataPtr(),LEZ);
741        return Data(c);
742      }
743    return C_TensorUnaryOperation(*this, bind2nd(less_equal<double>(),0.0));    return C_TensorUnaryOperation(*this, bind2nd(less_equal<double>(),0.0));
744  }  }
745    
# Line 700  Data::interpolate(const FunctionSpace& f Line 766  Data::interpolate(const FunctionSpace& f
766  bool  bool
767  Data::probeInterpolation(const FunctionSpace& functionspace) const  Data::probeInterpolation(const FunctionSpace& functionspace) const
768  {  {
769    if (getFunctionSpace()==functionspace) {    return getFunctionSpace().probeInterpolation(functionspace);
770      return true;  //   if (getFunctionSpace()==functionspace) {
771    } else {  //     return true;
772      const_Domain_ptr domain=getDomain();  //   } else {
773      if  (*domain==*functionspace.getDomain()) {  //     const_Domain_ptr domain=getDomain();
774        return domain->probeInterpolationOnDomain(getFunctionSpace().getTypeCode(),functionspace.getTypeCode());  //     if  (*domain==*functionspace.getDomain()) {
775      } else {  //       return domain->probeInterpolationOnDomain(getFunctionSpace().getTypeCode(),functionspace.getTypeCode());
776        return domain->probeInterpolationACross(getFunctionSpace().getTypeCode(),*(functionspace.getDomain()),functionspace.getTypeCode());  //     } else {
777      }  //       return domain->probeInterpolationACross(getFunctionSpace().getTypeCode(),*(functionspace.getDomain()),functionspace.getTypeCode());
778    }  //     }
779    //   }
780  }  }
781    
782  Data  Data
# Line 757  boost::python::numeric::array Line 824  boost::python::numeric::array
824  Data:: getValueOfDataPoint(int dataPointNo)  Data:: getValueOfDataPoint(int dataPointNo)
825  {  {
826    int i, j, k, l;    int i, j, k, l;
827    
828      FORCERESOLVE;
829    
830    //    //
831    // determine the rank and shape of each data point    // determine the rank and shape of each data point
832    int dataPointRank = getDataPointRank();    int dataPointRank = getDataPointRank();
# Line 858  Data::setValueOfDataPointToArray(int dat Line 928  Data::setValueOfDataPointToArray(int dat
928    if (isProtected()) {    if (isProtected()) {
929          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
930    }    }
931      FORCERESOLVE;
932    //    //
933    // check rank    // check rank
934    if (static_cast<unsigned int>(num_array.getrank())<getDataPointRank())    if (static_cast<unsigned int>(num_array.getrank())<getDataPointRank())
# Line 892  Data::setValueOfDataPoint(int dataPointN Line 963  Data::setValueOfDataPoint(int dataPointN
963    }    }
964    //    //
965    // make sure data is expanded:    // make sure data is expanded:
966      FORCERESOLVE;
967    if (!isExpanded()) {    if (!isExpanded()) {
968      expand();      expand();
969    }    }
# Line 910  Data::getValueOfGlobalDataPoint(int proc Line 982  Data::getValueOfGlobalDataPoint(int proc
982  {  {
983    size_t length=0;    size_t length=0;
984    int i, j, k, l, pos;    int i, j, k, l, pos;
985      FORCERESOLVE;
986    //    //
987    // determine the rank and shape of each data point    // determine the rank and shape of each data point
988    int dataPointRank = getDataPointRank();    int dataPointRank = getDataPointRank();
# Line 1044  Data::getValueOfGlobalDataPoint(int proc Line 1117  Data::getValueOfGlobalDataPoint(int proc
1117  }  }
1118    
1119    
1120    boost::python::numeric::array
1121    Data::integrate_const() const
1122    {
1123      if (isLazy())
1124      {
1125        throw DataException("Error - cannot integrate for constant lazy data.");
1126      }
1127      return integrateWorker();
1128    }
1129    
1130    boost::python::numeric::array
1131    Data::integrate()
1132    {
1133      if (isLazy())
1134      {
1135        expand();
1136      }
1137      return integrateWorker();
1138    }
1139    
1140    
1141    
1142  boost::python::numeric::array  boost::python::numeric::array
1143  Data::integrate() const  Data::integrateWorker() const
1144  {  {
1145    int index;    int index;
1146    int rank = getDataPointRank();    int rank = getDataPointRank();
# Line 1129  Data::integrate() const Line 1223  Data::integrate() const
1223  Data  Data
1224  Data::sin() const  Data::sin() const
1225  {  {
1226      if (isLazy())
1227      {
1228        DataLazy* c=new DataLazy(borrowDataPtr(),SIN);
1229        return Data(c);
1230      }
1231    return C_TensorUnaryOperation<double (*)(double)>(*this, ::sin);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::sin);
1232  }  }
1233    
1234  Data  Data
1235  Data::cos() const  Data::cos() const
1236  {  {
1237      if (isLazy())
1238      {
1239        DataLazy* c=new DataLazy(borrowDataPtr(),COS);
1240        return Data(c);
1241      }
1242    return C_TensorUnaryOperation<double (*)(double)>(*this, ::cos);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::cos);
1243  }  }
1244    
1245  Data  Data
1246  Data::tan() const  Data::tan() const
1247  {  {
1248      if (isLazy())
1249      {
1250        DataLazy* c=new DataLazy(borrowDataPtr(),TAN);
1251        return Data(c);
1252      }
1253    return C_TensorUnaryOperation<double (*)(double)>(*this, ::tan);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::tan);
1254  }  }
1255    
1256  Data  Data
1257  Data::asin() const  Data::asin() const
1258  {  {
1259      if (isLazy())
1260      {
1261        DataLazy* c=new DataLazy(borrowDataPtr(),ASIN);
1262        return Data(c);
1263      }
1264    return C_TensorUnaryOperation<double (*)(double)>(*this, ::asin);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::asin);
1265  }  }
1266    
1267  Data  Data
1268  Data::acos() const  Data::acos() const
1269  {  {
1270      if (isLazy())
1271      {
1272        DataLazy* c=new DataLazy(borrowDataPtr(),ACOS);
1273        return Data(c);
1274      }
1275    return C_TensorUnaryOperation<double (*)(double)>(*this, ::acos);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::acos);
1276  }  }
1277    
# Line 1160  Data::acos() const Line 1279  Data::acos() const
1279  Data  Data
1280  Data::atan() const  Data::atan() const
1281  {  {
1282      if (isLazy())
1283      {
1284        DataLazy* c=new DataLazy(borrowDataPtr(),ATAN);
1285        return Data(c);
1286      }
1287    return C_TensorUnaryOperation<double (*)(double)>(*this, ::atan);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::atan);
1288  }  }
1289    
1290  Data  Data
1291  Data::sinh() const  Data::sinh() const
1292  {  {
1293      return C_TensorUnaryOperation<double (*)(double)>(*this, ::sinh);    if (isLazy())
1294      {
1295        DataLazy* c=new DataLazy(borrowDataPtr(),SINH);
1296        return Data(c);
1297      }
1298      return C_TensorUnaryOperation<double (*)(double)>(*this, ::sinh);
1299  }  }
1300    
1301  Data  Data
1302  Data::cosh() const  Data::cosh() const
1303  {  {
1304      return C_TensorUnaryOperation<double (*)(double)>(*this, ::cosh);    if (isLazy())
1305      {
1306        DataLazy* c=new DataLazy(borrowDataPtr(),COSH);
1307        return Data(c);
1308      }
1309      return C_TensorUnaryOperation<double (*)(double)>(*this, ::cosh);
1310  }  }
1311    
1312  Data  Data
1313  Data::tanh() const  Data::tanh() const
1314  {  {
1315      return C_TensorUnaryOperation<double (*)(double)>(*this, ::tanh);    if (isLazy())
1316      {
1317        DataLazy* c=new DataLazy(borrowDataPtr(),TANH);
1318        return Data(c);
1319      }
1320      return C_TensorUnaryOperation<double (*)(double)>(*this, ::tanh);
1321  }  }
1322    
1323    
# Line 1189  Data::erf() const Line 1327  Data::erf() const
1327  #ifdef _WIN32  #ifdef _WIN32
1328    throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");    throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");
1329  #else  #else
1330      if (isLazy())
1331      {
1332        DataLazy* c=new DataLazy(borrowDataPtr(),ERF);
1333        return Data(c);
1334      }
1335    return C_TensorUnaryOperation(*this, ::erf);    return C_TensorUnaryOperation(*this, ::erf);
1336  #endif  #endif
1337  }  }
# Line 1196  Data::erf() const Line 1339  Data::erf() const
1339  Data  Data
1340  Data::asinh() const  Data::asinh() const
1341  {  {
1342      if (isLazy())
1343      {
1344        DataLazy* c=new DataLazy(borrowDataPtr(),ASINH);
1345        return Data(c);
1346      }
1347  #ifdef _WIN32  #ifdef _WIN32
1348    return C_TensorUnaryOperation(*this, escript::asinh_substitute);    return C_TensorUnaryOperation(*this, escript::asinh_substitute);
1349  #else  #else
# Line 1206  Data::asinh() const Line 1354  Data::asinh() const
1354  Data  Data
1355  Data::acosh() const  Data::acosh() const
1356  {  {
1357      if (isLazy())
1358      {
1359        DataLazy* c=new DataLazy(borrowDataPtr(),ACOSH);
1360        return Data(c);
1361      }
1362  #ifdef _WIN32  #ifdef _WIN32
1363    return C_TensorUnaryOperation(*this, escript::acosh_substitute);    return C_TensorUnaryOperation(*this, escript::acosh_substitute);
1364  #else  #else
# Line 1216  Data::acosh() const Line 1369  Data::acosh() const
1369  Data  Data
1370  Data::atanh() const  Data::atanh() const
1371  {  {
1372      if (isLazy())
1373      {
1374        DataLazy* c=new DataLazy(borrowDataPtr(),ATANH);
1375        return Data(c);
1376      }
1377  #ifdef _WIN32  #ifdef _WIN32
1378    return C_TensorUnaryOperation(*this, escript::atanh_substitute);    return C_TensorUnaryOperation(*this, escript::atanh_substitute);
1379  #else  #else
# Line 1225  Data::atanh() const Line 1383  Data::atanh() const
1383    
1384  Data  Data
1385  Data::log10() const  Data::log10() const
1386  {  {  if (isLazy())
1387      {
1388        DataLazy* c=new DataLazy(borrowDataPtr(),LOG10);
1389        return Data(c);
1390      }
1391    return C_TensorUnaryOperation<double (*)(double)>(*this, ::log10);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::log10);
1392  }  }
1393    
1394  Data  Data
1395  Data::log() const  Data::log() const
1396  {  {
1397      if (isLazy())
1398      {
1399        DataLazy* c=new DataLazy(borrowDataPtr(),LOG);
1400        return Data(c);
1401      }
1402    return C_TensorUnaryOperation<double (*)(double)>(*this, ::log);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::log);
1403  }  }
1404    
1405  Data  Data
1406  Data::sign() const  Data::sign() const
1407  {  {
1408      if (isLazy())
1409      {
1410        DataLazy* c=new DataLazy(borrowDataPtr(),SIGN);
1411        return Data(c);
1412      }
1413    return C_TensorUnaryOperation(*this, escript::fsign);    return C_TensorUnaryOperation(*this, escript::fsign);
1414  }  }
1415    
1416  Data  Data
1417  Data::abs() const  Data::abs() const
1418  {  {
1419      if (isLazy())
1420      {
1421        DataLazy* c=new DataLazy(borrowDataPtr(),ABS);
1422        return Data(c);
1423      }
1424    return C_TensorUnaryOperation<double (*)(double)>(*this, ::fabs);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::fabs);
1425  }  }
1426    
1427  Data  Data
1428  Data::neg() const  Data::neg() const
1429  {  {
1430      if (isLazy())
1431      {
1432        DataLazy* c=new DataLazy(borrowDataPtr(),NEG);
1433        return Data(c);
1434      }
1435    return C_TensorUnaryOperation(*this, negate<double>());    return C_TensorUnaryOperation(*this, negate<double>());
1436  }  }
1437    
1438  Data  Data
1439  Data::pos() const  Data::pos() const
1440  {  {
1441        // not doing lazy check here is deliberate.
1442        // since a deep copy of lazy data should be cheap, I'll just let it happen now
1443    Data result;    Data result;
1444    // perform a deep copy    // perform a deep copy
1445    result.copy(*this);    result.copy(*this);
# Line 1264  Data::pos() const Line 1448  Data::pos() const
1448    
1449  Data  Data
1450  Data::exp() const  Data::exp() const
1451  {  {  
1452      if (isLazy())
1453      {
1454        DataLazy* c=new DataLazy(borrowDataPtr(),EXP);
1455        return Data(c);
1456      }
1457    return C_TensorUnaryOperation<double (*)(double)>(*this, ::exp);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::exp);
1458  }  }
1459    
1460  Data  Data
1461  Data::sqrt() const  Data::sqrt() const
1462  {  {
1463      if (isLazy())
1464      {
1465        DataLazy* c=new DataLazy(borrowDataPtr(),SQRT);
1466        return Data(c);
1467      }
1468    return C_TensorUnaryOperation<double (*)(double)>(*this, ::sqrt);    return C_TensorUnaryOperation<double (*)(double)>(*this, ::sqrt);
1469  }  }
1470    
1471  double  double
1472  Data::Lsup() const  Data::Lsup_const() const
1473    {
1474       if (isLazy())
1475       {
1476        throw DataException("Error - cannot compute Lsup for constant lazy data.");
1477       }
1478       return LsupWorker();
1479    }
1480    
1481    double
1482    Data::Lsup()
1483    {
1484       if (isLazy())
1485       {
1486        expand();
1487       }
1488       return LsupWorker();
1489    }
1490    
1491    double
1492    Data::sup_const() const
1493    {
1494       if (isLazy())
1495       {
1496        throw DataException("Error - cannot compute sup for constant lazy data.");
1497       }
1498       return supWorker();
1499    }
1500    
1501    double
1502    Data::sup()
1503    {
1504       if (isLazy())
1505       {
1506        expand();
1507       }
1508       return supWorker();
1509    }
1510    
1511    double
1512    Data::inf_const() const
1513    {
1514       if (isLazy())
1515       {
1516        throw DataException("Error - cannot compute inf for constant lazy data.");
1517       }
1518       return infWorker();
1519    }
1520    
1521    double
1522    Data::inf()
1523    {
1524       if (isLazy())
1525       {
1526        expand();
1527       }
1528       return infWorker();
1529    }
1530    
1531    double
1532    Data::LsupWorker() const
1533  {  {
1534    double localValue;    double localValue;
1535    //    //
# Line 1293  Data::Lsup() const Line 1547  Data::Lsup() const
1547  }  }
1548    
1549  double  double
1550  Data::sup() const  Data::supWorker() const
1551  {  {
1552    double localValue;    double localValue;
1553    //    //
# Line 1310  Data::sup() const Line 1564  Data::sup() const
1564  }  }
1565    
1566  double  double
1567  Data::inf() const  Data::infWorker() const
1568  {  {
1569    double localValue;    double localValue;
1570    //    //
# Line 1406  Data::symmetric() const Line 1660  Data::symmetric() const
1660       else {       else {
1661          throw DataException("Error - Data::symmetric can only be calculated for rank 2 or 4 object.");          throw DataException("Error - Data::symmetric can only be calculated for rank 2 or 4 object.");
1662       }       }
1663         if (isLazy())
1664         {
1665        Data temp(*this);   // to get around the fact that you can't resolve a const Data
1666        temp.resolve();
1667        return temp.symmetric();
1668         }
1669       Data ev(0.,getDataPointShape(),getFunctionSpace());       Data ev(0.,getDataPointShape(),getFunctionSpace());
1670       ev.typeMatchRight(*this);       ev.typeMatchRight(*this);
1671       m_data->symmetric(ev.m_data.get());       m_data->symmetric(ev.m_data.get());
# Line 1415  Data::symmetric() const Line 1675  Data::symmetric() const
1675  Data  Data
1676  Data::nonsymmetric() const  Data::nonsymmetric() const
1677  {  {
1678         if (isLazy())
1679         {
1680        Data temp(*this);   // to get around the fact that you can't resolve a const Data
1681        temp.resolve();
1682        return temp.nonsymmetric();
1683         }
1684       // check input       // check input
1685       DataTypes::ShapeType s=getDataPointShape();       DataTypes::ShapeType s=getDataPointShape();
1686       if (getDataPointRank()==2) {       if (getDataPointRank()==2) {
# Line 1449  Data::nonsymmetric() const Line 1715  Data::nonsymmetric() const
1715  Data  Data
1716  Data::trace(int axis_offset) const  Data::trace(int axis_offset) const
1717  {  {
1718         if (isLazy())
1719         {
1720        Data temp(*this);   // to get around the fact that you can't resolve a const Data
1721        temp.resolve();
1722        return temp.trace(axis_offset);
1723         }
1724       DataTypes::ShapeType s=getDataPointShape();       DataTypes::ShapeType s=getDataPointShape();
1725       if (getDataPointRank()==2) {       if (getDataPointRank()==2) {
1726          DataTypes::ShapeType ev_shape;          DataTypes::ShapeType ev_shape;
# Line 1498  Data::trace(int axis_offset) const Line 1770  Data::trace(int axis_offset) const
1770    
1771  Data  Data
1772  Data::transpose(int axis_offset) const  Data::transpose(int axis_offset) const
1773  {  {    
1774         if (isLazy())
1775         {
1776        Data temp(*this);   // to get around the fact that you can't resolve a const Data
1777        temp.resolve();
1778        return temp.transpose(axis_offset);
1779         }
1780       DataTypes::ShapeType s=getDataPointShape();       DataTypes::ShapeType s=getDataPointShape();
1781       DataTypes::ShapeType ev_shape;       DataTypes::ShapeType ev_shape;
1782       // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]       // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]
# Line 1520  Data::transpose(int axis_offset) const Line 1798  Data::transpose(int axis_offset) const
1798  Data  Data
1799  Data::eigenvalues() const  Data::eigenvalues() const
1800  {  {
1801         if (isLazy())
1802         {
1803        Data temp(*this);   // to get around the fact that you can't resolve a const Data
1804        temp.resolve();
1805        return temp.eigenvalues();
1806         }
1807       // check input       // check input
1808       DataTypes::ShapeType s=getDataPointShape();       DataTypes::ShapeType s=getDataPointShape();
1809       if (getDataPointRank()!=2)       if (getDataPointRank()!=2)
# Line 1537  Data::eigenvalues() const Line 1821  Data::eigenvalues() const
1821  const boost::python::tuple  const boost::python::tuple
1822  Data::eigenvalues_and_eigenvectors(const double tol) const  Data::eigenvalues_and_eigenvectors(const double tol) const
1823  {  {
1824         if (isLazy())
1825         {
1826        Data temp(*this);   // to get around the fact that you can't resolve a const Data
1827        temp.resolve();
1828        return temp.eigenvalues_and_eigenvectors(tol);
1829         }
1830       DataTypes::ShapeType s=getDataPointShape();       DataTypes::ShapeType s=getDataPointShape();
1831       if (getDataPointRank()!=2)       if (getDataPointRank()!=2)
1832          throw DataException("Error - Data::eigenvalues and eigenvectors can only be calculated for rank 2 object.");          throw DataException("Error - Data::eigenvalues and eigenvectors can only be calculated for rank 2 object.");
# Line 1570  void Line 1860  void
1860  Data::calc_minGlobalDataPoint(int& ProcNo,  Data::calc_minGlobalDataPoint(int& ProcNo,
1861                          int& DataPointNo) const                          int& DataPointNo) const
1862  {  {
1863      if (isLazy())
1864      {
1865        Data temp(*this);   // to get around the fact that you can't resolve a const Data
1866        temp.resolve();
1867        return temp.calc_minGlobalDataPoint(ProcNo,DataPointNo);
1868      }
1869    int i,j;    int i,j;
1870    int lowi=0,lowj=0;    int lowi=0,lowj=0;
1871    double min=numeric_limits<double>::max();    double min=numeric_limits<double>::max();
# Line 1636  Data::saveDX(std::string fileName) const Line 1932  Data::saveDX(std::string fileName) const
1932    {    {
1933      throw DataException("Error - Operations not permitted on instances of DataEmpty.");      throw DataException("Error - Operations not permitted on instances of DataEmpty.");
1934    }    }
1935      if (isLazy())
1936      {
1937         Data temp(*this);  // to get around the fact that you can't resolve a const Data
1938         temp.resolve();
1939         temp.saveDX(fileName);
1940         return;
1941      }
1942    boost::python::dict args;    boost::python::dict args;
1943    args["data"]=boost::python::object(this);    args["data"]=boost::python::object(this);
1944    getDomain()->saveDX(fileName,args);    getDomain()->saveDX(fileName,args);
# Line 1649  Data::saveVTK(std::string fileName) cons Line 1952  Data::saveVTK(std::string fileName) cons
1952    {    {
1953      throw DataException("Error - Operations not permitted on instances of DataEmpty.");      throw DataException("Error - Operations not permitted on instances of DataEmpty.");
1954    }    }
1955      if (isLazy())
1956      {
1957         Data temp(*this);  // to get around the fact that you can't resolve a const Data
1958         temp.resolve();
1959         temp.saveVTK(fileName);
1960         return;
1961      }
1962    boost::python::dict args;    boost::python::dict args;
1963    args["data"]=boost::python::object(this);    args["data"]=boost::python::object(this);
1964    getDomain()->saveVTK(fileName,args);    getDomain()->saveVTK(fileName,args);
# Line 1661  Data::operator+=(const Data& right) Line 1971  Data::operator+=(const Data& right)
1971    if (isProtected()) {    if (isProtected()) {
1972          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1973    }    }
1974    binaryOp(right,plus<double>());    if (isLazy() || right.isLazy())
1975    return (*this);    {
1976        DataLazy* c=new DataLazy(m_data,right.borrowDataPtr(),ADD); // for lazy + is equivalent to +=
1977            m_data=c->getPtr();
1978        return (*this);
1979      }
1980      else
1981      {
1982        binaryOp(right,plus<double>());
1983        return (*this);
1984      }
1985  }  }
1986    
1987  Data&  Data&
1988  Data::operator+=(const boost::python::object& right)  Data::operator+=(const boost::python::object& right)
1989  {  {
1990      if (isProtected()) {
1991            throw DataException("Error - attempt to update protected Data object.");
1992      }
1993    Data tmp(right,getFunctionSpace(),false);    Data tmp(right,getFunctionSpace(),false);
1994    binaryOp(tmp,plus<double>());    if (isLazy())
1995    return (*this);    {
1996        DataLazy* c=new DataLazy(m_data,tmp.borrowDataPtr(),ADD);   // for lazy + is equivalent to +=
1997            m_data=c->getPtr();
1998        return (*this);
1999      }
2000      else
2001      {
2002        binaryOp(tmp,plus<double>());
2003        return (*this);
2004      }
2005  }  }
2006    
2007    // Hmmm, operator= makes a deep copy but the copy constructor does not?
2008  Data&  Data&
2009  Data::operator=(const Data& other)  Data::operator=(const Data& other)
2010  {  {
# Line 1685  Data::operator-=(const Data& right) Line 2018  Data::operator-=(const Data& right)
2018    if (isProtected()) {    if (isProtected()) {
2019          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
2020    }    }
2021    binaryOp(right,minus<double>());    if (isLazy() || right.isLazy())
2022    return (*this);    {
2023        DataLazy* c=new DataLazy(m_data,right.borrowDataPtr(),SUB); // for lazy - is equivalent to -=
2024            m_data=c->getPtr();
2025        return (*this);
2026      }
2027      else
2028      {
2029        binaryOp(right,minus<double>());
2030        return (*this);
2031      }
2032  }  }
2033    
2034  Data&  Data&
2035  Data::operator-=(const boost::python::object& right)  Data::operator-=(const boost::python::object& right)
2036  {  {
2037      if (isProtected()) {
2038            throw DataException("Error - attempt to update protected Data object.");
2039      }
2040    Data tmp(right,getFunctionSpace(),false);    Data tmp(right,getFunctionSpace(),false);
2041    binaryOp(tmp,minus<double>());    if (isLazy())
2042    return (*this);    {
2043        DataLazy* c=new DataLazy(m_data,tmp.borrowDataPtr(),SUB);   // for lazy - is equivalent to -=
2044            m_data=c->getPtr();
2045        return (*this);
2046      }
2047      else
2048      {
2049        binaryOp(tmp,minus<double>());
2050        return (*this);
2051      }
2052  }  }
2053    
2054  Data&  Data&
# Line 1703  Data::operator*=(const Data& right) Line 2057  Data::operator*=(const Data& right)
2057    if (isProtected()) {    if (isProtected()) {
2058          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
2059    }    }
2060    binaryOp(right,multiplies<double>());    if (isLazy() || right.isLazy())
2061    return (*this);    {
2062        DataLazy* c=new DataLazy(m_data,right.borrowDataPtr(),MUL); // for lazy * is equivalent to *=
2063            m_data=c->getPtr();
2064        return (*this);
2065      }
2066      else
2067      {
2068        binaryOp(right,multiplies<double>());
2069        return (*this);
2070      }
2071  }  }
2072    
2073  Data&  Data&
2074  Data::operator*=(const boost::python::object& right)  Data::operator*=(const boost::python::object& right)
2075  {  {  
2076      if (isProtected()) {
2077            throw DataException("Error - attempt to update protected Data object.");
2078      }
2079    Data tmp(right,getFunctionSpace(),false);    Data tmp(right,getFunctionSpace(),false);
2080    binaryOp(tmp,multiplies<double>());    if (isLazy())
2081    return (*this);    {
2082        DataLazy* c=new DataLazy(m_data,tmp.borrowDataPtr(),MUL);   // for lazy * is equivalent to *=
2083            m_data=c->getPtr();
2084        return (*this);
2085      }
2086      else
2087      {
2088        binaryOp(tmp,multiplies<double>());
2089        return (*this);
2090      }
2091  }  }
2092    
2093  Data&  Data&
# Line 1721  Data::operator/=(const Data& right) Line 2096  Data::operator/=(const Data& right)
2096    if (isProtected()) {    if (isProtected()) {
2097          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
2098    }    }
2099    binaryOp(right,divides<double>());    if (isLazy() || right.isLazy())
2100    return (*this);    {
2101        DataLazy* c=new DataLazy(m_data,right.borrowDataPtr(),DIV); // for lazy / is equivalent to /=
2102            m_data=c->getPtr();
2103        return (*this);
2104      }
2105      else
2106      {
2107        binaryOp(right,divides<double>());
2108        return (*this);
2109      }
2110  }  }
2111    
2112  Data&  Data&
2113  Data::operator/=(const boost::python::object& right)  Data::operator/=(const boost::python::object& right)
2114  {  {
2115      if (isProtected()) {
2116            throw DataException("Error - attempt to update protected Data object.");
2117      }
2118    Data tmp(right,getFunctionSpace(),false);    Data tmp(right,getFunctionSpace(),false);
2119    binaryOp(tmp,divides<double>());    if (isLazy())
2120    return (*this);    {
2121        DataLazy* c=new DataLazy(m_data,tmp.borrowDataPtr(),DIV);   // for lazy / is equivalent to /=
2122            m_data=c->getPtr();
2123        return (*this);
2124      }
2125      else
2126      {
2127        binaryOp(tmp,divides<double>());
2128        return (*this);
2129      }
2130  }  }
2131    
2132  Data  Data
# Line 1750  Data::powO(const boost::python::object& Line 2146  Data::powO(const boost::python::object&
2146  Data  Data
2147  Data::powD(const Data& right) const  Data::powD(const Data& right) const
2148  {  {
2149      if (isLazy() || right.isLazy())
2150      {
2151        DataLazy* c=new DataLazy(m_data,right.borrowDataPtr(),POW);
2152        return Data(c);
2153      }
2154    return C_TensorBinaryOperation<double (*)(double, double)>(*this, right, ::pow);    return C_TensorBinaryOperation<double (*)(double, double)>(*this, right, ::pow);
2155  }  }
2156    
# Line 1758  Data::powD(const Data& right) const Line 2159  Data::powD(const Data& right) const
2159  Data  Data
2160  escript::operator+(const Data& left, const Data& right)  escript::operator+(const Data& left, const Data& right)
2161  {  {
2162      if (left.isLazy() || right.isLazy())
2163      {
2164        DataLazy* c=new DataLazy(left.borrowDataPtr(),right.borrowDataPtr(),ADD);
2165        return Data(c);
2166      }
2167    return C_TensorBinaryOperation(left, right, plus<double>());    return C_TensorBinaryOperation(left, right, plus<double>());
2168  }  }
2169    
# Line 1766  escript::operator+(const Data& left, con Line 2172  escript::operator+(const Data& left, con
2172  Data  Data
2173  escript::operator-(const Data& left, const Data& right)  escript::operator-(const Data& left, const Data& right)
2174  {  {
2175      if (left.isLazy() || right.isLazy())
2176      {
2177        DataLazy* c=new DataLazy(left.borrowDataPtr(),right.borrowDataPtr(),SUB);
2178        return Data(c);
2179      }
2180    return C_TensorBinaryOperation(left, right, minus<double>());    return C_TensorBinaryOperation(left, right, minus<double>());
2181  }  }
2182    
# Line 1774  escript::operator-(const Data& left, con Line 2185  escript::operator-(const Data& left, con
2185  Data  Data
2186  escript::operator*(const Data& left, const Data& right)  escript::operator*(const Data& left, const Data& right)
2187  {  {
2188      if (left.isLazy() || right.isLazy())
2189      {
2190        DataLazy* c=new DataLazy(left.borrowDataPtr(),right.borrowDataPtr(),MUL);
2191        return Data(c);
2192      }
2193    return C_TensorBinaryOperation(left, right, multiplies<double>());    return C_TensorBinaryOperation(left, right, multiplies<double>());
2194  }  }
2195    
# Line 1782  escript::operator*(const Data& left, con Line 2198  escript::operator*(const Data& left, con
2198  Data  Data
2199  escript::operator/(const Data& left, const Data& right)  escript::operator/(const Data& left, const Data& right)
2200  {  {
2201      if (left.isLazy() || right.isLazy())
2202      {
2203        DataLazy* c=new DataLazy(left.borrowDataPtr(),right.borrowDataPtr(),DIV);
2204        return Data(c);
2205      }
2206    return C_TensorBinaryOperation(left, right, divides<double>());    return C_TensorBinaryOperation(left, right, divides<double>());
2207  }  }
2208    
# Line 1790  escript::operator/(const Data& left, con Line 2211  escript::operator/(const Data& left, con
2211  Data  Data
2212  escript::operator+(const Data& left, const boost::python::object& right)  escript::operator+(const Data& left, const boost::python::object& right)
2213  {  {
2214      if (left.isLazy())
2215      {
2216        DataLazy* c=new DataLazy(left.borrowDataPtr(),Data(right,left.getFunctionSpace(),false).borrowDataPtr(),ADD);
2217        return Data(c);
2218      }
2219    return left+Data(right,left.getFunctionSpace(),false);    return left+Data(right,left.getFunctionSpace(),false);
2220  }  }
2221    
# Line 1798  escript::operator+(const Data& left, con Line 2224  escript::operator+(const Data& left, con
2224  Data  Data
2225  escript::operator-(const Data& left, const boost::python::object& right)  escript::operator-(const Data& left, const boost::python::object& right)
2226  {  {
2227      if (left.isLazy())
2228      {
2229        DataLazy* c=new DataLazy(left.borrowDataPtr(),Data(right,left.getFunctionSpace(),false).borrowDataPtr(),SUB);
2230        return Data(c);
2231      }
2232    return left-Data(right,left.getFunctionSpace(),false);    return left-Data(right,left.getFunctionSpace(),false);
2233  }  }
2234    
# Line 1806  escript::operator-(const Data& left, con Line 2237  escript::operator-(const Data& left, con
2237  Data  Data
2238  escript::operator*(const Data& left, const boost::python::object& right)  escript::operator*(const Data& left, const boost::python::object& right)
2239  {  {
2240      if (left.isLazy())
2241      {
2242        DataLazy* c=new DataLazy(left.borrowDataPtr(),Data(right,left.getFunctionSpace(),false).borrowDataPtr(),MUL);
2243        return Data(c);
2244      }
2245    return left*Data(right,left.getFunctionSpace(),false);    return left*Data(right,left.getFunctionSpace(),false);
2246  }  }
2247    
# Line 1814  escript::operator*(const Data& left, con Line 2250  escript::operator*(const Data& left, con
2250  Data  Data
2251  escript::operator/(const Data& left, const boost::python::object& right)  escript::operator/(const Data& left, const boost::python::object& right)
2252  {  {
2253      if (left.isLazy())
2254      {
2255        DataLazy* c=new DataLazy(left.borrowDataPtr(),Data(right,left.getFunctionSpace(),false).borrowDataPtr(),DIV);
2256        return Data(c);
2257      }
2258    return left/Data(right,left.getFunctionSpace(),false);    return left/Data(right,left.getFunctionSpace(),false);
2259  }  }
2260    
# Line 1822  escript::operator/(const Data& left, con Line 2263  escript::operator/(const Data& left, con
2263  Data  Data
2264  escript::operator+(const boost::python::object& left, const Data& right)  escript::operator+(const boost::python::object& left, const Data& right)
2265  {  {
2266      if (right.isLazy())
2267      {
2268        DataLazy* c=new DataLazy(Data(left,right.getFunctionSpace(),false).borrowDataPtr(),right.borrowDataPtr(),ADD);
2269        return Data(c);
2270      }
2271    return Data(left,right.getFunctionSpace(),false)+right;    return Data(left,right.getFunctionSpace(),false)+right;
2272  }  }
2273    
# Line 1830  escript::operator+(const boost::python:: Line 2276  escript::operator+(const boost::python::
2276  Data  Data
2277  escript::operator-(const boost::python::object& left, const Data& right)  escript::operator-(const boost::python::object& left, const Data& right)
2278  {  {
2279      if (right.isLazy())
2280      {
2281        DataLazy* c=new DataLazy(Data(left,right.getFunctionSpace(),false).borrowDataPtr(),right.borrowDataPtr(),SUB);
2282        return Data(c);
2283      }
2284    return Data(left,right.getFunctionSpace(),false)-right;    return Data(left,right.getFunctionSpace(),false)-right;
2285  }  }
2286    
# Line 1838  escript::operator-(const boost::python:: Line 2289  escript::operator-(const boost::python::
2289  Data  Data
2290  escript::operator*(const boost::python::object& left, const Data& right)  escript::operator*(const boost::python::object& left, const Data& right)
2291  {  {
2292      if (right.isLazy())
2293      {
2294        DataLazy* c=new DataLazy(Data(left,right.getFunctionSpace(),false).borrowDataPtr(),right.borrowDataPtr(),MUL);
2295        return Data(c);
2296      }
2297    return Data(left,right.getFunctionSpace(),false)*right;    return Data(left,right.getFunctionSpace(),false)*right;
2298  }  }
2299    
# Line 1846  escript::operator*(const boost::python:: Line 2302  escript::operator*(const boost::python::
2302  Data  Data
2303  escript::operator/(const boost::python::object& left, const Data& right)  escript::operator/(const boost::python::object& left, const Data& right)
2304  {  {
2305      if (right.isLazy())
2306      {
2307        DataLazy* c=new DataLazy(Data(left,right.getFunctionSpace(),false).borrowDataPtr(),right.borrowDataPtr(),DIV);
2308        return Data(c);
2309      }
2310    return Data(left,right.getFunctionSpace(),false)/right;    return Data(left,right.getFunctionSpace(),false)/right;
2311  }  }
2312    
 //  
 //bool escript::operator==(const Data& left, const Data& right)  
 //{  
 //  /*  
 //  NB: this operator does very little at this point, and isn't to  
 //  be relied on. Requires further implementation.  
 //  */  
 //  
 //  bool ret;  
 //  
 //  if (left.isEmpty()) {  
 //    if(!right.isEmpty()) {  
 //      ret = false;  
 //    } else {  
 //      ret = true;  
 //    }  
 //  }  
 //  
 //  if (left.isConstant()) {  
 //    if(!right.isConstant()) {  
 //      ret = false;  
 //    } else {  
 //      ret = true;  
 //    }  
 // }  
 //  
 //  if (left.isTagged()) {  
 //   if(!right.isTagged()) {  
 //      ret = false;  
 //    } else {  
 //      ret = true;  
 //    }  
 //  }  
 //  
 //  if (left.isExpanded()) {  
 //    if(!right.isExpanded()) {  
 //      ret = false;  
 //    } else {  
 //      ret = true;  
 //    }  
 //  }  
 //  
 //  return ret;  
 //}  
2313    
2314  /* TODO */  /* TODO */
2315  /* global reduction */  /* global reduction */
# Line 1951  Data::setSlice(const Data& value, Line 2368  Data::setSlice(const Data& value,
2368    if (isProtected()) {    if (isProtected()) {
2369          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
2370    }    }
2371      FORCERESOLVE;
2372    /*  if (isLazy())
2373      {
2374        throw DataException("Error - setSlice not permitted on lazy data.");
2375      }*/
2376    Data tempValue(value);    Data tempValue(value);
2377    typeMatchLeft(tempValue);    typeMatchLeft(tempValue);
2378    typeMatchRight(tempValue);    typeMatchRight(tempValue);
2379    m_data->setSlice(tempValue.m_data.get(),region);    getReady()->setSlice(tempValue.m_data.get(),region);
2380  }  }
2381    
2382  void  void
2383  Data::typeMatchLeft(Data& right) const  Data::typeMatchLeft(Data& right) const
2384  {  {
2385      if (right.isLazy() && !isLazy())
2386      {
2387        right.resolve();
2388      }
2389    if (isExpanded()){    if (isExpanded()){
2390      right.expand();      right.expand();
2391    } else if (isTagged()) {    } else if (isTagged()) {
# Line 1972  Data::typeMatchLeft(Data& right) const Line 2398  Data::typeMatchLeft(Data& right) const
2398  void  void
2399  Data::typeMatchRight(const Data& right)  Data::typeMatchRight(const Data& right)
2400  {  {
2401      if (isLazy() && !right.isLazy())
2402      {
2403        resolve();
2404      }
2405    if (isTagged()) {    if (isTagged()) {
2406      if (right.isExpanded()) {      if (right.isExpanded()) {
2407        expand();        expand();
# Line 1990  Data::setTaggedValueByName(std::string n Line 2420  Data::setTaggedValueByName(std::string n
2420                             const boost::python::object& value)                             const boost::python::object& value)
2421  {  {
2422       if (getFunctionSpace().getDomain()->isValidTagName(name)) {       if (getFunctionSpace().getDomain()->isValidTagName(name)) {
2423        FORCERESOLVE;
2424          int tagKey=getFunctionSpace().getDomain()->getTag(name);          int tagKey=getFunctionSpace().getDomain()->getTag(name);
2425          setTaggedValue(tagKey,value);          setTaggedValue(tagKey,value);
2426       }       }
# Line 2003  Data::setTaggedValue(int tagKey, Line 2434  Data::setTaggedValue(int tagKey,
2434    }    }
2435    //    //
2436    // Ensure underlying data object is of type DataTagged    // Ensure underlying data object is of type DataTagged
2437      FORCERESOLVE;
2438    if (isConstant()) tag();    if (isConstant()) tag();
   
2439    numeric::array asNumArray(value);    numeric::array asNumArray(value);
2440    
   
2441    // extract the shape of the numarray    // extract the shape of the numarray
2442    DataTypes::ShapeType tempShape;    DataTypes::ShapeType tempShape;
2443    for (int i=0; i < asNumArray.getrank(); i++) {    for (int i=0; i < asNumArray.getrank(); i++) {
2444      tempShape.push_back(extract<int>(asNumArray.getshape()[i]));      tempShape.push_back(extract<int>(asNumArray.getshape()[i]));
2445    }    }
2446    
   // get the space for the data vector  
 //   int len = DataTypes::noValues(tempShape);  
 //   DataVector temp_data(len, 0.0, len);  
 //   DataArrayView temp_dataView(temp_data, tempShape);  
 //   temp_dataView.copy(asNumArray);  
   
2447    DataVector temp_data2;    DataVector temp_data2;
2448    temp_data2.copyFromNumArray(asNumArray);    temp_data2.copyFromNumArray(asNumArray);
2449    
2450    //    m_data->setTaggedValue(tagKey,tempShape, temp_data2);
   // Call DataAbstract::setTaggedValue  
   //m_data->setTaggedValue(tagKey,temp_dataView);  
   
     m_data->setTaggedValue(tagKey,tempShape, temp_data2);  
2451  }  }
2452    
2453    
# Line 2042  Data::setTaggedValueFromCPP(int tagKey, Line 2462  Data::setTaggedValueFromCPP(int tagKey,
2462    }    }
2463    //    //
2464    // Ensure underlying data object is of type DataTagged    // Ensure underlying data object is of type DataTagged
2465      FORCERESOLVE;
2466    if (isConstant()) tag();    if (isConstant()) tag();
   
2467    //    //
2468    // Call DataAbstract::setTaggedValue    // Call DataAbstract::setTaggedValue
2469    m_data->setTaggedValue(tagKey,pointshape, value, dataOffset);    m_data->setTaggedValue(tagKey,pointshape, value, dataOffset);
# Line 2075  escript::C_GeneralTensorProduct(Data& ar Line 2495  escript::C_GeneralTensorProduct(Data& ar
2495    // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)    // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)
2496    // SM is the product of the last axis_offset entries in arg_0.getShape().    // SM is the product of the last axis_offset entries in arg_0.getShape().
2497    
2498      // deal with any lazy data
2499      if (arg_0.isLazy()) {arg_0.resolve();}
2500      if (arg_1.isLazy()) {arg_1.resolve();}
2501    
2502    // Interpolate if necessary and find an appropriate function space    // Interpolate if necessary and find an appropriate function space
2503    Data arg_0_Z, arg_1_Z;    Data arg_0_Z, arg_1_Z;
2504    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {
# Line 2464  Data::borrowData() const Line 2888  Data::borrowData() const
2888    return m_data.get();    return m_data.get();
2889  }  }
2890    
2891    // Not all that happy about returning a non-const from a const
2892    DataAbstract_ptr
2893    Data::borrowDataPtr() const
2894    {
2895      return m_data;
2896    }
2897    
2898    // Not all that happy about returning a non-const from a const
2899    DataReady_ptr
2900    Data::borrowReadyPtr() const
2901    {
2902       DataReady_ptr dr=dynamic_pointer_cast<DataReady>(m_data);
2903       EsysAssert((dr!=0), "Error - casting to DataReady.");
2904       return dr;
2905    }
2906    
2907  std::string  std::string
2908  Data::toString() const  Data::toString() const
# Line 2472  Data::toString() const Line 2911  Data::toString() const
2911      getNumDataPoints()*getDataPointSize()>escriptParams.getInt("TOO_MANY_LINES"))      getNumDataPoints()*getDataPointSize()>escriptParams.getInt("TOO_MANY_LINES"))
2912      {      {
2913      stringstream temp;      stringstream temp;
2914      temp << "Summary: inf="<< inf() << " sup=" << sup() << " data points=" << getNumDataPoints();      temp << "Summary: inf="<< inf_const() << " sup=" << sup_const() << " data points=" << getNumDataPoints();
2915      return  temp.str();      return  temp.str();
2916      }      }
2917      return m_data->toString();      return m_data->toString();
# Line 2483  Data::toString() const Line 2922  Data::toString() const
2922  DataTypes::ValueType::const_reference  DataTypes::ValueType::const_reference
2923  Data::getDataAtOffset(DataTypes::ValueType::size_type i) const  Data::getDataAtOffset(DataTypes::ValueType::size_type i) const
2924  {  {
2925      return m_data->getDataAtOffset(i);      if (isLazy())
2926        {
2927        throw DataException("Programmer error - getDataAtOffset not permitted on lazy data (object is const which prevents resolving).");
2928        }
2929        return getReady()->getDataAtOffset(i);
2930  }  }
2931    
2932    
2933  DataTypes::ValueType::reference  DataTypes::ValueType::reference
2934  Data::getDataAtOffset(DataTypes::ValueType::size_type i)  Data::getDataAtOffset(DataTypes::ValueType::size_type i)
2935  {  {
2936      return m_data->getDataAtOffset(i);  //     if (isLazy())
2937    //     {
2938    //  throw DataException("getDataAtOffset not permitted on lazy data.");
2939    //     }
2940        FORCERESOLVE;
2941        return getReady()->getDataAtOffset(i);
2942  }  }
2943    
2944  DataTypes::ValueType::const_reference  DataTypes::ValueType::const_reference
2945  Data::getDataPoint(int sampleNo, int dataPointNo) const  Data::getDataPoint(int sampleNo, int dataPointNo) const
2946  {  {
2947      return m_data->getDataAtOffset(m_data->getPointOffset(sampleNo, dataPointNo));    if (!isReady())
2948      {
2949        throw DataException("Programmer error - getDataPoint() not permitted on Lazy Data (object is const which prevents resolving).");
2950      }
2951      else
2952      {
2953        const DataReady* dr=getReady();
2954        return dr->getDataAtOffset(dr->getPointOffset(sampleNo, dataPointNo));
2955      }
2956  }  }
2957    
2958    
2959  DataTypes::ValueType::reference  DataTypes::ValueType::reference
2960  Data::getDataPoint(int sampleNo, int dataPointNo)  Data::getDataPoint(int sampleNo, int dataPointNo)
2961  {  {
2962      return m_data->getDataAtOffset(m_data->getPointOffset(sampleNo, dataPointNo));    FORCERESOLVE;
2963      if (!isReady())
2964      {
2965        throw DataException("Programmer error - getDataPoint() not permitted on Lazy Data.");
2966      }
2967      else
2968      {
2969        DataReady* dr=getReady();
2970        return dr->getDataAtOffset(dr->getPointOffset(sampleNo, dataPointNo));
2971      }
2972  }  }
2973    
2974    
# Line 2527  void Line 2992  void
2992  Data::dump(const std::string fileName) const  Data::dump(const std::string fileName) const
2993  {  {
2994    try    try
2995       {    {
2996          return m_data->dump(fileName);      if (isLazy())
2997       }      {
2998       catch (exception& e)        Data temp(*this); // this is to get a non-const object which we can resolve
2999       {        temp.resolve();
3000          temp.dump(fileName);
3001        }
3002        else
3003        {
3004              return m_data->dump(fileName);
3005        }
3006      }
3007      catch (exception& e)
3008      {
3009          cout << e.what() << endl;          cout << e.what() << endl;
3010       }    }
3011  }  }
3012    
3013  int  int

Legend:
Removed from v.1977  
changed lines
  Added in v.2005

  ViewVC Help
Powered by ViewVC 1.1.26