typedef enum {NONE, DRAND48, RAND} Generator;
typedef struct random_data_desc {
+ long int seed;
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(double) random_generate(random_data_t random);
-XBT_PUBLIC(random_data_t) random_new(Generator generator, double min, double max, double mean, double stdDeviation);
+XBT_PUBLIC(random_data_t) random_new(Generator generator, long int seed,
+ double min, double max, double mean,
+ double stdDeviation);
SG_END_DECL()
}
#endif
-static double custom_random(Generator generator){
+static double custom_random(Generator generator, long int *seed){
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();
}
}
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 );
return y;
}
-random_data_t random_new(Generator generator, double min, double max, double mean, double 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->seed = seed;
random->min = min;
random->max = max;
random->mean = mean;
void add_randomness(void)
{
/* If needed aditional properties can be added by using the prop tag */
- random_data_t random = random_new(random_generator, random_min, random_max, random_mean, random_std_deviation);
+ random_data_t random = random_new(random_generator, 0, random_min, random_max, random_mean, random_std_deviation);
xbt_dict_set(random_data_list, random_id, (void *)random, NULL);
}