X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2cf856c54d9bd76ff96f903f785e054f7fde2e28..aa5a9557a537377fdde5d797c82dc2baed5b26b7:/src/surf/host_clm03.cpp diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index f25ebdfd7b..c4a3f20854 100644 --- 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); - 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; - 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; }