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
I don't need that anymore
[simgrid.git]
/
testsuite
/
surf
/
maxmin_bench.c
diff --git
a/testsuite/surf/maxmin_bench.c
b/testsuite/surf/maxmin_bench.c
index
a2b531e
..
0002161
100644
(file)
--- a/
testsuite/surf/maxmin_bench.c
+++ b/
testsuite/surf/maxmin_bench.c
@@
-9,13
+9,15
@@
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
+#include "xbt/xbt_portability.h"
#include "surf/maxmin.h"
#include "surf/maxmin.h"
-#include "gras/virtu.h" /* time manipulation for benchmarking */
+#include "xbt/xbt_portability.h"
+#include "xbt/sysdep.h" /* time manipulation for benchmarking */
double date;
double date;
-
xbt_maxmin_float_t float_random(xbt_maxmin_float_t
max);
-
xbt_maxmin_float_t float_random(xbt_maxmin_float_t
max)
+
double float_random(double
max);
+
double float_random(double
max)
{
return ((max * rand()) / (RAND_MAX + 1.0));
}
{
return ((max * rand()) / (RAND_MAX + 1.0));
}
@@
-56,9
+58,10
@@
void test(int nb_cnst, int nb_var, int nb_elem)
}
}
}
}
- date = gras_os_time() * 1000000;
+ printf("Starting to solve\n");
+ date = xbt_os_time() * 1000000;
lmm_solve(Sys);
lmm_solve(Sys);
- date =
gras
_os_time() * 1000000 - date;
+ date =
xbt
_os_time() * 1000000 - date;
lmm_system_free(Sys);
free(cnst);
lmm_system_free(Sys);
free(cnst);
@@
-69,13
+72,13
@@
void test(int nb_cnst, int nb_var, int nb_elem)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- int nb_cnst = 2000;
- int nb_var = 2000;
- int nb_elem =
2
0;
- date =
gras
_os_time() * 1000000;
+ int nb_cnst = 2000
0
;
+ int nb_var = 2000
0
;
+ int nb_elem =
8
0;
+ date =
xbt
_os_time() * 1000000;
test(nb_cnst, nb_var, nb_elem);
printf("One shot execution time for a total of %d constraints, "
test(nb_cnst, nb_var, nb_elem);
printf("One shot execution time for a total of %d constraints, "
- "%d variables with %d active constraint each : %
f
microsecondes \n",
+ "%d variables with %d active constraint each : %
g
microsecondes \n",
nb_cnst, nb_var, nb_elem, date);
return 0;
}
nb_cnst, nb_var, nb_elem, date);
return 0;
}