/[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

revision 1334 by matt, Thu Oct 25 05:08:54 2007 UTC revision 1693 by jfenwick, Fri Aug 8 04:22:58 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 323  class Data { Line 325  class Data {
325    
326    /**    /**
327       \brief       \brief
328       Write the data as a string.       Write the data as a string. For large amounts of data, a summary is printed.
329    */    */
330    ESCRIPT_DLL_API    ESCRIPT_DLL_API
   inline  
331    std::string    std::string
332    toString() const    toString() const;
333    {  
     return m_data->toString();  
   }  
334    
335    /**    /**
336       \brief       \brief
# Line 588  class Data { Line 587  class Data {
587    /**    /**
588       \brief       \brief
589       Assign the given value to the tag. Implicitly converts this       Assign the given value to the tag. Implicitly converts this
590       object to type DataTagged. Throws an exception if this object       object to type DataTagged if it is constant.
591       cannot be converted to a DataTagged object.  
592       \param tagKey - Input - Integer key.       \param tagKey - Input - Integer key.
593       \param value - Input - Value to associate with given key.       \param value - Input - Value to associate with given key.
594      ==>*      ==>*
# Line 602  class Data { Line 601  class Data {
601    /**    /**
602       \brief       \brief
603       Assign the given value to the tag. Implicitly converts this       Assign the given value to the tag. Implicitly converts this
604       object to type DataTagged. Throws an exception if this object       object to type DataTagged if it is constant.
605       cannot be converted to a DataTagged object.  
606       \param tagKey - Input - Integer key.       \param tagKey - Input - Integer key.
607       \param value - Input - Value to associate with given key.       \param value - Input - Value to associate with given key.
608      ==>*      ==>*
# Line 1532  C_GeneralTensorProduct(Data& arg0, Line 1531  C_GeneralTensorProduct(Data& arg0,
1531                       int transpose=0);                       int transpose=0);
1532    
1533    
 /**  
   \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);  
1534    
1535  /**  /**
1536    \brief    \brief
# Line 1703  Data::dp_algorithm(BinaryFunction operat Line 1689  Data::dp_algorithm(BinaryFunction operat
1689    return falseRetVal;    return falseRetVal;
1690  }  }
1691    
1692    /**
1693      \brief
1694      Compute a tensor operation with two Data objects
1695      \param arg0 - Input - Data object
1696      \param arg1 - Input - Data object
1697      \param operation - Input - Binary op functor
1698    */
1699  template <typename BinaryFunction>  template <typename BinaryFunction>
1700    inline
1701  Data  Data
1702  C_TensorBinaryOperation(Data const &arg_0,  C_TensorBinaryOperation(Data const &arg_0,
1703                          Data const &arg_1,                          Data const &arg_1,

Legend:
Removed from v.1334  
changed lines
  Added in v.1693

  ViewVC Help
Powered by ViewVC 1.1.26