Remove already fixed item in TODO list.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 2de3016588dd2dd95e66b073eba4b59eb1ab7e18..1883464d5d3364427e1946388ffae150be211218 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
 #include <algorithm>

+#include <cmath>

 #include <functional>
 #include <iterator>
 #include <numeric>
 #include <functional>
 #include <iterator>
 #include <numeric>


@@ -36,6 +37,13 @@ process::process(int argc, char* argv[])
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 

+    double iload = std::trunc(real_load);
+    if (opt::integer_transfer && real_load != iload) {
+        XBT_WARN("Initial load %g is not an integer.  Truncate it.",
+                 real_load);
+        real_load = iload;
+    }
+

     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());
     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());


@@ -127,6 +135,8 @@ void process::load_balance_loop()
             ++lb_iter;
         }
 
             ++lb_iter;
         }
 

+        ctrl_receive(0.0);
+

         mutex.acquire();
         if (!opt::bookkeeping)
             expected_load = real_load - get_sum_of_to_send();
         mutex.acquire();
         if (!opt::bookkeeping)
             expected_load = real_load - get_sum_of_to_send();


@@ -150,7 +160,6 @@ void process::load_balance_loop()
         mutex.release();
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         mutex.release();
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);

-        ctrl_receive(0.0);

     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);


@@ -302,26 +311,32 @@ void process::ctrl_send(neighbor& nb)
     }
 }
 
     }
 }
 

+double process::compute_load_to_send(double desired)
+{
+    if (opt::integer_transfer)
+        desired = std::floor(desired);
+    return desired >= opt::min_transfer_amount ? desired : 0.0;
+}
+

 void process::data_send(neighbor& nb)
 {
     double load_to_send;
     if (opt::bookkeeping) {
 void process::data_send(neighbor& nb)
 {
     double load_to_send;
     if (opt::bookkeeping) {

-        load_to_send = std::min(real_load, nb.get_debt());
-        if (load_to_send >= opt::min_transfer_amount) {
+        double excess_load;
+        if (opt::egocentric)
+            excess_load = std::max(0.0, real_load - expected_load);
+        else
+            excess_load = real_load;
+        load_to_send = compute_load_to_send(std::min(excess_load,
+                                                     nb.get_debt()));
+        if (load_to_send > 0.0)

             nb.set_debt(nb.get_debt() - load_to_send);
             nb.set_debt(nb.get_debt() - load_to_send);

-            real_load -= load_to_send;
-        } else {
-            load_to_send = 0.0;
-        }

     } else {
     } else {

-        load_to_send = nb.get_to_send();
-        if (load_to_send >= opt::min_transfer_amount) {
-            nb.set_to_send(0.0);
-            real_load -= load_to_send;
-        } else {
-            load_to_send = 0.0;
-        }
+        load_to_send = compute_load_to_send(nb.get_to_send());
+        if (load_to_send > 0.0)
+            nb.set_to_send(nb.get_to_send() - load_to_send);

     }
     }

+    real_load -= load_to_send;

     while (load_to_send > 0.0) {
         double amount;
         if (opt::max_transfer_amount)
     while (load_to_send > 0.0) {
         double amount;
         if (opt::max_transfer_amount)