Parameterize the exit on convergence.

Parameter is the number of iterations to wait while converged before
to decide to exit.

diff --git a/options.cpp b/options.cpp
index 9b427bc26119987689c7579349cdd76e6caf87cd..25d7642599604dba642e9ec0386f5c8721e5dbad 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -80,7 +80,7 @@ namespace opt {
     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;
     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;

-    bool exit_on_convergence = false;
+    int exit_on_convergence = 0;

     bool exit_on_close = true;
 
     // Named parameters lists
     bool exit_on_close = true;
 
     // Named parameters lists


@@ -234,7 +234,7 @@ bool opt::parse_args(int* argc, char* argv[])
     opterr = 0;
     while ((c = getopt(*argc, argv,
                        "%:"
     opterr = 0;
     while ((c = getopt(*argc, argv,
                        "%:"

-                       "a:bc:C:d:D:eEGhi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
+                       "a:bc:C:d:D:eEg:hi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))

            != -1) {
         switch (c) {
         case '%':
            != -1) {
         switch (c) {
         case '%':


@@ -280,8 +280,8 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;

-        case 'G':
-            opt::exit_on_convergence = !opt::exit_on_convergence;
+        case 'g':
+            PARSE_ARG(opt::exit_on_convergence);

             break;
         case 'h':
             opt::help_requested++;
             break;
         case 'h':
             opt::help_requested++;


@@ -447,7 +447,8 @@ void opt::print()
           h.val_or_string(comp_maxiter, "no limit"));
     DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);
     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));
           h.val_or_string(comp_maxiter, "no limit"));
     DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);
     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));

-    DESCR("exit on convergence", "%s", h.on_off(exit_on_convergence));
+    DESCR("exit on convergence", "%s",
+          h.val_or_string(exit_on_convergence, "disabled"));

     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 
     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 


@@ -572,8 +573,12 @@ void opt::usage()
     if (opt::help_requested > 1)
         std::clog << o("")
                   << "- if negative: use 100 * (nhosts / -value) / avg_load\n";
     if (opt::help_requested > 1)
         std::clog << o("")
                   << "- if negative: use 100 * (nhosts / -value) / avg_load\n";

-    std::clog << o("-G") << "toggle exit on detection of convergence"
-              << " [" << opt_helper::on_off(opt::exit_on_convergence) << "]\n";
+    std::clog << o("-g value")
+              << "number of consecutive detections of convergence to exit"
+              << " [" << opt::exit_on_convergence << "]\n";
+    if (opt::help_requested > 1)
+        std::clog << o("")
+                  << "- use 0 to disable\n";

     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";
     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";

diff --git a/options.h b/options.h
index ccb56bd0b8ada2d17761d2aa4888fff8b2cae817..5b47022667ab6a6ddfe96214d3bb0cb198d9d10c 100644 (file)
--- a/options.h
+++ b/options.h
@@ -63,7 +63,7 @@ namespace opt {
     extern unsigned lb_maxiter;
     extern unsigned comp_maxiter;
     extern double time_limit;
     extern unsigned lb_maxiter;
     extern unsigned comp_maxiter;
     extern double time_limit;

-    extern bool exit_on_convergence;
+    extern int exit_on_convergence;

     extern bool exit_on_close;
 
     // Named parameters lists
     extern bool exit_on_close;
 
     // Named parameters lists

diff --git a/process.cpp b/process.cpp
index 01b5e0fcc3ce9caab4dcaefb9b25f0a4a8ad3e6e..97f2a69db2e943c01bfdb6e9187856aa073db947 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -295,19 +295,22 @@ void process::convergence_check()
     double load_diff = std::fabs(real_load - average);
     bool converged = load_diff <= load_diff_threshold;
 
     double load_diff = std::fabs(real_load - average);
     bool converged = load_diff <= load_diff_threshold;
 

-    if (convergence >= 0.0) {
-        if (!converged) {
-            XBT_VERB("current load has diverged: %g (%.4g%%)",
-                     real_load, 100.0 * load_diff / average);
-            convergence = -1.0;
-            convergence_counter++;
-        }
-    } else {
-        if (converged) {
+    if (converged) {
+        if (convergence < 0) {

             XBT_VERB("current load has converged: %g (%.4g%%)",
                      real_load,  100.0 * load_diff / average);
             convergence = MSG_get_clock();
             XBT_VERB("current load has converged: %g (%.4g%%)",
                      real_load,  100.0 * load_diff / average);
             convergence = MSG_get_clock();

-            convergence_counter--;
+            local_convergence_counter = opt::exit_on_convergence;
+        }
+        if (local_convergence_counter > 0 && --local_convergence_counter == 0)
+                --convergence_counter;
+    } else {
+        if (convergence >= 0.0) {
+            XBT_VERB("current load has diverged: %g (%.4g%%)",
+                     real_load, 100.0 * load_diff / average);
+            convergence = -1.0;
+            if (local_convergence_counter == 0)
+                ++convergence_counter;

         }
     }
 }
         }
     }
 }

diff --git a/process.h b/process.h
index aa9ebcbb6764ba414c5917174417eb31c243fa9d..14d514f27841afb25df662e05bb4e277df749326 100644 (file)
--- a/process.h
+++ b/process.h
@@ -128,6 +128,7 @@ private:
 
     double idle_duration;       // how long we had nothing to compute
     double convergence;         // date when convergence was achieved, or -1.0
 
     double idle_duration;       // how long we had nothing to compute
     double convergence;         // date when convergence was achieved, or -1.0

+    int local_convergence_counter; // number of iterations since convergence

 
     mutex_t mutex;              // synchronization between threads
     condition_t cond;
 
     mutex_t mutex;              // synchronization between threads
     condition_t cond;