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
tiny speed optim
[simgrid.git]
/
src
/
surf
/
host_clm03.cpp
diff --git
a/src/surf/host_clm03.cpp
b/src/surf/host_clm03.cpp
index f25ebdfd7baed245e154aae4b9c35a5337c06fbe..c4a3f208542d7722feffb20ddaeb566d63da5017 100644
(file)
--- a/
src/surf/host_clm03.cpp
+++ b/
src/surf/host_clm03.cpp
@@
-44,12
+44,10
@@
double HostCLM03Model::next_occuring_event(double now)
typeid(surf_network_model).name(), min_by_net,
typeid(surf_storage_model).name(), min_by_sto);
typeid(surf_network_model).name(), min_by_net,
typeid(surf_storage_model).name(), min_by_sto);
- double res = std::max({min_by_cpu, min_by_net, min_by_sto});
- if (min_by_cpu >= 0.0 && min_by_cpu < res)
- res = min_by_cpu;
- if (min_by_net >= 0.0 && min_by_net < res)
+ double res = min_by_cpu;
+ if (res < 0 || (min_by_net >= 0.0 && min_by_net < res))
res = min_by_net;
res = min_by_net;
- if (
min_by_sto >= 0.0 && min_by_sto < res
)
+ if (
res < 0 || (min_by_sto >= 0.0 && min_by_sto < res)
)
res = min_by_sto;
return res;
}
res = min_by_sto;
return res;
}