Changeset 12313

Timestamp:

Mar 8, 2007, 3:15:49 AM (19 years ago)

Author:

rhl

Message:

Merged from mainline 2007/03/08

Location:

branches/rel-1_0/psLib/src/math

Files:

• psMatrix.c (modified) (3 diffs)
• psMatrix.h (modified) (2 diffs)

branches/rel-1_0/psLib/src/math/psMatrix.c

@@ -22 +22 @@
  *  @author Andy Becker, University of Washington (SVD).
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.47.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-08 13:15:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -878 +878 @@
 
 // This code supplied by Andy Becker (becker@astro.washington.edu)
-psImage *psMatrixSVDSolve(psImage* evec, psVector* eval, const psImage* in)
+psImage *psMatrixSVD(psImage* evec, psVector* eval, const psImage* in)
 {
     #define psMatrixSVD_EXIT {psFree(evec); psFree(eval); return NULL;}
@@ -915 +915 @@
         /* make sure that these things are sorted! */
         if (i > 0) {
-            assert(eval->data.F64[i] > eval->data.F64[i-1]);
+            assert(eval->data.F64[i] <= eval->data.F64[i-1]);
         }
     }

branches/rel-1_0/psLib/src/math/psMatrix.h

@@ -19 +19 @@
  * @author Ross Harman, MHPCC
  *
- * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-23 22:47:23 $
+ * @version $Revision: 1.26.2.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-08 13:15:49 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -177 +177 @@
 
 /// Single value decomposition, provided by Andy Becker
-psImage *psMatrixSVDSolve(psImage* evec, psVector* eval, const psImage* in);
+psImage *psMatrixSVD(psImage* evec, psVector* eval, const psImage* in);
 
 /// @}