Changeset 34461 for trunk/Ohana/src/opihi/cmd.data/read_vectors.c

Timestamp:

Sep 25, 2012, 6:39:11 AM (14 years ago)

Author:

eugene

Message:

add :char type to read vectors (very crude: sets vector to ascii value of first char); update reindex to handle duplicates; add mmatch function (equiv to avmatch)

File:

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

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

@@ -22 +22 @@
 
 // vector types
-enum {COLTYPE_NONE, COLTYPE_FLT, COLTYPE_INT, COLTYPE_TIME};
+enum {COLTYPE_NONE, COLTYPE_FLT, COLTYPE_INT, COLTYPE_TIME, COLTYPE_CHAR};
 
 int read_vectors (int argc, char **argv) {
@@ -101 +101 @@
       if (!strcasecmp(ptr, "float")) { coltype[i] = COLTYPE_FLT; }
       if (!strcasecmp(ptr, "int"))   { coltype[i] = COLTYPE_INT; }
+      if (!strcasecmp(ptr, "char"))  { coltype[i] = COLTYPE_CHAR; }
       if (!strcasecmp(ptr, "time"))  { coltype[i] = COLTYPE_TIME; }
       if (!coltype[i]) goto bad_colname;
@@ -143 +144 @@
   NELEM = 1000;
   for (i = 0; i < Nvec; i++) {
-    if (coltype[i] == COLTYPE_INT) {
+    if ((coltype[i] == COLTYPE_INT) || (coltype[i] == COLTYPE_CHAR)) {
       ResetVector (vec[i], OPIHI_INT, NELEM);
     } else {
@@ -195 +196 @@
       for (i = 0; i < Nvec; i++) {
         int ivalue;
+        char cvalue;
         double dvalue;
         time_t tvalue;
@@ -203 +205 @@
             readStatus = IsCSV ? iparse_csv (&ivalue, col[i], c0) : iparse (&ivalue, col[i], c0);
             vec[i][0].elements.Int[Nelem] = readStatus ? ivalue : 0;
+            break;
+          case COLTYPE_CHAR:
+            readStatus = IsCSV ? charparse_csv (&cvalue, col[i], c0) : charparse (&cvalue, col[i], c0);
+            vec[i][0].elements.Int[Nelem] = readStatus ? cvalue : 0;
             break;
           case COLTYPE_FLT: