Changeset 4731

Timestamp:

Aug 8, 2005, 11:44:09 AM (21 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/test/math

Files:

• tst_psFunc00.c (modified) (2 diffs)
• tst_psFunc01.c (modified) (1 diff)
• tst_psFunc02.c (modified) (2 diffs)
• tst_psFunc03.c (modified) (1 diff)
• tst_psFunc04.c (modified) (1 diff)
• tst_psFunc05.c (modified) (1 diff)
• tst_psFunc08.c (modified) (2 diffs)
• tst_psFunc09.c (modified) (2 diffs)
• tst_psFunc10.c (modified) (2 diffs)
• tst_psFunc11.c (modified) (2 diffs)
• tst_psMinimize06.c (modified) (5 diffs)

trunk/psLib/test/math/tst_psFunc00.c

@@ -13 +13 @@
 *    XXX: Modify these tests so that polynomials with a variety of different
 *    orders are created.
-*
-*    @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*    @date $Date: 2005-07-20 01:21:13 $
+* 
+*    @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*    @date $Date: 2005-08-08 21:44:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -43 +43 @@
 psS32 main(psS32 argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
 

trunk/psLib/test/math/tst_psFunc01.c

@@ -15 +15 @@
 psS32 main()
 {
+    psLogSetFormat("HLNM");
     psS32 testStatus = true;
     float x = 0.0;

trunk/psLib/test/math/tst_psFunc02.c

@@ -16 +16 @@
 psS32 main()
 {
+    psLogSetFormat("HLNM");
     psS32 testStatus = true;
     psS32 memLeaks=0;
@@ -388 +389 @@
                     "psSpline1DAllocGeneric(): negative order",
                     testStatus);
+        // XXX: Currently, if you free a psStructure twice, it seg faults.  Why?
+        psFree(bounds);
     */
-    psFree(bounds);
-
     /****************************************************************************/
     /****************************************************************************/

trunk/psLib/test/math/tst_psFunc03.c

@@ -17 +17 @@
 psS32 main()
 {
+    psLogSetFormat("HLNM");
     psS32 testStatus = true;
     psS32 memLeaks=0;

trunk/psLib/test/math/tst_psFunc04.c

@@ -129 +129 @@
 psS32 main()
 {
+    psLogSetFormat("HLNM");
     t00();
+    // XXX: Why is this commented?
     //    t01();
 }

trunk/psLib/test/math/tst_psFunc05.c

@@ -20 +20 @@
 psS32 main()
 {
+    psLogSetFormat("HLNM");
     psS32 testStatus = true;
     psS32 memLeaks=0;

trunk/psLib/test/math/tst_psFunc08.c

@@ -4 +4 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-20 01:21:13 $
+*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-08-08 21:44:09 $
 *
 *  XXX: Probably should test single- and multi-dimensional polynomials in
@@ -46 +46 @@
 psS32 main(psS32 argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
 

trunk/psLib/test/math/tst_psFunc09.c

@@ -4 +4 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-20 01:21:13 $
+*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-08-08 21:44:09 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -75 +75 @@
 psS32 main(psS32 argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
 

trunk/psLib/test/math/tst_psFunc10.c

@@ -4 +4 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-20 01:21:13 $
+*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-08-08 21:44:09 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -126 +126 @@
 psS32 main(psS32 argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
 

trunk/psLib/test/math/tst_psFunc11.c

@@ -4 +4 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-20 01:21:13 $
+*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-08-08 21:44:09 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -368 +368 @@
 psS32 main(psS32 argc, char* argv[])
 {
+    psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
 

trunk/psLib/test/math/tst_psMinimize06.c

@@ -6 +6 @@
 #include "psTest.h"
 #include <math.h>
-#define NUM_ITERATIONS 10000
+#define NUM_ITERATIONS 100
 #define ERR_TOL 0.0
-#define N 20
-#define MIN_VALUE 5.0
-#define NUM_PARAMS 3
+#define NUM_DATA_POINTS 20
+#define NUM_PARAMS 5
 float expectedParm[NUM_PARAMS];
 psS32 testStatus = true;
@@ -16 +15 @@
 /*****************************************************************************
 myFunc():
-    sum = (param[0] * x[0]) + 
-          (param[1] * x[1]) +
-          ...
+    sum = param[0] + x[0] * x[1] +
+          param[1] * x[0] + 
+          param[2] * x[0]^2 +
+          param[3] * x[1] + 
+          param[4] * x[1]^2
+ 
  *****************************************************************************/
-psF64 myFunc(psVector *deriv,
+psF32 myFunc(psVector *deriv,
              psVector *params,
              psVector *x)
 {
-    if ((deriv == NULL) ||
-            (params == NULL)) {
+    if ((deriv == NULL) || (params == NULL)) {
         psError(PS_ERR_UNKNOWN, true, "deriv or params is NULL.\n");
     }
 
-    psF64 sum = 0.0;
-    for (psS32 i=0 ; i < params->n ; i++) {
-        sum += (params->data.F32[i] * x->data.F32[i]);
-        deriv->data.F32[i] = params->data.F32[i];
-    }
+    psF32 sum = (params->data.F32[0] * x->data.F32[0] * x->data.F32[1]) +
+                (params->data.F32[1] * x->data.F32[0]) +
+                (params->data.F32[2] * PS_SQR(x->data.F32[0])) +
+                (params->data.F32[3] * x->data.F32[1]) +
+                (params->data.F32[4] * PS_SQR(x->data.F32[1]));
+
+    deriv->data.F32[0] = x->data.F32[0] * x->data.F32[1];
+    deriv->data.F32[1] = x->data.F32[0];
+    deriv->data.F32[2] = PS_SQR(x->data.F32[0]);
+    deriv->data.F32[3] = x->data.F32[1];
+    deriv->data.F32[4] = PS_SQR(x->data.F32[1]);
 
     return(sum);
@@ -42 +49 @@
 {
     psS32 currentId = psMemGetId();
-    psS32 memLeaks = 0;
-    psS32 i = 0;
-    psArray *myCoords;
-    psVector *myParams;
-    psImage *myCovar;
-    psMinimization *min;
-    psVector *y;
-
     psTraceSetLevel(".psLib", 0);
     /**************************************************************************
      *************************************************************************/
-    min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL);
-    myCovar = psImageAlloc(NUM_PARAMS, NUM_PARAMS, PS_TYPE_F32);
-    myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    myCoords = psArrayAlloc(N);
-    y = psVectorAlloc(N, PS_TYPE_F32);
+    psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL);
+    psImage *myCovar = psImageAlloc(NUM_PARAMS, NUM_PARAMS, PS_TYPE_F32);
+    psVector *myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
+    psVector *myDerivs = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
+    psArray *myCoords = psArrayAlloc(NUM_DATA_POINTS);
+    psVector *y = psVectorAlloc(NUM_DATA_POINTS, PS_TYPE_F32);
 
-    for (i=0;i<N;i++) {
+    for (psS32 i=0;i<NUM_DATA_POINTS;i++) {
         myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
         ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
         ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
+        /*
+                printf("x[%d] is vector (%f, %f)\n", i, ((psVector *) (myCoords->data[i]))->data.F32[0],
+                                                        ((psVector *) (myCoords->data[i]))->data.F32[1]);
+        */
         y->data.F32[i] = (float) i;
     }
-    for (i=0;i<NUM_PARAMS;i++) {
+    for (psS32 i=0;i<NUM_PARAMS;i++) {
         expectedParm[i] = 2.42 + (float) (2 * i);
-        myParams->data.F32[i] = (float) i;
-        myParams->data.F32[i] = expectedParm[i] * 1.3;
-        myParams->data.F32[i] = 0.0;
-        myParams->data.F32[i] = (float) (5 + i);
+        myParams->data.F32[i] = (float) (2 * i);
     }
 
@@ -82 +83 @@
                      (psMinimizeLMChi2Func) myFunc);
 
-    printf("\nThe chi-squared is %f\n", min->value);
-    for (i=0;i<NUM_PARAMS;i++) {
+    printf("\nThe value of the function at the minimum is %f\n", min->value);
+    for (psS32 i=0;i<NUM_DATA_POINTS;i++) {
+        printf("The minimum for data point %d: %f\n", i, myFunc(myDerivs, myParams, (psVector *) myCoords->data[i]));
+    }
+
+    for (psS32 i=0;i<NUM_PARAMS;i++) {
         printf("Parameter %d at the minimum is %f (expected: %f)\n", i,
                myParams->data.F32[i], expectedParm[i]);
@@ -91 +96 @@
     psFree(myCovar);
     psFree(myParams);
+    psFree(myDerivs);
     psFree(myCoords);
     psFree(y);
 
     psMemCheckCorruption(1);
-    memLeaks = psMemCheckLeaks(currentId,NULL,NULL,false);
+    psS32 memLeaks = psMemCheckLeaks(currentId,NULL,NULL,false);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);