Changeset 1278 for trunk/psLib/src/math/psMinimize.c

Timestamp:

Jul 22, 2004, 1:44:09 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/math/psMinimize.c (modified) (15 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-15 23:52:34 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 23:40:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
 /*****************************************************************************/
-/* INCLUDE FILES            */
+/* INCLUDE FILES                                                             */
 /*****************************************************************************/
 #include <stdlib.h>
@@ -41 +41 @@
 #include "psMatrix.h"
 /*****************************************************************************/
-/* DEFINE STATEMENTS           */
+/* DEFINE STATEMENTS                                                         */
 /*****************************************************************************/
 #define MAX_LMM_ITERATIONS 100
@@ -85 +85 @@
 
 /*****************************************************************************/
-/* TYPE DEFINITIONS           */
+/* TYPE DEFINITIONS                                                          */
 /*****************************************************************************/
 typedef struct
@@ -113 +113 @@
 
 /*****************************************************************************/
-/* GLOBAL VARIABLES           */
+/* GLOBAL VARIABLES                                                          */
 /*****************************************************************************/
 
@@ -119 +119 @@
 
 /*****************************************************************************/
-/* FILE STATIC VARIABLES           */
+/* FILE STATIC VARIABLES                                                     */
 /*****************************************************************************/
 
@@ -125 +125 @@
 
 /*****************************************************************************/
-/* FUNCTION IMPLEMENTATION - LOCAL          */
+/* FUNCTION IMPLEMENTATION - LOCAL                                           */
 /*****************************************************************************/
 
@@ -558 +558 @@
 
 /*****************************************************************************/
-/* FUNCTION IMPLEMENTATION - PUBLIC         */
+/* FUNCTION IMPLEMENTATION - PUBLIC                                          */
 /*****************************************************************************/
 
@@ -567 +567 @@
  
 This routine must minimize an arbitrary function; it determines the set of
-parameters of that function such that the.
+parameters of that function such that the ...
  *****************************************************************************/
 psVector *
@@ -681 +681 @@
 
 /******************************************************************************
-    This routine must minimize an arbitrary function.
+    This routine must determine the parameters of an arbitrary function
+    such that they best fit the supplied data points.
  *****************************************************************************/
 psVector *
@@ -795 +796 @@
     do {
         iter++;
+        for (i=0;i<initialGuess->n;i++) {
+            printf("Iteration %d: parameter %d is %.3f\n", iter, i, gsl_vector_get(s->x, i));
+        }
         // Perform an iteration of the GSL solver.
         status = gsl_multifit_fdfsolver_iterate(s);
-        //        printf ("psMinimize() status = %s\n", gsl_strerror(status));
+        printf("gsl_multifit_fdfsolver_iterate() status is %s\n", gsl_strerror(status));
+        for (i=0;i<initialGuess->n;i++) {
+            printf("Iteration %d: parameter %d is %.3f\n", iter, i, gsl_vector_get(s->x, i));
+        }
+
         // If there was a problem, abort.
         if (status) {
-            psAbort(__func__, "gsl_multifit_fdfsolver_iterate()\n");
+            psAbort(__func__, "gsl_multifit_fdfsolver_iterate(%s)\n", gsl_strerror(status));
         }
 
@@ -811 +819 @@
         // as specified in the ADD.
         *chiSq = gsl_blas_dnrm2(s->f);
+        printf("psMinimize.c: chiSq is %.3f\n", *chiSq);
         if (fabs(*chiSq - chiSqOld) < 1.0) {
             status = GSL_SUCCESS;
@@ -855 +864 @@
     This routine must fit a polynomial of degree myPoly to the data points
     (x, y) and return the coefficients of that polynomial, as well as the
-    error for each data poiny (yErr).
+    error for each data point (yErr).
  
 NOTE: yErr is currently ignored.
@@ -877 +886 @@
     psVector *xSums = NULL;
 
+    //    printf("psGetArrayPolynomial()\n");
+    //    for (i=0;i<x->n;i++) {
+    //        printf("(x, y, yErr) is (%f, %f, %f)\n", x->data.F64[i], y->data.F64[i], yErr->data.F64[i]);
+    //    }
+
     PS_CHECK_NULL_1DPOLY(myPoly);
     PS_CHECK_NULL_VECTOR(x);
@@ -929 +943 @@
     for(k=0;k<(polyOrder);k++) {
         myPoly->coeff[k] = coeffs->data.F64[k];
-    }
+        //        printf("myPoly->coeff[%d] is %f\n", k, myPoly->coeff[k]);
+    }
+
+
+    //    for (i=0;i<x->n;i++) {
+    //        printf("HMMM: psEvalPolynomial1D(%f) is %f\n", x->data.F64[i], psEvalPolynomial1D(x->data.F64[i], myPoly));
+    //    }
 
     psFree(A);
@@ -939 +959 @@
     psFree(xSums);
 
-    return(NULL);
-}
+    return(myPoly);
+}