Changeset 20936 for trunk/Ohana/src/opihi/lib.shell/VectorOps.c

Timestamp:

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

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/lib.shell/VectorOps.c (modified) (9 diffs)

trunk/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -1 +1 @@
 # include "opihi.h"
+
+// NOTE: we refer to elements.Ptr if we do not care about the actual type
 
 static Vector **vectors;
@@ -18 +20 @@
 
   for (i = 0; i < Nvectors; i++) {
-    free (vectors[i][0].elements);
+    if (vectors[i][0].elements.Int) {
+      free (vectors[i][0].elements.Int);
+    }
     free (vectors[i]);
   }
@@ -28 +32 @@
 
   ALLOCATE (vec, Vector, 1);
-  ALLOCATE (vec[0].elements, float, 1);
-  bzero (vec[0].name, 1024);
+
+  vec[0].type = OPIHI_FLT;    // is a float unless specified otherwise
+  ALLOCATE (vec[0].elements.Flt, opihi_flt, 1);
+
+  bzero (vec[0].name, OPIHI_NAME_SIZE);
   vec[0].Nelements = 0;
   return (vec);
@@ -56 +63 @@
 }
 
+// XXX add TYPE to arguments?
 Vector *SelectVector (char *name, int mode, int verbose) {
 
@@ -95 +103 @@
   if (i == Nvectors) return (FALSE);
 
-  free (vectors[i][0].elements);
+  if (vectors[i][0].elements.Ptr) free (vectors[i][0].elements.Ptr);
   free (vectors[i]);
 
@@ -115 +123 @@
   if (i == Nvectors) return (FALSE);
 
-  free (vectors[i][0].elements);
+  if (vectors[i][0].elements.Ptr) free (vectors[i][0].elements.Ptr);
   free (vectors[i]);
 
@@ -134 +142 @@
   return (TRUE);
 }
+
 int CopyVector (Vector *out, Vector *in) {
-  free (out[0].elements);
+  if (out[0].elements.Ptr) free (out[0].elements.Ptr);
   out[0].Nelements = in[0].Nelements;
-  ALLOCATE (out[0].elements, float, out[0].Nelements);
-  memcpy (out[0].elements, in[0].elements, out[0].Nelements*sizeof(float));
-  return (TRUE);
+  if (in[0].elements.Ptr) {
+    if (in[0].type == OPIHI_FLT) {
+      ALLOCATE (out[0].elements.Flt, opihi_flt, out[0].Nelements);
+      memcpy (out[0].elements.Flt, in[0].elements.Flt, out[0].Nelements*sizeof(opihi_flt));
+      out[0].type = OPIHI_FLT;
+    } else {
+      ALLOCATE (out[0].elements.Int, opihi_int, out[0].Nelements);
+      memcpy (out[0].elements.Int, in[0].elements.Int, out[0].Nelements*sizeof(opihi_int));
+      out[0].type = OPIHI_INT;
+    }
+  }
+  return (TRUE);
+}
+
+int MatchVector(Vector *out, Vector *in, char type) {
+  if (out[0].elements.Ptr) free (out[0].elements.Ptr);
+  out[0].Nelements = in[0].Nelements;
+  if (type == OPIHI_FLT) {
+    ALLOCATE (out[0].elements.Flt, opihi_flt, out[0].Nelements);
+    out[0].type = OPIHI_FLT;
+  } else {
+    ALLOCATE (out[0].elements.Int, opihi_int, out[0].Nelements);
+    out[0].type = OPIHI_INT;
+  }
+  return (TRUE);
+}
+
+// ResetVector (vecx, OPIHI_FLT, MAX (Npts, 1));
+int ResetVector (Vector *vec, char type, int Nelements) {
+
+  vec[0].Nelements = Nelements;
+  if (type == OPIHI_FLT) {
+    REALLOCATE (vec[0].elements.Flt, opihi_flt, Nelements);
+    vec[0].type = OPIHI_FLT;
+  } else {
+    REALLOCATE (vec[0].elements.Int, opihi_int, Nelements);
+    vec[0].type = OPIHI_INT;
+  }
+  return TRUE;
+}
+
+// SetVector (vecx, OPIHI_FLT, MAX (Npts, 1));
+int SetVector (Vector *vec, char type, int Nelements) {
+
+  vec[0].Nelements = Nelements;
+  if (type == OPIHI_FLT) {
+    ALLOCATE (vec[0].elements.Flt, opihi_flt, Nelements);
+    vec[0].type = OPIHI_FLT;
+  } else {
+    ALLOCATE (vec[0].elements.Int, opihi_int, Nelements);
+    vec[0].type = OPIHI_INT;
+  }
+  return TRUE;
+}
+
+// recast the vector to the specified type
+int CastVector (Vector *vec, char type) {
+
+  int i;
+
+  // the trivial case
+  if (vec[0].type == type) return TRUE;
+
+  if (type == OPIHI_FLT) {
+    opihi_flt *temp;
+    ALLOCATE (temp, opihi_flt, vec[0].Nelements);
+    opihi_flt *vo = temp;
+    opihi_int *vi = vec[0].elements.Int;
+    for (i = 0; i < vec[0].Nelements; i++, vo++, vi++) {
+      *vo = *vi;
+    }
+    free (vec[0].elements.Int);
+    vec[0].elements.Flt = vo;
+    vec[0].type = OPIHI_FLT;
+  } else {
+    opihi_int *temp;
+    ALLOCATE (temp, opihi_int, vec[0].Nelements);
+    opihi_int *vo = temp;
+    opihi_flt *vi = vec[0].elements.Flt;
+    for (i = 0; i < vec[0].Nelements; i++, vo++, vi++) {
+      *vo = *vi;
+    }
+    free (vec[0].elements.Flt);
+    vec[0].elements.Int = vo;
+    vec[0].type = OPIHI_INT;
+  }
+  return TRUE;
 }
 
@@ -150 +243 @@
   return (TRUE);
 }
+
 int MoveVector (Vector *out, Vector *in) {
   int i, j;
 
-  free (out[0].elements);
-  out[0].Nelements = in[0].Nelements;
-  out[0].elements =  in[0].elements;
+  if (out[0].elements.Ptr) free (out[0].elements.Ptr);
+  out[0].Nelements    = in[0].Nelements;
+  out[0].elements.Ptr = in[0].elements.Ptr;
+  out[0].type         = in[0].type;
 
   /* delete vector entry from vector list, if it exists */
@@ -184 +279 @@
   gprint (GP_LOG, "    N       name      size\n");
   for (i = 0; i < Nvectors; i++) {
-    gprint (GP_LOG, "%5d %10s %10d\n",
-             i, vectors[i][0].name, vectors[i][0].Nelements);
-  }
-  return (TRUE);
-}
-  
+    if (vectors[i][0].type == OPIHI_FLT) {
+      gprint (GP_LOG, "%5d %10s %10d (FLT)\n", i, vectors[i][0].name, vectors[i][0].Nelements);
+    } else {
+      gprint (GP_LOG, "%5d %10s %10d (INT)\n", i, vectors[i][0].name, vectors[i][0].Nelements);
+    }
+  }
+  return (TRUE);
+}
+