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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
include
/
surf
/
random_mgr.h
diff --git
a/src/include/surf/random_mgr.h
b/src/include/surf/random_mgr.h
index
d839d55
..
19b4a15
100644
(file)
--- a/
src/include/surf/random_mgr.h
+++ b/
src/include/surf/random_mgr.h
@@
-1,29
+1,33
@@
+/* 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. */
+
#ifndef _SURF_RMGR_H
#define _SURF_RMGR_H
#include "xbt/heap.h"
#include "xbt/dict.h"
#ifndef _SURF_RMGR_H
#define _SURF_RMGR_H
#include "xbt/heap.h"
#include "xbt/dict.h"
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
SG_BEGIN_DECL()
SG_BEGIN_DECL()
-typedef enum {
NONE, DRAND48, RAND} Generator
;
+typedef enum {
NONE, DRAND48, RAND, RNGSTREAM } e_random_generator_t
;
typedef struct random_data_desc {
long int seed;
typedef struct random_data_desc {
long int seed;
- double max, min, mean, stdDeviation;
- Generator generator;
+ double max, min;
+ double mean, std; /* note: mean and standard deviation are normalized */
+ e_random_generator_t 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);
} 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, long int seed,
- double min, double max, double mean,
- double stdDeviation);
+XBT_PUBLIC(random_data_t) random_new(e_random_generator_t generator,
+ long int seed,
+ double min, double max, double mean,
+ double stdDeviation);
SG_END_DECL()
SG_END_DECL()
-
-#endif /* _SURF_RMGR_H */
+#endif /* _SURF_RMGR_H */