Changeset 6226 for trunk/psLib/src/math/psMinimizeLMM.c

Timestamp:

Jan 27, 2006, 10:08:58 AM (20 years ago)

Author:

gusciora

Message:

I added tests for psImageSmooth, modified the psStats stuff and the Min
routines.

File:

• trunk/psLib/src/math/psMinimizeLMM.c (modified) (6 diffs)

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:22 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-27 20:08:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -277 +277 @@
 NOTES: EAM: this is my re-implementation of MinLM
  
+XXX: Must implement code to handle the constrain->min, ->max, ->delta members.
+ 
 XXX: Put the ASSERTS in.
  
@@ -283 +285 @@
      will have to convert all F32 input vectors to F64 regardless.  So,
      the F64 port might be.
+ 
   *****************************************************************************/
 psBool psMinimizeLMChi2(
@@ -288 +291 @@
     psImage *covar,
     psVector *params,
-    const psVector *paramMask,
+    psMinConstrain *constrain,
     const psArray *x,
     const psVector *y,
@@ -300 +303 @@
     PS_ASSERT_VECTOR_NON_EMPTY(params, false);
     PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, false);
-    if (paramMask != NULL) {
-        PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, false);
-        PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, false);
+    psVector *paramMask = NULL;
+    if (constrain != NULL) {
+        paramMask = constrain->paramMask;
+        if (paramMask != NULL) {
+            PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, false);
+            PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, false);
+        }
+        if (constrain->paramMin != NULL) {
+            psLogMsg(__func__, PS_LOG_WARN, "WARNING: the constrain->paramMin vector is currently ignored.\n");
+        }
+        if (constrain->paramMax != NULL) {
+            psLogMsg(__func__, PS_LOG_WARN, "WARNING: the constrain->paramMax vector is currently ignored.\n");
+        }
+        if (constrain->paramDelta != NULL) {
+            psLogMsg(__func__, PS_LOG_WARN, "WARNING: the constrain->paramDelta vector is currently ignored.\n");
+        }
     }
     PS_ASSERT_PTR_NON_NULL(x, false);
@@ -592 +608 @@
     return( psMemGetDeallocator(ptr) == (psFreeFunc)minimizationFree );
 }
+
+
+static void constrainFree(psMinConstrain *tmp)
+{
+    // There are no dynamically allocated items
+}
+
+psMinConstrain* psMinConstrainAlloc()
+{
+    psMinConstrain *tmp = psAlloc(sizeof(psMinConstrain));
+    tmp->paramMask = NULL;
+    tmp->paramMax = NULL;
+    tmp->paramMin = NULL;
+    tmp->paramDelta = NULL;
+
+    return(tmp);
+}
+
+bool psMemCheckConstrain(psPtr tmp)
+{
+    return( psMemGetDeallocator(tmp) == (psFreeFunc)constrainFree );
+}