From e4ff28b3504ae87e6c91b15fd38ed32622e99fcd Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 1 Jul 2021 12:27:42 +0200
Subject: [PATCH] [GL/SensorData] Use std::is_sorted, vec.front(), vec.back().
---
GeoLib/SensorData.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/GeoLib/SensorData.cpp b/GeoLib/SensorData.cpp
index 87918e9c523..70b3f87f4fc 100644
--- a/GeoLib/SensorData.cpp
+++ b/GeoLib/SensorData.cpp
@@ -28,18 +28,16 @@ SensorData::SensorData(const std::string& file_name)
}
SensorData::SensorData(std::vector<std::size_t> time_steps)
- : _start(time_steps[0]),
- _end(time_steps[time_steps.size() - 1]),
+ : _start(time_steps.front()),
+ _end(time_steps.back()),
_step_size(0),
_time_unit(TimeStepType::NONE),
_time_steps(time_steps)
{
- for (std::size_t i = 1; i < time_steps.size(); i++)
+ if (!std::is_sorted(
+ time_steps.begin(), time_steps.end(), std::less_equal{}))
{
- if (time_steps[i - 1] >= time_steps[i])
- {
- ERR("Error in SensorData() - Time series has no order!");
- }
+ ERR("Error in SensorData() - Time series has no order!");
}
}
--
GitLab