-/* 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
- * 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 "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");
} ieee_nan;
};
-#define IEEE754_DOUBLE_BIAS 0x3ff /* Added to exponent. */
+#define IEEE754_DOUBLE_BIAS 0x3ff /* Added to exponent. */
double drand48(void);
#endif
-static double custom_random(Generator generator, long int *seed)
+static double custom_random(e_random_generator_t generator, long int *seed)
{
switch (generator) {
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();
}
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);
/* Check user stupidities */
if (max < min)
- THROW2(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
+ THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
if (mean < min)
- THROW2(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
+ THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
min);
if (mean > max)
- THROW2(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
+ THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
max);
/* normalize the mean and standard deviation before storing */
random->std = std / (max - min);
if (random->mean * (1 - random->mean) < random->std * random->std)
- THROW2(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
+ THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
random->mean, random->std);
return random;