From 0676114935946d5423221fe546ca083e3cda4cdb Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 8 Jul 2018 16:41:57 +0200 Subject: [PATCH] tiny speed optim --- src/surf/host_clm03.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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; } -- 2.20.1