Update ag_parameters after last discussion.

[loba.git] / options.h

diff --git a/options.h b/options.h
index 0abec0f2e5ef0fe78e1c1802b666dbb62375177c..f9baa880f2185051c08d4b7f1626d43eaa34cf22 100644 (file)
--- a/options.h
+++ b/options.h
@@ -1,6 +1,7 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
 

+#include <csignal>              // std::sig_atomic_t

 #include <string>
 #include "cost_func.h"
 #include "named_object_list.h"
 #include <string>
 #include "cost_func.h"
 #include "named_object_list.h"


@@ -19,10 +20,12 @@ namespace opt {
     extern std::string program_name;
     extern int help_requested;
     extern bool version_requested;
     extern std::string program_name;
     extern int help_requested;
     extern bool version_requested;

+    extern int option_x;       // hidden option (int), for testing
+    extern double option_X;    // hidden option (double), for testing

 
     // Simulation parameters
     extern int log_rate;
 
     // Simulation parameters
     extern int log_rate;

-    extern bool exit_request;
+    extern volatile std::sig_atomic_t exit_request;

 
     // Platform and deployment
     extern std::string platform_file;
 
     // Platform and deployment
     extern std::string platform_file;


@@ -34,14 +37,19 @@ namespace opt {
         extern std::string topology;
         extern unsigned    nhosts;
         extern double      load;
         extern std::string topology;
         extern unsigned    nhosts;
         extern double      load;

+        extern bool        random_distribution;
+        extern unsigned long random_seed;

     }
 
     // Load balancing algorithm
     extern std::string loba_algo;
     extern bool bookkeeping;
     }
 
     // Load balancing algorithm
     extern std::string loba_algo;
     extern bool bookkeeping;

+    extern bool egocentric;

     extern double min_transfer_amount;
     extern double max_transfer_amount;
     extern double min_lb_iter_duration;
     extern double min_transfer_amount;
     extern double max_transfer_amount;
     extern double min_lb_iter_duration;

+    extern bool integer_transfer;
+    extern unsigned loba_best_divisor;

 
     // Application parameters
     extern cost_func comp_cost;
 
     // Application parameters
     extern cost_func comp_cost;


@@ -51,9 +59,11 @@ namespace opt {
     extern double comp_time_delay;
 
     // Parameters for the end of the simulation
     extern double comp_time_delay;
 
     // Parameters for the end of the simulation

+    extern double avg_load_ratio;

     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 unsigned exit_on_convergence;

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