Changeset 27840 for branches/simtest_nebulous_branches/psLib/src/math/psMinimizeLMM.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psLib/src/math/psMinimizeLMM.c (modified) (5 diffs)

branches/simtest_nebulous_branches/psLib/src/math/psMinimizeLMM.c

@@ -99 +99 @@
 
 // XXX check that the GJ solver works:
-# if (TESTGJ) 
+# if (TESTGJ)
     psImage *out = psImageAlloc (alpha->numRows, alpha->numCols, PS_TYPE_F32);
     for (int oy = 0; oy < out->numRows; oy++) {
-        for (int ox = 0; ox < out->numCols; ox++) {
-            float value = 0;
-            for (int i = 0; i < alpha->numCols; i++) {
-                value += alpha->data.F32[i][ox]*Alpha->data.F32[oy][i];
-            }
-            out->data.F32[oy][ox] = value;
-        }
+        for (int ox = 0; ox < out->numCols; ox++) {
+            float value = 0;
+            for (int i = 0; i < alpha->numCols; i++) {
+                value += alpha->data.F32[i][ox]*Alpha->data.F32[oy][i];
+            }
+            out->data.F32[oy][ox] = value;
+        }
     }
 
     psVector *vect = psVectorAlloc (beta->n, PS_TYPE_F32);
     for (int oy = 0; oy < vect->n; oy++) {
-        float value = 0;
-        for (int i = 0; i < alpha->numCols; i++) {
-            value += alpha->data.F32[oy][i]*Beta->data.F32[i];
-        }
-        vect->data.F32[oy] = value;
-    }
-    
+        float value = 0;
+        for (int i = 0; i < alpha->numCols; i++) {
+            value += alpha->data.F32[oy][i]*Beta->data.F32[i];
+        }
+        vect->data.F32[oy] = value;
+    }
+
     psFree (out);
     psFree (vect);
@@ -223 +223 @@
     if (isnan(chisq)) {
         psTrace ("psLib.math", 5, "psMinLM_SetABX() returned a NAN chisq.\n");
-        psVectorInit (delta, NAN);
+        psVectorInit (delta, NAN);
         retValue = false;
     }
@@ -238 +238 @@
     if (!status) {
         psTrace ("psLib.math", 5, "psMinLM_GuessABP() returned FALSE.\n");
-        psVectorInit (delta, NAN);
+        psVectorInit (delta, NAN);
         retValue = false;
     }
@@ -301 +301 @@
     PS_ASSERT_VECTOR_NON_NULL(dy, NAN);
 
-    PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, false);
+    PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NAN);
     if (paramMask) {
-        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_MASK, false);
+        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_VECTOR_MASK, NAN);
     }
 
@@ -325 +325 @@
         chisq += PS_SQR(delta) * dy->data.F32[i];
 
-        assert (!isnan(dy->data.F32[i]));
-        assert (!isnan(delta));
-        assert (!isnan(chisq));
+        if (isnan(dy->data.F32[i])) return NAN;
+        if (isnan(delta)) return NAN;
+        if (isnan(chisq)) return NAN;
 
         // we track alpha,beta and params,deriv separately