/[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 147 by jgs, Fri Aug 12 01:45:47 2005 UTC revision 150 by jgs, Thu Sep 15 03:44:45 2005 UTC
# Line 44  extern "C" { Line 44  extern "C" {
44  namespace escript {  namespace escript {
45    
46  //  //
47  // Forward declaration for various implimentations of Data.  // Forward declaration for various implementations of Data.
48  class DataEmpty;  class DataEmpty;
49  class DataConstant;  class DataConstant;
50  class DataTagged;  class DataTagged;
# 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      calc_mindp(int& SampleNo,
700                 int& DataPointNo) const;
701    
702    /**    /**
703       \brief       \brief
704       Return the length of each data point of this Data object.       Return the length of each data point of this Data object.
# Line 746  class Data { Line 761  class Data {
761    
762    /**    /**
763       \brief       \brief
764         Return the asin of each data point of this Data object.
765         *
766      */
767      Data
768      asin() const;
769    
770      /**
771         \brief
772         Return the acos of each data point of this Data object.
773         *
774      */
775      Data
776      acos() const;
777    
778      /**
779         \brief
780         Return the atan of each data point of this Data object.
781         *
782      */
783      Data
784      atan() const;
785    
786      /**
787         \brief
788         Return the sinh of each data point of this Data object.
789         *
790      */
791      Data
792      sinh() const;
793    
794      /**
795         \brief
796         Return the cosh of each data point of this Data object.
797         *
798      */
799      Data
800      cosh() const;
801    
802      /**
803         \brief
804         Return the tanh of each data point of this Data object.
805         *
806      */
807      Data
808      tanh() const;
809    
810      /**
811         \brief
812         Return the asinh of each data point of this Data object.
813         *
814      */
815      Data
816      asinh() const;
817    
818      /**
819         \brief
820         Return the acosh of each data point of this Data object.
821         *
822      */
823      Data
824      acosh() const;
825    
826      /**
827         \brief
828         Return the atanh of each data point of this Data object.
829         *
830      */
831      Data
832      atanh() const;
833    
834      /**
835         \brief
836       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.
837       *       *
838    */    */

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

  ViewVC Help
Powered by ViewVC 1.1.26