Changeset 3597 in Sophya for trunk/SophyaLib/BaseTools/srandgen.c

Timestamp:

Apr 21, 2009, 1:50:50 PM (16 years ago)

Author:

cmv

Message:

NorRand et GauRnd retournent double + elimination des label LAB: , cmv 21/04/2009

File:

• trunk/SophyaLib/BaseTools/srandgen.c (modified) (6 diffs)

trunk/SophyaLib/BaseTools/srandgen.c

@@ -187 +187 @@
     Normal (Gaussian) random number generator (Mean=0., Sigma=1.)
 */
-float NorRand(void)
-{
-double x,A,B;
-
-LAB10:
-A = drand01();
-if ( A == 0. ) goto LAB10;
-B = drand01();
-x = sqrt(-2.*log(A))*cos(DeuxPi*B);
-return( (float) x );
+double NorRand(void)
+{
+ double A;
+ while( (A=drand01()) == 0.);
+ return sqrt(-2.*log(A))*cos(DeuxPi*drand01());
 }
 
@@ -207 +202 @@
 --
 */
-float NorRand1(void)
+double NorRand1(void)
 {
 double b, x, y, gauss;
@@ -217 +212 @@
 gauss = b*exp(-x*x/2.);
 if ( gauss-y < 0. ) goto LAB10 ;
-return( (float) x );
+return  x;
 }
 
@@ -233 +228 @@
 double GauRnd(double am, double s)
 {
-double x,A,B;
-
-LAB10:
-A = drand01();
-if ( A == 0. ) goto LAB10;
-B = drand01();
-x = am + s * sqrt(-2.*log(A))*cos(DeuxPi*B);
-return(x);
+double A;
+while( (A=drand01()) == 0. );
+return am + s * sqrt(-2.*log(A))*cos(DeuxPi*drand01());
 }
 
@@ -352 +342 @@
 double c,s,X,Y;
 
-LAB10:
- s = drand01();
- if ( s == 0. ) goto LAB10;
+while( (s = drand01()) == 0. );
 s = sqrt(-2.*log(s));
 c = DeuxPi * drand01();
@@ -414 +402 @@
 double a,b,sa;
 if( ro <= -1. || ro >= 1. ) return(1);
-LAB10:
- b = drand01();
- if ( b == 0. ) goto LAB10;
+while( (b=drand01()) == 0. );
 b = sqrt(-2.*log(b));
 a = DeuxPi * drand01();