X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/3747a1927b03ebc8f22c0772f83a857a0bf3b811..163f27d1800fc613f521114ccd6b89ebf394746e:/options.cpp diff --git a/options.cpp b/options.cpp index 9b1344a..bde2ae8 100644 --- a/options.cpp +++ b/options.cpp @@ -10,9 +10,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); #include "deployment.h" #include "process.h" +#include "loba_2besteffort.h" #include "loba_besteffort.h" #include "loba_bulk.h" #include "loba_fairstrategy.h" +#include "loba_lln.h" #include "loba_makhoul.h" #include "loba_makhoul2.h" #include "loba_simple.h" @@ -38,7 +40,7 @@ namespace opt { // Simulation parameters int log_rate = 1; - bool exit_request = false; + volatile std::sig_atomic_t exit_request = 0; // Platform and deployment std::string platform_file; @@ -78,12 +80,16 @@ namespace opt { loba_algorithms_type loba_algorithms; loba_algorithms_type::loba_algorithms_type() { + NOL_INSERT("2besteffort", "balance with best effort strategy (take #2)", + loba_2besteffort); NOL_INSERT("besteffort", "balance with best effort strategy", loba_besteffort); - NOL_INSERT("bulk", "describe your algorithm here...", + NOL_INSERT("bulk", "A multi-load-units assignation rule without ordering...", loba_bulk); NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy); + NOL_INSERT("lln", "Balance with less loaded neighbors without ordering-bulk method", + loba_lln); NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm", loba_makhoul); NOL_INSERT("makhoul2", "balance with Makhoul's source code",