Changeset 20860 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/integrate.c

Timestamp:

Nov 30, 2008, 2:46:46 PM (18 years ago)

Author:

eugene

Message:

set vectors to use INT or FLT types as needed; cleanup type information in dbStack (use enum)

File:

• branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/integrate.c (modified) (3 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/integrate.c

@@ -4 +4 @@
   
   int i, N, VERBOSE, isFloat;
-  opihi_flt *X, *Y;
+  opihi_flt *Yf;
+  opihi_int *Yi;
   double start, end, value, range, dvalue;
   Vector *vecx, *vecy;
@@ -37 +38 @@
       if ((*X >= start) && (*X <= end)) {
         dvalue = (isFloat) ? *Yf : *Yi;
-        value += *Y * (X[1] - X[0]);
+        value += dvalue * (X[1] - X[0]);
         range += (X[1] - X[0]);
       }
@@ -46 +47 @@
       if ((*X >= start) && (*X <= end)) {
         dvalue = (isFloat) ? *Yf : *Yi;
-        value += *Y * (X[1] - X[0]);
+        value += dvalue * (X[1] - X[0]);
         range += (X[1] - X[0]);
       }