Use std::vector and stl algorithms for cost_func.

[loba.git] / options.h

diff --git a/options.h b/options.h
index de642a9b7b3a6c14c3cd437d5371ec3139cc0a59..ed5b49865376017823d012a9803403d9d4c6e7ae 100644 (file)
--- a/options.h
+++ b/options.h
@@ -21,7 +21,7 @@ namespace opt {
     extern bool version_requested;
 
     // Simulation parameters
     extern bool version_requested;
 
     // Simulation parameters

-    extern unsigned log_rate;
+    extern int log_rate;

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


@@ -42,11 +42,13 @@ namespace opt {
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;

-    extern double min_iter_duration;
+    extern double min_lb_iter_duration;
+    extern double min_comp_iter_duration;

 
     // Parameters for the end of the simulation
 
     // Parameters for the end of the simulation

-    extern unsigned comp_maxiter;

     extern unsigned lb_maxiter;
     extern unsigned lb_maxiter;

+    extern unsigned comp_maxiter;
+    extern double time_limit;

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