luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-12 10:45:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finally removed the g_random_normal and g_rand_normal functions.

Browse Source 
1999-06-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib.h, grand.c: Finally removed the g_random_normal and
	g_rand_normal functions.
This commit is contained in:
Sebastian Wilhelmi 1999-06-30 08:10:01 +00:00 committed by Sebastian Wilhelmi
parent d5039b2943
commit f80d6cc540
12 changed files with 40 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
1999-06-30 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, grand.c: Finally removed the g_random_normal and
g_rand_normal functions.
1999-06-28 Tor Lillqvist <tml@iki.fi> 1999-06-28 Tor Lillqvist <tml@iki.fi>
* glib.def: Add missing export of g_strncasecmp. * glib.def: Add missing export of g_strncasecmp.

9
glib.h
View File

@ -2443,11 +2443,6 @@ gdouble g_rand_double (GRand *rand);
gdouble g_rand_double_range (GRand *rand, gdouble g_rand_double_range (GRand *rand,
gdouble min, gdouble min,
gdouble max); gdouble max);
/* This might go in, if -lm is no problem for you guys
gdouble g_rand_normal (GRand *rand,
gdouble mean,
gdouble standard_deviation);
*/
void g_random_set_seed (guint32 seed); void g_random_set_seed (guint32 seed);
guint32 g_random_int (void); guint32 g_random_int (void);
@ -2456,10 +2451,6 @@ gint32 g_random_int_range (gint32 min,
gdouble g_random_double (void); gdouble g_random_double (void);
gdouble g_random_double_range (gdouble min, gdouble g_random_double_range (gdouble min,
gdouble max); gdouble max);
/* dito
gdouble g_random_normal (gdouble mean,
gdouble standard_deviation);
*/
/* Prime numbers. /* Prime numbers.

9
glib/glib.h
View File

@ -2443,11 +2443,6 @@ gdouble g_rand_double (GRand *rand);
gdouble g_rand_double_range (GRand *rand, gdouble g_rand_double_range (GRand *rand,
gdouble min, gdouble min,
gdouble max); gdouble max);
/* This might go in, if -lm is no problem for you guys
gdouble g_rand_normal (GRand *rand,
gdouble mean,
gdouble standard_deviation);
*/
void g_random_set_seed (guint32 seed); void g_random_set_seed (guint32 seed);
guint32 g_random_int (void); guint32 g_random_int (void);
@ -2456,10 +2451,6 @@ gint32 g_random_int_range (gint32 min,
gdouble g_random_double (void); gdouble g_random_double (void);
gdouble g_random_double_range (gdouble min, gdouble g_random_double_range (gdouble min,
gdouble max); gdouble max);
/* dito
gdouble g_random_normal (gdouble mean,
gdouble standard_deviation);
*/
/* Prime numbers. /* Prime numbers.

55
glib/grand.c
View File

@ -62,8 +62,6 @@ struct _GRand
{ {
guint32 mt[N]; /* the array for the state vector */ guint32 mt[N]; /* the array for the state vector */
guint mti; guint mti;
gboolean have_next_normal;
gdouble next_normal;
}; };
GRand* GRand*
@ -126,8 +124,6 @@ g_rand_set_seed (GRand* rand, guint32 seed)
rand->mt[0]= seed & 0xffffffff; rand->mt[0]= seed & 0xffffffff;
for (rand->mti=1; rand->mti<N; rand->mti++) for (rand->mti=1; rand->mti<N; rand->mti++)
rand->mt[rand->mti] = (69069 * rand->mt[rand->mti-1]) & 0xffffffff; rand->mt[rand->mti] = (69069 * rand->mt[rand->mti-1]) & 0xffffffff;
rand->have_next_normal = FALSE;
} }
guint32 guint32
@ -231,42 +227,6 @@ g_rand_double_range (GRand* rand, gdouble min, gdouble max)
return g_rand_int (rand) * ((max - min) * G_RAND_DOUBLE_TRANSFORM) + min; return g_rand_int (rand) * ((max - min) * G_RAND_DOUBLE_TRANSFORM) + min;
} }
#if WE_REALLY_WANT_HAVE_MATH_LIB_LINKED
gdouble
g_rand_normal (GRand* rand, gdouble mean, gdouble standard_deviation)
{
/* For a description of the used algorithm see Knuth: "The Art of
Computer Programming", Vol.2, Second Edition, Page 117: Polar
method for normal deviates due to Box, Muller, Marsaglia */
gdouble normal;
g_return_val_if_fail (rand != NULL, 0);
if (rand->have_next_normal)
{
rand->have_next_normal = FALSE;
normal = rand->next_normal;
}
else
{
gdouble u1;
gdouble u2 = g_rand_double_range (rand, -1, 1);
gdouble s, f;
do
{
u1 = u2;
u2 = g_rand_double_range (rand, -1, 1);
s = u1 * u1 + u2 * u2;
} while (s >= 1.0);
f = sqrt (-2 * log (s) / s);
normal = u1 * f;
rand->next_normal = u2 * f;
rand->have_next_normal = TRUE;
}
return mean + normal * standard_deviation;
}
#endif
guint32 guint32
g_random_int (void) g_random_int (void)
{ {
@ -319,21 +279,6 @@ g_random_double_range (gdouble min, gdouble max)
return result; return result;
} }
#if WE_REALLY_WANT_HAVE_MATH_LIB_LINKED
gdouble
g_random_normal (gdouble mean, gdouble standard_deviation)
{
double result;
G_LOCK (global_random);
if (!global_random)
global_random = g_rand_new ();
result = g_rand_normal (global_random, mean, standard_deviation);
G_UNLOCK (global_random);
return result;
}
#endif
void void
g_random_set_seed (guint32 seed) g_random_set_seed (guint32 seed)
{ {

55
grand.c
View File

@ -62,8 +62,6 @@ struct _GRand
{ {
guint32 mt[N]; /* the array for the state vector */ guint32 mt[N]; /* the array for the state vector */
guint mti; guint mti;
gboolean have_next_normal;
gdouble next_normal;
}; };
GRand* GRand*
@ -126,8 +124,6 @@ g_rand_set_seed (GRand* rand, guint32 seed)
rand->mt[0]= seed & 0xffffffff; rand->mt[0]= seed & 0xffffffff;
for (rand->mti=1; rand->mti<N; rand->mti++) for (rand->mti=1; rand->mti<N; rand->mti++)
rand->mt[rand->mti] = (69069 * rand->mt[rand->mti-1]) & 0xffffffff; rand->mt[rand->mti] = (69069 * rand->mt[rand->mti-1]) & 0xffffffff;
rand->have_next_normal = FALSE;
} }
guint32 guint32
@ -231,42 +227,6 @@ g_rand_double_range (GRand* rand, gdouble min, gdouble max)
return g_rand_int (rand) * ((max - min) * G_RAND_DOUBLE_TRANSFORM) + min; return g_rand_int (rand) * ((max - min) * G_RAND_DOUBLE_TRANSFORM) + min;
} }
#if WE_REALLY_WANT_HAVE_MATH_LIB_LINKED
gdouble
g_rand_normal (GRand* rand, gdouble mean, gdouble standard_deviation)
{
/* For a description of the used algorithm see Knuth: "The Art of
Computer Programming", Vol.2, Second Edition, Page 117: Polar
method for normal deviates due to Box, Muller, Marsaglia */
gdouble normal;
g_return_val_if_fail (rand != NULL, 0);
if (rand->have_next_normal)
{
rand->have_next_normal = FALSE;
normal = rand->next_normal;
}
else
{
gdouble u1;
gdouble u2 = g_rand_double_range (rand, -1, 1);
gdouble s, f;
do
{
u1 = u2;
u2 = g_rand_double_range (rand, -1, 1);
s = u1 * u1 + u2 * u2;
} while (s >= 1.0);
f = sqrt (-2 * log (s) / s);
normal = u1 * f;
rand->next_normal = u2 * f;
rand->have_next_normal = TRUE;
}
return mean + normal * standard_deviation;
}
#endif
guint32 guint32
g_random_int (void) g_random_int (void)
{ {
@ -319,21 +279,6 @@ g_random_double_range (gdouble min, gdouble max)
return result; return result;
} }
#if WE_REALLY_WANT_HAVE_MATH_LIB_LINKED
gdouble
g_random_normal (gdouble mean, gdouble standard_deviation)
{
double result;
G_LOCK (global_random);
if (!global_random)
global_random = g_rand_new ();
result = g_rand_normal (global_random, mean, standard_deviation);
G_UNLOCK (global_random);
return result;
}
#endif
void void
g_random_set_seed (guint32 seed) g_random_set_seed (guint32 seed)
{ {