Changeset 3856

Timestamp:

May 5, 2005, 12:32:34 PM (21 years ago)

Author:

gusciora

Message:

Got read of image/vector print routine.

Location:

trunk/psLib/src

Files:

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

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.113 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-05 22:21:55 $
+ *  @version $Revision: 1.114 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-05 22:32:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "psMinimize.h"
 #include "psStats.h"
+#include "psImageIO.h"
 /*****************************************************************************/
 /* DEFINE STATEMENTS                                                         */
@@ -558 +559 @@
 
 psF64 p_psImageGetElementF64(psImage *a, int i, int j);
-
-// XXX EAM these two functions are useful for testing
-// XXX EAM this should move to psImage.c
-bool p_psImagePrint (FILE *f, psImage *a, char *name)
-{
-
-    fprintf (f, "matrix: %s\n", name);
-
-    for (int j = 0; j < a[0].numRows; j++) {
-        for (int i = 0; i < a[0].numCols; i++) {
-            fprintf (f, "%f  ", p_psImageGetElementF64(a, i, j));
-        }
-        fprintf (f, "\n");
-    }
-    fprintf (f, "\n");
-    return (true);
-}
-
-// XXX EAM this should move to psVector.c
-bool p_psVectorPrint (FILE *f, psVector *a, char *name)
-{
-
-    fprintf (f, "vector: %s\n", name);
-
-    for (int i = 0; i < a[0].n; i++) {
-        fprintf (f, "%f\n", p_psVectorGetElementF64(a, i));
-    }
-    fprintf (f, "\n");
-    return (true);
-}
 
 // XXX EAM this is my re-implementation of MinLM

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.113 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-05 22:21:55 $
+ *  @version $Revision: 1.114 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-05 22:32:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "psMinimize.h"
 #include "psStats.h"
+#include "psImageIO.h"
 /*****************************************************************************/
 /* DEFINE STATEMENTS                                                         */
@@ -558 +559 @@
 
 psF64 p_psImageGetElementF64(psImage *a, int i, int j);
-
-// XXX EAM these two functions are useful for testing
-// XXX EAM this should move to psImage.c
-bool p_psImagePrint (FILE *f, psImage *a, char *name)
-{
-
-    fprintf (f, "matrix: %s\n", name);
-
-    for (int j = 0; j < a[0].numRows; j++) {
-        for (int i = 0; i < a[0].numCols; i++) {
-            fprintf (f, "%f  ", p_psImageGetElementF64(a, i, j));
-        }
-        fprintf (f, "\n");
-    }
-    fprintf (f, "\n");
-    return (true);
-}
-
-// XXX EAM this should move to psVector.c
-bool p_psVectorPrint (FILE *f, psVector *a, char *name)
-{
-
-    fprintf (f, "vector: %s\n", name);
-
-    for (int i = 0; i < a[0].n; i++) {
-        fprintf (f, "%f\n", p_psVectorGetElementF64(a, i));
-    }
-    fprintf (f, "\n");
-    return (true);
-}
 
 // XXX EAM this is my re-implementation of MinLM