Changeset 6346

Timestamp:

Feb 7, 2006, 1:14:21 PM (20 years ago)

Author:

gusciora

Message:

....

Location:

trunk/psLib

Files:

• src/astro/psCoord.c (modified) (6 diffs)
• src/imageops/psImageStats.c (modified) (2 diffs)
• src/math/psMinimizeLMM.c (modified) (2 diffs)
• src/math/psMinimizePowell.c (modified) (3 diffs)
• src/math/psMinimizePowell.h (modified) (2 diffs)
• test/math/tst_psMinimizePowell.c (modified) (1 diff)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-30 23:42:24 $
+*  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-07 23:14:21 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
 XXX: This code no longer makes sense.  The merge must be reviewed.
  *****************************************************************************/
-
 // XXX EAM : below is the code using the standard matrix representation.
 //           note that this inversion requires x->nX == 1, y->nY == 1 and
@@ -205 +204 @@
 }
 
-// XXX: Verify the order/nterms poly changes
 psPlaneTransform* psPlaneTransformAlloc(int order1, int order2)
 {
@@ -266 +264 @@
 }
 
-// XXX: Verify the order/nterms poly changes
 psPlaneDistort* psPlaneDistortAlloc(int order1, int order2, int order3, int order4)
 {
@@ -327 +324 @@
 /******************************************************************************
 XXX: Private Function.
+ 
+XXX: Optimize this.  We don't need a while loop here.
  
 piNormalize(): take an input angle in radians and convert it to the range 0:2*PI.
@@ -867 +866 @@
     // Solution via LU Decomposition
     //
+    // XXX: Check return codes
+    //
     psVector *permutation = psVectorAlloc(nCoeff, PS_TYPE_F64); // Permutation vector for LU Decomposition
     psImage *luMatrix = psMatrixLUD(NULL, &permutation, matrix); // LU decomposed matrix
     psVector *xSolution = psMatrixLUSolve(NULL, luMatrix, xVector, permutation); // Solution in x
     psVector *ySolution = psMatrixLUSolve(NULL, luMatrix, yVector, permutation); // Solution in y
-
-    //
-    // XXX: Should check the output of the matrix routines and return false if bad.
-    //
 
     //

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.89 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-02 21:11:13 $
+ *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-07 23:14:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -600 +600 @@
     } else if (coeffs->type == PS_POLYNOMIAL_CHEB) {
         return(p_psImageEvalPolynomialCheb(input, coeffs));
-    }
-    printf("XXX: Error: wrong polynomial type\n");
-    // XXX: psError()
+    } else {
+        psError(PS_ERR_UNKNOWN, false, "Incorrect Polynomial Type.\n");
+    }
     return(NULL);
 }

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-03 22:05:22 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-07 23:14:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -513 +513 @@
 }
 
-// XXX EAM : temporary gauss-jordan solver based on gene's
+// This is a temporary gauss-jordan solver based on gene's
 // version based on the Numerical Recipes version
 bool psGaussJordan(

trunk/psLib/src/math/psMinimizePowell.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-03 22:05:22 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-07 23:14:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -740 +740 @@
     psMinimization *min,
     psVector *params,
-    const psVector *paramMask,
+    psMinConstrain *constrain,
     const psArray *coords,
     const psVector *value,
@@ -751 +751 @@
     Chi2PowellFunc = model;
 
-    return(psMinimizePowell(min, params, paramMask, coords, myPowellChi2Func));
+    return(psMinimizePowell(min, params, constrain->paramMask, coords, myPowellChi2Func));
 }
 

trunk/psLib/src/math/psMinimizePowell.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-23 20:44:29 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-07 23:14:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -81 +81 @@
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
-    const psVector *paramMask,         ///< Parameters to be held fixed by minimizer
+    psMinConstrain *constrain,
     const psArray *coords,             ///< Measurement coordinates
     const psVector *value,             ///< Measured values at the coordinates

trunk/psLib/test/math/tst_psMinimizePowell.c

@@ -5 +5 @@
  
     XXX: Must verify the stderr for the NULL parameter tests.
+    XXX: psMinimizeChi2Powell() is untested.
  *****************************************************************************/
 #include <stdio.h>