Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/applyfit2d.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/applyfit2d.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "data.h"
-
-char *get_variable (char *);
 
 int applyfit2d (int argc, char **argv) {
@@ -8 +6 @@
   char *c, name[64];
   double **C, X, Y;
-  float *x, *y, *z;
+  opihi_flt *z;
   Vector *xvec, *yvec, *zvec;
 
@@ -45 +43 @@
   }
 
-  zvec[0].Nelements = xvec[0].Nelements;
-  REALLOCATE (zvec[0].elements, float, zvec[0].Nelements);
-  bzero (zvec[0].elements, sizeof(float)*zvec[0].Nelements);
-  x = xvec[0].elements;
-  y = yvec[0].elements;
-  z = zvec[0].elements;
+  ResetVector (zvec, OPIHI_FLT, xvec[0].Nelements);
+  bzero (zvec[0].elements.Flt, sizeof(opihi_flt)*zvec[0].Nelements);
+  z = zvec[0].elements.Flt;
 
-  for (n = 0; n < xvec[0].Nelements; n++, x++, y++, z++) {
-    Y = X = 1;
-    for (j = 0; j < order + 1; j++) {
-      X = Y;
-      for (i = 0; i < order + 1 - j; i++) {
-        *z += C[i][j]*X;
-        X = X * (*x);
+  // we have four cases (x == flt or int) and (y == flt or int)
+  if ((xvec[0].type == OPIHI_FLT) && (yvec[0].type == OPIHI_FLT)) {
+    opihi_flt *x = xvec[0].elements.Flt;
+    opihi_flt *y = yvec[0].elements.Flt;
+    for (n = 0; n < xvec[0].Nelements; n++, x++, y++, z++) {
+      Y = X = 1;
+      for (j = 0; j < order + 1; j++) {
+        X = Y;
+        for (i = 0; i < order + 1 - j; i++) {
+          *z += C[i][j]*X;
+          X = X * (*x);
+        }
+        Y = Y * (*y);
       }
-      Y = Y * (*y);
     }
   }
+  if ((xvec[0].type == OPIHI_FLT) && (yvec[0].type == OPIHI_INT)) {
+    opihi_flt *x = xvec[0].elements.Flt;
+    opihi_int *y = yvec[0].elements.Int;
+    for (n = 0; n < xvec[0].Nelements; n++, x++, y++, z++) {
+      Y = X = 1;
+      for (j = 0; j < order + 1; j++) {
+        X = Y;
+        for (i = 0; i < order + 1 - j; i++) {
+          *z += C[i][j]*X;
+          X = X * (*x);
+        }
+        Y = Y * (*y);
+      }
+    }
+  }
+  if ((xvec[0].type == OPIHI_INT) && (yvec[0].type == OPIHI_FLT)) {
+    opihi_int *x = xvec[0].elements.Int;
+    opihi_flt *y = yvec[0].elements.Flt;
+    for (n = 0; n < xvec[0].Nelements; n++, x++, y++, z++) {
+      Y = X = 1;
+      for (j = 0; j < order + 1; j++) {
+        X = Y;
+        for (i = 0; i < order + 1 - j; i++) {
+          *z += C[i][j]*X;
+          X = X * (*x);
+        }
+        Y = Y * (*y);
+      }
+    }
+  }
+  if ((xvec[0].type == OPIHI_INT) && (yvec[0].type == OPIHI_INT)) {
+    opihi_int *x = xvec[0].elements.Int;
+    opihi_int *y = yvec[0].elements.Int;
+    for (n = 0; n < xvec[0].Nelements; n++, x++, y++, z++) {
+      Y = X = 1;
+      for (j = 0; j < order + 1; j++) {
+        X = Y;
+        for (i = 0; i < order + 1 - j; i++) {
+          *z += C[i][j]*X;
+          X = X * (*x);
+        }
+        Y = Y * (*y);
+      }
+    }
+  }
+
   for (i = 0; i < order + 1; i++) free (C[i]);
   free (C);