From 783e8ff97ccec78454b541481af12355dee46804 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 27 Nov 2017 09:34:02 +0100 Subject: [PATCH] Field is effectively a boolean. --- src/include/surf/maxmin.hpp | 2 +- src/surf/fair_bottleneck.cpp | 2 +- src/surf/maxmin.cpp | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/include/surf/maxmin.hpp b/src/include/surf/maxmin.hpp index 08f62b1115..e1ec09e825 100644 --- a/src/include/surf/maxmin.hpp +++ b/src/include/surf/maxmin.hpp @@ -550,7 +550,7 @@ private: void check_concurrency(); public: - int modified; + bool modified; s_xbt_swag_t variable_set; /* a list of lmm_variable_t */ s_xbt_swag_t active_constraint_set; /* a list of lmm_constraint_t */ s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */ diff --git a/src/surf/fair_bottleneck.cpp b/src/surf/fair_bottleneck.cpp index acb4125494..7066a8fb3d 100644 --- a/src/surf/fair_bottleneck.cpp +++ b/src/surf/fair_bottleneck.cpp @@ -169,7 +169,7 @@ void bottleneck_solve(lmm_system_t sys) } while (xbt_swag_size(var_list)); xbt_swag_reset(cnst_list); - sys->modified = 0; + sys->modified = true; if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) { XBT_DEBUG("Fair bottleneck done"); sys->print(); diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index f1ddd533b8..9e5e8f75a2 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -119,7 +119,7 @@ void s_lmm_system_t::check_concurrency() void s_lmm_system_t::var_free(lmm_variable_t var) { XBT_IN("(sys=%p, var=%p)", this, var); - modified = 1; + modified = true; // TODOLATER Can do better than that by leaving only the variable in only one enabled_element_set, call // update_modified_set, and then remove it.. @@ -153,7 +153,7 @@ s_lmm_system_t::s_lmm_system_t(bool selective_update) s_lmm_variable_t var; s_lmm_constraint_t cnst; - modified = 0; + modified = false; selective_update_active = selective_update; visited_counter = 1; @@ -261,7 +261,7 @@ void s_lmm_system_t::variable_free(lmm_variable_t var) void s_lmm_system_t::expand(lmm_constraint_t cnst, lmm_variable_t var, double consumption_weight) { - modified = 1; + modified = true; //Check if this variable already has an active element in this constraint //If it does, substract it from the required slack @@ -314,7 +314,7 @@ void s_lmm_system_t::expand(lmm_constraint_t cnst, lmm_variable_t var, double co void s_lmm_system_t::expand_add(lmm_constraint_t cnst, lmm_variable_t var, double value) { - modified = 1; + modified = true; check_concurrency(); @@ -706,7 +706,7 @@ void s_lmm_system_t::solve() } while (cnst_light_num > 0); - modified = 0; + modified = false; if (selective_update_active) remove_all_modified_set(); @@ -736,7 +736,7 @@ void lmm_solve(lmm_system_t sys) */ void s_lmm_system_t::update_variable_bound(lmm_variable_t var, double bound) { - modified = 1; + modified = true; var->bound = bound; if (not var->cnsts.empty()) @@ -892,7 +892,7 @@ void s_lmm_system_t::update_variable_weight(lmm_variable_t var, double weight) XBT_IN("(sys=%p, var=%p, weight=%f)", this, var, weight); - modified = 1; + modified = true; //Are we enabling this variable? if (enabling_var){ @@ -919,7 +919,7 @@ void s_lmm_system_t::update_variable_weight(lmm_variable_t var, double weight) void s_lmm_system_t::update_constraint_bound(lmm_constraint_t cnst, double bound) { - modified = 1; + modified = true; update_modified_set(cnst); cnst->bound = bound; } -- 2.20.1