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

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

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

revision 1885 by jfenwick, Tue Oct 14 04:54:59 2008 UTC revision 1886 by jfenwick, Wed Oct 15 01:34:18 2008 UTC
# Line 34  enum ES_optype Line 34  enum ES_optype
34      ADD=2,      ADD=2,
35      SUB=3,      SUB=3,
36      MUL=4,      MUL=4,
37      DIV=5      DIV=5,
38        SIN=6,
39        COS=7,
40        TAN=8,
41        ASIN=9,
42        ACOS=10,
43        ATAN=11,
44        SINH=12,
45        COSH=13,
46        TANH=14,
47        ERF=15,
48        ASINH=16,
49        ACOSH=17,
50        ATANH=18,
51        LOG10=19,
52        LOG=20,
53        SIGN=21,
54        ABS=22,
55        NEG=23,
56        POS=24
57  };  };
58    
59  const std::string&  const std::string&
# Line 65  public: Line 84  public:
84    DataLazy(DataAbstract_ptr p);    DataLazy(DataAbstract_ptr p);
85    
86    ESCRIPT_DLL_API    ESCRIPT_DLL_API
87      DataLazy(DataAbstract_ptr left, ES_optype op);
88    
89    
90    
91      ESCRIPT_DLL_API
92    DataLazy(DataLazy_ptr left, DataLazy_ptr right, ES_optype op);    DataLazy(DataLazy_ptr left, DataLazy_ptr right, ES_optype op);
93    
94    ESCRIPT_DLL_API    ESCRIPT_DLL_API
# Line 110  public: Line 134  public:
134                   int dataPointNo) const;                   int dataPointNo) const;
135    
136    
 //   // this is a top level function, the actual searching will be done by helper methods  
 //   ESCRIPT_DLL_API  
 //   void  
 //   getSample(ValueType& v, int sampleNo,size_t offset=0) const;  
   
137    ESCRIPT_DLL_API    ESCRIPT_DLL_API
138    int    int
139    getBuffsRequired() const;    getBuffsRequired() const;
# Line 131  private: Line 150  private:
150    const double*    const double*
151    resolveSample(ValueType& v,int sampleNo,  size_t offset ) const;    resolveSample(ValueType& v,int sampleNo,  size_t offset ) const;
152    
153      void
154      intoString(std::ostringstream& oss) const;
155    
156  };  };
157    
158  }  }

Legend:
Removed from v.1885  
changed lines
  Added in v.1886

  ViewVC Help
Powered by ViewVC 1.1.26