X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b2da2dc71792c9bd255ad27c39cc3a715047d31..c8b828daeec8e27cec7131eeb37c206d7f581f1a:/testsuite/surf/maxmin_bench.c

diff --git a/testsuite/surf/maxmin_bench.c b/testsuite/surf/maxmin_bench.c
index 97da9ef926..0002161543 100644
--- a/testsuite/surf/maxmin_bench.c
+++ b/testsuite/surf/maxmin_bench.c
@@ -9,13 +9,15 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include "xbt/xbt_portability.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;
 
-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));
 }
@@ -56,9 +58,10 @@ void test(int nb_cnst, int nb_var, int nb_elem)
     }
   }
 
-  date = gras_os_time();
+  printf("Starting to solve\n");
+  date = xbt_os_time() * 1000000;
   lmm_solve(Sys);
-  date = gras_os_time() - date;
+  date = xbt_os_time() * 1000000 - date;
 
   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 nb_cnst = 2000;
-  int nb_var = 2000;
-  int nb_elem = 20;
-  date = gras_os_time();
+  int nb_cnst = 20000;
+  int nb_var = 20000;
+  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 : %f secondes \n",
+	 "%d variables with %d active constraint each : %g microsecondes \n",
 	 nb_cnst, nb_var, nb_elem, date);
   return 0;
 }