From da0db58ee61303869347de945bd288b086cd8d6a Mon Sep 17 00:00:00 2001 From: alegrand Date: Sat, 15 Mar 2008 20:37:09 +0000 Subject: [PATCH] Use doubles for random generators instead of ints and floats. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5296 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/random_mgr.h | 6 +++--- src/surf/random_mgr.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/include/surf/random_mgr.h b/src/include/surf/random_mgr.h index 6ef40d9c24..d02ec3de79 100644 --- a/src/include/surf/random_mgr.h +++ b/src/include/surf/random_mgr.h @@ -12,14 +12,14 @@ SG_BEGIN_DECL() typedef enum {NONE, DRAND48, RAND} Generator; typedef struct random_data_desc { - int max, min, mean, stdDeviation; + double max, min, mean, stdDeviation; Generator generator; } s_random_data_t, *random_data_t; XBT_PUBLIC_DATA(xbt_dict_t) random_data_list; -XBT_PUBLIC(float) random_generate(random_data_t random); -XBT_PUBLIC(random_data_t) random_new(int generator, int min, int max, int mean, int stdDeviation); +XBT_PUBLIC(double) random_generate(random_data_t random); +XBT_PUBLIC(random_data_t) random_new(Generator generator, double min, double max, double mean, double stdDeviation); SG_END_DECL() diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c index bbbe414581..4a9a0b7a48 100644 --- a/src/surf/random_mgr.c +++ b/src/surf/random_mgr.c @@ -10,7 +10,7 @@ static double drand48(void) } #endif -static double custom_random(int generator){ +static double custom_random(Generator generator){ switch(generator) { case DRAND48:return drand48(); @@ -20,8 +20,8 @@ static double custom_random(int generator){ } /* 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; @@ -46,7 +46,7 @@ float random_generate(random_data_t random){ return y; } -random_data_t random_new(int generator, int min, int max, int mean, int stdDeviation){ +random_data_t random_new(Generator generator, double min, double max, double mean, double stdDeviation){ random_data_t random = xbt_new0(s_random_data_t, 1); random->generator = generator; random->min = min; -- 2.20.1