Partially revert "ajout de 3 fichiers pour lancer des expés"

[loba.git] / options.h

diff --git a/options.h b/options.h
index 604d1781ebf1deb00ca901de2ae2bcef971a821f..f0f29359e993396f20601a4ba86d90b43e305453 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"


@@ -23,7 +24,7 @@ namespace opt {
 
     // 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;


@@ -45,6 +46,7 @@ namespace opt {
     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;

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