X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5828869a4c6d79018e8eca27a10d0fe51979e5..88fad0aaff9eb463f048bfdfe4ad6218aba44ddb:/teshsuite/surf/maxmin_bench/maxmin_bench.cpp diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp index 2b22d14a70..c23689e584 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp @@ -17,7 +17,7 @@ #include #include -using namespace simgrid::surf; +using namespace simgrid::kernel; double date; int64_t seedx = 0; @@ -40,11 +40,11 @@ static unsigned int int_random(int max) static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limit, unsigned int pw_max_limit, float rate_no_limit, int max_share, int mode) { - simgrid::kernel::lmm::Constraint* cnst[nb_cnst]; - simgrid::kernel::lmm::Variable* var[nb_var]; + lmm::Constraint* cnst[nb_cnst]; + lmm::Variable* var[nb_var]; int used[nb_cnst]; - simgrid::kernel::lmm::System* Sys = new simgrid::kernel::lmm::System(true); + lmm::System* Sys = new lmm::System(true); for (int i = 0; i < nb_cnst; i++) { cnst[i] = Sys->constraint_new(NULL, float_random(10.0)); @@ -81,7 +81,7 @@ static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi fprintf(stderr,"Starting to solve(%i)\n",myrand()%1000); date = xbt_os_time() * 1000000; - lmm_solve(Sys); + Sys->solve(); date = xbt_os_time() * 1000000 - date; if(mode==2){