X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5c7479480cbe31b662c1130a0497df4d87963cf..285fd7f4f1459beec616ace009d55cb3f22b3c8f:/src/surf/maxmin.cpp diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index f4a86af978..0ae0d70fbb 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -19,12 +19,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)"); -typedef std::vector dyn_light_t; - double sg_maxmin_precision = 0.00001; /* Change this with --cfg=maxmin/precision:VALUE */ double sg_surf_precision = 0.00001; /* Change this with --cfg=surf/precision:VALUE */ int sg_concurrency_limit = -1; /* Change this with --cfg=maxmin/concurrency-limit:VALUE */ +namespace simgrid { +namespace surf { + +typedef std::vector dyn_light_t; + int s_lmm_variable_t::Global_debug_id = 1; int s_lmm_constraint_t::Global_debug_id = 1; @@ -744,7 +747,7 @@ void s_lmm_variable_t::initialize(simgrid::surf::Action* id_value, double sharin int number_of_constraints, unsigned visited_value) { id = id_value; - id_int = s_lmm_variable_t::Global_debug_id++; + id_int = Global_debug_id++; cnsts.reserve(number_of_constraints); sharing_weight = sharing_weight_value; staged_weight = 0.0; @@ -1017,3 +1020,5 @@ int s_lmm_constraint_t::get_variable_amount() const } return result; } +} +}