Changeset 1847 for trunk/psLib/src/dataManip/psMinimize.c

Timestamp:

Sep 21, 2004, 4:42:20 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/dataManip/psMinimize.c (modified) (8 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -1 @@
-M/** @file  psMinimize.c
+/** @file  psMinimize.c
  *  \brief basic minimization functions
  *  @ingroup Math
@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-22 01:30:21 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-22 02:42:20 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -162 +162 @@
                              const psVector* restrict y)        ///< Coordinates
 {
+    psTrace(".psLib.dataManip.CalculateSecondDerivs", 4,
+            "---- CalculateSecondDerivs() begin ----\n");
+
     int i;
     int k;
@@ -194 +197 @@
         u[i] = (Y[i+1] - Y[i])/(X[i+1]-X[i]) - (Y[i]-Y[i-1])/(X[i]-X[i-1]);
         u[i] = (6.0 * u[i] / (X[i+1] - X[i-1]) - sig * u[i-1]) / p;
+
+        psTrace(".psLib.dataManip.CalculateSecondDerivs", 6,
+                "X[%d] is %f\n", i, X[i]);
+        psTrace(".psLib.dataManip.CalculateSecondDerivs", 6,
+                "Y[%d] is %f\n", i, Y[i]);
+        psTrace(".psLib.dataManip.CalculateSecondDerivs", 6,
+                "u[%d] is %f\n", i, u[i]);
     }
 
     for (k=(n-2);k>=0;k--) {
         derivs2[k] = derivs2[k] * derivs2[k+1] + u[k];
-    }
-
-
-
-
-
-
-
-
-
-    /*
-        if (mustFreeX == true) {
-            psFree(X);
-        }
-    */
+        psTrace(".psLib.dataManip.CalculateSecondDerivs", 6,
+                "derivs2[%d] is %f\n", k, derivs2[k]);
+    }
+    if (mustFreeX == true) {
+        psFree(X);
+    }
     psFree(u);
 
+    psTrace(".psLib.dataManip.CalculateSecondDerivs", 4,
+            "---- CalculateSecondDerivs() end ----\n");
     return(derivs2);
 }
@@ -249 +252 @@
                                 const psVector* restrict yErr)     ///< Errors in coordinates, or NULL
 {
+    psTrace(".psLib.dataManip.psVectorFitSpline1D", 4,
+            "---- psVectorFitSpline1D() begin ----\n");
     int numSplines = (y->n)-1;
     float tmp;
@@ -261 +266 @@
     for (i=0;i<numSplines;i++) {
         H = x->data.F32[i+1] - x->data.F32[i];
+        psTrace(".psLib.dataManip.psVectorFitSpline1D", 4,
+                "X data (%f - %f) (%f)\n", x->data.F32[i], x->data.F32[i+1], H);
         //
         // ******** Calulate 0-order term ********
@@ -309 +316 @@
         //
         // From (3)
-        (mySpline->spline[i])->coeff[2] = -((mySpline->p_psDeriv2)[i]) / (6.0 * H);
+        (mySpline->spline[i])->coeff[3] = -((mySpline->p_psDeriv2)[i]) / (6.0 * H);
         // From (4)
-        (mySpline->spline[i])->coeff[2]+=  ((mySpline->p_psDeriv2)[i+1]) / (6.0 * H);
-    }
-
-
-
-
-
-
-
-
-
+        (mySpline->spline[i])->coeff[3]+=  ((mySpline->p_psDeriv2)[i+1]) / (6.0 * H);
+
+        psTrace(".psLib.dataManip.psMinimizeLMChi2", 6,
+                "(mySpline->spline[%d])->coeff[0] is %f\n", i, (mySpline->spline[i])->coeff[0]);
+        psTrace(".psLib.dataManip.psMinimizeLMChi2", 6,
+                "(mySpline->spline[%d])->coeff[1] is %f\n", i, (mySpline->spline[i])->coeff[1]);
+        psTrace(".psLib.dataManip.psMinimizeLMChi2", 6,
+                "(mySpline->spline[%d])->coeff[2] is %f\n", i, (mySpline->spline[i])->coeff[2]);
+        psTrace(".psLib.dataManip.psMinimizeLMChi2", 6,
+                "(mySpline->spline[%d])->coeff[3] is %f\n", i, (mySpline->spline[i])->coeff[3]);
+
+    }
+
+    psTrace(".psLib.dataManip.psVectorFitSpline1D", 4,
+            "---- psVectorFitSpline1D() end ----\n");
     return(mySpline);
 }
@@ -559 +570 @@
     return(false);
 }
-
-
-
-
-
-
-
-
-
-
-
-
 
 /******************************************************************************