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
Merge branch 'master' into fix/execute_benched
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
4381f7c
..
cb5ed0e
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-416,7
+416,7
@@
double Model::nextOccuringEventLazy(double now)
action->updateRemainingLazy(now);
double min = -1;
action->updateRemainingLazy(now);
double min = -1;
- double share =
lmm_variable_getvalue(action->getVariable()
);
+ double share =
action->getVariable()->get_value(
);
if (share > 0) {
double time_to_completion;
if (share > 0) {
double time_to_completion;
@@
-465,7
+465,7
@@
double Model::nextOccuringEventFull(double /*now*/) {
double min = -1;
for (Action& action : *getRunningActionSet()) {
double min = -1;
for (Action& action : *getRunningActionSet()) {
- double value =
lmm_variable_getvalue(action.getVariable()
);
+ double value =
action.getVariable()->get_value(
);
if (value > 0) {
if (action.getRemains() > 0)
value = action.getRemainsNoUpdate() / value;
if (value > 0) {
if (action.getRemains() > 0)
value = action.getRemainsNoUpdate() / value;
@@
-646,7
+646,7
@@
void Action::setState(Action::State state)
double Action::getBound() const
{
double Action::getBound() const
{
- return
(variable_) ? lmm_variable_getbound(variable_
) : 0;
+ return
variable_ ? variable_->get_bound(
) : 0;
}
void Action::setBound(double bound)
}
void Action::setBound(double bound)