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
API format unification
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
798c991
..
66dad37
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-393,18
+393,18
@@
Model::~Model(){
delete doneActionSet_;
}
delete doneActionSet_;
}
-double Model::next
_occuring_e
vent(double now)
+double Model::next
OccuringE
vent(double now)
{
//FIXME: set the good function once and for all
if (updateMechanism_ == UM_LAZY)
{
//FIXME: set the good function once and for all
if (updateMechanism_ == UM_LAZY)
- return next
_occuring_event_l
azy(now);
+ return next
OccuringEventL
azy(now);
else if (updateMechanism_ == UM_FULL)
else if (updateMechanism_ == UM_FULL)
- return next
_occuring_event_f
ull(now);
+ return next
OccuringEventF
ull(now);
else
xbt_die("Invalid cpu update mechanism!");
}
else
xbt_die("Invalid cpu update mechanism!");
}
-double Model::next
_occuring_event_l
azy(double now)
+double Model::next
OccuringEventL
azy(double now)
{
XBT_DEBUG("Before share resources, the size of modified actions set is %zd", modifiedSet_->size());
lmm_solve(maxminSystem_);
{
XBT_DEBUG("Before share resources, the size of modified actions set is %zd", modifiedSet_->size());
lmm_solve(maxminSystem_);
@@
-471,17
+471,11
@@
double Model::next_occuring_event_lazy(double now)
}
}
}
}
-double Model::next_occuring_event_full(double /*now*/) {
- THROW_UNIMPLEMENTED;
- return 0.0;
-}
-
-double shareResourcesMaxMin(ActionList *runningActions, lmm_system_t sys, void (*solve) (lmm_system_t))
-{
- solve(sys);
+double Model::nextOccuringEventFull(double /*now*/) {
+ maxminSystem_->solve_fun(maxminSystem_);
double min = -1;
double min = -1;
- for
(auto it(runningActions->begin()), itend(runningActions
->end()); it != itend ; ++it) {
+ for
(auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()
->end()); it != itend ; ++it) {
Action *action = &*it;
double value = lmm_variable_getvalue(action->getVariable());
if (value > 0) {
Action *action = &*it;
double value = lmm_variable_getvalue(action->getVariable());
if (value > 0) {