Count supernumerary comp. iterations.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 45c58cede87dd13f559b1a144cfc42aefa154a70..7a5ccce58615531f850610a530c92cf95d1d3cbd 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -53,6 +53,7 @@ namespace {
     statistics comps;
     statistics comp_iterations;
     statistics all_comp_iterations;
     statistics comps;
     statistics comp_iterations;
     statistics all_comp_iterations;

+    statistics iter_deviation;

     statistics data_send_amount;
     statistics data_recv_amount;
     statistics data_send_count;
     statistics data_send_amount;
     statistics data_recv_amount;
     statistics data_send_count;


@@ -84,6 +85,7 @@ static int simulation_main(int argc, char* argv[])
         comps.push(proc->get_comp_amount());
         comp_iterations.push(proc->get_comp_iter());
         all_comp_iterations.push(proc->get_all_comp_iter());
         comps.push(proc->get_comp_amount());
         comp_iterations.push(proc->get_comp_iter());
         all_comp_iterations.push(proc->get_all_comp_iter());

+        iter_deviation.push(proc->get_iter_deviation());

         data_send_amount.push(proc->get_data_send_amount());
         data_recv_amount.push(proc->get_data_recv_amount());
         data_send_count.push(proc->get_data_send_count());
         data_send_amount.push(proc->get_data_send_amount());
         data_recv_amount.push(proc->get_data_recv_amount());
         data_send_count.push(proc->get_data_send_count());


@@ -187,7 +189,7 @@ static void install_signal_handler()
 
 #define PR_STATS(descr, st)                                             \
     XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \
 
 #define PR_STATS(descr, st)                                             \
     XBT_INFO("| %.*s: %g / %g / %g", DATA_DESCR_WIDTH,                  \

-             descr " (total/avg./stddev).............................", \
+             descr " (sum/avg/dev)...................................", \

              st.get_sum(), st.get_mean(), st.get_stddev())
 
 int main(int argc, char* argv[])
              st.get_sum(), st.get_mean(), st.get_stddev())
 
 int main(int argc, char* argv[])


@@ -331,6 +333,7 @@ int main(int argc, char* argv[])
         PR_STATS("Computation", comps);
         PR_STATS("Comp. iterations", comp_iterations);
         PR_STATS("X-Comp. iterations", all_comp_iterations);
         PR_STATS("Computation", comps);
         PR_STATS("Comp. iterations", comp_iterations);
         PR_STATS("X-Comp. iterations", all_comp_iterations);

+        PR_STATS("Supernumer. comp. iter.", iter_deviation);

         PR_STATS("Idle duration", idle_duration);
         PR_STATS("Data send amount", data_send_amount);
         PR_STATS("Data recv amount", data_recv_amount);
         PR_STATS("Idle duration", idle_duration);
         PR_STATS("Data send amount", data_send_amount);
         PR_STATS("Data recv amount", data_recv_amount);