Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/applyfit.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/cmd.data/applyfit.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/applyfit.c

@@ -1 +1 @@
 # include "data.h"
-
-char *get_variable (char *);
 
 int applyfit (int argc, char **argv) {
@@ -8 +6 @@
   char *c, name[64];
   double *C, X;
-  float *x, *y;
+  opihi_flt *y;
   Vector *xvec, *yvec;
 
@@ -38 +36 @@
     free (c);
   }
-  yvec[0].Nelements = xvec[0].Nelements;
-  REALLOCATE (yvec[0].elements, float, yvec[0].Nelements);
-  bzero (yvec[0].elements, sizeof(float)*yvec[0].Nelements);
-  x = xvec[0].elements;
-  y = yvec[0].elements;
 
-  for (j = 0; j < xvec[0].Nelements; j++, x++, y++) {
-    X = 1;
-    for (i = 0; i < order + 1; i++) {
-      *y += C[i]*X;
-      X = X * (*x);
+  ResetVector (yvec, OPIHI_FLT, xvec[0].Nelements);
+  bzero (yvec[0].elements.Flt, sizeof(opihi_flt)*yvec[0].Nelements);
+  y = yvec[0].elements.Flt;
+
+  if (xvec[0].type == OPIHI_FLT) {
+    opihi_flt *x = xvec[0].elements.Flt;
+    for (j = 0; j < xvec[0].Nelements; j++, x++, y++) {
+      X = 1;
+      for (i = 0; i < order + 1; i++) {
+        *y += C[i]*X;
+        X = X * (*x);
+      }
+    }
+  } else {
+    opihi_int *x = xvec[0].elements.Int;
+    for (j = 0; j < xvec[0].Nelements; j++, x++, y++) {
+      X = 1;
+      for (i = 0; i < order + 1; i++) {
+        *y += C[i]*X;
+        X = X * (*x);
+      }
     }
   }