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
[trace] fix on user link variable declaration
[simgrid.git]
/
testsuite
/
surf
/
maxmin_bench.c
diff --git
a/testsuite/surf/maxmin_bench.c
b/testsuite/surf/maxmin_bench.c
index
c54f374
..
149f273
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. */
@@
-16,7
+15,7
@@
#include <stdio.h>
#include "surf/maxmin.h"
#include "xbt/xbt_os_time.h"
#include <stdio.h>
#include "surf/maxmin.h"
#include "xbt/xbt_os_time.h"
-#include "xbt/sysdep.h"
/* time manipulation for benchmarking */
+#include "xbt/sysdep.h" /* time manipulation for benchmarking */
double date;
double date;
@@
-36,9
+35,9
@@
void test(int nb_cnst, int nb_var, int nb_elem);
void test(int nb_cnst, int nb_var, int nb_elem)
{
lmm_system_t Sys = NULL;
void test(int nb_cnst, int nb_var, int nb_elem)
{
lmm_system_t Sys = NULL;
- lmm_constraint_t *cnst =
calloc(nb_cnst, sizeof(lmm_constraint_t)
);
- lmm_variable_t *var =
calloc(nb_var, sizeof(lmm_variable_t)
);
- int *used =
calloc(nb_cnst, sizeof(int)
);
+ lmm_constraint_t *cnst =
xbt_new0(lmm_constraint_t, nb_cnst
);
+ lmm_variable_t *var =
xbt_new0(lmm_variable_t, nb_var
);
+ int *used =
xbt_new0(int, nb_cnst
);
int i, j, k;
Sys = lmm_system_new();
int i, j, k;
Sys = lmm_system_new();
@@
-54,8
+53,8
@@
void test(int nb_cnst, int nb_var, int nb_elem)
for (j = 0; j < nb_elem; j++) {
k = int_random(nb_cnst);
if (used[k]) {
for (j = 0; j < nb_elem; j++) {
k = int_random(nb_cnst);
if (used[k]) {
- j--;
- continue;
+
j--;
+
continue;
}
lmm_expand(Sys, cnst[k], var[i], float_random(1.0));
used[k] = 1;
}
lmm_expand(Sys, cnst[k], var[i], float_random(1.0));
used[k] = 1;
@@
-67,6
+66,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);
@@
-80,13
+81,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
0
;
- int nb_var = 2000
0
;
+ int nb_cnst = 2000;
+ int nb_var = 2000;
int nb_elem = 80;
date = xbt_os_time() * 1000000;
test(nb_cnst, nb_var, nb_elem);
printf("One shot execution time for a total of %d constraints, "
int nb_elem = 80;
date = xbt_os_time() * 1000000;
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 : %g microsecondes \n",
- nb_cnst, nb_var, nb_elem, date);
+
"%d variables with %d active constraint each : %g microsecondes \n",
+
nb_cnst, nb_var, nb_elem, date);
return 0;
}
return 0;
}