Changeset 7160

Timestamp:

May 22, 2006, 12:30:04 PM (20 years ago)

Author:

Paul Price

Message:

Increasing number of data points, using sigma instead of multiplier
within exponent, better noise model.

File:

• trunk/psLib/test/math/tst_psMinimizeLMM.c (modified) (5 diffs)

trunk/psLib/test/math/tst_psMinimizeLMM.c

@@ -13 +13 @@
 #define NUM_ITERATIONS 100
 #define ERR_TOL 1e-6
-#define NUM_DATA_POINTS 100
+#define NUM_DATA_POINTS 300
 #define NUM_PARAMS 3
 float expectedParm[NUM_PARAMS];
@@ -23 +23 @@
 {
     return params->data.F32[0] *
-           expf(- params->data.F32[1] * (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1]))) +
+           expf(- (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1]) / 2.0 / PS_SQR(params->data.F32[1]))) +
            params->data.F32[2];
 }
@@ -32 +32 @@
                 )
 {
-    deriv->data.F32[0] = expf(- params->data.F32[1] * (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1])));
-    deriv->data.F32[1] = - params->data.F32[0] * (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1])) *
-                         expf(- params->data.F32[1] * (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1])));
+    deriv->data.F32[0] = expf(- (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1]) / 2.0 / PS_SQR(params->data.F32[1])));
+    deriv->data.F32[1] = params->data.F32[0] * (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1]) / 2.0 / PS_SQR(params->data.F32[1])) / params->data.F32[1] / params->data.F32[1] / params->data.F32[1] * expf(- (PS_SQR(x->data.F32[0]) + PS_SQR(x->data.F32[1]) / 2.0 / PS_SQR(params->data.F32[1])));
     deriv->data.F32[2] = 1.0;
 }
@@ -80 +79 @@
 
     trueParams->data.F32[0] = 100.0;    // Normalisation
-    trueParams->data.F32[1] = 0.1;      // Shape
+    trueParams->data.F32[1] = 3.0;      // Width
     trueParams->data.F32[2] = 10.0;     // Background
 
@@ -94 +93 @@
         x->data.F32[1] = 10.0 * psRandomUniform(rng) - 5.0;
         ordinates->data[i] = x;
-        coordinates->data.F32[i] = function(params, x) + 0.1 * psRandomGaussian(rng); // Add some noise
+        // Add some noise
+        coordinates->data.F32[i] = function(params, x) + 0.1 * (2.0 * psRandomGaussian(rng) - 1.0);
         errors->data.F32[i] = 0.1;
         printf("Data %ld: (%f, %f) --> %f\n", i, x->data.F32[0], x->data.F32[1], coordinates->data.F32[i]);