/[escript]/trunk/escript/src/DataLazy.h
ViewVC logotype

Diff of /trunk/escript/src/DataLazy.h

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

branches/schroedinger/escript/src/DataLazy.h revision 1903 by jfenwick, Wed Oct 22 06:11:01 2008 UTC branches/schroedinger_upto1946/escript/src/DataLazy.h revision 1992 by phornby, Fri Nov 7 04:51:04 2008 UTC
# Line 25  Line 25 
25    
26  namespace escript {  namespace escript {
27    
28    // For the purposes of unit testing and maintaining sanity, it is important that this enum be contiguous
29  enum ES_optype  enum ES_optype
30  {  {
31      UNKNOWNOP=0,      UNKNOWNOP=0,
# Line 33  enum ES_optype Line 34  enum ES_optype
34      SUB=3,      SUB=3,
35      MUL=4,      MUL=4,
36      DIV=5,      DIV=5,
37      SIN=6,      POW=6,
38      COS=7,      SIN=POW+1,
39      TAN=8,      COS=SIN+1,
40      ASIN=9,      TAN=SIN+2,
41      ACOS=10,      ASIN=SIN+3,
42      ATAN=11,      ACOS=SIN+4,
43      SINH=12,      ATAN=SIN+5,
44      COSH=13,      SINH=SIN+6,
45      TANH=14,      COSH=SIN+7,
46      ERF=15,      TANH=SIN+8,
47      ASINH=16,      ERF=SIN+9,
48      ACOSH=17,      ASINH=SIN+10,
49      ATANH=18,      ACOSH=SIN+11,
50      LOG10=19,      ATANH=SIN+12,
51      LOG=20,      LOG10=ATANH+1,
52      SIGN=21,      LOG=LOG10+1,
53      ABS=22,      SIGN=LOG10+2,
54      NEG=23,      ABS=LOG10+3,
55      POS=24,      NEG=LOG10+4,
56      EXP=25,      POS=LOG10+5,
57      SQRT=26,      EXP=LOG10+6,
58      RECIP=27,      SQRT=LOG10+7,
59      GZ=28,      RECIP=LOG10+8,
60      LZ=29,      GZ=RECIP+1,
61      GEZ=30,      LZ=GZ+1,
62      LEZ=31      GEZ=GZ+2,
63        LEZ=GZ+3
64  };  };
65    
66    ESCRIPT_DLL_API
67  const std::string&  const std::string&
68  opToString(ES_optype op);  opToString(ES_optype op);
69    
# Line 153  public: Line 156  public:
156    getPointOffset(int sampleNo,    getPointOffset(int sampleNo,
157                   int dataPointNo) const;                   int dataPointNo) const;
158    
159      DataTypes::ValueType::size_type
160      getPointOffset(int sampleNo,
161                     int dataPointNo);
162    
163    
164    /**    /**
165      \return the number of samples which need to be stored to evaluate the expression.      \return the number of samples which need to be stored to evaluate the expression.

Legend:
Removed from v.1903  
changed lines
  Added in v.1992

  ViewVC Help
Powered by ViewVC 1.1.26