Changeset 3551

Timestamp:

Mar 29, 2005, 12:51:24 PM (21 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

• dataManip/psStats.c (modified) (4 diffs)
• math/psStats.c (modified) (4 diffs)

trunk/psLib/src/dataManip/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 22:34:59 $
+ *  @version $Revision: 1.124 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-29 22:51:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1628 +1628 @@
         // Gaussian to the robustHistogramVector.
         psImage *covar = NULL;
-        psMinimization *min = psMinimizationAlloc(100, 0.1);
+        /* XXX: Old, remove.
+                psMinimization *min = psMinimizationAlloc(100, 0.1);
+                psVector *myParams = psVectorAlloc(2, PS_TYPE_F32);
+                psArray *myCoords = psArrayAlloc(robustHistogramVector->n);
+                psVector *y = psVectorAlloc(robustHistogramVector->n, PS_TYPE_F32);
+                myParams->data.F32[0] = myMean;
+                myParams->data.F32[1] = myStdev;
+                for (i=0;i<robustHistogramVector->n;i++) {
+                    myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
+                    ((psVector *) (myCoords->data[i]))->data.F32[0] = (psF32) i;
+                    y->data.F32[i] = robustHistogramVector->data.F32[i];
+                }
+        */
+
+        psMinimization *min = psMinimizationAlloc(100, 0.01);
         psVector *myParams = psVectorAlloc(2, PS_TYPE_F32);
-        psArray *myCoords = psArrayAlloc(robustHistogramVector->n);
-        psVector *y = psVectorAlloc(robustHistogramVector->n, PS_TYPE_F32);
-
-
+        psArray *myCoords = psArrayAlloc(2 * dL + 1);
+        psVector *y = psVectorAlloc(2 * dL + 1, PS_TYPE_F32);
         myParams->data.F32[0] = myMean;
         myParams->data.F32[1] = myStdev;
-
-        /* XXX: old.  Remove this.
-        for (i=0;i<robustHistogramVector->n;i++) {
-            myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
-            ((psVector *) (myCoords->data[i]))->data.F32[0] = (psF32) i;
-            y->data.F32[i] = robustHistogramVector->data.F32[i];
-        }
-        */
 
         for (i = modeBinNum - dL; i <= modeBinNum + dL; i++) {
@@ -1652 +1656 @@
         }
 
-        bool rc = psMinimizeLMChi2(min,
-                                   NULL,
-                                   myParams,
-                                   NULL,
-                                   myCoords,
-                                   y,
-                                   NULL,
-                                   (psMinimizeLMChi2Func) psMinimizeLMChi2Gauss1D);
+
+        psBool rc = psMinimizeLMChi2(min,
+                                     NULL,
+                                     myParams,
+                                     NULL,
+                                     myCoords,
+                                     y,
+                                     NULL,
+                                     (psMinimizeLMChi2Func) psMinimizeLMChi2Gauss1D);
         if (rc == false) {
             psLogMsg(__func__, PS_LOG_WARN,
@@ -1682 +1687 @@
             }
         }
-
 
         if (stats->options & PS_STAT_ROBUST_STDEV) {

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 22:34:59 $
+ *  @version $Revision: 1.124 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-29 22:51:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1628 +1628 @@
         // Gaussian to the robustHistogramVector.
         psImage *covar = NULL;
-        psMinimization *min = psMinimizationAlloc(100, 0.1);
+        /* XXX: Old, remove.
+                psMinimization *min = psMinimizationAlloc(100, 0.1);
+                psVector *myParams = psVectorAlloc(2, PS_TYPE_F32);
+                psArray *myCoords = psArrayAlloc(robustHistogramVector->n);
+                psVector *y = psVectorAlloc(robustHistogramVector->n, PS_TYPE_F32);
+                myParams->data.F32[0] = myMean;
+                myParams->data.F32[1] = myStdev;
+                for (i=0;i<robustHistogramVector->n;i++) {
+                    myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
+                    ((psVector *) (myCoords->data[i]))->data.F32[0] = (psF32) i;
+                    y->data.F32[i] = robustHistogramVector->data.F32[i];
+                }
+        */
+
+        psMinimization *min = psMinimizationAlloc(100, 0.01);
         psVector *myParams = psVectorAlloc(2, PS_TYPE_F32);
-        psArray *myCoords = psArrayAlloc(robustHistogramVector->n);
-        psVector *y = psVectorAlloc(robustHistogramVector->n, PS_TYPE_F32);
-
-
+        psArray *myCoords = psArrayAlloc(2 * dL + 1);
+        psVector *y = psVectorAlloc(2 * dL + 1, PS_TYPE_F32);
         myParams->data.F32[0] = myMean;
         myParams->data.F32[1] = myStdev;
-
-        /* XXX: old.  Remove this.
-        for (i=0;i<robustHistogramVector->n;i++) {
-            myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
-            ((psVector *) (myCoords->data[i]))->data.F32[0] = (psF32) i;
-            y->data.F32[i] = robustHistogramVector->data.F32[i];
-        }
-        */
 
         for (i = modeBinNum - dL; i <= modeBinNum + dL; i++) {
@@ -1652 +1656 @@
         }
 
-        bool rc = psMinimizeLMChi2(min,
-                                   NULL,
-                                   myParams,
-                                   NULL,
-                                   myCoords,
-                                   y,
-                                   NULL,
-                                   (psMinimizeLMChi2Func) psMinimizeLMChi2Gauss1D);
+
+        psBool rc = psMinimizeLMChi2(min,
+                                     NULL,
+                                     myParams,
+                                     NULL,
+                                     myCoords,
+                                     y,
+                                     NULL,
+                                     (psMinimizeLMChi2Func) psMinimizeLMChi2Gauss1D);
         if (rc == false) {
             psLogMsg(__func__, PS_LOG_WARN,
@@ -1682 +1687 @@
             }
         }
-
 
         if (stats->options & PS_STAT_ROBUST_STDEV) {