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

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

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

temp/escript/src/Data.h revision 1387 by trankine, Fri Jan 11 07:45:26 2008 UTC trunk/escript/src/Data.h revision 1719 by gross, Thu Aug 21 06:24:29 2008 UTC
# Line 34  extern "C" { Line 34  extern "C" {
34  #include "esysmpi.h"  #include "esysmpi.h"
35  #include <string>  #include <string>
36  #include <algorithm>  #include <algorithm>
37    #include <sstream>
38    
39    
40  #include <boost/shared_ptr.hpp>  #include <boost/shared_ptr.hpp>
41  #include <boost/python/object.hpp>  #include <boost/python/object.hpp>
# Line 298  class Data { Line 300  class Data {
300       \brief       \brief
301       Return the tag number associated with the given data-point.       Return the tag number associated with the given data-point.
302    
      The data-point number here corresponds to the data-point number in the  
      numarray returned by convertToNumArray.  
303    */    */
304    ESCRIPT_DLL_API    ESCRIPT_DLL_API
305    int    int
# Line 323  class Data { Line 323  class Data {
323    
324    /**    /**
325       \brief       \brief
326       Write the data as a string.       Write the data as a string. For large amounts of data, a summary is printed.
327    */    */
328    ESCRIPT_DLL_API    ESCRIPT_DLL_API
   inline  
329    std::string    std::string
330    toString() const    toString() const;
331    {  
     return m_data->toString();  
   }  
332    
333    /**    /**
334       \brief       \brief
# Line 1532  C_GeneralTensorProduct(Data& arg0, Line 1529  C_GeneralTensorProduct(Data& arg0,
1529                       int transpose=0);                       int transpose=0);
1530    
1531    
 /**  
   \brief  
   Compute a tensor operation with two Data objects  
   \param arg0 - Input - Data object  
   \param arg1 - Input - Data object  
   \param operation - Input - Binary op functor  
 */  
 template <typename BinaryFunction>  
 ESCRIPT_DLL_API  
 Data  
 C_TensorBinaryOperation(Data const &arg0,  
                         Data const &arg1,  
                         BinaryFunction operation);  
1532    
1533  /**  /**
1534    \brief    \brief
# Line 1703  Data::dp_algorithm(BinaryFunction operat Line 1687  Data::dp_algorithm(BinaryFunction operat
1687    return falseRetVal;    return falseRetVal;
1688  }  }
1689    
1690    /**
1691      \brief
1692      Compute a tensor operation with two Data objects
1693      \param arg0 - Input - Data object
1694      \param arg1 - Input - Data object
1695      \param operation - Input - Binary op functor
1696    */
1697  template <typename BinaryFunction>  template <typename BinaryFunction>
1698    inline
1699  Data  Data
1700  C_TensorBinaryOperation(Data const &arg_0,  C_TensorBinaryOperation(Data const &arg_0,
1701                          Data const &arg_1,                          Data const &arg_1,

Legend:
Removed from v.1387  
changed lines
  Added in v.1719

  ViewVC Help
Powered by ViewVC 1.1.26