X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f3527d281baac664d10ce7086e0d0138e1389d7..59094fa79de9a5e0e8d29ee12f34156d4be87156:/src/kernel/lmm/maxmin.cpp diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp index e859c9e717..b9c5b41bee 100644 --- a/src/kernel/lmm/maxmin.cpp +++ b/src/kernel/lmm/maxmin.cpp @@ -212,7 +212,7 @@ void System::variable_mallocator_free_f(void* var) delete static_cast(var); } -Variable* System::variable_new(simgrid::surf::Action* id, double sharing_weight, double bound, +Variable* System::variable_new(simgrid::kernel::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); @@ -535,8 +535,8 @@ template void System::solve(CnstList& cnst_list) cnst.usage = elem.consumption_weight / elem.variable->sharing_weight; elem.make_active(); - simgrid::surf::Action* action = static_cast(elem.variable->id); - if (keep_track && not action->is_linked()) + simgrid::kernel::resource::Action* action = static_cast(elem.variable->id); + if (keep_track && not action->isLinkedModifiedSet()) keep_track->push_back(*action); } } @@ -712,7 +712,7 @@ void System::update_variable_bound(Variable* var, double bound) update_modified_set(var->cnsts[0].constraint); } -void Variable::initialize(simgrid::surf::Action* id_value, double sharing_weight_value, double bound_value, +void Variable::initialize(simgrid::kernel::resource::Action* id_value, double sharing_weight_value, double bound_value, int number_of_constraints, unsigned visited_value) { id = id_value;