X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27b0c1ee1d85c53f1d11bb2b8e539cd76e4cf437..38dfe4cc823740a962aa1da0f3be0c40582d7648:/src/kernel/lmm/maxmin.cpp diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index adeee26ea5..b98ae8c321 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -202,8 +202,7 @@ void System::variable_mallocator_free_f(void* var) delete static_cast(var); } -Variable* System::variable_new(simgrid::kernel::resource::Action* id, double sharing_weight, double bound, - int number_of_constraints) +Variable* System::variable_new(resource::Action* id, double sharing_weight, double bound, int number_of_constraints) { XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", this, id, sharing_weight, bound, number_of_constraints); @@ -525,7 +524,7 @@ template void System::lmm_solve(CnstList& cnst_list) cnst.usage = elem.consumption_weight / elem.variable->sharing_weight; elem.make_active(); - simgrid::kernel::resource::Action* action = static_cast(elem.variable->id); + resource::Action* action = static_cast(elem.variable->id); if (modified_set_ && not action->is_within_modified_set()) modified_set_->push_back(*action); } @@ -697,7 +696,7 @@ void System::update_variable_bound(Variable* var, double bound) update_modified_set(var->cnsts[0].constraint); } -void Variable::initialize(simgrid::kernel::resource::Action* id_value, double sharing_weight_value, double bound_value, +void Variable::initialize(resource::Action* id_value, double sharing_weight_value, double bound_value, int number_of_constraints, unsigned visited_value) { id = id_value;