From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 6 Jun 2011 09:01:37 +0000 (+0200)
Subject: Factorize computation of load_to_send.
X-Git-Tag: v0.1~53
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/163f27d1800fc613f521114ccd6b89ebf394746e?ds=sidebyside

Factorize computation of load_to_send.
---

diff --git a/process.cpp b/process.cpp
index 47dd94a..45d0621 100644
--- a/process.cpp
+++ b/process.cpp
@@ -303,26 +303,24 @@ void process::ctrl_send(neighbor& nb)
     }
 }
 
+double process::compute_load_to_send(double desired)
+{
+    return desired >= opt::min_transfer_amount ? desired : 0.0;
+}
+
 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) {
+        load_to_send = compute_load_to_send(std::min(real_load, nb.get_debt()));
+        if (load_to_send > 0.0)
             nb.set_debt(nb.get_debt() - load_to_send);
-            real_load -= load_to_send;
-        } else {
-            load_to_send = 0.0;
-        }
     } 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)
diff --git a/process.h b/process.h
index 57ece07..8a9e74c 100644
--- a/process.h
+++ b/process.h
@@ -153,6 +153,9 @@ private:
     // Returns the sum of "to_send" for all neighbors.
     double get_sum_of_to_send() const;
 
+    // Compute load_to_send (for data_send), subject to the execution parameters
+    static double compute_load_to_send(double desired);
+
     // Send procedures
     void ctrl_send(neighbor& nb);
     void data_send(neighbor& nb);