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

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

@@ -4 +4 @@
   
   int i, j;
-  float *ip, *op, *xp, *yp;
+  opihi_flt *ip, *op, *xp, *yp;
   Vector *in, *out, *xv, *yv;
 
@@ -17 +17 @@
   if ((yv  = SelectVector (argv[4], OLDVECTOR, TRUE)) == NULL) return (FALSE);
 
+  REQUIRE_VECTOR_FLT (in, FALSE); 
+  REQUIRE_VECTOR_FLT (xv, FALSE); 
+  REQUIRE_VECTOR_FLT (yv, FALSE); 
+
   if (xv[0].Nelements != yv[0].Nelements) {
       gprint (GP_ERR, "unmatched lookup table lengths\n");
@@ -22 +26 @@
   }
 
-  out[0].Nelements = in[0].Nelements;
-  REALLOCATE (out[0].elements, float, out[0].Nelements);
+  ResetVector (out, OPIHI_FLT, in[0].Nelements);
 
-  ip = in[0].elements;
-  op = out[0].elements;
+  ip = in[0].elements.Flt;
+  op = out[0].elements.Flt;
 
   for (i = 0; i < in[0].Nelements; i++, ip++, op++) {
     // re-write this using bisection
-    xp = xv[0].elements;
-    yp = yv[0].elements;
+    xp = xv[0].elements.Flt;
+    yp = yv[0].elements.Flt;
 
     for (j = 0; (*ip < *xp) && (j < yv[0].Nelements); j++);