/[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 2476 by jfenwick, Wed Jun 17 04:42:13 2009 UTC revision 2519 by jfenwick, Mon Jul 6 00:43:08 2009 UTC
# Line 576  If false, the result is a list of scalar Line 576  If false, the result is a list of scalar
576      preferred interface but is provided for use by C code.      preferred interface but is provided for use by C code.
577      The bufferg parameter is only required for LazyData.      The bufferg parameter is only required for LazyData.
578      \param sampleNo - Input - the given sample no.      \param sampleNo - Input - the given sample no.
579      \param buffer - A buffer to to compute (and store) sample data in will be selected from this group.      \param bufferg - A buffer to compute (and store) sample data in will be selected from this group.
580      \return pointer to the sample data.      \return pointer to the sample data.
581  */  */
582    ESCRIPT_DLL_API    ESCRIPT_DLL_API
# Line 691  If false, the result is a list of scalar Line 691  If false, the result is a list of scalar
691       Assign the given value to the tag assocciated with name. Implicitly converts this       Assign the given value to the tag assocciated with name. Implicitly converts this
692       object to type DataTagged. Throws an exception if this object       object to type DataTagged. Throws an exception if this object
693       cannot be converted to a DataTagged object or name cannot be mapped onto a tag key.       cannot be converted to a DataTagged object or name cannot be mapped onto a tag key.
694       \param tagKey - Input - Integer key.       \param name - Input - name of tag.
695       \param value - Input - Value to associate with given key.       \param value - Input - Value to associate with given key.
     ==>*  
696    */    */
697    ESCRIPT_DLL_API    ESCRIPT_DLL_API
698    void    void
# Line 1949  ESCRIPT_DLL_API std::ostream& operator<< Line 1948  ESCRIPT_DLL_API std::ostream& operator<<
1948  /**  /**
1949    \brief    \brief
1950    Compute a tensor product of two Data objects    Compute a tensor product of two Data objects
1951    \param arg0 - Input - Data object    \param arg_0 - Input - Data object
1952    \param arg1 - Input - Data object    \param arg_1 - Input - Data object
1953    \param axis_offset - Input - axis offset    \param axis_offset - Input - axis offset
1954    \param transpose - Input - 0: transpose neither, 1: transpose arg0, 2: transpose arg1    \param transpose - Input - 0: transpose neither, 1: transpose arg0, 2: transpose arg1
1955  */  */
1956  ESCRIPT_DLL_API  ESCRIPT_DLL_API
1957  Data  Data
1958  C_GeneralTensorProduct(Data& arg0,  C_GeneralTensorProduct(Data& arg_0,
1959                       Data& arg1,                       Data& arg_1,
1960                       int axis_offset=0,                       int axis_offset=0,
1961                       int transpose=0);                       int transpose=0);
1962    
# Line 2121  Data::dp_algorithm(BinaryFunction operat Line 2120  Data::dp_algorithm(BinaryFunction operat
2120  /**  /**
2121    \brief    \brief
2122    Compute a tensor operation with two Data objects    Compute a tensor operation with two Data objects
2123    \param arg0 - Input - Data object    \param arg_0 - Input - Data object
2124    \param arg1 - Input - Data object    \param arg_1 - Input - Data object
2125    \param operation - Input - Binary op functor    \param operation - Input - Binary op functor
2126  */  */
2127  template <typename BinaryFunction>  template <typename BinaryFunction>

Legend:
Removed from v.2476  
changed lines
  Added in v.2519

  ViewVC Help
Powered by ViewVC 1.1.26