Changeset 16003 for trunk/Ohana/src/opihi/lib.shell/expand_vectors.c

Timestamp:

Jan 4, 2008, 11:24:32 AM (19 years ago)

Author:

eugene

Message:

added A[][] for matrix set / get

File:

• trunk/Ohana/src/opihi/lib.shell/expand_vectors.c (modified) (4 diffs)

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

@@ -4 +4 @@
 
   char *newline, *tmpline, strValue[128], *val;
-  char *L, *N, *p, *q, *w;
-  int n, I, size, showLength, NLINE, Noff;
+  char *L, *N, *p, *q, *p2, *w;
+  int n, I, J, size, showLength, NLINE, Noff, isBuffer, inRange;
+  float *ptr;
   double f1;
   Vector *vec;
+  Buffer *buf;
 
   if (line == NULL) return (NULL);
@@ -26 +28 @@
   N = newline + n;
   while (1) {
-    /* find vector subscript */
+    /* find square-bracket pair [..] */
     p = strchr (L, '[');
     q = strchr (L, ']');
@@ -33 +35 @@
     if ((p == NULL) && (q == NULL)) goto dumpline;
     if (p > q) goto dumpline; /* odd state: unmatched pair: ][ */
+
+    /* find vector subscript */
     n = (int) (q - p - 1);
     val = NULL;
@@ -50 +54 @@
     }      
 
-    /* find vector name */
+    /* if a second [..] immediately follows, we are a buffer, not a vector */
+    isBuffer = FALSE;
+    if (*(q + 1) == '[') {
+      p2 = strchr (q + 1, ']');
+      if (p2 != NULL) {
+        if (showLength) {
+          gprint (GP_ERR, "unsupported : name[][..]\n"); 
+          goto asVector;
+        }
+
+        isBuffer = TRUE;
+
+        /* find buffer second subscript */
+        n = (int) (p2 - q - 2);
+        val = NULL;
+        if (n == 0) {
+          gprint (GP_ERR, "unsupported : name[..][]\n"); 
+          isBuffer = FALSE;
+          goto asVector;
+        } 
+        tmpline = strncreate (q+2, n);
+        val = dvomath (1, &tmpline, &size, 0);
+        free (tmpline);
+        if (val == NULL) {
+          isBuffer = FALSE;
+          goto asVector; /* not a valid vector subscript */
+        }
+        J = 0; 
+        if (val != NULL) {
+          J = atoi (val);
+          free (val);
+        }      
+      }
+      q = p2;
+    }
+
+  asVector:
+    /* find vector/buffer name */
     for (w = p - 1; (w >= line) && !OHANA_WHITESPACE(*w) && (isalnum(*w) || (*w == ':') || (*w == '_')); w--);
     w ++;
     n = (int)(p - w);
     tmpline = strncreate (w, n);
-    if ((vec = SelectVector (tmpline, OLDVECTOR, TRUE)) == NULL) goto dumpline;
-    free (tmpline);
 
-    /* find vector element */
-    if ((I >= vec[0].Nelements) || (I < -1*vec[0].Nelements)) {
-      gprint (GP_ERR, "vector subscript out of range\n"); 
-      goto escape;
-    }
-    if (showLength) {
-      f1 = vec[0].Nelements;
+    if (isBuffer) {
+      if ((buf = SelectBuffer (tmpline, OLDBUFFER, TRUE)) == NULL) goto dumpline;
+
+      /* find buffer element */
+      inRange = TRUE;
+      inRange &= (I <  +1*buf[0].header.Naxis[0]);
+      inRange &= (I >= -1*buf[0].header.Naxis[0]);
+      inRange &= (J <  +1*buf[0].header.Naxis[1]);
+      inRange &= (J >= -1*buf[0].header.Naxis[1]);
+      if (!inRange) {
+        gprint (GP_ERR, "buffer subscript out of range\n"); 
+        goto escape;
+      }
+      if (I < 0) I += buf[0].header.Naxis[0];
+      if (J < 0) J += buf[0].header.Naxis[1];
+      ptr = (float *) buf[0].matrix.buffer;
+      f1 = ptr[I + J*buf[0].header.Naxis[1]];
     } else {
-      if (I < 0) {
-        f1 = vec[0].elements[vec[0].Nelements+I];
+      if ((vec = SelectVector (tmpline, OLDVECTOR, TRUE)) == NULL) goto dumpline;
+
+      /* find vector element */
+      if ((I >= vec[0].Nelements) || (I < -1*vec[0].Nelements)) {
+        gprint (GP_ERR, "vector subscript out of range\n"); 
+        goto escape;
+      }
+      if (showLength) {
+        f1 = vec[0].Nelements;
       } else {
+        if (I < 0) I += vec[0].Nelements;
         f1 = vec[0].elements[I];
       }
     }
+
+    free (tmpline);
     if ((int)f1 == f1) 
       snprintf (strValue, 128, "%.0f", f1);