for (Variable& var : sys->variable_set) {
var.value = 0.0;
XBT_DEBUG("Handling variable %p", &var);
- if (var.sharing_weight > 0.0 && std::find_if(begin(var.cnsts), end(var.cnsts), [](s_lmm_element_t const& x) {
+ if (var.sharing_weight > 0.0 && std::find_if(begin(var.cnsts), end(var.cnsts), [](Element const& x) {
return x.consumption_weight != 0.0;
}) != end(var.cnsts)) {
sys->saturated_variable_set.push_back(var);
int nb = 0;
XBT_DEBUG("Processing cnst %p ", &cnst);
cnst.usage = 0.0;
- for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+ for (Element& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
if (elem.consumption_weight > 0 && elem.variable->saturated_variable_set_hook.is_linked())
nb++;
for (auto iter = std::begin(var_list); iter != std::end(var_list);) {
Variable& var = *iter;
double min_inc = DBL_MAX;
- for (s_lmm_element_t const& elm : var.cnsts) {
+ for (Element const& elm : var.cnsts) {
if (elm.consumption_weight > 0)
min_inc = std::min(min_inc, elm.constraint->usage / elm.consumption_weight);
}
Constraint& cnst = *iter;
XBT_DEBUG("Updating cnst %p ", &cnst);
if (cnst.sharing_policy) {
- for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+ for (Element& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
XBT_DEBUG("\tUpdate constraint %p (%g) with variable %p by %g", &cnst, cnst.remaining, elem.variable,
elem.variable->mu);
double_update(&cnst.remaining, elem.consumption_weight * elem.variable->mu, sg_maxmin_precision);
}
} else {
- for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+ for (Element& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
XBT_DEBUG("\tNon-Shared variable. Update constraint usage of %p (%g) with variable %p by %g", &cnst,
cnst.usage, elem.variable, elem.variable->mu);
XBT_DEBUG("\tGet rid of constraint %p", &cnst);
iter = cnst_list.erase(iter);
- for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+ for (Element& elem : cnst.enabled_element_set) {
if (elem.variable->sharing_weight <= 0)
break;
if (elem.consumption_weight > 0 && elem.variable->saturated_variable_set_hook.is_linked()) {
{
for (Constraint const& cnst : cnst_list) {
double tmp = 0;
- for (s_lmm_element_t const& elem : cnst.enabled_element_set) {
+ for (Element const& elem : cnst.enabled_element_set) {
lmm_variable_t var = elem.variable;
xbt_assert(var->sharing_weight > 0);
tmp += var->value;
{
double tmp = 0;
- for (s_lmm_element_t const& elem : var.cnsts) {
+ for (Element const& elem : var.cnsts) {
tmp += elem.constraint->lambda;
}
if (var.bound > 0)
double mu_i = 0.0;
double sigma_i = 0.0;
- for (s_lmm_element_t const& elem : var.cnsts) {
+ for (Element const& elem : var.cnsts) {
sigma_i += elem.constraint->lambda;
}
mu_i = var.func_fp(var, var.bound) - sigma_i;
if (not var.sharing_weight)
break;
- for (s_lmm_element_t const& elem : var.cnsts)
+ for (Element const& elem : var.cnsts)
sigma_i += elem.constraint->lambda;
if (var.bound > 0)
XBT_DEBUG("#### var(%p) ->mu : %e", &var, var.mu);
XBT_DEBUG("#### var(%p) ->weight: %e", &var, var.sharing_weight);
XBT_DEBUG("#### var(%p) ->bound: %e", &var, var.bound);
- auto weighted = std::find_if(begin(var.cnsts), end(var.cnsts),
- [](s_lmm_element_t const& x) { return x.consumption_weight != 0.0; });
+ auto weighted =
+ std::find_if(begin(var.cnsts), end(var.cnsts), [](Element const& x) { return x.consumption_weight != 0.0; });
if (weighted == end(var.cnsts))
var.value = 1.0;
}
XBT_CDEBUG(surf_lagrange_dichotomy, "Computing diff of cnst (%p)", &cnst);
- for (s_lmm_element_t const& elem : cnst.enabled_element_set) {
+ for (Element const& elem : cnst.enabled_element_set) {
Variable& var = *elem.variable;
xbt_assert(var.sharing_weight > 0);
XBT_CDEBUG(surf_lagrange_dichotomy, "Computing sigma_i for var (%p)", &var);
double sigma_i = 0.0;
// Compute sigma_i
- for (s_lmm_element_t const& elem2 : var.cnsts)
+ for (Element const& elem2 : var.cnsts)
sigma_i += elem2.constraint->lambda;
// add mu_i if this flow has a RTT constraint associated
int Variable::Global_debug_id = 1;
int Constraint::Global_debug_id = 1;
-int s_lmm_element_t::get_concurrency() const
+int Element::get_concurrency() const
{
// Ignore element with weight less than one (e.g. cross-traffic)
return (consumption_weight >= 1) ? 1 : 0;
// return (int)ceil(elem->weight);//Include element as the rounded-up integer value of the element weight
}
-void s_lmm_element_t::decrease_concurrency()
+void Element::decrease_concurrency()
{
xbt_assert(constraint->concurrency_current >= get_concurrency());
constraint->concurrency_current -= get_concurrency();
}
-void s_lmm_element_t::increase_concurrency()
+void Element::increase_concurrency()
{
constraint->concurrency_current += get_concurrency();
for (Constraint const& cnst : constraint_set) {
int concurrency = 0;
- for (s_lmm_element_t const& elem : cnst.enabled_element_set) {
+ for (Element const& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
concurrency += elem.get_concurrency();
}
- for (s_lmm_element_t const& elem : cnst.disabled_element_set) {
+ for (Element const& elem : cnst.disabled_element_set) {
// We should have staged variables only if concurrency is reached in some constraint
xbt_assert(cnst.get_concurrency_limit() < 0 || elem.variable->staged_weight == 0 ||
elem.variable->get_min_concurrency_slack() < elem.variable->concurrency_share,
if (var.cnsts.empty())
continue;
- const s_lmm_element_t& elem = var.cnsts[0];
- int belong_to_enabled = elem.enabled_element_set_hook.is_linked();
- int belong_to_disabled = elem.disabled_element_set_hook.is_linked();
- int belong_to_active = elem.active_element_set_hook.is_linked();
+ const Element& elem = var.cnsts[0];
+ int belong_to_enabled = elem.enabled_element_set_hook.is_linked();
+ int belong_to_disabled = elem.disabled_element_set_hook.is_linked();
+ int belong_to_active = elem.active_element_set_hook.is_linked();
- for (s_lmm_element_t const& elem2 : var.cnsts) {
+ for (Element const& elem2 : var.cnsts) {
xbt_assert(belong_to_enabled == elem2.enabled_element_set_hook.is_linked(),
"Variable inconsistency (1): enabled_element_set");
xbt_assert(belong_to_disabled == elem2.disabled_element_set_hook.is_linked(),
if (not var->cnsts.empty())
update_modified_set(var->cnsts[0].constraint);
- for (s_lmm_element_t& elem : var->cnsts) {
+ for (Element& elem : var->cnsts) {
if (var->sharing_weight > 0)
elem.decrease_concurrency();
if (elem.enabled_element_set_hook.is_linked())
// If it does, substract it from the required slack
int current_share = 0;
if (var->concurrency_share > 1) {
- for (s_lmm_element_t& elem : var->cnsts) {
+ for (Element& elem : var->cnsts) {
if (elem.constraint == cnst && elem.enabled_element_set_hook.is_linked())
current_share += elem.get_concurrency();
}
if (var->sharing_weight > 0 && var->concurrency_share - current_share > cnst->get_concurrency_slack()) {
double weight = var->sharing_weight;
disable_var(var);
- for (s_lmm_element_t const& elem : var->cnsts)
+ for (Element const& elem : var->cnsts)
on_disabled_var(elem.constraint);
consumption_weight = 0;
var->staged_weight = weight;
xbt_assert(var->cnsts.size() < var->cnsts.capacity(), "Too much constraints");
var->cnsts.resize(var->cnsts.size() + 1);
- s_lmm_element_t& elem = var->cnsts.back();
+ Element& elem = var->cnsts.back();
elem.consumption_weight = consumption_weight;
elem.constraint = cnst;
check_concurrency();
// BEWARE: In case you have multiple elements in one constraint, this will always add value to the first element.
- auto elem_it = std::find_if(begin(var->cnsts), end(var->cnsts),
- [&cnst](s_lmm_element_t const& x) { return x.constraint == cnst; });
+ auto elem_it =
+ std::find_if(begin(var->cnsts), end(var->cnsts), [&cnst](Element const& x) { return x.constraint == cnst; });
if (elem_it != end(var->cnsts)) {
- s_lmm_element_t& elem = *elem_it;
+ Element& elem = *elem_it;
if (var->sharing_weight)
elem.decrease_concurrency();
if (cnst->get_concurrency_slack() < elem.get_concurrency()) {
double weight = var->sharing_weight;
disable_var(var);
- for (s_lmm_element_t const& elem2 : var->cnsts)
+ for (Element const& elem2 : var->cnsts)
on_disabled_var(elem2.constraint);
var->staged_weight = weight;
xbt_assert(not var->sharing_weight);
* (cnst_light_tab)*/
for (int const& saturated_cnst : saturated_constraints) {
ConstraintLight& cnst = cnst_light_tab[saturated_cnst];
- for (s_lmm_element_t const& elem : cnst.cnst->active_element_set) {
+ for (Element const& elem : cnst.cnst->active_element_set) {
// Visiting active_element_set, so, by construction, should never get a zero weight, correct?
xbt_assert(elem.variable->sharing_weight > 0);
if (elem.consumption_weight > 0 && not elem.variable->saturated_variable_set_hook.is_linked())
}
template <class ElemList>
-static void format_lmm_element_list(const ElemList& elem_list, int sharing_policy, double& sum, std::string& buf)
+static void format_element_list(const ElemList& elem_list, int sharing_policy, double& sum, std::string& buf)
{
- for (s_lmm_element_t const& elem : elem_list) {
+ for (Element const& elem : elem_list) {
buf += std::to_string(elem.consumption_weight) + ".'" + std::to_string(elem.variable->id_int) + "'(" +
std::to_string(elem.variable->value) + ")" + (sharing_policy ? " + " : " , ");
if (sharing_policy)
// Show the enabled variables
buf += "\t";
buf += cnst.sharing_policy ? "(" : "max(";
- format_lmm_element_list(cnst.enabled_element_set, cnst.sharing_policy, sum, buf);
+ format_element_list(cnst.enabled_element_set, cnst.sharing_policy, sum, buf);
// TODO: Adding disabled elements only for test compatibility, but do we really want them to be printed?
- format_lmm_element_list(cnst.disabled_element_set, cnst.sharing_policy, sum, buf);
+ format_element_list(cnst.disabled_element_set, cnst.sharing_policy, sum, buf);
buf += "0) <= " + std::to_string(cnst.bound) + " ('" + std::to_string(cnst.id_int) + "')";
XBT_DEBUG("Active constraints : %zu", cnst_list.size());
/* Init: Only modified code portions: reset the value of active variables */
for (Constraint const& cnst : cnst_list) {
- for (s_lmm_element_t const& elem : cnst.enabled_element_set) {
+ for (Element const& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0.0);
elem.variable->value = 0.0;
}
if (not double_positive(cnst.remaining, cnst.bound * sg_maxmin_precision))
continue;
cnst.usage = 0;
- for (s_lmm_element_t& elem : cnst.enabled_element_set) {
+ for (Element& elem : cnst.enabled_element_set) {
xbt_assert(elem.variable->sharing_weight > 0);
if (elem.consumption_weight > 0) {
if (cnst.sharing_policy)
var.id_int, var.value);
/* Update the usage of contraints where this variable is involved */
- for (s_lmm_element_t& elem : var.cnsts) {
+ for (Element& elem : var.cnsts) {
lmm_constraint_t cnst = elem.constraint;
if (cnst->sharing_policy) {
// Remember: shared constraints require that sum(elem.value * var.value) < cnst->bound
// Remember: non-shared constraints only require that max(elem.value * var.value) < cnst->bound
cnst->usage = 0.0;
elem.make_inactive();
- for (s_lmm_element_t& elem2 : cnst->enabled_element_set) {
+ for (Element& elem2 : cnst->enabled_element_set) {
xbt_assert(elem2.variable->sharing_weight > 0);
if (elem2.variable->value > 0)
continue;
int Variable::get_min_concurrency_slack() const
{
int minslack = std::numeric_limits<int>::max();
- for (s_lmm_element_t const& elem : cnsts) {
+ for (Element const& elem : cnsts) {
int slack = elem.constraint->get_concurrency_slack();
if (slack < minslack) {
// This is only an optimization, to avoid looking at more constraints when slack is already zero
simgrid::xbt::intrusive_erase(variable_set, *var);
variable_set.push_front(*var);
- for (s_lmm_element_t& elem : var->cnsts) {
+ for (Element& elem : var->cnsts) {
simgrid::xbt::intrusive_erase(elem.constraint->disabled_element_set, elem);
elem.constraint->enabled_element_set.push_front(elem);
elem.increase_concurrency();
variable_set.push_back(*var);
if (not var->cnsts.empty())
update_modified_set(var->cnsts[0].constraint);
- for (s_lmm_element_t& elem : var->cnsts) {
+ for (Element& elem : var->cnsts) {
simgrid::xbt::intrusive_erase(elem.constraint->enabled_element_set, elem);
elem.constraint->disabled_element_set.push_back(elem);
if (elem.active_element_set_hook.is_linked())
*/
void s_lmm_system_t::update_modified_set_rec(lmm_constraint_t cnst)
{
- for (s_lmm_element_t const& elem : cnst->enabled_element_set) {
+ for (Element const& elem : cnst->enabled_element_set) {
lmm_variable_t var = elem.variable;
- for (s_lmm_element_t const& elem2 : var->cnsts) {
+ for (Element const& elem2 : var->cnsts) {
if (var->visited == visited_counter)
break;
if (elem2.constraint != cnst && not elem2.constraint->modified_constraint_set_hook.is_linked()) {
{
double result = 0.0;
if (sharing_policy) {
- for (s_lmm_element_t const& elem : enabled_element_set)
+ for (Element const& elem : enabled_element_set)
if (elem.consumption_weight > 0)
result += elem.consumption_weight * elem.variable->value;
} else {
- for (s_lmm_element_t const& elem : enabled_element_set)
+ for (Element const& elem : enabled_element_set)
if (elem.consumption_weight > 0)
result = std::max(result, elem.consumption_weight * elem.variable->value);
}
int Constraint::get_variable_amount() const
{
return std::count_if(std::begin(enabled_element_set), std::end(enabled_element_set),
- [](const s_lmm_element_t& elem) { return elem.consumption_weight > 0; });
+ [](const Element& elem) { return elem.consumption_weight > 0; });
}
}
}
* Then, it is used to list all variables involved in constraint through constraint's xxx_element_set lists, or
* vice-versa list all constraints for a given variable.
*/
-XBT_PUBLIC_CLASS s_lmm_element_t
+XBT_PUBLIC_CLASS Element
{
public:
int get_concurrency() const;
boost::intrusive::list_member_hook<> active_constraint_set_hook;
boost::intrusive::list_member_hook<> modified_constraint_set_hook;
boost::intrusive::list_member_hook<> saturated_constraint_set_hook;
- boost::intrusive::list<s_lmm_element_t,
- boost::intrusive::member_hook<s_lmm_element_t, boost::intrusive::list_member_hook<>,
- &s_lmm_element_t::enabled_element_set_hook>>
+ boost::intrusive::list<Element, boost::intrusive::member_hook<Element, boost::intrusive::list_member_hook<>,
+ &Element::enabled_element_set_hook>>
enabled_element_set;
- boost::intrusive::list<s_lmm_element_t,
- boost::intrusive::member_hook<s_lmm_element_t, boost::intrusive::list_member_hook<>,
- &s_lmm_element_t::disabled_element_set_hook>>
+ boost::intrusive::list<Element, boost::intrusive::member_hook<Element, boost::intrusive::list_member_hook<>,
+ &Element::disabled_element_set_hook>>
disabled_element_set;
- boost::intrusive::list<s_lmm_element_t,
- boost::intrusive::member_hook<s_lmm_element_t, boost::intrusive::list_member_hook<>,
- &s_lmm_element_t::active_element_set_hook>>
+ boost::intrusive::list<Element, boost::intrusive::member_hook<Element, boost::intrusive::list_member_hook<>,
+ &Element::active_element_set_hook>>
active_element_set;
double remaining;
double usage;
boost::intrusive::list_member_hook<> variable_set_hook;
boost::intrusive::list_member_hook<> saturated_variable_set_hook;
- std::vector<s_lmm_element_t> cnsts;
+ std::vector<Element> cnsts;
// sharing_weight: variable's impact on the resource during the sharing
// if == 0, the variable is not considered by LMM
static int Global_debug_id;
};
-inline void s_lmm_element_t::make_active()
+inline void Element::make_active()
{
constraint->active_element_set.push_front(*this);
}
-inline void s_lmm_element_t::make_inactive()
+inline void Element::make_inactive()
{
if (active_element_set_hook.is_linked())
simgrid::xbt::intrusive_erase(constraint->active_element_set, *this);