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
UPPER_CASE the Action::State values (+ uniformity with s4u::Activity)
[simgrid.git]
/
src
/
kernel
/
resource
/
Model.cpp
diff --git
a/src/kernel/resource/Model.cpp
b/src/kernel/resource/Model.cpp
index
f73ee98
..
c8b0e08
100644
(file)
--- a/
src/kernel/resource/Model.cpp
+++ b/
src/kernel/resource/Model.cpp
@@
-17,9
+17,9
@@
Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
Model::~Model()
{
delete inited_action_set_;
Model::~Model()
{
delete inited_action_set_;
- delete
running
_action_set_;
+ delete
started
_action_set_;
delete failed_action_set_;
delete failed_action_set_;
- delete
done
_action_set_;
+ delete
finished
_action_set_;
delete maxmin_system_;
}
delete maxmin_system_;
}
@@
-50,7
+50,7
@@
double Model::next_occuring_event_lazy(double now)
maxmin_system_->modified_set_->pop_front();
bool max_duration_flag = false;
maxmin_system_->modified_set_->pop_front();
bool max_duration_flag = false;
- if (action->get_state_set() !=
running
_action_set_)
+ if (action->get_state_set() !=
started
_action_set_)
continue;
/* bogus priority, skip it */
continue;
/* bogus priority, skip it */
@@
-108,7
+108,7
@@
double Model::next_occuring_event_full(double /*now*/)
double min = -1;
double min = -1;
- for (Action& action : *get_
running
_action_set()) {
+ for (Action& action : *get_
started
_action_set()) {
double value = action.get_variable()->get_value();
if (value > 0) {
if (action.get_remains() > 0)
double value = action.get_variable()->get_value();
if (value > 0) {
if (action.get_remains() > 0)