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
[mc] Do not trigger errors in MC_automaton_new_propositional_symbol() when MC is...
[simgrid.git]
/
src
/
surf
/
random_mgr.c
diff --git
a/src/surf/random_mgr.c
b/src/surf/random_mgr.c
index
cec30f9
..
091e6c2
100644
(file)
--- a/
src/surf/random_mgr.c
+++ b/
src/surf/random_mgr.c
@@
-1,12
+1,16
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
-
* under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#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 "internal_config.h" /*_XBT_WIN32*/
+#include <math.h>
+#include <stdlib.h>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf");
#ifdef _XBT_WIN32
#ifdef _XBT_WIN32
@@
-52,7
+56,7
@@
union ieee754_double {
} ieee_nan;
};
} ieee_nan;
};
-#define IEEE754_DOUBLE_BIAS
0x3ff /* Added to exponent. */
+#define IEEE754_DOUBLE_BIAS 0x3ff /* Added to exponent. */
double drand48(void);
double drand48(void);
@@
-189,7
+193,7
@@
int _rand_r(unsigned int *pseed)
#endif
#endif
-static double custom_random(
Generator
generator, long int *seed)
+static double custom_random(
e_random_generator_t
generator, long int *seed)
{
switch (generator) {
{
switch (generator) {
@@
-197,6
+201,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();
}
@@
-247,7
+254,7
@@
double random_generate(random_data_t random)
return X * (random->max - random->min) + random->min;
}
return X * (random->max - random->min) + random->min;
}
-random_data_t random_new(
Generator
generator, long int seed,
+random_data_t random_new(
e_random_generator_t
generator, long int seed,
double min, double max, double mean, double std)
{
random_data_t random = xbt_new0(s_random_data_t, 1);
double min, double max, double mean, double std)
{
random_data_t random = xbt_new0(s_random_data_t, 1);
@@
-259,12
+266,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
+279,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;