X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/97a4b4dbf628a627e3c2d5689be89265f56074df..4002ef2864a3fec23e61f8fcaa052373283c430c:/loba_fairstrategy.cpp?ds=sidebyside

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index eb05b49..552f060 100644
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -5,53 +5,26 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 #include "loba_fairstrategy.h"
 
-/* simple version:
- *   load balance with a least-loaded neighbor,
- *   without breaking the ping-pong condition
- */
-
-class compare {
-public : 
-	bool operator()(const neighbor*a, const neighbor*b)	{
-		return a->get_load()>b->get_load();
-	}
-};
-
-double loba_fairstrategy::load_balance(double my_load)
+void loba_fairstrategy::load_balance()
 {
-    int imin = -1;
-    int imax = -1;
-    double min = my_load;
-    double max = -1.0;
-
-		std::sort(pneigh.begin(),pneigh.end(),compare());
-
-		print_loads_p();
-
-		double sum_sent=0;
-		bool found=true;
-
-		while(found) {
-			found=false;
-			for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
-        double l = pneigh[i]->get_load();
-        if (l >= my_load)
-					continue;
-				if(l<my_load+2) {
-					found=true;
-					pneigh[i]->set_load(l+1);
-					pneigh[i]->add_to_send(1);
-					INFO1("sent to %s",pneigh[i]->get_name());
-					my_load--;
-					sum_sent++;
-				}
-			}
-		}
-
-
-		
-		return sum_sent;
-    
+    const double delta = 0.001;
+
+    std::sort(pneigh.begin(), pneigh.end(), pneigh_load_greater());
+
+    print_loads_p(false, xbt_log_priority_debug);
+
+    bool found = true;
+
+    while (found) {
+        found = false;
+        for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
+            if (pneigh[i]->get_load() <= get_load() - 2 * delta) {
+                found = true;
+                send(pneigh[i], delta);
+                XBT_DEBUG("sent to %s", pneigh[i]->get_name());
+            }
+        }
+    }
 }
 
 // Local variables: