Changeset 16059

Timestamp:

Jan 14, 2008, 1:50:11 PM (18 years ago)

Author:

eugene

Message:

convert to new gauss-jordan code (non-Press); fixing Wall,Werror warnings; fixed bug in shell command; fixed bug in matrix element lookup

Location:

trunk/Ohana/src/opihi

Files:

• cmd.astro/multifit.c (modified) (1 diff)
• cmd.basic/shell.c (modified) (2 diffs)
• cmd.basic/test/list.sh (modified) (1 diff)
• cmd.basic/test/output.sh (modified) (1 diff)
• cmd.basic/test/scan.sh (modified) (1 diff)
• cmd.data/fit.c (modified) (1 diff)
• cmd.data/fit2d.c (modified) (1 diff)
• cmd.data/gaussj.c (modified) (1 diff)
• cmd.data/tvcolors.c (modified) (1 diff)
• lib.data/mrq2dmin.c (modified) (2 diffs)
• lib.data/mrqmin.c (modified) (2 diffs)
• lib.shell/expand_vectors.c (modified) (1 diff)
• lib.shell/parse.c (modified) (1 diff)
• mana/fitcontour.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.astro/multifit.c

@@ -141 +141 @@
     }
   }
-  dgaussj (a, Ndim, b, 1);
+  dgaussjordan (a, b, Ndim, 1);
 
   Ny = 0;

trunk/Ohana/src/opihi/cmd.basic/shell.c

@@ -1 +1 @@
 # include "basic.h"
+
+static char *defshell = "/bin/sh";
+static char *cmdflag = "-c";
 
 int shell (int argc, char **argv) {
@@ -6 +9 @@
   int exit_status;
   int wait_status;
-  int result;
-  char **args;
+  int result, length;
+  char **args, *shell;
 
-  ALLOCATE (args, char *, argc);
+  shell = getenv ("SHELL");
+  if (shell == NULL) shell = defshell;
+
+  // we are creating a command of the form /bin/sh -c argv[1] argv[2] etc, where
+  // the argv[1], etc elements are concatenated into a single string
+  ALLOCATE (args, char *, 4);
+  args[0] = shell;
+  args[1] = cmdflag;
+
+  length = 0;
   for (i = 1; i < argc; i++) {
-    args[i-1] = argv[i];
+    length += strlen(argv[i]) + 1;
   }
-  args[i-1] = NULL;
+  
+  ALLOCATE (args[2], char, length);
+  args[2][0] = 0;
+  for (i = 1; i < argc; i++) {
+    strcat (args[2], argv[i]);
+    if (i < argc - 1) strcat (args[2], " ");
+  }
+  args[3] = NULL;
+
+  // send the commands to the shell specified in the env variable SHELL, or else /bin/sh
 
   // use execvp to enable a timeout on the system call 
   pid = fork ();
   if (!pid) { /* must be child process */
-    execvp (args[0], args);
+    execvp (shell, args);
     exit (1);
   }

trunk/Ohana/src/opihi/cmd.basic/test/list.sh

@@ -75 +75 @@
   echo "Number of list elements: $check4:n"
  end
- if (("$check4:0" != "This ") || ("$check4:1" != "is ") || ("$check4:2" != "a ") || ("$check4:3" != "list "))
+ if (("$check4:0" != "This") || ("$check4:1" != "is") || ("$check4:2" != "a") || ("$check4:3" != "list"))
   $PASS = 0
   echo "List element does not return correctly!"

trunk/Ohana/src/opihi/cmd.basic/test/output.sh

@@ -23 +23 @@
  output stdout
  $line = `cat testout.txt`
- if ("$line" == "This is a test. ")
+ if ("$line" == "This is a test.")
    $PASS = 1
  else

trunk/Ohana/src/opihi/cmd.basic/test/scan.sh

@@ -20 +20 @@
  output stdout
  scan test_file.txt fscan
- if ("$fscan" != "This ")
+ if ("$fscan" != "This")
   $PASS = 0
   echo "Default not working!"
  end
  scan test_file.txt fscan 4
- if ("$fscan" != "test ")
+ if ("$fscan" != "test")
   $PASS = 0
   echo "Scan failure!"

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

@@ -118 +118 @@
       }
     }
-    if (!dgaussj (c, nterm, b, 1)) goto escape;
+    if (!dgaussjordan (c, b, nterm, 1)) goto escape;
 
     /* generate fitted values */

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

@@ -161 +161 @@
     }
 
-    dgaussj (c, wterm, b, 1);
+    dgaussjordan (c, b, wterm, 1);
 
     /** test print **/

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

@@ -34 +34 @@
   }
 
-  status = dgaussj (a, N, b, 1);
+  status = dgaussjordan (a, b, N, 1);
 
   for (i = 0; i < N; i++) {

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

@@ -3 +3 @@
 int tvcolors (int argc, char **argv) {
   
-  int N, kapa, Nchannel;
+  int N, kapa;
   char *name;
   KapaImageData data;

trunk/Ohana/src/opihi/lib.data/mrq2dmin.c

@@ -90 +90 @@
 
   /* keep this test in here? */
-  if (!fgaussj (talpha, Npar, tbeta, 1)) {
+  if (!fgaussjordan (talpha, tbeta, Npar, 1)) {
     lambda *= 10.0;
     return (ochisq);
@@ -183 +183 @@
 float **mrq2dcovar (int Npar) {
 
-  fgaussj (alpha, Npar, beta, 1);
+  fgaussjordan (alpha, beta, Npar, 1);
   return (alpha);
 

trunk/Ohana/src/opihi/lib.data/mrqmin.c

@@ -60 +60 @@
   }
 
-  fgaussj (talpha, Npar, tbeta, 1);
+  fgaussjordan (talpha, tbeta, Npar, 1);
 
   for (j = 0; j < Npar; j++) partry[j] = par[j] - tbeta[j][0];
@@ -137 +137 @@
 /* don't invoke this in the middle of a run, only near the end */ 
 float **mrqcovar (int Npar) {
-  fgaussj (alpha, Npar, beta, 1);
+  fgaussjordan (alpha, beta, Npar, 1);
   return (alpha);
 } 

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

@@ -113 +113 @@
       if (J < 0) J += buf[0].header.Naxis[1];
       ptr = (float *) buf[0].matrix.buffer;
-      f1 = ptr[I + J*buf[0].header.Naxis[1]];
+      f1 = ptr[I + J*buf[0].header.Naxis[0]];
     } else {
       if ((vec = SelectVector (tmpline, OLDVECTOR, TRUE)) == NULL) goto dumpline;

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

@@ -177 +177 @@
 
       fptr = (float *) buf[0].matrix.buffer;
-      fptr[Nx + Ny*buf[0].header.Naxis[1]] = atof (val);
+      fptr[Nx + Ny*buf[0].header.Naxis[0]] = atof (val);
     } else {
       if ((vec = SelectVector (V0, OLDVECTOR, TRUE)) == NULL) goto error;

trunk/Ohana/src/opihi/mana/fitcontour.c

@@ -57 +57 @@
   C[1][2] = C[2][1];
     
-  dgaussj (C, NTERM, B, 1);
+  dgaussjordan (C, B, NTERM, 1);
   
   /** this is somewhat weak: if the object is too elongated, Rmin can be < 0 **/