Changeset 28918

Timestamp:

Aug 15, 2010, 3:51:40 PM (16 years ago)

Author:

eugene

Message:

add fit3d and applyfit3d

Location:

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

Files:

• Makefile (modified) (2 diffs)
• applyfit2d.c (modified) (1 diff)
• applyfit3d.c (added)
• fit2d.c (modified) (2 diffs)
• fit3d.c (added)
• init.c (modified) (4 diffs)
• vgauss.c (modified) (1 diff)

branches/eam_branches/ipp-20100621/Ohana/src/opihi/cmd.data/Makefile

@@ -19 +19 @@
 $(SRC)/init.$(ARCH).o          \
 $(SRC)/accum.$(ARCH).o          \
+$(SRC)/applyfit1d.$(ARCH).o     \
 $(SRC)/applyfit2d.$(ARCH).o     \
-$(SRC)/applyfit1d.$(ARCH).o     \
+$(SRC)/applyfit3d.$(ARCH).o     \
 $(SRC)/box.$(ARCH).o            \
 $(SRC)/book.$(ARCH).o           \
@@ -46 +47 @@
 $(SRC)/fit1d.$(ARCH).o          \
 $(SRC)/fit2d.$(ARCH).o          \
+$(SRC)/fit3d.$(ARCH).o          \
 $(SRC)/gaussj.$(ARCH).o \
 $(SRC)/gaussdeviate.$(ARCH).o   \

branches/eam_branches/ipp-20100621/Ohana/src/opihi/cmd.data/applyfit2d.c

@@ -10 +10 @@
 
   if (argc != 4) {
-    gprint (GP_ERR, "USAGE: applyfit x y z\n");
+    gprint (GP_ERR, "USAGE: applyfit2d x y z\n");
     return (FALSE);
   }

branches/eam_branches/ipp-20100621/Ohana/src/opihi/cmd.data/fit2d.c

@@ -168 +168 @@
     }
 
+    /** test print **/
+    if (VERBOSE) {
+      for (i = 0; i < wterm; i++) {
+        for (j = 0; j < wterm; j++) {
+          gprint (GP_ERR, "%g  ", c[i][j]);
+        }
+        gprint (GP_ERR, "\n");
+      }
+      gprint (GP_ERR, "-----\n");
+    }
+
     dgaussjordan (c, b, wterm, 1);
 
@@ -176 +187 @@
           gprint (GP_ERR, "x^%d y^%d: %g\n", nx, ny, b[i][0]);
         }
+      }
+    }
+
+    /** test print **/
+    if (VERBOSE) {
+      for (i = 0; i < wterm; i++) {
+        for (j = 0; j < wterm; j++) {
+          gprint (GP_ERR, "%g  ", c[i][j]);
+        }
+        gprint (GP_ERR, "\n");
       }
     }

branches/eam_branches/ipp-20100621/Ohana/src/opihi/cmd.data/init.c

@@ -5 +5 @@
 int applyfit1d       PROTO((int, char **));
 int applyfit2d       PROTO((int, char **));
+int applyfit3d       PROTO((int, char **));
 int box              PROTO((int, char **));
 int book_command     PROTO((int, char **));
@@ -34 +35 @@
 int fit1d            PROTO((int, char **));
 int fit2d            PROTO((int, char **));
+int fit3d            PROTO((int, char **));
 int gaussjordan      PROTO((int, char **));
 int gaussdeviate     PROTO((int, char **));
@@ -138 +140 @@
   {1, "applyfit1d",   applyfit1d,       "apply 1-d fit to new vector"},
   {1, "applyfit2d",   applyfit2d,       "apply 2-d fit to new vector"},
+  {1, "applyfit3d",   applyfit3d,       "apply 3-d fit to new vector"},
   {1, "book",         book_command,     "commands to manipulate book/page/word data"},
   {1, "box",          box,              "draw a box on the plot"},
@@ -168 +171 @@
   {1, "fit1d",        fit1d,            "fit polynomial to vector pair"},
   {1, "fit2d",        fit2d,            "fit 2-d polynomial to vector triplet"},
+  {1, "fit3d",        fit3d,            "fit 3-d polynomial to vector quad"},
   {1, "gaussdev",     gaussdeviate,     "generate a gaussian deviate vector"},
   {1, "gaussint",     gaussintegral,    "return the integrated gaussian vector"},

branches/eam_branches/ipp-20100621/Ohana/src/opihi/cmd.data/vgauss.c

@@ -42 +42 @@
   if ((ovec = SelectVector (argv[4], ANYVECTOR, TRUE)) == NULL) return (FALSE);
 
-  REQUIRE_VECTOR_FLT (xvec, FALSE); 
-  REQUIRE_VECTOR_FLT (yvec, FALSE); 
-  REQUIRE_VECTOR_FLT (svec, FALSE); 
+  CastVector (xvec, OPIHI_FLT);
+  CastVector (yvec, OPIHI_FLT);
+  CastVector (svec, OPIHI_FLT);
 
   Npts = xvec[0].Nelements;