Changeset 20860 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/peak.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/peak.c (modified) (2 diffs)

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

@@ -5 +5 @@
   int i, N, imax, QUIET;
   double start, end, xmax, ymax;
-  opihi_flt *X, *Y;
   Vector *vecx, *vecy;
 
@@ -31 +30 @@
 
   imax = -1;
+  xmax = -HUGE_VAL;
+  ymax = -HUGE_VAL;
 
-  if (vecx[0].type == OPIHI_FLT) {
+  if ((vecx[0].type == OPIHI_FLT) && (vecy[0].type == OPIHI_FLT)) {
     opihi_flt *X = vecx[0].elements.Flt;
-    xmax = X[start];
-    ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[start] : vecy[0].elements.Int[start];
-    for (i = 1; i < vecx[0].Nelements-1; i++, X++, Y++) {
-      if ((*X >= start) && (*X <= end)) {
-        if ((imax == -1) || (*Y > ymax)) {
-          xmax = *X;
-          ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[i] : vecy[0].elements.Int[i];
-          imax = i;
-        }
-      }
+    opihi_flt *Y = vecy[0].elements.Flt;
+    for (i = 0; i < vecx[0].Nelements; i++, X++, Y++) {
+      if (*X < start) continue;
+      if (*X > end) continue;
+      if (*Y < ymax) continue;
+      xmax = *X;
+      ymax = *Y;
+      imax = i;
     }      
-  } else {
+  }
+  if ((vecx[0].type == OPIHI_FLT) && (vecy[0].type == OPIHI_INT)) {
+    opihi_flt *X = vecx[0].elements.Flt;
+    opihi_int *Y = vecy[0].elements.Int;
+    for (i = 0; i < vecx[0].Nelements; i++, X++, Y++) {
+      if (*X < start) continue;
+      if (*X > end) continue;
+      if (*Y < ymax) continue;
+      xmax = *X;
+      ymax = *Y;
+      imax = i;
+    }      
+  }
+  if ((vecx[0].type == OPIHI_INT) && (vecy[0].type == OPIHI_FLT)) {
     opihi_int *X = vecx[0].elements.Int;
-    xmax = X[start];
-    ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[start] : vecy[0].elements.Int[start];
-    for (i = 1; i < vecx[0].Nelements-1; i++, X++, Y++) {
-      if ((*X >= start) && (*X <= end)) {
-        if ((imax == -1) || (*Y > ymax)) {
-          xmax = *X;
-          ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[i] : vecy[0].elements.Int[i];
-          imax = i;
-        }
-      }
+    opihi_flt *Y = vecy[0].elements.Flt;
+    for (i = 0; i < vecx[0].Nelements; i++, X++, Y++) {
+      if (*X < start) continue;
+      if (*X > end) continue;
+      if (*Y < ymax) continue;
+      xmax = *X;
+      ymax = *Y;
+      imax = i;
+    }      
+  }
+  if ((vecx[0].type == OPIHI_INT) && (vecy[0].type == OPIHI_INT)) {
+    opihi_int *X = vecx[0].elements.Int;
+    opihi_int *Y = vecy[0].elements.Int;
+    for (i = 0; i < vecx[0].Nelements; i++, X++, Y++) {
+      if (*X < start) continue;
+      if (*X > end) continue;
+      if (*Y < ymax) continue;
+      xmax = *X;
+      ymax = *Y;
+      imax = i;
     }      
   }