Changeset 4753

Timestamp:

Aug 10, 2005, 12:41:17 PM (21 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/math/psMinimize.c (modified) (2 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.128 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-08 21:42:07 $
+ *  @version $Revision: 1.129 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-10 22:41:17 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -850 +850 @@
                         psMinimizeLMChi2Func func)
 {
-    PS_ASSERT_PTR_NON_NULL(min, NULL);
-    PS_ASSERT_VECTOR_NON_NULL(params, NULL);
-    PS_ASSERT_VECTOR_NON_EMPTY(params, NULL);
-    PS_ASSERT_PTR_NON_NULL(x, NULL);
-    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
-    PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
-    PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL);
-    PS_ASSERT_PTR_NON_NULL(func, NULL);
+    PS_ASSERT_PTR_NON_NULL(min, false);
+    PS_ASSERT_VECTOR_NON_NULL(params, false);
+    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);
+    }
+    PS_ASSERT_PTR_NON_NULL(x, false);
+    for (psS32 i = 0 ; i < x->n ; i++) {
+        psVector *coord = (psVector *) (x->data[i]);
+        PS_ASSERT_VECTOR_NON_NULL(coord, false);
+        PS_ASSERT_VECTOR_TYPE(coord, PS_TYPE_F32, false);
+    }
+    PS_ASSERT_VECTOR_NON_NULL(y, false);
+    PS_ASSERT_VECTOR_NON_EMPTY(y, false);
+    PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, false);
+    PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, false);
+    if (yErr != NULL) {
+        PS_ASSERT_VECTOR_TYPE(yErr, PS_TYPE_F32, false);
+        PS_ASSERT_VECTORS_SIZE_EQUAL(y, yErr, false);
+    }
+    PS_ASSERT_PTR_NON_NULL(func, false);
 
     // this function has test and current values for several things