Bug fix: only send to a lesser loaded neighbor!

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index b5ab711b38b32056dfa4122997b64a27bed2a4db..4e8864cd941484c3b333c2f477ac4391275333d8 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,11 +1,6 @@
-#include <algorithm>
-#include <cmath>

 #include <cstring>
 #include <cstring>

-#include <tr1/functional>

 #include <iostream>
 #include <iostream>

-#include <numeric>

 #include <stdexcept>
 #include <stdexcept>

-#include <vector>

 #include <msg/msg.h>
 #include <xbt/log.h>
 
 #include <msg/msg.h>
 #include <xbt/log.h>
 


@@ -24,6 +19,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "misc.h"
 #include "options.h"
 #include "process.h"
 #include "misc.h"
 #include "options.h"
 #include "process.h"

+#include "statistics.h"

 #include "timer.h"
 #include "tracing.h"
 #include "version.h"
 #include "timer.h"
 #include "tracing.h"
 #include "version.h"


@@ -38,14 +34,9 @@ namespace {
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 

-    std::vector<double> comps;
-    double comp_total;
-    double comp_avg;
-    double comp_stddev;
+    struct statistics comps;
+    struct statistics loads;

 
 

-    std::vector<double> loads;
-    double load_avg;
-    double load_stddev;

 }
 
 static int simulation_main(int argc, char* argv[])
 }
 
 static int simulation_main(int argc, char* argv[])


@@ -55,8 +46,8 @@ static int simulation_main(int argc, char* argv[])
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
         result = proc->run();
     try {
         proc = opt::loba_algorithms.new_instance(opt::loba_algo, argc, argv);
         result = proc->run();

-        comps.push_back(proc->get_comp());
-        loads.push_back(proc->get_load());
+        comps.push(proc->get_comp());
+        loads.push(proc->get_real_load());

         delete proc;
     }
     catch (std::invalid_argument& e) {
         delete proc;
     }
     catch (std::invalid_argument& e) {


@@ -74,12 +65,12 @@ static void check_for_lost_load()
     double lost_ratio = 100.0 * lost / total_init;
     if (lost_ratio < -opt::load_ratio_threshold)
         CRITICAL2("Gained load at exit! %g (%g%%) <============",
     double lost_ratio = 100.0 * lost / total_init;
     if (lost_ratio < -opt::load_ratio_threshold)
         CRITICAL2("Gained load at exit! %g (%g%%) <============",

-                  lost, lost_ratio);
+                  -lost, -lost_ratio);

     else if (lost_ratio > opt::load_ratio_threshold)
         CRITICAL2("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
     else
     else if (lost_ratio > opt::load_ratio_threshold)
         CRITICAL2("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
     else

-        DEBUG2("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
+        VERB2("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);

 
     double total_running = process::get_total_load_running();
     double running_ratio = 100.0 * total_running / total_init;
 
     double total_running = process::get_total_load_running();
     double running_ratio = 100.0 * total_running / total_init;


@@ -90,42 +81,14 @@ static void check_for_lost_load()
         CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
     else
         CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
                   total_running, running_ratio);
     else

-        DEBUG2("Running load at exit looks good: %g (%g%%)",
+        VERB2("Running load at exit looks good: %g (%g%%)",

                total_running, running_ratio);
 }
 
                total_running, running_ratio);
 }
 

-static void statistics(const std::vector<double>& vec,
-                       double* sum, double* avg, double* stddev)
-{
-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
-
-    unsigned n = vec.size();
-    double vec_sum = std::accumulate(vec.begin(), vec.end(), 0.0);
-    double vec_avg = vec_sum / n;
-
-    if (sum)
-        *sum = vec_sum;
-    if (avg)
-        *avg = vec_avg;
-
-    if (stddev) {
-        std::vector<double> diff(vec);
-        std::transform(diff.begin(), diff.end(), diff.begin(),
-                       bind(std::minus<double>(), _1, vec_avg));
-        double epsilon = std::accumulate(diff.begin(), diff.end(), 0.0);
-        double square_sum = std::inner_product(diff.begin(), diff.end(),
-                                               diff.begin(), 0.0);
-        double variance = (square_sum - (epsilon * epsilon) / n) / n;
-        *stddev = sqrt(variance);
-    }
-}
-
-static void compute_metrics()
-{
-    statistics(comps, &comp_total, &comp_avg, &comp_stddev);
-    statistics(loads, NULL, &load_avg, &load_stddev);
-}
+#define PR_STATS(descr, st)                                             \
+    INFO5("| %.*s: %g / %g / %g", 39,                                   \
+          descr " total/avg./stddev. at exit.........................", \
+          st.get_sum(), st.get_avg(), st.get_stddev())

 
 int main(int argc, char* argv[])
 {
 
 int main(int argc, char* argv[])
 {


@@ -235,12 +198,9 @@ int main(int argc, char* argv[])
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         check_for_lost_load();
     if (simulated_time >= 0.0) {
         simulation_time.stop();
         check_for_lost_load();

-        compute_metrics();

         INFO0(",----[ Results ]");
         INFO0(",----[ Results ]");

-        INFO2("| Load avg./stddev. at exit..............: %g / %g",
-              load_avg, load_stddev);
-        INFO3("| Computation total/avg./stddev. at exit.: %g / %g / %g",
-              comp_total, comp_avg, comp_stddev);
+        PR_STATS("Load", loads);
+        PR_STATS("Computation", comps);

         INFO1("| Total simulated time...................: %g", simulated_time);
         INFO1("| Total simulation time..................: %g",
               simulation_time.duration());
         INFO1("| Total simulated time...................: %g", simulated_time);
         INFO1("| Total simulation time..................: %g",
               simulation_time.duration());