Temporarily use opt::option_x in algorithms (2)besteffort.

diff --git a/TODO b/TODO
index 93df78fae1d2eaec226be3f57389ebd8dd2f8e32..e99ae98c542edc03c1b366ab87e87461e77b7709 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
+* Remove usage of opt::option_x in loba_besteffort.cpp and loba_2besteffort.cpp
+   Either simply remove it, or change it to a real option.
+

 * Support heterogeneous platforms?
    Not sure yet.
    Should be doable if each process also sends its speed to its neighbors.
 * Support heterogeneous platforms?
    Not sure yet.
    Should be doable if each process also sends its speed to its neighbors.

diff --git a/loba_2besteffort.cpp b/loba_2besteffort.cpp
index 967476e0309a7e8640f98a2d106f9c0dc93120cb..820c7a5f813a6a0d2deba0b4a6c72a691506400c 100644 (file)
--- a/loba_2besteffort.cpp
+++ b/loba_2besteffort.cpp
@@ -31,6 +31,8 @@ void loba_2besteffort::load_balance()
         // don't continue if get_load() <= mean, or pneigh[i]->get_load >= mean
         if (transfer <= 0.0)
             break;
         // don't continue if get_load() <= mean, or pneigh[i]->get_load >= mean
         if (transfer <= 0.0)
             break;

+        if (opt::option_x)
+            transfer /= opt::option_x; // HACK!!!

         send(pneigh[i], transfer);
         XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name());
     }
         send(pneigh[i], transfer);
         XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name());
     }

diff --git a/loba_besteffort.cpp b/loba_besteffort.cpp
index fa7273075397ebe1b673850c560e31f219c7a947..22343e0af364db111c148fc10abd50e2f1b8ea2a 100644 (file)
--- a/loba_besteffort.cpp
+++ b/loba_besteffort.cpp
@@ -26,6 +26,8 @@ void loba_besteffort::load_balance()
     double mean = sum / (bound + 1);
     for (unsigned i = 0 ; i < bound ; ++i) {
         double transfer = mean - pneigh[i]->get_load();
     double mean = sum / (bound + 1);
     for (unsigned i = 0 ; i < bound ; ++i) {
         double transfer = mean - pneigh[i]->get_load();

+        if (opt::option_x)
+            transfer /= opt::option_x; // HACK!!!

         send(pneigh[i], transfer);
         XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name());
     }
         send(pneigh[i], transfer);
         XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name());
     }