Changeset 793

Timestamp:

May 26, 2004, 4:49:34 PM (22 years ago)

Author:

gusciora

Message:

Coded the psGaussianDev() function.

Location:

trunk/psLib/src

Files:

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

trunk/psLib/src/dataManip/psFunctions.c

@@ -16 +16 @@
 #include "float.h"
 #include <math.h>
-#define PI 3.14
+#include <gsl/gsl_rng.h>
+#include <gsl/gsl_randist.h>
 /*****************************************************************************
     Evaluate a non-normalized Gaussian with the given mean and sigma at the
@@ -31 +32 @@
 
     if (normal == 1) {
-        tmp = 1.0 / sqrtf(2.0 * PI * (stddev * stddev));
+        tmp = 1.0 / sqrtf(2.0 * M_PI * (stddev * stddev));
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
     } else {
@@ -38 +39 @@
 }
 
-/*
+/*****************************************************************************
+    psGaussianDev()
+ 
+ This routine creates a psVector of the specified size and type F32
+ and fils it with a random Gaussiang distribution of numbers with
+ the specified meand and sigma.  This routine makes use of the GSL
+ routines for generating both uniformly distributed numbers and the
+ Gaussian distribution as well.
+ *****************************************************************************/
 psVector *psGaussianDev(float mean,
                         float sigma,
@@ -44 +53 @@
 {
     psVector *gauss = NULL;
- 
+    const gsl_rng_type *T = NULL;
+    gsl_rng *r = NULL;
+    int i = 0;
+
     gauss = psVectorAlloc(Npts, PS_TYPE_FLOAT);
-}
-*/
+    gsl_rng_env_setup();
+    T = gsl_rng_default;
+    r = gsl_rng_alloc(T);
+
+    for (i = 0; i < Npts; i++) {
+        gauss->vec.f[i] = mean + gsl_ran_gaussian(r, sigma);
+    }
+    return(gauss);
+}
+
 
 /*****************************************************************************

trunk/psLib/src/math/psPolynomial.c

@@ -16 +16 @@
 #include "float.h"
 #include <math.h>
-#define PI 3.14
+#include <gsl/gsl_rng.h>
+#include <gsl/gsl_randist.h>
 /*****************************************************************************
     Evaluate a non-normalized Gaussian with the given mean and sigma at the
@@ -31 +32 @@
 
     if (normal == 1) {
-        tmp = 1.0 / sqrtf(2.0 * PI * (stddev * stddev));
+        tmp = 1.0 / sqrtf(2.0 * M_PI * (stddev * stddev));
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
     } else {
@@ -38 +39 @@
 }
 
-/*
+/*****************************************************************************
+    psGaussianDev()
+ 
+ This routine creates a psVector of the specified size and type F32
+ and fils it with a random Gaussiang distribution of numbers with
+ the specified meand and sigma.  This routine makes use of the GSL
+ routines for generating both uniformly distributed numbers and the
+ Gaussian distribution as well.
+ *****************************************************************************/
 psVector *psGaussianDev(float mean,
                         float sigma,
@@ -44 +53 @@
 {
     psVector *gauss = NULL;
- 
+    const gsl_rng_type *T = NULL;
+    gsl_rng *r = NULL;
+    int i = 0;
+
     gauss = psVectorAlloc(Npts, PS_TYPE_FLOAT);
-}
-*/
+    gsl_rng_env_setup();
+    T = gsl_rng_default;
+    r = gsl_rng_alloc(T);
+
+    for (i = 0; i < Npts; i++) {
+        gauss->vec.f[i] = mean + gsl_ran_gaussian(r, sigma);
+    }
+    return(gauss);
+}
+
 
 /*****************************************************************************

trunk/psLib/src/math/psSpline.c

@@ -16 +16 @@
 #include "float.h"
 #include <math.h>
-#define PI 3.14
+#include <gsl/gsl_rng.h>
+#include <gsl/gsl_randist.h>
 /*****************************************************************************
     Evaluate a non-normalized Gaussian with the given mean and sigma at the
@@ -31 +32 @@
 
     if (normal == 1) {
-        tmp = 1.0 / sqrtf(2.0 * PI * (stddev * stddev));
+        tmp = 1.0 / sqrtf(2.0 * M_PI * (stddev * stddev));
         return(tmp * exp(-((x-mean) * (x-mean)) / (2.0 * stddev * stddev)));
     } else {
@@ -38 +39 @@
 }
 
-/*
+/*****************************************************************************
+    psGaussianDev()
+ 
+ This routine creates a psVector of the specified size and type F32
+ and fils it with a random Gaussiang distribution of numbers with
+ the specified meand and sigma.  This routine makes use of the GSL
+ routines for generating both uniformly distributed numbers and the
+ Gaussian distribution as well.
+ *****************************************************************************/
 psVector *psGaussianDev(float mean,
                         float sigma,
@@ -44 +53 @@
 {
     psVector *gauss = NULL;
- 
+    const gsl_rng_type *T = NULL;
+    gsl_rng *r = NULL;
+    int i = 0;
+
     gauss = psVectorAlloc(Npts, PS_TYPE_FLOAT);
-}
-*/
+    gsl_rng_env_setup();
+    T = gsl_rng_default;
+    r = gsl_rng_alloc(T);
+
+    for (i = 0; i < Npts; i++) {
+        gauss->vec.f[i] = mean + gsl_ran_gaussian(r, sigma);
+    }
+    return(gauss);
+}
+
 
 /*****************************************************************************