From d96fe472978246e5fe20a87bf190f1a94c6c2e1f Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Sun, 9 Aug 2026 15:44:36 -0400 Subject: [PATCH] Move Date to `core/object` Extract `core/object/Timespan.hpp` from `Date.hpp` Move needed constants for Timespan into Timespan class Expose Timespan constants as transparent Date constants Split Timespan and Date includes --- src/openvic-simulation/InstanceManager.hpp | 2 +- .../console/ConsoleInstance.cpp | 2 +- .../console/ConsoleInstance.hpp | 2 +- .../{types => core/object}/Date.cpp | 6 +- .../{types => core/object}/Date.hpp | 166 ++++-------------- .../core/object/Timespan.hpp | 118 +++++++++++++ .../country/CountryInstance.cpp | 3 +- .../country/CountryInstance.hpp | 3 +- .../country/CountryInstanceDeps.hpp | 2 +- .../country/CountryInstanceManager.cpp | 1 + .../country/CountryInstanceManager.hpp | 2 +- .../country/CountryParty.hpp | 2 +- .../dataloader/NodeTools.cpp | 1 + .../dataloader/NodeTools.hpp | 3 +- src/openvic-simulation/defines/AIDefines.hpp | 2 +- .../defines/CountryDefines.hpp | 2 +- src/openvic-simulation/defines/Define.hpp | 2 +- .../defines/DiplomacyDefines.hpp | 2 +- .../defines/EconomyDefines.hpp | 2 +- .../defines/MilitaryDefines.hpp | 2 +- .../diplomacy/CountryRelation.hpp | 2 +- .../diplomacy/DiplomaticAction.cpp | 3 +- .../economy/BuildingInstance.hpp | 2 +- .../economy/BuildingType.hpp | 2 +- src/openvic-simulation/ecs/System.hpp | 2 +- .../ecs/SystemScheduler.hpp | 2 +- src/openvic-simulation/history/Bookmark.cpp | 2 +- .../history/CountryHistory.hpp | 2 +- .../history/DiplomaticHistory.hpp | 2 +- src/openvic-simulation/history/HistoryMap.hpp | 2 +- src/openvic-simulation/history/Period.hpp | 2 +- .../history/ProvinceHistory.hpp | 2 +- .../history/diplomacy/WarHistory.hpp | 2 +- src/openvic-simulation/map/MapInstance.hpp | 2 +- .../map/ProvinceInstance.hpp | 1 + src/openvic-simulation/military/Leader.hpp | 2 +- src/openvic-simulation/military/UnitType.hpp | 2 +- src/openvic-simulation/military/Wargoal.cpp | 1 + src/openvic-simulation/military/Wargoal.hpp | 1 + src/openvic-simulation/modifier/Modifier.hpp | 2 +- .../politics/Government.cpp | 1 + .../politics/Government.hpp | 2 +- .../politics/PoliticsInstanceManager.hpp | 2 +- .../research/Technology.hpp | 2 +- .../scripts/ConditionalWeight.cpp | 2 + src/openvic-simulation/utility/ThreadPool.hpp | 2 +- tests/benchmarks/src/ecs/AliasingHotLoop.cpp | 2 +- tests/benchmarks/src/ecs/ImmutableEntity.cpp | 2 +- tests/benchmarks/src/ecs/Scheduler.cpp | 2 +- tests/benchmarks/src/ecs/SystemShouldRun.cpp | 2 +- tests/benchmarks/src/ecs/SystemTick.cpp | 2 +- tests/src/{types => core/object}/Date.cpp | 4 +- tests/src/{types => core/object}/Timespan.cpp | 2 +- tests/src/dataloader/NodeTools.cpp | 3 +- tests/src/ecs/BulkCreate.cpp | 2 +- tests/src/ecs/Checksum.cpp | 2 +- tests/src/ecs/ChunkPool.cpp | 2 +- tests/src/ecs/ChunkSystem.cpp | 3 +- tests/src/ecs/CommandBufferApplyOrder.cpp | 2 +- tests/src/ecs/IdentitySnapshotInvariance.cpp | 2 +- tests/src/ecs/ImmutableEntity.cpp | 2 +- tests/src/ecs/InTickMutationGuard.cpp | 2 +- tests/src/ecs/Integration.cpp | 2 +- tests/src/ecs/IntraSystemParallel.cpp | 2 +- tests/src/ecs/MultiSystemMixedStage.cpp | 2 +- tests/src/ecs/System.cpp | 2 +- tests/src/ecs/SystemFilters.cpp | 2 +- .../SystemFiltersWorkerCountInvariance.cpp | 2 +- tests/src/ecs/SystemPhaseAnchors.cpp | 2 +- .../ecs/SystemSchedulerDisjointWriters.cpp | 2 +- .../ecs/SystemSchedulerSingletonWrites.cpp | 2 +- tests/src/ecs/SystemScheduler_Conflicts.cpp | 2 +- tests/src/ecs/SystemScheduler_DAG.cpp | 2 +- tests/src/ecs/SystemShouldRun.cpp | 2 +- tests/src/ecs/SystemThreadedSpawn.cpp | 2 +- tests/src/ecs/WorkerCountInvariance.cpp | 2 +- 76 files changed, 239 insertions(+), 199 deletions(-) rename src/openvic-simulation/{types => core/object}/Date.cpp (98%) rename src/openvic-simulation/{types => core/object}/Date.hpp (85%) create mode 100644 src/openvic-simulation/core/object/Timespan.hpp rename tests/src/{types => core/object}/Date.cpp (99%) rename tests/src/{types => core/object}/Timespan.cpp (97%) diff --git a/src/openvic-simulation/InstanceManager.hpp b/src/openvic-simulation/InstanceManager.hpp index 0b82ad79b..50b8e84a6 100644 --- a/src/openvic-simulation/InstanceManager.hpp +++ b/src/openvic-simulation/InstanceManager.hpp @@ -6,6 +6,7 @@ #include "openvic-simulation/console/ConsoleInstance.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/country/CountryInstanceDeps.hpp" #include "openvic-simulation/country/CountryInstanceManager.hpp" #include "openvic-simulation/diplomacy/CountryRelation.hpp" @@ -22,7 +23,6 @@ #include "openvic-simulation/politics/PoliticsInstanceManager.hpp" #include "openvic-simulation/population/PopDeps.hpp" #include "openvic-simulation/population/PopsAggregateDeps.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/FlagStrings.hpp" #include "openvic-simulation/utility/ThreadPool.hpp" diff --git a/src/openvic-simulation/console/ConsoleInstance.cpp b/src/openvic-simulation/console/ConsoleInstance.cpp index ff035f9ab..66b09a0ba 100644 --- a/src/openvic-simulation/console/ConsoleInstance.cpp +++ b/src/openvic-simulation/console/ConsoleInstance.cpp @@ -12,6 +12,7 @@ #include "openvic-simulation/core/error/ErrorMacros.hpp" #include "openvic-simulation/core/memory/String.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/DefinitionManager.hpp" #include "openvic-simulation/InstanceManager.hpp" @@ -22,7 +23,6 @@ #include "openvic-simulation/research/Invention.hpp" #include "openvic-simulation/research/Technology.hpp" #include "openvic-simulation/types/Colour.hpp" -#include "openvic-simulation/types/Date.hpp" using namespace OpenVic; using namespace std::string_view_literals; diff --git a/src/openvic-simulation/console/ConsoleInstance.hpp b/src/openvic-simulation/console/ConsoleInstance.hpp index 3eeb5f18f..4ee215b64 100644 --- a/src/openvic-simulation/console/ConsoleInstance.hpp +++ b/src/openvic-simulation/console/ConsoleInstance.hpp @@ -11,8 +11,8 @@ #include "openvic-simulation/core/memory/Formatting.hpp" #include "openvic-simulation/core/memory/String.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/types/Colour.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/utility/Getters.hpp" diff --git a/src/openvic-simulation/types/Date.cpp b/src/openvic-simulation/core/object/Date.cpp similarity index 98% rename from src/openvic-simulation/types/Date.cpp rename to src/openvic-simulation/core/object/Date.cpp index d304a1d60..26a67da59 100644 --- a/src/openvic-simulation/types/Date.cpp +++ b/src/openvic-simulation/core/object/Date.cpp @@ -1,16 +1,18 @@ #include "Date.hpp" -#include +#include #include -#include +#include #include #include #include +#include #include #include +#include "openvic-simulation/core/memory/String.hpp" #include "openvic-simulation/core/Typedefs.hpp" using namespace OpenVic; diff --git a/src/openvic-simulation/types/Date.hpp b/src/openvic-simulation/core/object/Date.hpp similarity index 85% rename from src/openvic-simulation/types/Date.hpp rename to src/openvic-simulation/core/object/Date.hpp index da738ffc0..2940316cc 100644 --- a/src/openvic-simulation/types/Date.hpp +++ b/src/openvic-simulation/core/object/Date.hpp @@ -4,10 +4,9 @@ #include #include #include +#include #include -#include #include -#include #include #include @@ -19,94 +18,17 @@ #include "openvic-simulation/core/Hash.hpp" #include "openvic-simulation/core/memory/Formatting.hpp" #include "openvic-simulation/core/memory/String.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/core/stl/containers/StackString.hpp" #include "openvic-simulation/core/string/CharConv.hpp" #include "openvic-simulation/core/Typedefs.hpp" #include "openvic-simulation/utility/Getters.hpp" namespace OpenVic { - // A relative period between points in time, measured in days - struct Timespan { - /* PROPERTY generated getter functions will return timespans by value, rather than const reference. */ - using ov_return_by_value = void; - - using day_t = int64_t; - - private: - day_t days; - - public: - OV_ALWAYS_INLINE constexpr Timespan(day_t value = 0) : days { value } {} - - OV_ALWAYS_INLINE friend constexpr auto operator<=>(Timespan const&, Timespan const&) = default; - OV_ALWAYS_INLINE friend constexpr bool operator==(Timespan const&, Timespan const&) = default; - OV_SPEED_INLINE constexpr Timespan operator+(Timespan other) const { - return days + other.days; - } - OV_SPEED_INLINE constexpr Timespan operator-(Timespan other) const { - return days - other.days; - } - OV_SPEED_INLINE constexpr Timespan operator*(day_t factor) const { - return days * factor; - } - OV_SPEED_INLINE constexpr Timespan operator/(day_t factor) const { - return days / factor; - } - OV_SPEED_INLINE constexpr Timespan& operator+=(Timespan other) { - days += other.days; - return *this; - } - OV_SPEED_INLINE constexpr Timespan& operator-=(Timespan other) { - days -= other.days; - return *this; - } - OV_SPEED_INLINE constexpr Timespan& operator++() { - days++; - return *this; - } - OV_SPEED_INLINE constexpr Timespan operator++(int) { - Timespan old = *this; - ++(*this); - return old; - } - OV_SPEED_INLINE constexpr Timespan& operator--() { - days--; - return *this; - } - OV_SPEED_INLINE constexpr Timespan operator--(int) { - Timespan old = *this; - --(*this); - return old; - } - OV_SPEED_INLINE constexpr Timespan operator-() const { - Timespan ret = *this; - ret.days = -ret.days; - return ret; - } - - OV_ALWAYS_INLINE constexpr day_t to_int() const { - return days; - } - OV_ALWAYS_INLINE explicit constexpr operator day_t() const { - return days; - } - - inline std::to_chars_result to_chars(char* first, char* last) const { - return std::to_chars(first, last, days); - } - - memory::string to_string() const; - explicit operator memory::string() const; - - OV_SPEED_INLINE static constexpr Timespan from_years(day_t num); - OV_SPEED_INLINE static constexpr Timespan from_months(day_t num); - OV_SPEED_INLINE static constexpr Timespan from_days(day_t num); - }; - std::ostream& operator<<(std::ostream& out, Timespan const& timespan); - // Represents an in-game date // Note: Current implementation does not account for leap-years - struct Date { + class Date { + public: /* PROPERTY generated getter functions will return dates by value, rather than const reference. */ using ov_return_by_value = void; @@ -114,26 +36,13 @@ namespace OpenVic { using month_t = uint8_t; using day_t = uint8_t; - static constexpr std::array DAYS_IN_MONTH = - std::to_array({ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }); + static constexpr auto DAYS_IN_MONTH = Timespan::DAYS_IN_MONTH; - static constexpr Timespan::day_t MONTHS_IN_YEAR = DAYS_IN_MONTH.size(); - static constexpr Timespan::day_t MAX_DAYS_IN_MONTH = *ranges::max_element(DAYS_IN_MONTH); + static constexpr auto MONTHS_IN_YEAR = Timespan::MONTHS_IN_YEAR; + static constexpr auto MAX_DAYS_IN_MONTH = *ranges::max_element(DAYS_IN_MONTH); - static constexpr Timespan::day_t DAYS_IN_YEAR = std::accumulate( - DAYS_IN_MONTH.begin(), DAYS_IN_MONTH.end(), Timespan::day_t { 0 } - ); - static_assert(DAYS_IN_YEAR == 365); - - static constexpr std::array DAYS_UP_TO_MONTH = [] { - std::array days_up_to_month {}; - Timespan::day_t days = 0; - for (Timespan::day_t month = 0; month < MONTHS_IN_YEAR; month++) { - days_up_to_month[month] = days; - days += DAYS_IN_MONTH[month]; - } - return days_up_to_month; - }(); + static constexpr auto DAYS_IN_YEAR = Timespan::DAYS_IN_YEAR; + static constexpr auto DAYS_UP_TO_MONTH = Timespan::DAYS_UP_TO_MONTH; static constexpr std::array MONTH_FROM_DAY_IN_YEAR = [] { std::array month_from_day_in_year {}; @@ -149,8 +58,8 @@ namespace OpenVic { static constexpr char SEPARATOR_CHARACTER = '.'; static constexpr std::array MONTH_NAMES { - "January", "February", "March", "April", "May", "June", // - "July", "August", "September", "October", "November", "December" // + "January", "February", "March", "April", "May", "June", // + "July", "August", "September", "October", "November", "December" // }; static constexpr std::string_view INVALID_MONTH_NAME = "Invalid Month"; @@ -163,22 +72,13 @@ namespace OpenVic { INITIAL_WEEKDAY_NAME < WEEKDAY_NAMES.size(), "INITIAL_WEEKDAY_NAME must be less than WEEKDAY_NAMES.size()" ); - private: - // Number of days since Jan 1st, Year 0 - Timespan PROPERTY(timespan); - - OV_SPEED_INLINE static constexpr Timespan _date_to_timespan(year_t year, month_t month, day_t day) { - month = std::clamp(month, 1, MONTHS_IN_YEAR); - day = std::clamp(day, 1, DAYS_IN_MONTH[month - 1]); - return year * DAYS_IN_YEAR + DAYS_UP_TO_MONTH[month - 1] + day - 1; - } - public: // The Timespan is considered to be the number of days since Jan 1st, Year 0. // Negative Timespans indicate dates before Jan 1st, Year 0. OV_ALWAYS_INLINE constexpr Date(Timespan new_timespan) : timespan { new_timespan } {} // Year month day specification - OV_ALWAYS_INLINE constexpr Date(year_t year = 0, month_t month = 1, day_t day = 1) : timespan { _date_to_timespan(year, month, day) } {} + OV_ALWAYS_INLINE constexpr Date(year_t year = 0, month_t month = 1, day_t day = 1) + : timespan { _date_to_timespan(year, month, day) } {} OV_SPEED_INLINE constexpr Timespan::day_t get_day_of_year() const { Timespan::day_t day_in_year = static_cast(timespan) % DAYS_IN_YEAR; @@ -189,10 +89,9 @@ namespace OpenVic { } OV_SPEED_INLINE constexpr year_t get_year() const { - return (timespan >= 0 - ? static_cast(timespan) - : static_cast(timespan) - DAYS_IN_YEAR + 1 - ) / DAYS_IN_YEAR; + return (timespan >= 0 ? static_cast(timespan) + : static_cast(timespan) - DAYS_IN_YEAR + 1) / + DAYS_IN_YEAR; } OV_SPEED_INLINE constexpr month_t get_month() const { return MONTH_FROM_DAY_IN_YEAR[get_day_of_year()]; @@ -345,7 +244,9 @@ namespace OpenVic { } struct stack_string; - OV_SPEED_INLINE constexpr stack_string to_array(bool pad_year = false, bool pad_month = true, bool pad_day = true) const; + OV_SPEED_INLINE constexpr stack_string to_array( + bool pad_year = false, bool pad_month = true, bool pad_day = true // + ) const; struct stack_string final : StackString< fmt::detail::count_digits(uint64_t(std::numeric_limits::max())) + @@ -405,8 +306,8 @@ namespace OpenVic { } if (OV_unlikely( - year_check > std::numeric_limits::max() || year_check < std::numeric_limits::min() - )) { + year_check > std::numeric_limits::max() || year_check < std::numeric_limits::min() + )) { result.ec = std::errc::value_too_large; result.ptr = first; return result; @@ -564,7 +465,9 @@ namespace OpenVic { from_chars->ec == std::errc::value_too_large && from_chars->type == errc_type::day && from_chars->ptr == from_chars->type_first, date, - memory::fmt::format("Day value cannot be larger than {} for {}.", DAYS_IN_MONTH[date.get_month() - 1], date.get_month()) + memory::fmt::format( + "Day value cannot be larger than {} for {}.", DAYS_IN_MONTH[date.get_month() - 1], date.get_month() + ) ); return date; @@ -586,18 +489,19 @@ namespace OpenVic { Date date = handle_from_string_log(str, from_chars); return date; } + + private: + // Number of days since Jan 1st, Year 0 + Timespan PROPERTY(timespan); + + OV_SPEED_INLINE static constexpr Timespan _date_to_timespan(year_t year, month_t month, day_t day) { + month = std::clamp(month, 1, MONTHS_IN_YEAR); + day = std::clamp(day, 1, DAYS_IN_MONTH[month - 1]); + return year * DAYS_IN_YEAR + DAYS_UP_TO_MONTH[month - 1] + day - 1; + } }; - std::ostream& operator<<(std::ostream& out, Date date); - OV_SPEED_INLINE constexpr Timespan Timespan::from_years(day_t num) { - return num * Date::DAYS_IN_YEAR; - } - OV_SPEED_INLINE constexpr 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]; - } - OV_SPEED_INLINE constexpr Timespan Timespan::from_days(day_t num) { - return num; - } + std::ostream& operator<<(std::ostream& out, Date date); OV_SPEED_INLINE constexpr Date::stack_string Date::to_array(bool pad_year, bool pad_month, bool pad_day) const { stack_string str {}; diff --git a/src/openvic-simulation/core/object/Timespan.hpp b/src/openvic-simulation/core/object/Timespan.hpp new file mode 100644 index 000000000..b35a5009c --- /dev/null +++ b/src/openvic-simulation/core/object/Timespan.hpp @@ -0,0 +1,118 @@ +#pragma once + +#include +#include +#include +#include + +#include "openvic-simulation/core/memory/String.hpp" +#include "openvic-simulation/core/Typedefs.hpp" + +namespace OpenVic { + // A relative period between points in time, measured in days + class Timespan { + public: + /* PROPERTY generated getter functions will return timespans by value, rather than const reference. */ + using ov_return_by_value = void; + + using day_t = int64_t; + + static constexpr std::array DAYS_IN_MONTH = std::to_array({ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }); + static constexpr day_t MONTHS_IN_YEAR = DAYS_IN_MONTH.size(); + + static constexpr day_t DAYS_IN_YEAR = + std::accumulate(DAYS_IN_MONTH.begin(), DAYS_IN_MONTH.end(), Timespan::day_t { 0 }); + static_assert(DAYS_IN_YEAR == 365); + + static constexpr std::array DAYS_UP_TO_MONTH = [] { + std::array days_up_to_month {}; + Timespan::day_t days = 0; + for (Timespan::day_t month = 0; month < MONTHS_IN_YEAR; month++) { + days_up_to_month[month] = days; + days += DAYS_IN_MONTH[month]; + } + return days_up_to_month; + }(); + + OV_ALWAYS_INLINE constexpr Timespan(day_t value = 0) : days { value } {} + + OV_ALWAYS_INLINE friend constexpr auto operator<=>(Timespan const&, Timespan const&) = default; + OV_ALWAYS_INLINE friend constexpr bool operator==(Timespan const&, Timespan const&) = default; + OV_SPEED_INLINE constexpr Timespan operator+(Timespan other) const { + return days + other.days; + } + OV_SPEED_INLINE constexpr Timespan operator-(Timespan other) const { + return days - other.days; + } + OV_SPEED_INLINE constexpr Timespan operator*(day_t factor) const { + return days * factor; + } + OV_SPEED_INLINE constexpr Timespan operator/(day_t factor) const { + return days / factor; + } + OV_SPEED_INLINE constexpr Timespan& operator+=(Timespan other) { + days += other.days; + return *this; + } + OV_SPEED_INLINE constexpr Timespan& operator-=(Timespan other) { + days -= other.days; + return *this; + } + OV_SPEED_INLINE constexpr Timespan& operator++() { + days++; + return *this; + } + OV_SPEED_INLINE constexpr Timespan operator++(int) { + Timespan old = *this; + ++(*this); + return old; + } + OV_SPEED_INLINE constexpr Timespan& operator--() { + days--; + return *this; + } + OV_SPEED_INLINE constexpr Timespan operator--(int) { + Timespan old = *this; + --(*this); + return old; + } + OV_SPEED_INLINE constexpr Timespan operator-() const { + Timespan ret = *this; + ret.days = -ret.days; + return ret; + } + + OV_ALWAYS_INLINE constexpr day_t to_int() const { + return days; + } + OV_ALWAYS_INLINE explicit constexpr operator day_t() const { + return days; + } + + inline std::to_chars_result to_chars(char* first, char* last) const { + return std::to_chars(first, last, days); + } + + memory::string to_string() const; + explicit operator memory::string() const; + + OV_SPEED_INLINE static constexpr Timespan from_years(day_t num); + OV_SPEED_INLINE static constexpr Timespan from_months(day_t num); + OV_SPEED_INLINE static constexpr Timespan from_days(day_t num); + + private: + day_t days; + }; + + OV_SPEED_INLINE constexpr Timespan Timespan::from_years(day_t num) { + return num * DAYS_IN_YEAR; + } + OV_SPEED_INLINE constexpr Timespan Timespan::from_months(day_t num) { + return (num / MONTHS_IN_YEAR) * DAYS_IN_YEAR + DAYS_UP_TO_MONTH[num % MONTHS_IN_YEAR]; + } + OV_SPEED_INLINE constexpr Timespan Timespan::from_days(day_t num) { + return num; + } + + std::ostream& operator<<(std::ostream& out, Timespan const& timespan); +} diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp index 28a78bf3f..72dd6fc8a 100644 --- a/src/openvic-simulation/country/CountryInstance.cpp +++ b/src/openvic-simulation/country/CountryInstance.cpp @@ -10,6 +10,8 @@ #include #include "openvic-simulation/core/error/ErrorMacros.hpp" +#include "openvic-simulation/core/object/Date.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/core/Typedefs.hpp" #include "openvic-simulation/country/CountryDefinition.hpp" #include "openvic-simulation/country/SharedCountryValues.hpp" @@ -46,7 +48,6 @@ #include "openvic-simulation/research/Invention.hpp" #include "openvic-simulation/research/Technology.hpp" #include "openvic-simulation/types/ClampedValue.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/fixed_point/Math.hpp" #include "openvic-simulation/types/IndexedFlatMap.hpp" diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp index 06ff9f050..0c3102da5 100644 --- a/src/openvic-simulation/country/CountryInstance.hpp +++ b/src/openvic-simulation/country/CountryInstance.hpp @@ -7,6 +7,8 @@ #include "openvic-simulation/core/memory/SmartPtr.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/core/stl/containers/TypedSpan.hpp" #include "openvic-simulation/core/thread/SpinMutex.hpp" #include "openvic-simulation/diplomacy/CountryRelation.hpp" @@ -19,7 +21,6 @@ #include "openvic-simulation/population/PopsAggregate.hpp" #include "openvic-simulation/research/TechnologyUnlockLevel.hpp" #include "openvic-simulation/types/ClampedValue.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/Atomic.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/FlagStrings.hpp" diff --git a/src/openvic-simulation/country/CountryInstanceDeps.hpp b/src/openvic-simulation/country/CountryInstanceDeps.hpp index 487943801..05af05b2e 100644 --- a/src/openvic-simulation/country/CountryInstanceDeps.hpp +++ b/src/openvic-simulation/country/CountryInstanceDeps.hpp @@ -1,9 +1,9 @@ #pragma once #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/core/portable/ForwardableSpan.hpp" #include "openvic-simulation/population/PopsAggregateDeps.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/UnitBranchType.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/country/CountryInstanceManager.cpp b/src/openvic-simulation/country/CountryInstanceManager.cpp index 090745d07..8652cdd99 100644 --- a/src/openvic-simulation/country/CountryInstanceManager.cpp +++ b/src/openvic-simulation/country/CountryInstanceManager.cpp @@ -3,6 +3,7 @@ #include #include +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/country/CountryDefinition.hpp" #include "openvic-simulation/defines/CountryDefines.hpp" #include "openvic-simulation/DefinitionManager.hpp" diff --git a/src/openvic-simulation/country/CountryInstanceManager.hpp b/src/openvic-simulation/country/CountryInstanceManager.hpp index f611c51b9..b0cffdf2d 100644 --- a/src/openvic-simulation/country/CountryInstanceManager.hpp +++ b/src/openvic-simulation/country/CountryInstanceManager.hpp @@ -5,9 +5,9 @@ #include "openvic-simulation/core/memory/FixedVector.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/country/SharedCountryValues.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/TypedIndices.hpp" #include "openvic-simulation/utility/Getters.hpp" diff --git a/src/openvic-simulation/country/CountryParty.hpp b/src/openvic-simulation/country/CountryParty.hpp index 2dc2f9536..2c2ca1cdb 100644 --- a/src/openvic-simulation/country/CountryParty.hpp +++ b/src/openvic-simulation/country/CountryParty.hpp @@ -1,7 +1,7 @@ #pragma once #include "openvic-simulation/core/memory/FixedVector.hpp" -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/types/HasIdentifier.hpp" #include "openvic-simulation/types/TypedIndices.hpp" diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp index a2ae665fc..1cfc0f925 100644 --- a/src/openvic-simulation/dataloader/NodeTools.cpp +++ b/src/openvic-simulation/dataloader/NodeTools.cpp @@ -15,6 +15,7 @@ #include #include +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/core/ui/TextFormat.hpp" #include "openvic-simulation/types/Colour.hpp" #include "openvic-simulation/types/fixed_point/String.hpp" diff --git a/src/openvic-simulation/dataloader/NodeTools.hpp b/src/openvic-simulation/dataloader/NodeTools.hpp index e075dd7ef..51bc0ad98 100644 --- a/src/openvic-simulation/dataloader/NodeTools.hpp +++ b/src/openvic-simulation/dataloader/NodeTools.hpp @@ -20,12 +20,13 @@ #include "openvic-simulation/core/FormatValidate.hpp" #include "openvic-simulation/core/memory/String.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/core/stl/MutableIterator.hpp" #include "openvic-simulation/core/string/Utility.hpp" #include "openvic-simulation/core/template/Concepts.hpp" #include "openvic-simulation/core/ui/TextFormat.hpp" #include "openvic-simulation/types/Colour.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IndexedFlatMap.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/types/Vector.hpp" diff --git a/src/openvic-simulation/defines/AIDefines.hpp b/src/openvic-simulation/defines/AIDefines.hpp index 5cbc41f53..e8cd04529 100644 --- a/src/openvic-simulation/defines/AIDefines.hpp +++ b/src/openvic-simulation/defines/AIDefines.hpp @@ -1,7 +1,7 @@ #pragma once +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/utility/Getters.hpp" diff --git a/src/openvic-simulation/defines/CountryDefines.hpp b/src/openvic-simulation/defines/CountryDefines.hpp index 2bff371ad..5621cf2e3 100644 --- a/src/openvic-simulation/defines/CountryDefines.hpp +++ b/src/openvic-simulation/defines/CountryDefines.hpp @@ -2,8 +2,8 @@ #include +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/map/LifeRating.hpp" #include "openvic-simulation/utility/Getters.hpp" diff --git a/src/openvic-simulation/defines/Define.hpp b/src/openvic-simulation/defines/Define.hpp index e1b2bc2f2..282c7afc0 100644 --- a/src/openvic-simulation/defines/Define.hpp +++ b/src/openvic-simulation/defines/Define.hpp @@ -1,5 +1,6 @@ #pragma once +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/defines/AIDefines.hpp" #include "openvic-simulation/defines/CountryDefines.hpp" #include "openvic-simulation/defines/DiplomacyDefines.hpp" @@ -7,7 +8,6 @@ #include "openvic-simulation/defines/GraphicsDefines.hpp" #include "openvic-simulation/defines/MilitaryDefines.hpp" #include "openvic-simulation/defines/PopsDefines.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/utility/Getters.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/defines/DiplomacyDefines.hpp b/src/openvic-simulation/defines/DiplomacyDefines.hpp index 07587a29b..9bfc68edf 100644 --- a/src/openvic-simulation/defines/DiplomacyDefines.hpp +++ b/src/openvic-simulation/defines/DiplomacyDefines.hpp @@ -1,7 +1,7 @@ #pragma once +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/utility/Getters.hpp" diff --git a/src/openvic-simulation/defines/EconomyDefines.hpp b/src/openvic-simulation/defines/EconomyDefines.hpp index 1da082fed..c0548e340 100644 --- a/src/openvic-simulation/defines/EconomyDefines.hpp +++ b/src/openvic-simulation/defines/EconomyDefines.hpp @@ -1,7 +1,7 @@ #pragma once +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/utility/Getters.hpp" diff --git a/src/openvic-simulation/defines/MilitaryDefines.hpp b/src/openvic-simulation/defines/MilitaryDefines.hpp index c104893c0..0cf75cb68 100644 --- a/src/openvic-simulation/defines/MilitaryDefines.hpp +++ b/src/openvic-simulation/defines/MilitaryDefines.hpp @@ -1,8 +1,8 @@ #pragma once +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" #include "openvic-simulation/military/CombatWidth.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/population/PopSize.hpp" #include "openvic-simulation/utility/Getters.hpp" diff --git a/src/openvic-simulation/diplomacy/CountryRelation.hpp b/src/openvic-simulation/diplomacy/CountryRelation.hpp index 6780ae663..119d0a0af 100644 --- a/src/openvic-simulation/diplomacy/CountryRelation.hpp +++ b/src/openvic-simulation/diplomacy/CountryRelation.hpp @@ -11,7 +11,7 @@ #include "openvic-simulation/core/Compare.hpp" #include "openvic-simulation/core/Hash.hpp" -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/diplomacy/DiplomaticAction.cpp b/src/openvic-simulation/diplomacy/DiplomaticAction.cpp index 92f7ea98c..6bd8d122c 100644 --- a/src/openvic-simulation/diplomacy/DiplomaticAction.cpp +++ b/src/openvic-simulation/diplomacy/DiplomaticAction.cpp @@ -4,9 +4,10 @@ #include #include "openvic-simulation/InstanceManager.hpp" +#include "openvic-simulation/core/object/Date.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/diplomacy/CountryRelation.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/utility/Logger.hpp" diff --git a/src/openvic-simulation/economy/BuildingInstance.hpp b/src/openvic-simulation/economy/BuildingInstance.hpp index 7fc5431b8..4ed66a6fa 100644 --- a/src/openvic-simulation/economy/BuildingInstance.hpp +++ b/src/openvic-simulation/economy/BuildingInstance.hpp @@ -1,7 +1,7 @@ #pragma once +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/economy/BuildingLevel.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/HasIdentifier.hpp" diff --git a/src/openvic-simulation/economy/BuildingType.hpp b/src/openvic-simulation/economy/BuildingType.hpp index f4bb8a689..8c1f2a814 100644 --- a/src/openvic-simulation/economy/BuildingType.hpp +++ b/src/openvic-simulation/economy/BuildingType.hpp @@ -5,10 +5,10 @@ #include "openvic-simulation/core/memory/Vector.hpp" #include "openvic-simulation/modifier/Modifier.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/core/stl/containers/TypedSpan.hpp" #include "openvic-simulation/economy/BuildingLevel.hpp" #include "openvic-simulation/economy/BuildingRestrictionCategory.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/HasIndex.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" diff --git a/src/openvic-simulation/ecs/System.hpp b/src/openvic-simulation/ecs/System.hpp index 42c715b9f..d4683ab24 100644 --- a/src/openvic-simulation/ecs/System.hpp +++ b/src/openvic-simulation/ecs/System.hpp @@ -10,12 +10,12 @@ #include #include +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/QueryFilter.hpp" #include "openvic-simulation/ecs/SystemAccess.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" -#include "openvic-simulation/types/Date.hpp" namespace OpenVic::ecs { struct World; diff --git a/src/openvic-simulation/ecs/SystemScheduler.hpp b/src/openvic-simulation/ecs/SystemScheduler.hpp index 941e8bbf1..1b190fca4 100644 --- a/src/openvic-simulation/ecs/SystemScheduler.hpp +++ b/src/openvic-simulation/ecs/SystemScheduler.hpp @@ -4,9 +4,9 @@ #include #include +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/System.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" -#include "openvic-simulation/types/Date.hpp" namespace OpenVic::ecs { struct World; diff --git a/src/openvic-simulation/history/Bookmark.cpp b/src/openvic-simulation/history/Bookmark.cpp index 79efd7a62..e1f4e3d47 100644 --- a/src/openvic-simulation/history/Bookmark.cpp +++ b/src/openvic-simulation/history/Bookmark.cpp @@ -4,8 +4,8 @@ #include +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/utility/Logger.hpp" diff --git a/src/openvic-simulation/history/CountryHistory.hpp b/src/openvic-simulation/history/CountryHistory.hpp index 1cdb25977..01cac766e 100644 --- a/src/openvic-simulation/history/CountryHistory.hpp +++ b/src/openvic-simulation/history/CountryHistory.hpp @@ -3,8 +3,8 @@ #include #include "openvic-simulation/core/memory/SmartPtr.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/history/HistoryMap.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IndexedFlatMap.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp" diff --git a/src/openvic-simulation/history/DiplomaticHistory.hpp b/src/openvic-simulation/history/DiplomaticHistory.hpp index 3fc829da7..96620b8d8 100644 --- a/src/openvic-simulation/history/DiplomaticHistory.hpp +++ b/src/openvic-simulation/history/DiplomaticHistory.hpp @@ -3,12 +3,12 @@ #include #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" #include "openvic-simulation/history/diplomacy/AllianceHistory.hpp" #include "openvic-simulation/history/diplomacy/ReparationsHistory.hpp" #include "openvic-simulation/history/diplomacy/SubjectHistory.hpp" #include "openvic-simulation/history/diplomacy/WarHistory.hpp" -#include "openvic-simulation/types/Date.hpp" namespace OpenVic { struct CountryDefinitionManager; diff --git a/src/openvic-simulation/history/HistoryMap.hpp b/src/openvic-simulation/history/HistoryMap.hpp index c106b0caa..b80b8c0fb 100644 --- a/src/openvic-simulation/history/HistoryMap.hpp +++ b/src/openvic-simulation/history/HistoryMap.hpp @@ -5,8 +5,8 @@ #include "openvic-simulation/core/memory/SmartPtr.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/history/Period.hpp b/src/openvic-simulation/history/Period.hpp index a28df7116..7d8661b16 100644 --- a/src/openvic-simulation/history/Period.hpp +++ b/src/openvic-simulation/history/Period.hpp @@ -2,7 +2,7 @@ #include -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Date.hpp" namespace OpenVic { struct Period { diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp index 2d5d09294..21501dbc1 100644 --- a/src/openvic-simulation/history/ProvinceHistory.hpp +++ b/src/openvic-simulation/history/ProvinceHistory.hpp @@ -4,13 +4,13 @@ #include "openvic-simulation/core/memory/FixedVector.hpp" #include "openvic-simulation/core/memory/SmartPtr.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/core/stl/containers/TypedSpan.hpp" #include "openvic-simulation/economy/BuildingType.hpp" #include "openvic-simulation/history/HistoryMap.hpp" #include "openvic-simulation/population/Pop.hpp" #include "openvic-simulation/economy/BuildingLevel.hpp" #include "openvic-simulation/types/ColonyStatus.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/types/TypedIndices.hpp" diff --git a/src/openvic-simulation/history/diplomacy/WarHistory.hpp b/src/openvic-simulation/history/diplomacy/WarHistory.hpp index 2a13ce3b3..06b2b7e7f 100644 --- a/src/openvic-simulation/history/diplomacy/WarHistory.hpp +++ b/src/openvic-simulation/history/diplomacy/WarHistory.hpp @@ -4,8 +4,8 @@ #include #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/history/Period.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/utility/Getters.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/map/MapInstance.hpp b/src/openvic-simulation/map/MapInstance.hpp index 0c37d5589..0658d5dc1 100644 --- a/src/openvic-simulation/map/MapInstance.hpp +++ b/src/openvic-simulation/map/MapInstance.hpp @@ -1,12 +1,12 @@ #pragma once +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/map/ProvinceDefinition.hpp" #include "openvic-simulation/map/ProvinceInstance.hpp" #include "openvic-simulation/map/State.hpp" #include "openvic-simulation/pathfinding/AStarPathing.hpp" #include "openvic-simulation/population/PopSum.hpp" #include "openvic-simulation/population/PopValuesFromProvince.hpp" -#include "openvic-simulation/types/Date.hpp" namespace OpenVic { struct BuildingTypeManager; diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp index c21510e46..bde9c2034 100644 --- a/src/openvic-simulation/map/ProvinceInstance.hpp +++ b/src/openvic-simulation/map/ProvinceInstance.hpp @@ -5,6 +5,7 @@ #include "openvic-simulation/core/memory/Colony.hpp" #include "openvic-simulation/core/memory/FixedVector.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/core/portable/ForwardableSpan.hpp" #include "openvic-simulation/core/stl/containers/TypedSpan.hpp" #include "openvic-simulation/economy/BuildingInstance.hpp" diff --git a/src/openvic-simulation/military/Leader.hpp b/src/openvic-simulation/military/Leader.hpp index 25c4245cf..8867f183f 100644 --- a/src/openvic-simulation/military/Leader.hpp +++ b/src/openvic-simulation/military/Leader.hpp @@ -2,7 +2,7 @@ #include -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/UnitBranchType.hpp" #include "openvic-simulation/types/UniqueId.hpp" diff --git a/src/openvic-simulation/military/UnitType.hpp b/src/openvic-simulation/military/UnitType.hpp index 7f215641a..cd874dc44 100644 --- a/src/openvic-simulation/military/UnitType.hpp +++ b/src/openvic-simulation/military/UnitType.hpp @@ -5,10 +5,10 @@ #include +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" #include "openvic-simulation/economy/GoodDefinition.hpp" #include "openvic-simulation/modifier/Modifier.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/HasIdentifier.hpp" #include "openvic-simulation/types/HasIndex.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" diff --git a/src/openvic-simulation/military/Wargoal.cpp b/src/openvic-simulation/military/Wargoal.cpp index 1945abb27..2ff37d140 100644 --- a/src/openvic-simulation/military/Wargoal.cpp +++ b/src/openvic-simulation/military/Wargoal.cpp @@ -4,6 +4,7 @@ #include +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" using namespace OpenVic; diff --git a/src/openvic-simulation/military/Wargoal.hpp b/src/openvic-simulation/military/Wargoal.hpp index daeb958a5..a02dd578d 100644 --- a/src/openvic-simulation/military/Wargoal.hpp +++ b/src/openvic-simulation/military/Wargoal.hpp @@ -5,6 +5,7 @@ #include #include "openvic-simulation/core/memory/String.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/scripts/ConditionScript.hpp" #include "openvic-simulation/scripts/EffectScript.hpp" #include "openvic-simulation/core/template/EnumBitfield.hpp" diff --git a/src/openvic-simulation/modifier/Modifier.hpp b/src/openvic-simulation/modifier/Modifier.hpp index 662a6f681..61e194928 100644 --- a/src/openvic-simulation/modifier/Modifier.hpp +++ b/src/openvic-simulation/modifier/Modifier.hpp @@ -2,9 +2,9 @@ #include +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/modifier/ModifierValue.hpp" #include "openvic-simulation/scripts/ConditionScript.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/utility/Getters.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/politics/Government.cpp b/src/openvic-simulation/politics/Government.cpp index fc252fb45..7ff15c5ae 100644 --- a/src/openvic-simulation/politics/Government.cpp +++ b/src/openvic-simulation/politics/Government.cpp @@ -2,6 +2,7 @@ #include +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/politics/Ideology.hpp" using namespace OpenVic; diff --git a/src/openvic-simulation/politics/Government.hpp b/src/openvic-simulation/politics/Government.hpp index b41a09984..a829c387e 100644 --- a/src/openvic-simulation/politics/Government.hpp +++ b/src/openvic-simulation/politics/Government.hpp @@ -4,7 +4,7 @@ #include "openvic-simulation/core/memory/String.hpp" #include "openvic-simulation/core/memory/Vector.hpp" -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/types/HasIdentifier.hpp" #include "openvic-simulation/types/HasIndex.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" diff --git a/src/openvic-simulation/politics/PoliticsInstanceManager.hpp b/src/openvic-simulation/politics/PoliticsInstanceManager.hpp index a333c94fa..06a7d4731 100644 --- a/src/openvic-simulation/politics/PoliticsInstanceManager.hpp +++ b/src/openvic-simulation/politics/PoliticsInstanceManager.hpp @@ -2,7 +2,7 @@ #include -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/types/IndexedFlatMap.hpp" #include "openvic-simulation/utility/Getters.hpp" #include "openvic-simulation/core/portable/ForwardableSpan.hpp" diff --git a/src/openvic-simulation/research/Technology.hpp b/src/openvic-simulation/research/Technology.hpp index 25997a222..a1cf5e967 100644 --- a/src/openvic-simulation/research/Technology.hpp +++ b/src/openvic-simulation/research/Technology.hpp @@ -4,9 +4,9 @@ #include #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/modifier/Modifier.hpp" #include "openvic-simulation/scripts/ConditionalWeight.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/HasIdentifier.hpp" #include "openvic-simulation/types/HasIndex.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" diff --git a/src/openvic-simulation/scripts/ConditionalWeight.cpp b/src/openvic-simulation/scripts/ConditionalWeight.cpp index c5a72da35..6aa6f27e1 100644 --- a/src/openvic-simulation/scripts/ConditionalWeight.cpp +++ b/src/openvic-simulation/scripts/ConditionalWeight.cpp @@ -1,5 +1,7 @@ #include "ConditionalWeight.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" + using namespace OpenVic; using namespace OpenVic::NodeTools; diff --git a/src/openvic-simulation/utility/ThreadPool.hpp b/src/openvic-simulation/utility/ThreadPool.hpp index 8251857ef..9d11236b8 100644 --- a/src/openvic-simulation/utility/ThreadPool.hpp +++ b/src/openvic-simulation/utility/ThreadPool.hpp @@ -9,10 +9,10 @@ #include "openvic-simulation/population/PopValuesFromProvince.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/core/portable/ForwardableSpan.hpp" #include "openvic-simulation/core/random/RandomGenerator.hpp" #include "openvic-simulation/population/PopValuesFromProvince.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/TypedIndices.hpp" namespace OpenVic { diff --git a/tests/benchmarks/src/ecs/AliasingHotLoop.cpp b/tests/benchmarks/src/ecs/AliasingHotLoop.cpp index 69c07fa18..7d34a33e2 100644 --- a/tests/benchmarks/src/ecs/AliasingHotLoop.cpp +++ b/tests/benchmarks/src/ecs/AliasingHotLoop.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ChunkSystem.hpp" #include "openvic-simulation/ecs/ChunkView.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/benchmarks/src/ecs/ImmutableEntity.cpp b/tests/benchmarks/src/ecs/ImmutableEntity.cpp index b7c6e6319..8fc45af4a 100644 --- a/tests/benchmarks/src/ecs/ImmutableEntity.cpp +++ b/tests/benchmarks/src/ecs/ImmutableEntity.cpp @@ -1,8 +1,8 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/benchmarks/src/ecs/Scheduler.cpp b/tests/benchmarks/src/ecs/Scheduler.cpp index 432c8427b..693c54bc1 100644 --- a/tests/benchmarks/src/ecs/Scheduler.cpp +++ b/tests/benchmarks/src/ecs/Scheduler.cpp @@ -1,8 +1,8 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/benchmarks/src/ecs/SystemShouldRun.cpp b/tests/benchmarks/src/ecs/SystemShouldRun.cpp index 6954218f1..bb292a677 100644 --- a/tests/benchmarks/src/ecs/SystemShouldRun.cpp +++ b/tests/benchmarks/src/ecs/SystemShouldRun.cpp @@ -1,8 +1,8 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/benchmarks/src/ecs/SystemTick.cpp b/tests/benchmarks/src/ecs/SystemTick.cpp index 80a1d05dc..655597230 100644 --- a/tests/benchmarks/src/ecs/SystemTick.cpp +++ b/tests/benchmarks/src/ecs/SystemTick.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ChunkSystem.hpp" #include "openvic-simulation/ecs/ChunkView.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/types/Date.cpp b/tests/src/core/object/Date.cpp similarity index 99% rename from tests/src/types/Date.cpp rename to tests/src/core/object/Date.cpp index ff8126a11..5a00fe668 100644 --- a/tests/src/types/Date.cpp +++ b/tests/src/core/object/Date.cpp @@ -1,9 +1,11 @@ -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include #include #include +#include "openvic-simulation/core/object/Timespan.hpp" + #include "Helper.hpp" // IWYU pragma: keep #include #include diff --git a/tests/src/types/Timespan.cpp b/tests/src/core/object/Timespan.cpp similarity index 97% rename from tests/src/types/Timespan.cpp rename to tests/src/core/object/Timespan.cpp index bd2b17455..be3f88e49 100644 --- a/tests/src/types/Timespan.cpp +++ b/tests/src/core/object/Timespan.cpp @@ -2,7 +2,7 @@ #include #include -#include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "Helper.hpp" // IWYU pragma: keep #include diff --git a/tests/src/dataloader/NodeTools.cpp b/tests/src/dataloader/NodeTools.cpp index 6f7d25b1b..8711cc509 100644 --- a/tests/src/dataloader/NodeTools.cpp +++ b/tests/src/dataloader/NodeTools.cpp @@ -22,8 +22,9 @@ #include #include +#include "openvic-simulation/core/object/Date.hpp" +#include "openvic-simulation/core/object/Timespan.hpp" #include "openvic-simulation/types/Colour.hpp" -#include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/fixed_point/String.hpp" #include "openvic-simulation/core/string/CharConv.hpp" diff --git a/tests/src/ecs/BulkCreate.cpp b/tests/src/ecs/BulkCreate.cpp index cfaf19687..cade2d4ed 100644 --- a/tests/src/ecs/BulkCreate.cpp +++ b/tests/src/ecs/BulkCreate.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/Checksum.cpp b/tests/src/ecs/Checksum.cpp index 5ac08a756..0d5410fc5 100644 --- a/tests/src/ecs/Checksum.cpp +++ b/tests/src/ecs/Checksum.cpp @@ -1,5 +1,6 @@ #include "openvic-simulation/ecs/Archetype.hpp" #include "openvic-simulation/ecs/Checksum.hpp" +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ChecksumTraits.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" @@ -7,7 +8,6 @@ #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/ChunkPool.cpp b/tests/src/ecs/ChunkPool.cpp index f5786f6da..b46bb6331 100644 --- a/tests/src/ecs/ChunkPool.cpp +++ b/tests/src/ecs/ChunkPool.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/Chunk.hpp" #include "openvic-simulation/ecs/ChunkPool.hpp" #include "openvic-simulation/ecs/ChunkView.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/ChunkSystem.cpp b/tests/src/ecs/ChunkSystem.cpp index b2f3bc1b6..adfa5c3de 100644 --- a/tests/src/ecs/ChunkSystem.cpp +++ b/tests/src/ecs/ChunkSystem.cpp @@ -1,10 +1,11 @@ #include "openvic-simulation/ecs/ChunkSystem.hpp" + +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/CommandBufferApplyOrder.cpp b/tests/src/ecs/CommandBufferApplyOrder.cpp index 148c8223b..46e015f15 100644 --- a/tests/src/ecs/CommandBufferApplyOrder.cpp +++ b/tests/src/ecs/CommandBufferApplyOrder.cpp @@ -1,3 +1,4 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" @@ -5,7 +6,6 @@ #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include diff --git a/tests/src/ecs/IdentitySnapshotInvariance.cpp b/tests/src/ecs/IdentitySnapshotInvariance.cpp index 3c1529ca9..17c081327 100644 --- a/tests/src/ecs/IdentitySnapshotInvariance.cpp +++ b/tests/src/ecs/IdentitySnapshotInvariance.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/ImmutableEntity.cpp b/tests/src/ecs/ImmutableEntity.cpp index 0af686bdb..e7ab67ee2 100644 --- a/tests/src/ecs/ImmutableEntity.cpp +++ b/tests/src/ecs/ImmutableEntity.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/InTickMutationGuard.cpp b/tests/src/ecs/InTickMutationGuard.cpp index 530243919..3f0eed5f4 100644 --- a/tests/src/ecs/InTickMutationGuard.cpp +++ b/tests/src/ecs/InTickMutationGuard.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/Integration.cpp b/tests/src/ecs/Integration.cpp index 1529201b8..1895cb5f5 100644 --- a/tests/src/ecs/Integration.cpp +++ b/tests/src/ecs/Integration.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CachedRef.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/Query.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/IntraSystemParallel.cpp b/tests/src/ecs/IntraSystemParallel.cpp index c1bc1f7eb..5d2037eff 100644 --- a/tests/src/ecs/IntraSystemParallel.cpp +++ b/tests/src/ecs/IntraSystemParallel.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/MultiSystemMixedStage.cpp b/tests/src/ecs/MultiSystemMixedStage.cpp index 211e53f5a..a207a5080 100644 --- a/tests/src/ecs/MultiSystemMixedStage.cpp +++ b/tests/src/ecs/MultiSystemMixedStage.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/System.cpp b/tests/src/ecs/System.cpp index 905b2b6f5..c309281d8 100644 --- a/tests/src/ecs/System.cpp +++ b/tests/src/ecs/System.cpp @@ -1,8 +1,8 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemFilters.cpp b/tests/src/ecs/SystemFilters.cpp index ee73c7129..8378dbec3 100644 --- a/tests/src/ecs/SystemFilters.cpp +++ b/tests/src/ecs/SystemFilters.cpp @@ -1,3 +1,4 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ChunkSystem.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" @@ -6,7 +7,6 @@ #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemFiltersWorkerCountInvariance.cpp b/tests/src/ecs/SystemFiltersWorkerCountInvariance.cpp index abb161377..5ba8c03fb 100644 --- a/tests/src/ecs/SystemFiltersWorkerCountInvariance.cpp +++ b/tests/src/ecs/SystemFiltersWorkerCountInvariance.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/QueryFilter.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemPhaseAnchors.cpp b/tests/src/ecs/SystemPhaseAnchors.cpp index f94cc42b4..315b493c7 100644 --- a/tests/src/ecs/SystemPhaseAnchors.cpp +++ b/tests/src/ecs/SystemPhaseAnchors.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/QueryFilter.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemPhase.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemSchedulerDisjointWriters.cpp b/tests/src/ecs/SystemSchedulerDisjointWriters.cpp index 0b32e7543..219f80880 100644 --- a/tests/src/ecs/SystemSchedulerDisjointWriters.cpp +++ b/tests/src/ecs/SystemSchedulerDisjointWriters.cpp @@ -1,3 +1,4 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ChunkSystem.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" @@ -7,7 +8,6 @@ #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemSchedulerSingletonWrites.cpp b/tests/src/ecs/SystemSchedulerSingletonWrites.cpp index c3154b3bb..af588216b 100644 --- a/tests/src/ecs/SystemSchedulerSingletonWrites.cpp +++ b/tests/src/ecs/SystemSchedulerSingletonWrites.cpp @@ -1,9 +1,9 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemScheduler_Conflicts.cpp b/tests/src/ecs/SystemScheduler_Conflicts.cpp index ef769f831..7126e430d 100644 --- a/tests/src/ecs/SystemScheduler_Conflicts.cpp +++ b/tests/src/ecs/SystemScheduler_Conflicts.cpp @@ -1,8 +1,8 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include diff --git a/tests/src/ecs/SystemScheduler_DAG.cpp b/tests/src/ecs/SystemScheduler_DAG.cpp index b836c8bc7..02859c757 100644 --- a/tests/src/ecs/SystemScheduler_DAG.cpp +++ b/tests/src/ecs/SystemScheduler_DAG.cpp @@ -1,8 +1,8 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemShouldRun.cpp b/tests/src/ecs/SystemShouldRun.cpp index bb6848445..3ee205fb0 100644 --- a/tests/src/ecs/SystemShouldRun.cpp +++ b/tests/src/ecs/SystemShouldRun.cpp @@ -1,3 +1,4 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/Checksum.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" @@ -5,7 +6,6 @@ #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/SystemThreadedSpawn.cpp b/tests/src/ecs/SystemThreadedSpawn.cpp index 5a742bac0..1b8a9ad4f 100644 --- a/tests/src/ecs/SystemThreadedSpawn.cpp +++ b/tests/src/ecs/SystemThreadedSpawn.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include diff --git a/tests/src/ecs/WorkerCountInvariance.cpp b/tests/src/ecs/WorkerCountInvariance.cpp index 829fe588e..d6c8b7e5f 100644 --- a/tests/src/ecs/WorkerCountInvariance.cpp +++ b/tests/src/ecs/WorkerCountInvariance.cpp @@ -1,10 +1,10 @@ +#include "openvic-simulation/core/object/Date.hpp" #include "openvic-simulation/ecs/CommandBuffer.hpp" #include "openvic-simulation/ecs/ComponentTypeID.hpp" #include "openvic-simulation/ecs/EntityID.hpp" #include "openvic-simulation/ecs/SystemImpl.hpp" #include "openvic-simulation/ecs/SystemTypeID.hpp" #include "openvic-simulation/ecs/World.hpp" -#include "openvic-simulation/types/Date.hpp" #include #include