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
remove unused code in migration
[simgrid.git]
/
src
/
surf
/
random_mgr.c
diff --git
a/src/surf/random_mgr.c
b/src/surf/random_mgr.c
index
6fb652d
..
091e6c2
100644
(file)
--- a/
src/surf/random_mgr.c
+++ b/
src/surf/random_mgr.c
@@
-1,12
+1,14
@@
-/* 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 "gras_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");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf");
@@
-54,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);
@@
-191,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) {
@@
-200,8
+202,8
@@
static double custom_random(Generator generator, long int *seed)
case RAND:
return (double) rand_r((unsigned int *) seed) / RAND_MAX;
case RNGSTREAM :
case RAND:
return (double) rand_r((unsigned int *) seed) / RAND_MAX;
case RNGSTREAM :
-
XBT_INFO("Seen RNGSTREAM");
-
return 0.0;
+ XBT_INFO("Seen RNGSTREAM");
+ return 0.0;
default:
return drand48();
}
default:
return drand48();
}
@@
-252,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);