A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add seed management to have independant streams.
[simgrid.git]
/
src
/
surf
/
random_mgr.c
diff --git
a/src/surf/random_mgr.c
b/src/surf/random_mgr.c
index
a5dc07f
..
44f8534
100644
(file)
--- a/
src/surf/random_mgr.c
+++ b/
src/surf/random_mgr.c
@@
-5,23
+5,24
@@
#ifdef WIN32
static double drand48(void)
{
#ifdef WIN32
static double drand48(void)
{
- THROW_UNIMPLEMENTED
()
;
+ THROW_UNIMPLEMENTED;
return -1;
}
#endif
return -1;
}
#endif
-static double custom_random(
int generator
){
+static double custom_random(
Generator generator, long int *seed
){
switch(generator) {
switch(generator) {
-
- case DRAND48:return drand48();
- case RAND: return (double)rand()/RAND_MAX;
+ case DRAND48:
+ return drand48();
+ case RAND:
+ return (double)rand_r((unsigned int*)seed)/RAND_MAX;
default: return drand48();
}
}
/* Generate numbers between min and max with a given mean and standard deviation */
default: return drand48();
}
}
/* Generate numbers between min and max with a given mean and standard deviation */
-
float
random_generate(random_data_t random){
-
float
x1, x2, w, y;
+
double
random_generate(random_data_t random){
+
double
x1, x2, w, y;
if (random == NULL) return 0.0f;
if (random == NULL) return 0.0f;
@@
-31,8
+32,8
@@
float random_generate(random_data_t random){
y1 = sqrt( - 2 * log(x1) ) * cos( 2 * pi * x2 )
*/
do {
y1 = sqrt( - 2 * log(x1) ) * cos( 2 * pi * x2 )
*/
do {
- x1 = 2.0 * custom_random(random->generator) - 1.0;
- x2 = 2.0 * custom_random(random->generator) - 1.0;
+ x1 = 2.0 * custom_random(random->generator
,&(random->seed)
) - 1.0;
+ x2 = 2.0 * custom_random(random->generator
,&(random->seed)
) - 1.0;
w = x1 * x1 + x2 * x2;
} while ( w >= 1.0 );
w = x1 * x1 + x2 * x2;
} while ( w >= 1.0 );
@@
-46,9
+47,12
@@
float random_generate(random_data_t random){
return y;
}
return y;
}
-random_data_t random_new(int generator, int min, int max, int mean, int stdDeviation){
+random_data_t random_new(Generator generator, long int seed,
+ double min, double max, double mean,
+ double stdDeviation){
random_data_t random = xbt_new0(s_random_data_t, 1);
random->generator = generator;
random_data_t random = xbt_new0(s_random_data_t, 1);
random->generator = generator;
+ random->seed = seed;
random->min = min;
random->max = max;
random->mean = mean;
random->min = min;
random->max = max;
random->mean = mean;