Changeset 1107

Timestamp:

Jun 25, 2004, 3:12:22 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib

Files:

• src/dataManip/psMinimize.c (modified) (3 diffs)
• src/math/psMinimize.c (modified) (3 diffs)
• test/dataManip/Makefile (modified) (3 diffs)
• test/image/tst_psImageStats03.c (modified) (1 diff)

trunk/psLib/src/dataManip/psMinimize.c

@@ -193 +193 @@
                         gsl_matrix *J)
 {
+    return 0;
     gsl_function_f(x, params, f);
     gsl_function_df(x, params, J);
@@ -230 +231 @@
     gsl_multifit_fdfsolver *s; // GSL data structure.
 
-    //    inputData = (psModelData *) psAlloc(sizeof(psModelData));
     psModelData inputData;
     inputData.n = numData;
@@ -293 +293 @@
     s = gsl_multifit_fdfsolver_alloc(T, numData, inputData.count);
 
-    printf("HERE 04\n");
+    printf("HERE 04 (HMMM)\n");
     // Initialize the GSL minimizer to use function defined by the data
     // structure "f" and x.vector as an initial guess for the parameters.
+    psMemCheckCorruption(1);
+    printf("HERE 05 (HMMM)\n");
     gsl_multifit_fdfsolver_set(s, &f, &x.vector);
-
-
-    printf("HERE 05\n");
     // Each iteration of the following loop will perform one step in an
     // attempt to minimized chi-squared for the function.  The loop exits
     // either when the change in parameters is small enough, or when the
     // maximum number of iterations is reached.
+    printf("HERE 06.0\n");
     do {
         iter++;

trunk/psLib/src/math/psMinimize.c

@@ -193 +193 @@
                         gsl_matrix *J)
 {
+    return 0;
     gsl_function_f(x, params, f);
     gsl_function_df(x, params, J);
@@ -230 +231 @@
     gsl_multifit_fdfsolver *s; // GSL data structure.
 
-    //    inputData = (psModelData *) psAlloc(sizeof(psModelData));
     psModelData inputData;
     inputData.n = numData;
@@ -293 +293 @@
     s = gsl_multifit_fdfsolver_alloc(T, numData, inputData.count);
 
-    printf("HERE 04\n");
+    printf("HERE 04 (HMMM)\n");
     // Initialize the GSL minimizer to use function defined by the data
     // structure "f" and x.vector as an initial guess for the parameters.
+    psMemCheckCorruption(1);
+    printf("HERE 05 (HMMM)\n");
     gsl_multifit_fdfsolver_set(s, &f, &x.vector);
-
-
-    printf("HERE 05\n");
     // Each iteration of the following loop will perform one step in an
     // attempt to minimized chi-squared for the function.  The loop exits
     // either when the change in parameters is small enough, or when the
     // maximum number of iterations is reached.
+    printf("HERE 06.0\n");
     do {
         iter++;

trunk/psLib/test/dataManip/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.19 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-25 23:28:31 $
+##  $Revision: 1.20 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-26 01:12:22 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
  tst_psFunc00 \
  tst_psFunc01 \
+ tst_psMinimize00 \
  tst_psImageStats00 \
  tst_psImageStats01 \
@@ -67 +68 @@
 tst_psFunc02:           tst_psFunc02.o
 tst_psFunc03:           tst_psFunc03.o
+tst_psMinimize00:       tst_psMinimize00.o
 tst_psImageStats00:     tst_psImageStats00.o
 tst_psImageStats01:     tst_psImageStats01.o

trunk/psLib/test/image/tst_psImageStats03.c

@@ -71 +71 @@
     /*  Deallocate data structures                                   */
     /*************************************************************************/
-    psImageFree(tmpImage);
+    // GUS: replace with psFree()?
+    //    psImageFree(tmpImage);
 
     psMemCheckCorruption(1);