Improve coverage for Date to Julian Day conversion

- Move conversion functions to Calendar.(h|c)pp
- Remove unnecessary Cal
- Add tests for the convertion

Author: marcosbento

Viewer/ecflowUI/src/VRepeatAttr.cpp

@@ -15,7 +15,7 @@
 #include "VAttributeType.hpp"
 #include "VNode.hpp"
 #include "ecflow/attribute/RepeatRange.hpp"
-#include "ecflow/core/Cal.hpp"
+#include "ecflow/core/Calendar.hpp"
 
 std::string VRepeatDateAttr::subType_("date");
 std::string VRepeatDateTimeAttr::subType_("datetime");
@@ -195,8 +195,8 @@ int VRepeatDateAttr::endIndex() const {
     if (node_ptr node = parent_->node()) {
         const Repeat& r = node->repeat();
         if (r.step() > 0) {
-            long jStart = Cal::date_to_julian(r.start());
-            long jEnd   = Cal::date_to_julian(r.end());
+            long jStart = ecf::calendar_date_to_julian_day(r.start());
+            long jEnd   = ecf::calendar_date_to_julian_day(r.end());
 
             int index = (jEnd - jStart) / r.step();
             long val  = jStart + index * r.step();
@@ -213,7 +213,7 @@ int VRepeatDateAttr::endIndex() const {
 int VRepeatDateAttr::currentIndex() const {
     if (node_ptr node = parent_->node()) {
         const Repeat& r = node->repeat();
-        int cur         = (Cal::date_to_julian(r.index_or_value()) - Cal::date_to_julian(r.start())) / r.step();
+        int cur         = (ecf::calendar_date_to_julian_day(r.index_or_value()) - ecf::calendar_date_to_julian_day(r.start())) / r.step();
         return cur;
     }
     return 0;
@@ -239,7 +239,7 @@ std::string VRepeatDateAttr::value(int index) const {
     std::stringstream ss;
     if (node_ptr node = parent_->node()) {
         const Repeat& r = node->repeat();
-        ss << (Cal::julian_to_date(Cal::date_to_julian(r.start()) + index * r.step()));
+        ss << (ecf::julian_day_to_calendar_date(ecf::calendar_date_to_julian_day(r.start()) + index * r.step()));
     }
 
     return ss.str();
@@ -252,7 +252,7 @@ int VRepeatDateAttr::currentPosition() const {
             return -1;
         else if (r.value() == r.start())
             return 0;
-        else if (r.value() == r.end() || Cal::date_to_julian(r.value()) + r.step() > Cal::date_to_julian(r.end()))
+        else if (r.value() == r.end() || ecf::calendar_date_to_julian_day(r.value()) + r.step() > ecf::calendar_date_to_julian_day(r.end()))
             return 2;
         else
             return 1;

libs/CMakeLists.txt

@@ -230,7 +230,6 @@ set(srcs
   ${CMAKE_BINARY_DIR}/generated/src/ecflow/core/ecflow_version.h
   ${CMAKE_BINARY_DIR}/generated/src/ecflow/core/ecflow_source_build_dir.h
   core/src/ecflow/core/AssertTimer.hpp
-  core/src/ecflow/core/Cal.hpp
   core/src/ecflow/core/Calendar.hpp
   core/src/ecflow/core/CalendarUpdateParams.hpp
   core/src/ecflow/core/CheckPt.hpp
@@ -279,7 +278,6 @@ set(srcs
   core/src/ecflow/core/exceptions/Exceptions.hpp
   # Core -- Sources
   core/src/ecflow/core/AssertTimer.cpp
-  core/src/ecflow/core/Cal.cpp
   core/src/ecflow/core/Calendar.cpp
   core/src/ecflow/core/Child.cpp
   core/src/ecflow/core/Chrono.cpp

libs/attribute/src/ecflow/attribute/RepeatAttr.cpp

@@ -16,7 +16,7 @@
 #include <boost/date_time.hpp>
 #include <boost/date_time/posix_time/time_parsers.hpp>
 
-#include "ecflow/core/Cal.hpp"
+#include "ecflow/core/Calendar.hpp"
 #include "ecflow/core/Converter.hpp"
 #include "ecflow/core/Ecf.hpp"
 #include "ecflow/core/Indentor.hpp"
@@ -260,7 +260,7 @@ void RepeatDate::update_repeat_genvar_value() const {
             dow_.set_value(ecf::convert_to<std::string>(day_of_week));
 
             long last_value = last_valid_value();
-            long julian     = Cal::date_to_julian(last_value);
+            long julian     = ecf::calendar_date_to_julian_day(last_value);
             julian_.set_value(ecf::convert_to<std::string>(julian));
         }
         catch (std::exception& e) {
@@ -305,16 +305,16 @@ long RepeatDate::valid_value(long value) const {
 
 long RepeatDate::last_valid_value_minus(int val) const {
     long last_value = last_valid_value();
-    long julian     = Cal::date_to_julian(last_value);
+    long julian     = ecf::calendar_date_to_julian_day(last_value);
     julian -= val;
-    return Cal::julian_to_date(julian);
+    return ecf::julian_day_to_calendar_date(julian);
 }
 
 long RepeatDate::last_valid_value_plus(int val) const {
     long last_value = last_valid_value();
-    long julian     = Cal::date_to_julian(last_value);
+    long julian     = ecf::calendar_date_to_julian_day(last_value);
     julian += val;
-    return Cal::julian_to_date(julian);
+    return ecf::julian_day_to_calendar_date(julian);
 }
 
 void RepeatDate::reset() {
@@ -386,9 +386,9 @@ std::string RepeatDate::value_as_string(int index) const {
 std::string RepeatDate::next_value_as_string() const {
     long val = last_valid_value();
 
-    long julian = Cal::date_to_julian(val);
+    long julian = ecf::calendar_date_to_julian_day(val);
     julian += delta_;
-    val = Cal::julian_to_date(julian);
+    val = ecf::julian_day_to_calendar_date(julian);
 
     try {
         return ecf::convert_to<std::string>(valid_value(val));
@@ -401,9 +401,9 @@ std::string RepeatDate::next_value_as_string() const {
 std::string RepeatDate::prev_value_as_string() const {
     long val = last_valid_value();
 
-    long julian = Cal::date_to_julian(val);
+    long julian = ecf::calendar_date_to_julian_day(val);
     julian -= delta_;
-    val = Cal::julian_to_date(julian);
+    val = ecf::julian_day_to_calendar_date(julian);
 
     try {
         return ecf::convert_to<std::string>(valid_value(val));
@@ -414,9 +414,9 @@ std::string RepeatDate::prev_value_as_string() const {
 }
 
 void RepeatDate::increment() {
-    long julian = Cal::date_to_julian(value_);
+    long julian = ecf::calendar_date_to_julian_day(value_);
     julian += delta_;
-    set_value(Cal::julian_to_date(julian));
+    set_value(ecf::julian_day_to_calendar_date(julian));
 }
 
 void RepeatDate::change(const std::string& newdate) {
@@ -469,8 +469,8 @@ void RepeatDate::changeValue(long the_new_date) {
     }
 
     // Check new value is in step. ECFLOW-325 repeat date 7
-    long julian_new_date = Cal::date_to_julian(the_new_date);
-    long julian_start    = Cal::date_to_julian(start_);
+    long julian_new_date = ecf::calendar_date_to_julian_day(the_new_date);
+    long julian_start    = ecf::calendar_date_to_julian_day(start_);
     long diff            = julian_new_date - julian_start;
     if (diff % delta_ != 0) {
         std::stringstream ss;
@@ -914,7 +914,7 @@ void RepeatDateList::update_repeat_genvar_value() const {
             dow_.set_value(ecf::convert_to<std::string>(day_of_week));
 
             long last_value = last_valid_value();
-            long julian     = Cal::date_to_julian(last_value);
+            long julian     = ecf::calendar_date_to_julian_day(last_value);
             julian_.set_value(ecf::convert_to<std::string>(julian));
         }
         catch (std::exception& e) {
@@ -1001,19 +1001,19 @@ long RepeatDateList::last_valid_value_minus(int val) const {
     if (last_value == 0)
         return 0;
 
-    long julian = Cal::date_to_julian(last_value);
+    long julian = ecf::calendar_date_to_julian_day(last_value);
     julian -= val;
-    return Cal::julian_to_date(julian);
+    return ecf::julian_day_to_calendar_date(julian);
 }
 
 long RepeatDateList::last_valid_value_plus(int val) const {
     long last_value = last_valid_value();
     if (last_value == 0)
         return 0;
 
-    long julian = Cal::date_to_julian(last_value);
+    long julian = ecf::calendar_date_to_julian_day(last_value);
     julian += val;
-    return Cal::julian_to_date(julian);
+    return ecf::julian_day_to_calendar_date(julian);
 }
 
 void RepeatDateList::setToLastValue() {

libs/attribute/src/ecflow/attribute/RepeatAttr.hpp

@@ -29,7 +29,6 @@
 #include <vector>
 
 #include "ecflow/attribute/Variable.hpp"
-#include "ecflow/core/Cal.hpp"
 #include "ecflow/core/Chrono.hpp"
 
 /////////////////////////////////////////////////////////////////////////

libs/attribute/src/ecflow/attribute/RepeatRange.hpp

@@ -12,6 +12,7 @@
 #define ecflow_attribute_RepeatRange_HPP
 
 #include "ecflow/attribute/RepeatAttr.hpp"
+#include "ecflow/core/Calendar.hpp"
 
 namespace ecf {
 
@@ -54,25 +55,25 @@ struct Range<RepeatDate>
 
     iterator begin() const { return 0; }
     iterator end() const {
-        int i = Cal::date_to_julian(r_.start());
-        int j = Cal::date_to_julian(r_.end());
+        int i = ecf::calendar_date_to_julian_day(r_.start());
+        int j = ecf::calendar_date_to_julian_day(r_.end());
         int s = r_.step();
         int d = (j - i) + 1;
         return (d / s) + ((d % s == 0) ? 0 : 1);
     }
     iterator current_index() const {
-        auto i   = Cal::date_to_julian(r_.start());
+        auto i   = ecf::calendar_date_to_julian_day(r_.start());
         auto s   = r_.step();
-        auto v   = Cal::date_to_julian(r_.value());
+        auto v   = ecf::calendar_date_to_julian_day(r_.value());
         auto idx = (v - i) / s;
         return idx;
     }
 
     value_type current_value() const { return r_.value(); }
 
     value_type at(iterator i) const {
-        int j = Cal::date_to_julian(r_.start());
-        return Cal::julian_to_date(j + i * r_.step());
+        int j = ecf::calendar_date_to_julian_day(r_.start());
+        return ecf::julian_day_to_calendar_date(j + i * r_.step());
     }
 
     size_type size() const { return end() - begin(); }

libs/attribute/test/TestRepeat.cpp

@@ -14,7 +14,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include "ecflow/attribute/RepeatAttr.hpp"
-#include "ecflow/core/Cal.hpp"
+#include "ecflow/core/Calendar.hpp"
 #include "ecflow/core/Converter.hpp"
 #include "ecflow/test/scaffold/Naming.hpp"
 
@@ -530,7 +530,7 @@ BOOST_AUTO_TEST_CASE(generated_variables) {
     {
         const Variable& var = rep.find_gen_variable("YMD_JULIAN");
         BOOST_CHECK_MESSAGE(!var.empty(), "Did not find generated variable YMD_JULIAN");
-        std::string expected = ecf::convert_to<std::string>(Cal::date_to_julian(20090916));
+        std::string expected = ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20090916));
         BOOST_CHECK_MESSAGE(var.theValue() == expected, "expected " << expected << " but found " << var.theValue());
     }
 }
@@ -597,13 +597,13 @@ BOOST_AUTO_TEST_CASE(more_generated_variables) {
     expected_day_of_week.emplace_back("5");
 
     std::vector<std::string> expected_julian;
-    expected_julian.push_back(ecf::convert_to<std::string>(Cal::date_to_julian(20161231)));
-    expected_julian.push_back(ecf::convert_to<std::string>(Cal::date_to_julian(20170101)));
-    expected_julian.push_back(ecf::convert_to<std::string>(Cal::date_to_julian(20170102)));
-    expected_julian.push_back(ecf::convert_to<std::string>(Cal::date_to_julian(20170103)));
-    expected_julian.push_back(ecf::convert_to<std::string>(Cal::date_to_julian(20170104)));
-    expected_julian.push_back(ecf::convert_to<std::string>(Cal::date_to_julian(20170105)));
-    expected_julian.push_back(ecf::convert_to<std::string>(Cal::date_to_julian(20170106)));
+    expected_julian.push_back(ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20161231)));
+    expected_julian.push_back(ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20170101)));
+    expected_julian.push_back(ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20170102)));
+    expected_julian.push_back(ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20170103)));
+    expected_julian.push_back(ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20170104)));
+    expected_julian.push_back(ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20170105)));
+    expected_julian.push_back(ecf::convert_to<std::string>(ecf::calendar_date_to_julian_day(20170106)));
 
     for (int i = 0; i < 7; i++) {