Changeset 41269 for trunk/Ohana/src/opihi/cmd.data/write_vectors.c

Timestamp:

Feb 24, 2020, 3:19:09 PM (6 years ago)

Author:

eugene

Message:

adding string-type vectors to opihi

File:

• trunk/Ohana/src/opihi/cmd.data/write_vectors.c (modified) (5 diffs)

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

@@ -154 +154 @@
   if (ADD_HEADER) {
     for (j = 0; j < Nvec; j++) {
+      if (j == 0) fprintf (f, "# ");
       if (CSV) {
         fprintf (f, "%s,", vec[j][0].name);
       } else {
-        if (j == 0) fprintf (f, "# ");
         fprintf (f, "%s ", vec[j][0].name);
       }
@@ -166 +166 @@
   /* default output format */
   if (format == (char *) NULL) {
+    char padChar = CSV ? ',' : ' ';
     for (i = 0; i < vec[0][0].Nelements; i++) {
       for (j = 0; j < Nvec; j++) {
-        if (vec[j][0].type == OPIHI_FLT) {
-          if (CSV) {
-            fprintf (f, "%.12g,", vec[j][0].elements.Flt[i]);
-          } else {
-            fprintf (f, "%.12g ", vec[j][0].elements.Flt[i]);
-          }
-        } else {
-          if (CSV) {
-            fprintf (f, OPIHI_INT_FMT",", vec[j][0].elements.Int[i]);
-          } else {
-            fprintf (f, OPIHI_INT_FMT" ", vec[j][0].elements.Int[i]);
-          }
+        switch (vec[j][0].type) {
+          case OPIHI_FLT:
+            fprintf (f, "%.12g%c", vec[j][0].elements.Flt[i], padChar);
+            break;
+          case OPIHI_INT:
+            fprintf (f, OPIHI_INT_FMT"%c", vec[j][0].elements.Int[i], padChar);
+            break;
+          case OPIHI_STR:
+            fprintf (f, "%s%c", vec[j][0].elements.Str[i], padChar);
+            break;
         }
       }
@@ -226 +225 @@
         fmttype[j] = 'd';
         break;
+      case 's':
+        fmttype[j] = 's';
+        break;
       default:
-        gprint (GP_ERR, "syntax error in format (only e,f,d,c,x allowed)\n");
+        gprint (GP_ERR, "syntax error in format (only e,f,d,c,x,s allowed)\n");
         return (FALSE);
     }
@@ -234 +236 @@
   strcat (fmtlist[Nvec-1], p0);
   
+  // check format types against vector types:
+  for (j = 0; j < Nvec; j++) {
+    switch (vec[j][0].type) {
+      case OPIHI_FLT:
+      case OPIHI_INT:
+        if (fmttype[j] == 's') {
+          gprint (GP_ERR, "mismatch between string format and numerical vector for %s\n", vec[j][0].name);
+          return FALSE;
+        }
+        break;
+      case OPIHI_STR:
+        if (fmttype[j] != 's') {
+          gprint (GP_ERR, "mismatch between numerical format and string vector for %s\n", vec[j][0].name);
+          return FALSE;
+        }
+        break;
+    }
+  }
+
   for (i = 0; i < vec[0][0].Nelements; i++) {
     for (j = 0; j < Nvec; j++) {
@@ -249 +270 @@
           fprintf (f, fmtlist[j], (opihi_flt)(vec[j][0].elements.Int[i]));
         }
+      } 
+      if (fmttype[j] == 's') {
+        fprintf (f, fmtlist[j], vec[j][0].elements.Str[i]);
       } 
     }