From eff0c83ffa8a4a75d5ab8ed711cacac0521a3558 Mon Sep 17 00:00:00 2001
From: Paul <d.goldbauer@protonmail.com>
Date: Fri, 8 Dec 2023 23:01:35 +0100
Subject: [PATCH 1/3] full test coverage of timegrid

---
 test-suite/timegrid.cpp | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/test-suite/timegrid.cpp b/test-suite/timegrid.cpp
index be75146aed4..db7e476faa9 100644
--- a/test-suite/timegrid.cpp
+++ b/test-suite/timegrid.cpp
@@ -56,6 +56,19 @@ BOOST_AUTO_TEST_CASE(testConstructorMandatorySteps)
         tg.begin(), tg.end(), expected_times.begin(), expected_times.end());
 }
 
+BOOST_AUTO_TEST_CASE(testConstructorAdditionalStepsAutomatically)
+{
+    BOOST_TEST_MESSAGE("Testing TimeGrid construction with time step length determined automatically...");
+
+    const TimeGrid tg{{0.0, 1.0, 2.0, 4.0}, 0};
+
+    // Time step length is determined by minimal adjacent distance in given times
+    const std::vector<Time> expected_times{0.0, 1.0, 2.0, 3.0, 4.0};
+
+    BOOST_CHECK_EQUAL_COLLECTIONS(
+        tg.begin(), tg.end(), expected_times.begin(), expected_times.end());
+}
+
 BOOST_AUTO_TEST_CASE(testConstructorEvenSteps)
 {
     BOOST_TEST_MESSAGE("Testing TimeGrid construction with n evenly spaced points...");
@@ -89,6 +102,28 @@ BOOST_AUTO_TEST_CASE(testConstructorNegativeValuesInIterator)
     BOOST_CHECK_THROW(const TimeGrid tg(times.begin(), times.end()), Error);
 }
 
+BOOST_AUTO_TEST_CASE(testIndex)
+{
+    BOOST_TEST_MESSAGE("Testing that the supplied time is very close to a time grid point...");
+
+    // will automatically insert additional point at t=0
+    const TimeGrid tg = {1.0, 2.0, 5.0};
+
+    BOOST_CHECK_THROW(tg.index(-2.0), Error);
+
+    BOOST_ASSERT(4u == tg.size());
+
+    BOOST_CHECK_THROW(tg.index(-0.1), Error);
+    BOOST_TEST(0 == tg.index(0.0));
+    BOOST_CHECK_THROW(tg.index(0.5), Error);
+    BOOST_TEST(1 == tg.index(1.0));
+    BOOST_CHECK_THROW(tg.index(1.1), Error);
+    BOOST_TEST(2 == tg.index(2.0));
+    BOOST_CHECK_THROW(tg.index(2.9), Error);
+    BOOST_TEST(3 == tg.index(5.0));
+    BOOST_CHECK_THROW(tg.index(5.1), Error);
+}
+
 BOOST_AUTO_TEST_CASE(testClosestIndex)
 {
     BOOST_TEST_MESSAGE("Testing that the returned index is closest to the requested time...");

From 6abf054209bea0281d9ff41167c8cac8bc7a63a4 Mon Sep 17 00:00:00 2001
From: Paul <d.goldbauer@protonmail.com>
Date: Sat, 9 Dec 2023 22:25:50 +0100
Subject: [PATCH 2/3] better test message

---
 test-suite/timegrid.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test-suite/timegrid.cpp b/test-suite/timegrid.cpp
index db7e476faa9..95aee0cd0fc 100644
--- a/test-suite/timegrid.cpp
+++ b/test-suite/timegrid.cpp
@@ -72,13 +72,13 @@ BOOST_AUTO_TEST_CASE(testConstructorAdditionalStepsAutomatically)
 BOOST_AUTO_TEST_CASE(testConstructorEvenSteps)
 {
     BOOST_TEST_MESSAGE("Testing TimeGrid construction with n evenly spaced points...");
-    
+
     Time end_time = 10;
     Size steps = 5;
     const TimeGrid tg(end_time, steps);
 
     std::vector<Time> expected_times = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0};
-    
+
     BOOST_CHECK_EQUAL_COLLECTIONS(
         tg.begin(), tg.end(), expected_times.begin(), expected_times.end()
     );
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE(testConstructorEmptyIterator)
     BOOST_TEST_MESSAGE(
         "Testing that the TimeGrid constructor raises an error for empty iterators..."
     );
-    
+
     const std::vector<Time> times;
     BOOST_CHECK_THROW(const TimeGrid tg(times.begin(), times.end()), Error);
 }
@@ -97,14 +97,15 @@ BOOST_AUTO_TEST_CASE(testConstructorEmptyIterator)
 BOOST_AUTO_TEST_CASE(testConstructorNegativeValuesInIterator)
 {
     BOOST_TEST_MESSAGE("Testing that the TimeGrid constructor raises an error for negative time values...");
-    
+
     std::vector<Time> times = {-3.0, 1.0, 4.0, 5.0};
     BOOST_CHECK_THROW(const TimeGrid tg(times.begin(), times.end()), Error);
 }
 
 BOOST_AUTO_TEST_CASE(testIndex)
 {
-    BOOST_TEST_MESSAGE("Testing that the supplied time is very close to a time grid point...");
+    BOOST_TEST_MESSAGE("Testing that querying an index by floating-point time works for exact time nodes and "
+                       "throws otherwise...");
 
     // will automatically insert additional point at t=0
     const TimeGrid tg = {1.0, 2.0, 5.0};
@@ -130,7 +131,7 @@ BOOST_AUTO_TEST_CASE(testClosestIndex)
 
     const TimeGrid tg = {1.0, 2.0, 5.0};
     const Size expected_index = 3;
-    
+
     QL_ASSERT(tg.closestIndex(4) == expected_index,
               "Expected index: " << expected_index << ", which does not match " <<
               "the returned index: " << tg.closestIndex(4));
@@ -141,7 +142,7 @@ BOOST_AUTO_TEST_CASE(testClosestTime)
     BOOST_TEST_MESSAGE("Testing that the returned time matches the requested index...");
     const TimeGrid tg = {1.0, 2.0, 5.0};
     const Size expected_time = 5;
-    
+
     QL_ASSERT(tg.closestTime(4) == expected_time,
               "Expected time of: " << expected_time << ", which does not match " <<
               "the returned time: " << tg.closestTime(4));
@@ -152,7 +153,7 @@ BOOST_AUTO_TEST_CASE(testMandatoryTimes)
     BOOST_TEST_MESSAGE("Testing that mandatory times are recalled correctly...");
     std::vector<Time> test_times = {1.0, 2.0, 4.0};
     const TimeGrid tg(test_times.begin(), test_times.end(), 8);
-    
+
     // Mandatory times are those provided by the original iterator.
     const std::vector<Time>& tg_mandatory_times = tg.mandatoryTimes();
     BOOST_CHECK_EQUAL_COLLECTIONS(
@@ -162,4 +163,4 @@ BOOST_AUTO_TEST_CASE(testMandatoryTimes)
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()

From 23e541c6ee64822f89eac5888e1865ff61ea8f54 Mon Sep 17 00:00:00 2001
From: Paul <d.goldbauer@protonmail.com>
Date: Sat, 9 Dec 2023 22:31:41 +0100
Subject: [PATCH 3/3] undo whitespace changes

---
 test-suite/timegrid.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test-suite/timegrid.cpp b/test-suite/timegrid.cpp
index 95aee0cd0fc..421fd584c90 100644
--- a/test-suite/timegrid.cpp
+++ b/test-suite/timegrid.cpp
@@ -72,13 +72,13 @@ BOOST_AUTO_TEST_CASE(testConstructorAdditionalStepsAutomatically)
 BOOST_AUTO_TEST_CASE(testConstructorEvenSteps)
 {
     BOOST_TEST_MESSAGE("Testing TimeGrid construction with n evenly spaced points...");
-
+    
     Time end_time = 10;
     Size steps = 5;
     const TimeGrid tg(end_time, steps);
 
     std::vector<Time> expected_times = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0};
-
+    
     BOOST_CHECK_EQUAL_COLLECTIONS(
         tg.begin(), tg.end(), expected_times.begin(), expected_times.end()
     );
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE(testConstructorEmptyIterator)
     BOOST_TEST_MESSAGE(
         "Testing that the TimeGrid constructor raises an error for empty iterators..."
     );
-
+    
     const std::vector<Time> times;
     BOOST_CHECK_THROW(const TimeGrid tg(times.begin(), times.end()), Error);
 }
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(testConstructorEmptyIterator)
 BOOST_AUTO_TEST_CASE(testConstructorNegativeValuesInIterator)
 {
     BOOST_TEST_MESSAGE("Testing that the TimeGrid constructor raises an error for negative time values...");
-
+    
     std::vector<Time> times = {-3.0, 1.0, 4.0, 5.0};
     BOOST_CHECK_THROW(const TimeGrid tg(times.begin(), times.end()), Error);
 }
@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(testClosestIndex)
 
     const TimeGrid tg = {1.0, 2.0, 5.0};
     const Size expected_index = 3;
-
+    
     QL_ASSERT(tg.closestIndex(4) == expected_index,
               "Expected index: " << expected_index << ", which does not match " <<
               "the returned index: " << tg.closestIndex(4));
@@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE(testClosestTime)
     BOOST_TEST_MESSAGE("Testing that the returned time matches the requested index...");
     const TimeGrid tg = {1.0, 2.0, 5.0};
     const Size expected_time = 5;
-
+    
     QL_ASSERT(tg.closestTime(4) == expected_time,
               "Expected time of: " << expected_time << ", which does not match " <<
               "the returned time: " << tg.closestTime(4));
@@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE(testMandatoryTimes)
     BOOST_TEST_MESSAGE("Testing that mandatory times are recalled correctly...");
     std::vector<Time> test_times = {1.0, 2.0, 4.0};
     const TimeGrid tg(test_times.begin(), test_times.end(), 8);
-
+    
     // Mandatory times are those provided by the original iterator.
     const std::vector<Time>& tg_mandatory_times = tg.mandatoryTimes();
     BOOST_CHECK_EQUAL_COLLECTIONS(
@@ -163,4 +163,4 @@ BOOST_AUTO_TEST_CASE(testMandatoryTimes)
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file