Short documentation for makhoul3, and reindentation.

diff --git a/ALGORITHMS b/ALGORITHMS
index d73b67503311240d261cf0c66c2d35db8eaeb97a..53fe1f30300645bf96d6d08fa28d75c04724e264 100644 (file)
--- a/ALGORITHMS
+++ b/ALGORITHMS
@@ -89,6 +89,12 @@ Références:
       cf. MAKHOUL.txt
 
 
       cf. MAKHOUL.txt
 
 

+makhoul3
+========
+Comme makhoul mais, dans le ratio 1/(N+1), N correspond au nombre de
+voisins moins chargés.
+
+

 none
 ====
 Aucun équilibrage.  Peut-être utile pour tester/déboguer le code.
 none
 ====
 Aucun équilibrage.  Peut-être utile pour tester/déboguer le code.

diff --git a/loba_makhoul3.cpp b/loba_makhoul3.cpp
index 9517002082774760575965bb1387ae2ea7e25ae8..fd06d223621b86a6ef72ee0988e5efafdba00d4a 100644 (file)
--- a/loba_makhoul3.cpp
+++ b/loba_makhoul3.cpp
@@ -9,10 +9,10 @@ void loba_makhoul3::load_balance()
     pneigh_sort_by_load(std::less<double>());
     print_loads_p(false, xbt_log_priority_debug);
 
     pneigh_sort_by_load(std::less<double>());
     print_loads_p(false, xbt_log_priority_debug);
 

-               int nb_less_loaded=0;
-               for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
-                       nb_less_loaded+=(pneigh[i]->get_load()<=get_load());
-               }
+    int nb_less_loaded = 0;
+    for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
+        nb_less_loaded += (pneigh[i]->get_load() <= get_load());
+    }

 
     double alpha = 1.0 / (nb_less_loaded );
     double my_load = get_load();
 
     double alpha = 1.0 / (nb_less_loaded );
     double my_load = get_load();

diff --git a/options.cpp b/options.cpp
index 482d486fed7d880ca70cbae23ab02190b506642a..908a797f0048849a2b3e5ea641d8137b09024386 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -97,7 +97,7 @@ namespace opt {
                    loba_makhoul);
         NOL_INSERT("makhoul2", "balance with Makhoul's source code",
                    loba_makhoul2);
                    loba_makhoul);
         NOL_INSERT("makhoul2", "balance with Makhoul's source code",
                    loba_makhoul2);

-        NOL_INSERT("makhoul3", "describe your algorithm here...",
+        NOL_INSERT("makhoul3", "variation on Makhoul's algorithm",

                    loba_makhoul3);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);
                    loba_makhoul3);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);