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

trunk/esys2/escript/src/Data/Data.h revision 147 by jgs, Fri Aug 12 01:45:47 2005 UTC trunk/escript/src/Data.h revision 480 by jgs, Wed Feb 1 05:15:12 2006 UTC
# Line 18  Line 18 
18  #ifndef DATA_H  #ifndef DATA_H
19  #define DATA_H  #define DATA_H
20    
21  #include "escript/Data/DataAbstract.h"  #include "DataAbstract.h"
22  #include "escript/Data/DataTagged.h"  #include "DataAlgorithm.h"
23  #include "escript/Data/DataAlgorithm.h"  #include "FunctionSpace.h"
24  #include "escript/Data/FunctionSpace.h"  #include "BinaryOp.h"
25  #include "escript/Data/BinaryOp.h"  #include "UnaryOp.h"
26  #include "escript/Data/UnaryOp.h"  #include "DataException.h"
 #include "escript/Data/DataException.h"  
27    
28  extern "C" {  extern "C" {
29  #include "escript/Data/DataC.h"  #include "DataC.h"
30  }  }
31    
 #include <iostream>  
32  #include <string>  #include <string>
 #include <memory>  
33  #include <algorithm>  #include <algorithm>
34    
35  #include <boost/shared_ptr.hpp>  #include <boost/shared_ptr.hpp>
36  #include <boost/python/object.hpp>  #include <boost/python/object.hpp>
 #include <boost/python/list.hpp>  
37  #include <boost/python/tuple.hpp>  #include <boost/python/tuple.hpp>
38  #include <boost/python/numeric.hpp>  #include <boost/python/numeric.hpp>
39    
40  namespace escript {  namespace escript {
41    
42  //  //
43  // Forward declaration for various implimentations of Data.  // Forward declaration for various implementations of Data.
 class DataEmpty;  
44  class DataConstant;  class DataConstant;
45  class DataTagged;  class DataTagged;
46  class DataExpanded;  class DataExpanded;
# Line 206  class Data { Line 201  class Data {
201         const boost::python::tuple& shape=boost::python::make_tuple(),         const boost::python::tuple& shape=boost::python::make_tuple(),
202         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
203         bool expanded=false);         bool expanded=false);
204      /**
205         \brief
206         Destructor
207      */
208      ~Data();
209    
210    /**    /**
211       \brief       \brief
# Line 226  class Data { Line 226  class Data {
226    convertToNumArray();    convertToNumArray();
227    
228    /**    /**
      \brief fills the expanded Data object from values of a  python numarray object.  
   
   */  
   void  
   fillFromNumArray(const boost::python::numeric::array);  
   /**  
229       \brief       \brief
230       Return the values of all data-points for the given sample as a single python numarray object.       Return the values of all data-points for the given sample as a single python numarray object.
231    */    */
# Line 248  class Data { Line 242  class Data {
242    
243    /**    /**
244       \brief       \brief
245         Fills the expanded Data object from values of a python numarray object.
246      */
247      void
248      fillFromNumArray(const boost::python::numeric::array);
249    
250      /**
251         \brief
252         Return the tag number associated with the given data-point.
253    
254         The data-point number here corresponds to the data-point number in the
255         numarray returned by convertToNumArray.
256      */
257      int
258      getTagNumber(int dpno);
259    
260      /**
261         \brief
262       Return the C wrapper for the Data object.       Return the C wrapper for the Data object.
263    */    */
264    escriptDataC    escriptDataC
# Line 684  class Data { Line 695  class Data {
695    const boost::python::tuple    const boost::python::tuple
696    mindp() const;    mindp() const;
697    
698    /**    void
699       \brief    calc_mindp(int& SampleNo,
700       Return the length of each data point of this Data object.               int& DataPointNo) const;
      sqrt(sum(A[i,j,k,l]^2))  
      *  
   */  
   Data  
   length() const;  
701    
702    /**    /**
703       \brief       \brief
# Line 746  class Data { Line 752  class Data {
752    
753    /**    /**
754       \brief       \brief
755         Return the asin of each data point of this Data object.
756         *
757      */
758      Data
759      asin() const;
760    
761      /**
762         \brief
763         Return the acos of each data point of this Data object.
764         *
765      */
766      Data
767      acos() const;
768    
769      /**
770         \brief
771         Return the atan of each data point of this Data object.
772         *
773      */
774      Data
775      atan() const;
776    
777      /**
778         \brief
779         Return the sinh of each data point of this Data object.
780         *
781      */
782      Data
783      sinh() const;
784    
785      /**
786         \brief
787         Return the cosh of each data point of this Data object.
788         *
789      */
790      Data
791      cosh() const;
792    
793      /**
794         \brief
795         Return the tanh of each data point of this Data object.
796         *
797      */
798      Data
799      tanh() const;
800    
801      /**
802         \brief
803         Return the asinh of each data point of this Data object.
804         *
805      */
806      Data
807      asinh() const;
808    
809      /**
810         \brief
811         Return the acosh of each data point of this Data object.
812         *
813      */
814      Data
815      acosh() const;
816    
817      /**
818         \brief
819         Return the atanh of each data point of this Data object.
820         *
821      */
822      Data
823      atanh() const;
824    
825      /**
826         \brief
827       Return the log to base 10 of each data point of this Data object.       Return the log to base 10 of each data point of this Data object.
828       *       *
829    */    */
830    Data    Data
831    log() const;    log10() const;
832    
833    /**    /**
834       \brief       \brief
# Line 758  class Data { Line 836  class Data {
836       *       *
837    */    */
838    Data    Data
839    ln() const;    log() const;
840    
841    /**    /**
842       \brief       \brief

Legend:
Removed from v.147  
changed lines
  Added in v.480

  ViewVC Help
Powered by ViewVC 1.1.26