Changeset 751

Timestamp:

May 20, 2004, 3:09:20 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

• dataManip/psFunctions.c (modified) (4 diffs)
• dataManip/psFunctions.h (modified) (1 diff)
• math/psPolynomial.c (modified) (4 diffs)
• math/psPolynomial.h (modified) (1 diff)
• math/psSpline.c (modified) (4 diffs)
• math/psSpline.h (modified) (1 diff)

trunk/psLib/src/dataManip/psFunctions.c

@@ -16 +16 @@
 #include "float.h"
 #include <math.h>
+#define PI 3.14
 /*****************************************************************************
     Evaluate a non-normalized Gaussian with the given mean and sigma at the
@@ -29 +30 @@
     float tmp = 0.0;
 
-    if (nomal == true) {
+    if (normal == 1) {
         tmp = 1.0 / sqrtf(2.0 * PI * (stddev * stddev));
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
@@ -37 +38 @@
 }
 
+/*
 psVector *psGaussianDev(float mean,
                         float sigma,
@@ -42 +44 @@
 {
     psVector *gauss = NULL;
-
+ 
     gauss = psVectorAlloc(Npts, PS_TYPE_FLOAT);
 }
+*/
 
 /*****************************************************************************

trunk/psLib/src/dataManip/psFunctions.h

@@ -12 +12 @@
 
 float
-psGaussian(float x,   ///< Value at which to evaluate
-           float mean,   ///< Mean for the Gaussian
-           float stddev   ///< Standard deviation for the Gaussian
+psGaussian(float x,        ///< Value at which to evaluate
+           float mean,     ///< Mean for the Gaussian
+           float stddev,   ///< Standard deviation for the Gaussian
+           int normal      ///< Indicates whether result should be normalized
           );
 

trunk/psLib/src/math/psPolynomial.c

@@ -16 +16 @@
 #include "float.h"
 #include <math.h>
+#define PI 3.14
 /*****************************************************************************
     Evaluate a non-normalized Gaussian with the given mean and sigma at the
@@ -29 +30 @@
     float tmp = 0.0;
 
-    if (nomal == true) {
+    if (normal == 1) {
         tmp = 1.0 / sqrtf(2.0 * PI * (stddev * stddev));
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
@@ -37 +38 @@
 }
 
+/*
 psVector *psGaussianDev(float mean,
                         float sigma,
@@ -42 +44 @@
 {
     psVector *gauss = NULL;
-
+ 
     gauss = psVectorAlloc(Npts, PS_TYPE_FLOAT);
 }
+*/
 
 /*****************************************************************************

trunk/psLib/src/math/psPolynomial.h

@@ -12 +12 @@
 
 float
-psGaussian(float x,   ///< Value at which to evaluate
-           float mean,   ///< Mean for the Gaussian
-           float stddev   ///< Standard deviation for the Gaussian
+psGaussian(float x,        ///< Value at which to evaluate
+           float mean,     ///< Mean for the Gaussian
+           float stddev,   ///< Standard deviation for the Gaussian
+           int normal      ///< Indicates whether result should be normalized
           );
 

trunk/psLib/src/math/psSpline.c

@@ -16 +16 @@
 #include "float.h"
 #include <math.h>
+#define PI 3.14
 /*****************************************************************************
     Evaluate a non-normalized Gaussian with the given mean and sigma at the
@@ -29 +30 @@
     float tmp = 0.0;
 
-    if (nomal == true) {
+    if (normal == 1) {
         tmp = 1.0 / sqrtf(2.0 * PI * (stddev * stddev));
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
@@ -37 +38 @@
 }
 
+/*
 psVector *psGaussianDev(float mean,
                         float sigma,
@@ -42 +44 @@
 {
     psVector *gauss = NULL;
-
+ 
     gauss = psVectorAlloc(Npts, PS_TYPE_FLOAT);
 }
+*/
 
 /*****************************************************************************

trunk/psLib/src/math/psSpline.h

@@ -12 +12 @@
 
 float
-psGaussian(float x,   ///< Value at which to evaluate
-           float mean,   ///< Mean for the Gaussian
-           float stddev   ///< Standard deviation for the Gaussian
+psGaussian(float x,        ///< Value at which to evaluate
+           float mean,     ///< Mean for the Gaussian
+           float stddev,   ///< Standard deviation for the Gaussian
+           int normal      ///< Indicates whether result should be normalized
           );