Use std::vector and stl algorithms for cost_func.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index a92187ddaf550d0d3e8b9a7aabf9cd500a1f05e2..f997d99efc7c1127520e535e7e75e61ea1bd14d0 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -132,6 +132,7 @@ void process::load_balance_loop()
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));

+        prev_load_broadcast = get_load();

 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);


@@ -188,6 +189,11 @@ void process::compute_loop()
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);

+    // last send, for not losing load scheduled to be sent
+    std::for_each(neigh.begin(), neigh.end(),
+                  bind(&process::data_send, this, _1));
+    finalizing = true;
+    total_load_running -= real_load;

     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),


@@ -309,6 +315,7 @@ void process::data_send(neighbor& nb)
     } else {
         load_to_send = nb.get_to_send();
         nb.set_to_send(0.0);
     } else {
         load_to_send = nb.get_to_send();
         nb.set_to_send(0.0);

+        // do not update real_load here

     }
     if (load_to_send > 0.0)
         comm.data_send(nb.get_data_mbox(),
     }
     if (load_to_send > 0.0)
         comm.data_send(nb.get_data_mbox(),