A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various useless cosmetics
[simgrid.git]
/
src
/
kernel
/
lmm
/
maxmin.cpp
diff --git
a/src/kernel/lmm/maxmin.cpp
b/src/kernel/lmm/maxmin.cpp
index
adeee26
..
b98ae8c
100644
(file)
--- 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<Variable*>(var);
}
delete static_cast<Variable*>(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);
{
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 <class CnstList> void System::lmm_solve(CnstList& cnst_list)
cnst.usage = elem.consumption_weight / elem.variable->sharing_weight;
elem.make_active();
cnst.usage = elem.consumption_weight / elem.variable->sharing_weight;
elem.make_active();
-
simgrid::kernel::resource::Action* action = static_cast<simgrid::kernel::
resource::Action*>(elem.variable->id);
+
resource::Action* action = static_cast<
resource::Action*>(elem.variable->id);
if (modified_set_ && not action->is_within_modified_set())
modified_set_->push_back(*action);
}
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);
}
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;
int number_of_constraints, unsigned visited_value)
{
id = id_value;