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
Rename sg_platf_new_AS_{open,close} to {begin,end} since you cannot reopen them to...
[simgrid.git]
/
src
/
surf
/
random_mgr.c
diff --git
a/src/surf/random_mgr.c
b/src/surf/random_mgr.c
index
cec30f9
..
6fb652d
100644
(file)
--- a/
src/surf/random_mgr.c
+++ b/
src/surf/random_mgr.c
@@
-6,7
+6,9
@@
#include "surf/random_mgr.h"
#include "xbt/sysdep.h"
#include "surf/random_mgr.h"
#include "xbt/sysdep.h"
-#include "simgrid_config.h" /*_XBT_WIN32*/
+#include "gras_config.h" /*_XBT_WIN32*/
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf");
#ifdef _XBT_WIN32
#ifdef _XBT_WIN32
@@
-197,6
+199,9
@@
static double custom_random(Generator generator, long int *seed)
return drand48();
case RAND:
return (double) rand_r((unsigned int *) seed) / RAND_MAX;
return drand48();
case RAND:
return (double) rand_r((unsigned int *) seed) / RAND_MAX;
+ case RNGSTREAM :
+ XBT_INFO("Seen RNGSTREAM");
+ return 0.0;
default:
return drand48();
}
default:
return drand48();
}
@@
-259,12
+264,12
@@
random_data_t random_new(Generator generator, long int seed,
/* Check user stupidities */
if (max < min)
/* Check user stupidities */
if (max < min)
- THROW
2
(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
+ THROW
F
(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
if (mean < min)
if (mean < min)
- THROW
2
(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
+ THROW
F
(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
min);
if (mean > max)
min);
if (mean > max)
- THROW
2
(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
+ THROW
F
(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
max);
/* normalize the mean and standard deviation before storing */
max);
/* normalize the mean and standard deviation before storing */
@@
-272,7
+277,7
@@
random_data_t random_new(Generator generator, long int seed,
random->std = std / (max - min);
if (random->mean * (1 - random->mean) < random->std * random->std)
random->std = std / (max - min);
if (random->mean * (1 - random->mean) < random->std * random->std)
- THROW
2
(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
+ THROW
F
(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
random->mean, random->std);
return random;
random->mean, random->std);
return random;