Changeset 33311

Timestamp:

Feb 20, 2012, 3:06:34 PM (14 years ago)

Author:

eugene

Message:

allow all vector results to yield 0 length vectors

Location:

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data

Files:

• cut.c (modified) (2 diffs)
• imcut.c (modified) (1 diff)
• read_vectors.c (modified) (1 diff)
• reindex.c (modified) (2 diffs)
• select.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/cut.c

@@ -48 +48 @@
   case 'X':
     /* create output vectors */
-    ResetVector (xvec, OPIHI_FLT, MAX (nx, 1));
-    ResetVector (yvec, OPIHI_FLT, MAX (nx, 1));
+    ResetVector (xvec, OPIHI_FLT, nx);
+    ResetVector (yvec, OPIHI_FLT, nx);
     bzero (yvec[0].elements.Flt, nx*sizeof(opihi_flt));
     for (i = 0; i < nx; i++) {
@@ -80 +80 @@
   case 'y':
   case 'Y':
-    ResetVector (xvec, OPIHI_FLT, MAX (ny, 1));
-    ResetVector (yvec, OPIHI_FLT, MAX (ny, 1));
+    ResetVector (xvec, OPIHI_FLT, ny);
+    ResetVector (yvec, OPIHI_FLT, ny);
     bzero (yvec[0].elements.Flt, ny*sizeof(opihi_flt));
     for (i = 0; i < ny; i++) {

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/imcut.c

@@ -37 +37 @@
   dY = dY / L;
 
-  ResetVector (xvec, OPIHI_FLT, MAX (L, 1));
-  ResetVector (yvec, OPIHI_FLT, MAX (L, 1));
+  ResetVector (xvec, OPIHI_FLT, L);
+  ResetVector (yvec, OPIHI_FLT, L);
 
   V = (float *)buf[0].matrix.buffer;

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -402 +402 @@
         sprintf (name, "%s:%d", argv[i], j);
       if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
-      ResetVector (vec[j], vecType, MAX (Ny,1));
+      ResetVector (vec[j], vecType, Ny);
     }
 

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/reindex.c

@@ -22 +22 @@
 
   // ovec matches ivec in type and xvec in size (xvec need not have all ivec elements, and may have duplicates
-  ResetVector (ovec, ivec->type, MAX (xvec[0].Nelements, 1));
+  ResetVector (ovec, ivec->type, xvec[0].Nelements);
 
   Nmax = ivec[0].Nelements - 1;
@@ -51 +51 @@
 
   // free up unused memory
-  ResetVector (ovec, ivec->type, MAX (Npts, 1));
+  ResetVector (ovec, ivec->type, Npts);
   return (TRUE);
 

branches/eam_branches/ipp-20111122/Ohana/src/opihi/cmd.data/select.c

@@ -28 +28 @@
 
   if ((in1->type == OPIHI_INT) && (in2->type == OPIHI_INT)) {
-    ResetVector (ovec, OPIHI_INT, MAX (tvec[0].Nelements, 1));
+    ResetVector (ovec, OPIHI_INT, tvec[0].Nelements);
   } else {
-    ResetVector (ovec, OPIHI_FLT, MAX (tvec[0].Nelements, 1));
+    ResetVector (ovec, OPIHI_FLT, tvec[0].Nelements);
   }