X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/50a00235743c59840ee2db2258e9e6dd7444f646..51f707d60785283c582c16c141ab6832a744dd3a:/main.cpp?ds=sidebyside

diff --git a/main.cpp b/main.cpp
index 5326e73..92e4882 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,7 @@
+#include <algorithm>
 #include <cmath>
 #include <cstring>
+#include <tr1/functional>
 #include <iostream>
 #include <numeric>
 #include <stdexcept>
@@ -35,9 +37,14 @@ namespace {
         EXIT_FAILURE_CLEAN = 0x08,  // error at cleanup
     };
 
+    std::vector<double> comps;
+    double comp_total;
+    double comp_avg;
+    double comp_stddev;
+
     std::vector<double> loads;
-    double load_stddev;
     double load_avg;
+    double load_stddev;
 }
 
 static int simulation_main(int argc, char* argv[])
@@ -47,6 +54,7 @@ static int simulation_main(int argc, char* argv[])
     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());
         delete proc;
     }
@@ -85,19 +93,37 @@ static void check_for_lost_load()
                total_running, running_ratio);
 }
 
-static void compute_load_imbalance()
+static void statistics(const std::vector<double>& vec,
+                       double* sum, double* avg, double* stddev)
 {
-    unsigned n = loads.size();
-    load_avg = std::accumulate(loads.begin(), loads.end(), 0.0) / n;
-    double variance = 0.0;
-    double epsilon = 0.0;
-    for (unsigned i = 0 ; i < n ; ++i) {
-        double diff = loads[i] - load_avg;
-        variance += diff * diff;
-        epsilon += diff;
+    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);
     }
-    variance = (variance - (epsilon * epsilon) / n) / n;
-    load_stddev = sqrt(variance);
+}
+
+static void compute_metrics()
+{
+    statistics(comps, &comp_total, &comp_avg, &comp_stddev);
+    statistics(loads, NULL, &load_avg, &load_stddev);
 }
 
 int main(int argc, char* argv[])
@@ -128,7 +154,7 @@ int main(int argc, char* argv[])
     MSG_global_init(&argc, argv);
 
     // Parse global parameters
-    int parse_res = opt::parse_args(&argc, argv);
+    bool parse_res = opt::parse_args(&argc, argv);
     if (!parse_res
         || opt::version_requested || opt::help_requested) {
         if (opt::version_requested)
@@ -177,8 +203,6 @@ int main(int argc, char* argv[])
         res = MSG_main();
         simulated_time = MSG_get_clock();
         INFO1("Simulation ended at %f.", simulated_time);
-        check_for_lost_load();
-        compute_load_imbalance();
         if (res != MSG_OK)
             THROW1(0, 0, "MSG_main() failed with status %#x", res);
 
@@ -204,10 +228,16 @@ int main(int argc, char* argv[])
     // Report final simulation status.
     if (simulated_time >= 0.0) {
         simulation_time.stop();
+        check_for_lost_load();
+        compute_metrics();
         INFO0(",----[ Results ]");
-        INFO2("| Load avg./stddev. at exit.: %g / %g", load_avg, load_stddev);
-        INFO1("| Total simulated time......: %g", simulated_time);
-        INFO1("| Total simulation time.....: %g", simulation_time.duration());
+        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);
+        INFO1("| Total simulated time...................: %g", simulated_time);
+        INFO1("| Total simulation time..................: %g",
+              simulation_time.duration());
         INFO0("`----");
     }
     if (exit_status)