Refactor less used utility and type headers into core path

Spartan322 · Spartan322 · commit f144985103cc · 2025-11-29T16:47:14.000-05:00
diff --git a/src/openvic-simulation/core/Algorithm.hpp b/src/openvic-simulation/core/Algorithm.hpp
diff --git a/src/openvic-simulation/core/Compare.hpp b/src/openvic-simulation/core/Compare.hpp
diff --git a/src/openvic-simulation/core/FormatValidate.hpp b/src/openvic-simulation/core/FormatValidate.hpp
diff --git a/src/openvic-simulation/core/Hash.hpp b/src/openvic-simulation/core/Hash.hpp
diff --git a/src/openvic-simulation/core/Math.hpp b/src/openvic-simulation/core/Math.hpp
diff --git a/src/openvic-simulation/core/random/RandomGenerator.hpp b/src/openvic-simulation/core/random/RandomGenerator.hpp
diff --git a/src/openvic-simulation/core/random/WeightedSampling.hpp b/src/openvic-simulation/core/random/WeightedSampling.hpp
@@ -2,12 +2,13 @@
 
 #include <cstdint>
 #include <limits>
+#include <span>
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
+#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
-	OV_ALWAYS_INLINE static size_t sample_weighted_index(
+	OV_SPEED_INLINE static size_t sample_weighted_index(
 		const uint32_t random_value, 
 		const std::span<const fixed_point_t> positive_weights,
 		const fixed_point_t weights_sum
diff --git a/src/openvic-simulation/core/template/EnumBitfield.hpp b/src/openvic-simulation/core/template/EnumBitfield.hpp
diff --git a/src/openvic-simulation/core/thread/NullMutex.hpp b/src/openvic-simulation/core/thread/NullMutex.hpp
diff --git a/src/openvic-simulation/core/thread/SpinMutex.hpp b/src/openvic-simulation/core/thread/SpinMutex.hpp
diff --git a/src/openvic-simulation/core/ui/TextFormat.hpp b/src/openvic-simulation/core/ui/TextFormat.hpp
diff --git a/src/openvic-simulation/dataloader/ModManager.cpp b/src/openvic-simulation/dataloader/ModManager.cpp
@@ -7,7 +7,7 @@
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp
@@ -16,7 +16,7 @@
 #include <range/v3/view/enumerate.hpp>
 
 #include "openvic-simulation/types/Colour.hpp"
-#include "openvic-simulation/types/TextFormat.hpp"
+#include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/dataloader/NodeTools.hpp b/src/openvic-simulation/dataloader/NodeTools.hpp
@@ -20,9 +20,9 @@
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/types/TextFormat.hpp"
+#include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/types/Vector.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 #include "openvic-simulation/utility/TslHelper.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
diff --git a/src/openvic-simulation/diplomacy/CountryRelation.hpp b/src/openvic-simulation/diplomacy/CountryRelation.hpp
@@ -11,7 +11,7 @@
 
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/utility/Hash.hpp"
+#include "openvic-simulation/core/Hash.hpp"
 
 namespace OpenVic {
 	struct CountryInstance;
diff --git a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
@@ -17,9 +17,9 @@
 #include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/population/PopValuesFromProvince.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/utility/RandomGenerator.hpp"
+#include "openvic-simulation/core/random/RandomGenerator.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
-#include "openvic-simulation/utility/WeightedSampling.hpp"
+#include "openvic-simulation/core/random/WeightedSampling.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/history/CountryHistory.cpp b/src/openvic-simulation/history/CountryHistory.cpp
@@ -5,7 +5,7 @@
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/politics/Government.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
diff --git a/src/openvic-simulation/interface/GFXObject.hpp b/src/openvic-simulation/interface/GFXObject.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 
 #include "openvic-simulation/interface/LoadBase.hpp"
-#include "openvic-simulation/types/TextFormat.hpp"
+#include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 
diff --git a/src/openvic-simulation/interface/GUI.hpp b/src/openvic-simulation/interface/GUI.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "openvic-simulation/interface/GFXSprite.hpp"
-#include "openvic-simulation/types/TextFormat.hpp"
+#include "openvic-simulation/core/ui/TextFormat.hpp"
 #include "openvic-simulation/misc/SoundEffect.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/map/MapDefinition.cpp b/src/openvic-simulation/map/MapDefinition.cpp
@@ -25,7 +25,7 @@
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 #include "openvic-simulation/types/TypedSpan.hpp"
 #include "openvic-simulation/types/Vector.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 #include "openvic-simulation/utility/StringUtils.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
diff --git a/src/openvic-simulation/map/TerrainType.cpp b/src/openvic-simulation/map/TerrainType.cpp
@@ -5,7 +5,7 @@
 #include "openvic-simulation/modifier/ModifierManager.hpp"
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/military/UnitInstanceGroup.cpp b/src/openvic-simulation/military/UnitInstanceGroup.cpp
@@ -11,7 +11,7 @@
 #include "openvic-simulation/population/Culture.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/military/Wargoal.hpp b/src/openvic-simulation/military/Wargoal.hpp
@@ -4,7 +4,7 @@
 
 #include "openvic-simulation/scripts/ConditionScript.hpp"
 #include "openvic-simulation/scripts/EffectScript.hpp"
-#include "openvic-simulation/types/EnumBitfield.hpp"
+#include "openvic-simulation/core/template/EnumBitfield.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
diff --git a/src/openvic-simulation/modifier/ModifierEffect.hpp b/src/openvic-simulation/modifier/ModifierEffect.hpp
@@ -2,7 +2,7 @@
 
 #include <string_view>
 
-#include "openvic-simulation/types/EnumBitfield.hpp"
+#include "openvic-simulation/core/template/EnumBitfield.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/pathfinding/PointMap.hpp b/src/openvic-simulation/pathfinding/PointMap.hpp
@@ -8,11 +8,11 @@
 #include <tsl/ordered_map.h>
 #include <tsl/ordered_set.h>
 
-#include "openvic-simulation/types/EnumBitfield.hpp"
+#include "openvic-simulation/core/template/EnumBitfield.hpp"
 #include "openvic-simulation/types/Signal.hpp"
 #include "openvic-simulation/types/Vector.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/utility/Hash.hpp"
+#include "openvic-simulation/core/Hash.hpp"
 
 namespace OpenVic {
 	struct PointMap {
diff --git a/src/openvic-simulation/politics/NationalFocus.cpp b/src/openvic-simulation/politics/NationalFocus.cpp
@@ -4,7 +4,7 @@
 #include "openvic-simulation/modifier/ModifierManager.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/population/PopManager.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
diff --git a/src/openvic-simulation/politics/Rule.cpp b/src/openvic-simulation/politics/Rule.cpp
@@ -4,7 +4,7 @@
 #include "openvic-simulation/utility/TslHelper.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
diff --git a/src/openvic-simulation/population/Pop.cpp b/src/openvic-simulation/population/Pop.cpp
@@ -38,7 +38,7 @@
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 
diff --git a/src/openvic-simulation/population/PopManager.cpp b/src/openvic-simulation/population/PopManager.cpp
@@ -9,7 +9,7 @@
 #include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
-#include "openvic-simulation/utility/FormatValidate.hpp"
+#include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/scripts/Condition.hpp b/src/openvic-simulation/scripts/Condition.hpp
@@ -5,7 +5,7 @@
 #include <string_view>
 #include <variant>
 
-#include "openvic-simulation/types/EnumBitfield.hpp"
+#include "openvic-simulation/core/template/EnumBitfield.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
diff --git a/src/openvic-simulation/types/BasicIterator.hpp b/src/openvic-simulation/types/BasicIterator.hpp
@@ -4,7 +4,7 @@
 #include <iterator>
 
 #include "openvic-simulation/core/Typedefs.hpp"
-#include "openvic-simulation/utility/Compare.hpp"
+#include "openvic-simulation/core/Compare.hpp"
 
 namespace OpenVic {
 	template<typename Pointer, typename ContainerTag>
diff --git a/src/openvic-simulation/types/CowVector.hpp b/src/openvic-simulation/types/CowVector.hpp
@@ -13,7 +13,7 @@
 
 #include "openvic-simulation/types/BasicIterator.hpp"
 #include "openvic-simulation/utility/Allocator.hpp"
-#include "openvic-simulation/utility/Compare.hpp"
+#include "openvic-simulation/core/Compare.hpp"
 #include "openvic-simulation/core/template/Concepts.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 
diff --git a/src/openvic-simulation/types/Date.hpp b/src/openvic-simulation/types/Date.hpp
@@ -21,7 +21,7 @@
 #include "openvic-simulation/utility/Getters.hpp"
 #include "openvic-simulation/utility/StringUtils.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
-#include "openvic-simulation/utility/Hash.hpp"
+#include "openvic-simulation/core/Hash.hpp"
 
 namespace OpenVic {
 	// A relative period between points in time, measured in days
diff --git a/src/openvic-simulation/types/Signal.hpp b/src/openvic-simulation/types/Signal.hpp
@@ -14,7 +14,7 @@
 
 #include "openvic-simulation/types/CowPtr.hpp"
 #include "openvic-simulation/types/CowVector.hpp"
-#include "openvic-simulation/types/NullMutex.hpp"
+#include "openvic-simulation/core/thread/NullMutex.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 
diff --git a/src/openvic-simulation/types/Vector.hpp b/src/openvic-simulation/types/Vector.hpp
@@ -8,7 +8,7 @@
 #include "openvic-simulation/types/BasicIterator.hpp" // IWYU pragma: keep
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/core/template/Concepts.hpp" // IWYU pragma: keep
-#include "openvic-simulation/utility/Math.hpp" // IWYU pragma: keep
+#include "openvic-simulation/core/Math.hpp" // IWYU pragma: keep
 #include "openvic-simulation/core/Typedefs.hpp" // IWYU pragma: keep
 
 #define VEC_TYPE vec2_t
diff --git a/src/openvic-simulation/types/fixed_point/FixedPoint.hpp b/src/openvic-simulation/types/fixed_point/FixedPoint.hpp
@@ -21,7 +21,7 @@
 #include "openvic-simulation/utility/StringUtils.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
-#include "openvic-simulation/utility/Math.hpp"
+#include "openvic-simulation/core/Math.hpp"
 
 /* Sin lookup table */
 #include "openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp"
diff --git a/src/openvic-simulation/utility/ThreadPool.hpp b/src/openvic-simulation/utility/ThreadPool.hpp
@@ -9,7 +9,7 @@
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/core/portable/ForwardableSpan.hpp"
-#include "openvic-simulation/utility/RandomGenerator.hpp"
+#include "openvic-simulation/core/random/RandomGenerator.hpp"
 
 namespace OpenVic {
 	struct GameRulesManager;
diff --git a/tests/src/core/DualAdjacent.cpp b/tests/src/core/DualAdjacent.cpp
@@ -4,7 +4,7 @@
 #include <range/v3/algorithm/equal.hpp>
 #include <range/v3/view/drop.hpp>
 
-#include "openvic-simulation/utility/Algorithm.hpp"
+#include "openvic-simulation/core/Algorithm.hpp"
 
 #include "Helper.hpp" // IWYU pragma: keep
 #include <snitch/snitch_append.hpp>
diff --git a/tests/src/core/random/ExtendedMath.hpp b/tests/src/core/random/ExtendedMath.hpp
diff --git a/tests/src/core/random/WeightedSampling.cpp b/tests/src/core/random/WeightedSampling.cpp
@@ -1,7 +1,7 @@
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/utility/WeightedSampling.hpp"
+#include "openvic-simulation/core/random/WeightedSampling.hpp"
 
-#include "utility/ExtendedMath.hpp"
+#include "core/random/ExtendedMath.hpp"
 
 #include <cstdint>
 #include <limits>
diff --git a/tests/src/types/Approx.hpp b/tests/src/types/Approx.hpp
@@ -6,7 +6,7 @@
 #include <limits>
 
 #include "openvic-simulation/types/Vector.hpp"
-#include "openvic-simulation/utility/Math.hpp"
+#include "openvic-simulation/core/Math.hpp"
 
 #include "Vector.hpp" // IWYU pragma: keep
 #include <snitch/snitch_string.hpp>
diff --git a/tests/src/types/Signal.cpp b/tests/src/types/Signal.cpp
@@ -5,7 +5,7 @@
 #include <sstream>
 #include <string>
 
-#include "openvic-simulation/types/SpinMutex.hpp"
+#include "openvic-simulation/core/thread/SpinMutex.hpp"
 
 #include "Helper.hpp" // IWYU pragma: keep
 #include <snitch/snitch_macros_check.hpp>
