/[escript]/branches/schroedinger/escript/src/Data.h
ViewVC logotype

Diff of /branches/schroedinger/escript/src/Data.h

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

revision 1429 by trankine, Fri Jan 11 07:45:58 2008 UTC revision 1430 by trankine, Wed Feb 27 09:07:19 2008 UTC
# Line 1532  C_GeneralTensorProduct(Data& arg0, Line 1532  C_GeneralTensorProduct(Data& arg0,
1532                       int transpose=0);                       int transpose=0);
1533    
1534    
 /**  
   \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);  
1535    
1536  /**  /**
1537    \brief    \brief
# Line 1703  Data::dp_algorithm(BinaryFunction operat Line 1690  Data::dp_algorithm(BinaryFunction operat
1690    return falseRetVal;    return falseRetVal;
1691  }  }
1692    
1693    /**
1694      \brief
1695      Compute a tensor operation with two Data objects
1696      \param arg0 - Input - Data object
1697      \param arg1 - Input - Data object
1698      \param operation - Input - Binary op functor
1699    */
1700  template <typename BinaryFunction>  template <typename BinaryFunction>
1701    inline
1702  Data  Data
1703  C_TensorBinaryOperation(Data const &arg_0,  C_TensorBinaryOperation(Data const &arg_0,
1704                          Data const &arg_1,                          Data const &arg_1,

Legend:
Removed from v.1429  
changed lines
  Added in v.1430

  ViewVC Help
Powered by ViewVC 1.1.26