Made Date constexpr so that PROPERTY getters can be constexpr

Author: Hop311

src/openvic-simulation/types/Date.cpp

@@ -1,81 +1,12 @@
 #include "Date.hpp"
 
-#include <algorithm>
-#include <cassert>
 #include <cctype>
-#include <charconv>
 
 #include "openvic-simulation/utility/Logger.hpp"
 #include "openvic-simulation/utility/StringUtils.hpp"
 
 using namespace OpenVic;
 
-Timespan::Timespan(day_t value) : days { value } {}
-
-bool Timespan::operator<(Timespan other) const {
-	return days < other.days;
-};
-bool Timespan::operator>(Timespan other) const {
-	return days > other.days;
-};
-bool Timespan::operator<=(Timespan other) const {
-	return days <= other.days;
-};
-bool Timespan::operator>=(Timespan other) const {
-	return days >= other.days;
-};
-bool Timespan::operator==(Timespan other) const {
-	return days == other.days;
-};
-bool Timespan::operator!=(Timespan other) const {
-	return days != other.days;
-};
-
-Timespan Timespan::operator+(Timespan other) const {
-	return days + other.days;
-}
-
-Timespan Timespan::operator-(Timespan other) const {
-	return days - other.days;
-}
-
-Timespan Timespan::operator*(day_t factor) const {
-	return days * factor;
-}
-
-Timespan Timespan::operator/(day_t factor) const {
-	return days / factor;
-}
-
-Timespan& Timespan::operator+=(Timespan other) {
-	days += other.days;
-	return *this;
-}
-
-Timespan& Timespan::operator-=(Timespan other) {
-	days -= other.days;
-	return *this;
-}
-
-Timespan& Timespan::operator++() {
-	days++;
-	return *this;
-}
-
-Timespan Timespan::operator++(int) {
-	Timespan old = *this;
-	++(*this);
-	return old;
-}
-
-Timespan::day_t Timespan::to_int() const {
-	return days;
-}
-
-Timespan::operator day_t() const {
-	return days;
-}
-
 std::string Timespan::to_string() const {
 	return std::to_string(days);
 }
@@ -84,145 +15,10 @@ Timespan::operator std::string() const {
 	return to_string();
 }
 
-Timespan Timespan::from_years(day_t num) {
-	return num * Date::DAYS_IN_YEAR;
-}
-
-Timespan Timespan::from_months(day_t num) {
-	return (num / Date::MONTHS_IN_YEAR) * Date::DAYS_IN_YEAR + Date::DAYS_UP_TO_MONTH[num % Date::MONTHS_IN_YEAR];
-}
-
-Timespan Timespan::from_days(day_t num) {
-	return num;
-}
-
 std::ostream& OpenVic::operator<<(std::ostream& out, Timespan const& timespan) {
 	return out << timespan.to_string();
 }
 
-const std::string Date::MONTH_NAMES[MONTHS_IN_YEAR] = {
-	"January", "February", "March", "April", "May", "June",
-	"July", "August", "September", "October", "November",
-	"December"
-};
-
-Timespan Date::_date_to_timespan(year_t year, month_t month, day_t day) {
-	month = std::clamp<month_t>(month, 1, MONTHS_IN_YEAR);
-	day = std::clamp<day_t>(day, 1, DAYS_IN_MONTH[month - 1]);
-	return year * DAYS_IN_YEAR + DAYS_UP_TO_MONTH[month - 1] + day - 1;
-}
-
-Timespan::day_t const* Date::DAYS_UP_TO_MONTH = generate_days_up_to_month();
-
-Timespan::day_t const* Date::generate_days_up_to_month() {
-	static Timespan::day_t days_up_to_month[MONTHS_IN_YEAR];
-	Timespan::day_t days = 0;
-	int month = 0;
-	while (month < MONTHS_IN_YEAR) {
-		days_up_to_month[month] = days;
-		days += DAYS_IN_MONTH[month++];
-	}
-	assert(days == DAYS_IN_YEAR);
-	return days_up_to_month;
-}
-
-Date::month_t const* Date::MONTH_FROM_DAY_IN_YEAR = generate_month_from_day_in_year();
-
-Date::month_t const* Date::generate_month_from_day_in_year() {
-	static month_t month_from_day_in_year[DAYS_IN_YEAR];
-	Timespan::day_t days_left = 0;
-	int day = 0, month = 0;
-	while (day < DAYS_IN_YEAR) {
-		days_left = (days_left > 0 ? days_left : DAYS_IN_MONTH[month++]) - 1;
-		month_from_day_in_year[day++] = month;
-	}
-	assert(days_left == 0);
-	assert(month_from_day_in_year[DAYS_IN_YEAR - 1] == MONTHS_IN_YEAR);
-	return month_from_day_in_year;
-}
-
-Date::Date(Timespan total_days) : timespan { total_days } {
-	if (timespan < 0) {
-		Logger::error("Invalid timespan for date: ", timespan, " (cannot be negative)");
-		timespan = 0;
-	}
-}
-
-Date::Date(year_t year, month_t month, day_t day) : timespan { _date_to_timespan(year, month, day) } {}
-
-Date::year_t Date::get_year() const {
-	return static_cast<Timespan::day_t>(timespan) / DAYS_IN_YEAR;
-}
-
-Date::month_t Date::get_month() const {
-	return MONTH_FROM_DAY_IN_YEAR[static_cast<Timespan::day_t>(timespan) % DAYS_IN_YEAR];
-}
-
-Date::day_t Date::get_day() const {
-	return (static_cast<Timespan::day_t>(timespan) % DAYS_IN_YEAR) - DAYS_UP_TO_MONTH[get_month() - 1] + 1;
-}
-
-bool Date::operator<(Date other) const {
-	return timespan < other.timespan;
-};
-bool Date::operator>(Date other) const {
-	return timespan > other.timespan;
-};
-bool Date::operator<=(Date other) const {
-	return timespan <= other.timespan;
-};
-bool Date::operator>=(Date other) const {
-	return timespan >= other.timespan;
-};
-bool Date::operator==(Date other) const {
-	return timespan == other.timespan;
-};
-bool Date::operator!=(Date other) const {
-	return timespan != other.timespan;
-};
-
-Date Date::operator+(Timespan other) const {
-	return timespan + other;
-}
-
-Timespan Date::operator-(Date other) const {
-	return timespan - other.timespan;
-}
-
-Date& Date::operator+=(Timespan other) {
-	timespan += other;
-	return *this;
-}
-
-Date& Date::operator-=(Timespan other) {
-	timespan -= other;
-	return *this;
-}
-
-Date& Date::operator++() {
-	timespan++;
-	return *this;
-}
-
-Date Date::operator++(int) {
-	Date old = *this;
-	++(*this);
-	return old;
-}
-
-bool Date::in_range(Date start, Date end) const {
-	return start <= *this && *this <= end;
-}
-
-std::string const& Date::get_month_name() const {
-	const month_t month = get_month();
-	if (1 <= month && month <= MONTHS_IN_YEAR) {
-		return MONTH_NAMES[month - 1];
-	}
-	static const std::string invalid_month_name = "Invalid Month";
-	return invalid_month_name;
-}
-
 std::string Date::to_string() const {
 	std::stringstream ss;
 	ss << *this;