X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50102ec1c30562e20d450afa7015374387bf1904..49f7f894ddeeaaea5198dd3255ddedd594b3b801:/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 59bff100d7..5bced38219 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp @@ -1,6 +1,6 @@ /* A few crash tests for the maxmin library */ -/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2022. 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. */ @@ -24,7 +24,7 @@ static double test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_li std::vector variables(nb_var); /* We cannot activate the selective update as we pass nullptr as an Action when creating the variables */ - simgrid::kernel::lmm::System Sys(false); + simgrid::kernel::lmm::MaxMin Sys(false); for (auto& cnst : constraints) { cnst = Sys.constraint_new(nullptr, simgrid::xbt::random::uniform_real(0.0, 10.0)); @@ -52,7 +52,7 @@ static double test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_li k = simgrid::xbt::random::uniform_int(0, nb_cnst - 1); } while (used[k] >= concurrency_share); Sys.expand(constraints[k], var, simgrid::xbt::random::uniform_real(0.0, 1.5)); - Sys.expand_add(constraints[k], var, simgrid::xbt::random::uniform_real(0.0, 1.5)); + Sys.expand(constraints[k], var, simgrid::xbt::random::uniform_real(0.0, 1.5)); used[k]++; } } @@ -137,11 +137,11 @@ int main(int argc, char **argv) mode=3; if(mode==1) - xbt_log_control_set("surf/maxmin.threshold:DEBUG surf/maxmin.fmt:\'[%r]: [%c/%p] %m%n\' " - "surf.threshold:DEBUG surf.fmt:\'[%r]: [%c/%p] %m%n\' "); + xbt_log_control_set("ker_lmm.threshold:DEBUG ker_lmm.fmt:\'[%r]: [%c/%p] %m%n\' " + "kernel.threshold:DEBUG kernel.fmt:\'[%r]: [%c/%p] %m%n\' "); if(mode==2) - xbt_log_control_set("surf/maxmin.threshold:DEBUG surf.threshold:DEBUG"); + xbt_log_control_set("ker_lmm.threshold:DEBUG kernel.threshold:DEBUG"); unsigned int nb_cnst= TestClasses[testclass][0]; unsigned int nb_var= TestClasses[testclass][1];