/[escript]/branches/numpy/escript/src/Data.cpp
ViewVC logotype

Diff of /branches/numpy/escript/src/Data.cpp

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

revision 2452 by jfenwick, Fri May 29 00:22:42 2009 UTC revision 2453 by jfenwick, Tue Jun 2 22:54:20 2009 UTC
# Line 1015  Data::getLength() const Line 1015  Data::getLength() const
1015    return m_data->getLength();    return m_data->getLength();
1016  }  }
1017    
 #ifndef NONUMARRAY  
 const  
 boost::python::numeric :: array  
 Data:: getValueOfDataPoint(int dataPointNo)  
 {  
     return boost::python::numeric::array(getValueOfDataPointAsTuple(dataPointNo));  
 }  
 #endif  
   
1018  const boost::python::object  const boost::python::object
1019  Data::getValueOfDataPointAsTuple(int dataPointNo)  Data::getValueOfDataPointAsTuple(int dataPointNo)
1020  {  {
# Line 1119  Data::setValueOfDataPoint(int dataPointN Line 1110  Data::setValueOfDataPoint(int dataPointN
1110    }    }
1111  }  }
1112    
 #ifndef NONUMARRAY  
 const  
 boost::python::numeric::array  
 Data::getValueOfGlobalDataPoint(int procNo, int dataPointNo)  
 {  
    return boost::python::numeric::array(getValueOfGlobalDataPointAsTuple(procNo, dataPointNo));  
 }  
 #endif  
   
1113  const  const
1114  boost::python::object  boost::python::object
1115  Data::getValueOfGlobalDataPointAsTuple(int procNo, int dataPointNo)  Data::getValueOfGlobalDataPointAsTuple(int procNo, int dataPointNo)
# Line 1203  Data::integrateToTuple() Line 1185  Data::integrateToTuple()
1185    
1186  }  }
1187    
 #ifndef NONUMARRAY  
 boost::python::object  
 Data::integrate_const() const  
 {  
   if (isLazy())  
   {  
     throw DataException("Error - cannot integrate for constant lazy data.");  
   }  
   return boost::python::numeric::array(integrateWorker());  
 }  
   
 boost::python::object  
 Data::integrate()  
 {  
   if (isLazy())  
   {  
     expand();  
   }  
   return boost::python::numeric::array(integrateWorker());  
 }  
 #endif  
   
   
1188  boost::python::object  boost::python::object
1189  Data::integrateWorker() const  Data::integrateWorker() const
1190  {  {

Legend:
Removed from v.2452  
changed lines
  Added in v.2453

  ViewVC Help
Powered by ViewVC 1.1.26