Display load average and standard deviation at the end.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 12e1b22e28156d95faa12c9a64e650508b96305b..2c8e61d672b7c82adfadbbf233805f06f193c225 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -1,16 +1,24 @@
-#include "options.h"
-

 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <unistd.h>             // getopt
 #include <xbt/log.h>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <unistd.h>             // getopt
 #include <xbt/log.h>

-#include "loba_simple.h"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 

+#include "loba_simple.h"
+#include "loba_fairstrategy.h"
+
+#include "options.h"
+

 namespace opt {
 
 namespace opt {
 

+    // Constants
+
+    // A sum of loads if considered null if it is less than
+    // load_ratio_threshold percent of the sum of loads at init.
+    const double load_ratio_threshold = 1e-4;
+

     // Global options
     std::string program_name;
     int help_requested = 0;
     // Global options
     std::string program_name;
     int help_requested = 0;


@@ -45,14 +53,15 @@ namespace opt {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {

-        NOL_INSERT("none", "no load-balancing (for testing)", process);
+        NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
+        NOL_INSERT("none", "no load-balancing (for testing only)", process);

         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }
 
     topologies_type topologies;
     topologies_type::topologies_type()
     {
         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }
 
     topologies_type topologies;
     topologies_type::topologies_type()
     {

-        NOL_INSERT("btree", "binary tree topologym intiial load at root", 
+        NOL_INSERT("btree", "binary tree topology, initial load at root",

                    deployment_btree);
         NOL_INSERT("clique", "all connected topology", deployment_clique);
         NOL_INSERT("hcube", "hypercube topology", deployment_hcube);
                    deployment_btree);
         NOL_INSERT("clique", "all connected topology", deployment_clique);
         NOL_INSERT("hcube", "hypercube topology", deployment_hcube);