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 'bittorrent'
[simgrid.git]
/
testsuite
/
surf
/
maxmin_bench.c
diff --git
a/testsuite/surf/maxmin_bench.c
b/testsuite/surf/maxmin_bench.c
index
f462bfe
..
0d46aa5
100644
(file)
--- a/
testsuite/surf/maxmin_bench.c
+++ b/
testsuite/surf/maxmin_bench.c
@@
-1,8
+1,7
@@
-/* $Id$ */
-
/* A crash few tests for the maxmin library */
/* A crash few tests for the maxmin library */
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
/* 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. */
@@
-12,12
+11,14
@@
#endif
#endif
-#include <stdlib.h>
-#include <stdio.h>
#include "surf/maxmin.h"
#include "surf/maxmin.h"
+#include "xbt/module.h"
#include "xbt/xbt_os_time.h"
#include "xbt/sysdep.h" /* time manipulation for benchmarking */
#include "xbt/xbt_os_time.h"
#include "xbt/sysdep.h" /* time manipulation for benchmarking */
+#include <stdlib.h>
+#include <stdio.h>
+
double date;
double float_random(double max);
double date;
double float_random(double max);
@@
-41,7
+42,7
@@
void test(int nb_cnst, int nb_var, int nb_elem)
int *used = xbt_new0(int, nb_cnst);
int i, j, k;
int *used = xbt_new0(int, nb_cnst);
int i, j, k;
- Sys = lmm_system_new();
+ Sys = lmm_system_new(
1
);
for (i = 0; i < nb_cnst; i++) {
cnst[i] = lmm_constraint_new(Sys, NULL, float_random(10.0));
for (i = 0; i < nb_cnst; i++) {
cnst[i] = lmm_constraint_new(Sys, NULL, float_random(10.0));
@@
-67,6
+68,8
@@
void test(int nb_cnst, int nb_var, int nb_elem)
lmm_solve(Sys);
date = xbt_os_time() * 1000000 - date;
lmm_solve(Sys);
date = xbt_os_time() * 1000000 - date;
+ for (i = 0; i < nb_var; i++)
+ lmm_variable_free(Sys, var[i]);
lmm_system_free(Sys);
free(cnst);
free(var);
lmm_system_free(Sys);
free(cnst);
free(var);
@@
-83,6
+86,7
@@
int main(int argc, char **argv)
int nb_cnst = 2000;
int nb_var = 2000;
int nb_elem = 80;
int nb_cnst = 2000;
int nb_var = 2000;
int nb_elem = 80;
+ xbt_init(&argc, argv);
date = xbt_os_time() * 1000000;
test(nb_cnst, nb_var, nb_elem);
printf("One shot execution time for a total of %d constraints, "
date = xbt_os_time() * 1000000;
test(nb_cnst, nb_var, nb_elem);
printf("One shot execution time for a total of %d constraints, "