Changeset 1281 for trunk/psLib/src/dataManip

Timestamp:

Jul 22, 2004, 1:47:23 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src/dataManip

Files:

• psFunctions.c (modified) (5 diffs)
• psMinimize.h (modified) (1 diff)
• psStats.h (modified) (2 diffs)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-15 23:52:34 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 23:45:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 #include "psFunctions.h"
 
-#include "float.h"
-#include <math.h>
 #include <gsl/gsl_rng.h>
 #include <gsl/gsl_randist.h>
-
+/*****************************************************************************/
+/* DEFINE STATEMENTS                                                         */
+/*****************************************************************************/
+
+// None
+
+/*****************************************************************************/
+/* TYPE DEFINITIONS                                                          */
+/*****************************************************************************/
 static void polynomial1DFree(psPolynomial1D *myPoly);
 static void polynomial2DFree(psPolynomial2D *myPoly);
@@ -44 +50 @@
 
 /*****************************************************************************/
+/* GLOBAL VARIABLES                                                          */
+/*****************************************************************************/
+
+// None
+
+/*****************************************************************************/
+/* FILE STATIC VARIABLES                                                     */
+/*****************************************************************************/
+
+// None
+
+/*****************************************************************************/
+/* FUNCTION IMPLEMENTATION - LOCAL                                           */
+/*****************************************************************************/
+
+// None
+
+/*****************************************************************************/
 /*  FUNCTION IMPLEMENTATION - PUBLIC                                         */
 /*****************************************************************************/
@@ -55 +79 @@
 psGaussian(float x,
            float mean,
-           float stddev,
+           float sigma,
            int normal)
 {
-    float tmp = 0.0;
+    float tmp = 1.0;
 
     if (normal == 1) {
         #ifdef DARWIN
-        tmp = 1.0 / (float)sqrt(2.0 * M_PI * (stddev * stddev));
+        tmp = 1.0 / (float)sqrt(2.0 * M_PI * (sigma * sigma));
         #else
 
-        tmp = 1.0 / sqrtf(2.0 * M_PI * (stddev * stddev));
+        tmp = 1.0 / sqrtf(2.0 * M_PI * (sigma * sigma));
         #endif
 
-        return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
-    } else {
-        return(exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
-    }
+    }
+
+    return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * sigma * sigma)));
 }
 
@@ -328 +351 @@
     float xSum = 1.0;
 
+    if (NULL == myPoly) {
+        psAbort(__func__, "psEvalPolynomial1D(): myPoly is NULL\n");
+    }
+
+
     // NOTE: Do we want to flag this case?
     if (myPoly->n == 0) {
         return(1.0);
+    }
+
+    if (NULL == myPoly->coeff) {
+        psAbort(__func__, "psEvalPolynomial1D(): myPoly->coeff is NULL\n");
     }
 

trunk/psLib/src/dataManip/psMinimize.h

@@ -2 +2 @@
 #define PS_MINIMIZE_H
 
+#include "psFunctions.h"
 /** \file psMinimize.h
  *  \brief minimization operations

trunk/psLib/src/dataManip/psStats.h

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 23:44:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
     double sampleLimit;         ///<
     double robustMean;          ///< robust mean of array
-    int    robustMeanNvalues;   ///< number of measurements used for robust mean
     double robustMedian;        ///< robust median of array
     double robustMode;          ///< Robust mode of array