Changeset 2438

Timestamp:

Nov 24, 2004, 12:22:38 PM (22 years ago)

Author:

gusciora

Message:

Added error checking for covar.

Location:

trunk/psLib/src

Files:

• dataManip/psConstants.h (modified) (2 diffs)
• dataManip/psMinimize.c (modified) (3 diffs)
• math/psConstants.h (modified) (2 diffs)
• math/psMinimize.c (modified) (3 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-12 19:36:07 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:22:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -395 +395 @@
 }
 
+#define PS_IMAGE_CHECK_SIZE_(NAME1, NUM_COLS, NUM_ROWS, RVAL) \
+if ((NAME1->numCols != NUM_COLS) || \
+        (NAME1->numRows != NUM_ROWS)) { \
+    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
+            "Unallowable operation: psImages %s is not the correct size.", \
+            #NAME1); \
+    return(RVAL); \
+}
+
 
 

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.89 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-23 19:35:30 $
+ *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:22:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -529 +529 @@
      will have to convert all F32 input vectors to F64 regardless.  So,
      the F64 port might be.
+ 
+XXX: Must update the covar matrix.
  *****************************************************************************/
 psBool psMinimizeLMChi2(psMinimization *min,
@@ -553 +555 @@
     if (yErr != NULL) {
         PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
+    }
+
+    if (covar != NULL) {
+        PS_IMAGE_CHECK_SIZE_(covar, params->n, params->n, NULL);
+    } else {
+        covar = psImageAlloc(params->n, params->n, PS_TYPE_F64);
     }
 

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-12 19:36:07 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:22:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -395 +395 @@
 }
 
+#define PS_IMAGE_CHECK_SIZE_(NAME1, NUM_COLS, NUM_ROWS, RVAL) \
+if ((NAME1->numCols != NUM_COLS) || \
+        (NAME1->numRows != NUM_ROWS)) { \
+    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
+            "Unallowable operation: psImages %s is not the correct size.", \
+            #NAME1); \
+    return(RVAL); \
+}
+
 
 

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.89 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-23 19:35:30 $
+ *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:22:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -529 +529 @@
      will have to convert all F32 input vectors to F64 regardless.  So,
      the F64 port might be.
+ 
+XXX: Must update the covar matrix.
  *****************************************************************************/
 psBool psMinimizeLMChi2(psMinimization *min,
@@ -553 +555 @@
     if (yErr != NULL) {
         PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
+    }
+
+    if (covar != NULL) {
+        PS_IMAGE_CHECK_SIZE_(covar, params->n, params->n, NULL);
+    } else {
+        covar = psImageAlloc(params->n, params->n, PS_TYPE_F64);
     }