Move declarations at proper place, and fix indentation.

diff --git a/options.cpp b/options.cpp
index 9ea0a72927ed0c6d8cac6315c7bf92d53e107569..189bed2f5957fd9d8dd1e73ff56ca535aa36018a 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -66,10 +66,14 @@ namespace opt {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {

-        NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
-        NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm", loba_makhoul);
-        NOL_INSERT("none", "no load-balancing (for testing only)", process);
-        NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
+        NOL_INSERT("fairstrategy", "balance with fair strategy",
+                   loba_fairstrategy);
+        NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
+                   loba_makhoul);
+        NOL_INSERT("none", "no load-balancing (for testing only)",
+                   process);
+        NOL_INSERT("simple", "balance with least loaded neighbor",
+                   loba_simple);

     }
 
     topologies_type topologies;
     }
 
     topologies_type topologies;


@@ -219,7 +223,8 @@ bool opt::parse_args(int* argc, char* argv[])
             try {
                 opt::comp_cost = cost_func(optarg);
             } catch (...) {
             try {
                 opt::comp_cost = cost_func(optarg);
             } catch (...) {

-                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+                          c, optarg);

                 result = false;
             }
             break;
                 result = false;
             }
             break;


@@ -227,7 +232,8 @@ bool opt::parse_args(int* argc, char* argv[])
             try {
                 opt::comm_cost = cost_func(optarg);
             } catch (...) {
             try {
                 opt::comm_cost = cost_func(optarg);
             } catch (...) {

-                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+                          c, optarg);

                 result = false;
             }
             break;
                 result = false;
             }
             break;


@@ -327,10 +333,12 @@ void opt::print()
     }
     DESCR("load balancing algorithm", "%s", loba_algo.c_str());
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
     }
     DESCR("load balancing algorithm", "%s", loba_algo.c_str());
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));

-    DESCR("minimum duration between lb. iterations", "%g", min_lb_iter_duration);
+    DESCR("minimum duration between lb. iterations", "%g",
+          min_lb_iter_duration);

     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());

-    DESCR("minimum duration between comp. iterations", "%g", min_comp_iter_duration);
+    DESCR("minimum duration between comp. iterations", "%g",
+          min_comp_iter_duration);

     DESCR("computations start after lb. iter", "%u", comp_iter_delay);
     DESCR("computations start after time", "%g", comp_time_delay);
     DESCR("maximum number of lb. iterations", "%s",
     DESCR("computations start after lb. iter", "%u", comp_iter_delay);
     DESCR("computations start after time", "%g", comp_time_delay);
     DESCR("maximum number of lb. iterations", "%s",

diff --git a/options.h b/options.h
index fcb982a5a1e1da3f37c43652015eeb857db9c6dd..1032a633969c2f811d6192f08d83991c2d874764 100644 (file)
--- a/options.h
+++ b/options.h
@@ -39,13 +39,13 @@ namespace opt {
     extern std::string loba_algo;
     extern bool bookkeeping;
     extern double min_lb_iter_duration;
     extern std::string loba_algo;
     extern bool bookkeeping;
     extern double min_lb_iter_duration;

-    extern unsigned comp_iter_delay;
-    extern double comp_time_delay;

 
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;
     extern double min_comp_iter_duration;
 
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;
     extern double min_comp_iter_duration;

+    extern unsigned comp_iter_delay;
+    extern double comp_time_delay;

 
     // Parameters for the end of the simulation
     extern unsigned lb_maxiter;
 
     // Parameters for the end of the simulation
     extern unsigned lb_maxiter;