Refactor types and utility directories to core

Add more explicit header includes
Format header includes

Responsibility of classes and functions in headers moved to core have been reduced

Author: Spartan322

misc/scripts/exp_lut_generator.py

@@ -77,7 +77,7 @@ def generate_exp_lut(divisor_base: int, divisor_power: int, exp_base: decimal.De
     source += "}\n// clang-format on\n"
 
     fixed_point_lut_path: str = os.path.join(
-        os.path.dirname(__file__), f"../../src/openvic-simulation/types/fixed_point/FixedPointLUT_{lut_identifier}.hpp"
+        os.path.dirname(__file__), f"../../src/openvic-simulation/core/object/FixedPoint/LUT_{lut_identifier}.hpp"
     )
     with open(fixed_point_lut_path, "w", newline="\n") as file:
         file.write(source)

misc/scripts/sin_lut_generator.py

@@ -119,7 +119,7 @@ def generate_sin_lut(precision: int, count_log2: int):
     source += "}\n// clang-format on\n"
 
     fixed_point_sin_path: str = os.path.join(
-        os.path.dirname(__file__), "../../src/openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp"
+        os.path.dirname(__file__), "../../src/openvic-simulation/core/object/FixedPoint/LUT_sin.hpp"
     )
     with open(fixed_point_sin_path, "w", newline="\n") as file:
         file.write(source)

src/headless/main.cpp

@@ -1,7 +1,17 @@
+#include <algorithm>
+#include <array>
 #include <chrono>
+#include <cstddef>
+#include <cstring>
 #include <filesystem>
+#include <iterator>
 #include <memory>
+#include <optional>
 #include <random>
+#include <source_location>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include <fmt/base.h>
 #include <fmt/chrono.h>
@@ -13,16 +23,17 @@
 #include <spdlog/sinks/callback_sink.h>
 
 #include <openvic-simulation/GameManager.hpp>
+#include <openvic-simulation/core/Logger.hpp>
+#include <openvic-simulation/core/memory/String.hpp>
+#include <openvic-simulation/core/memory/Tracker.hpp>
+#include <openvic-simulation/core/portable/ForwardableSpan.hpp>
 #include <openvic-simulation/country/CountryInstance.hpp>
 #include <openvic-simulation/dataloader/Dataloader.hpp>
 #include <openvic-simulation/economy/GoodDefinition.hpp>
 #include <openvic-simulation/economy/production/ProductionType.hpp>
 #include <openvic-simulation/economy/production/ResourceGatheringOperation.hpp>
 #include <openvic-simulation/pathfinding/AStarPathing.hpp>
 #include <openvic-simulation/testing/Testing.hpp>
-#include <openvic-simulation/utility/Containers.hpp>
-#include <openvic-simulation/utility/Logger.hpp>
-#include <openvic-simulation/utility/MemoryTracker.hpp>
 
 using namespace OpenVic;
 
@@ -257,7 +268,7 @@ static bool run_headless(fs::path const& root, memory::vector<memory::string>& m
 	SPDLOG_INFO("===== Ranking system test... =====");
 	if (game_manager.get_instance_manager()) {
 		const auto print_ranking_list = [ //
-		](std::string_view title, OpenVic::utility::forwardable_span<CountryInstance* const> countries) -> void {
+		](std::string_view title, OpenVic::forwardable_span<CountryInstance* const> countries) -> void {
 			memory::string countries_str;
 			for (CountryInstance* country : countries) {
 				countries_str += fmt::format(
@@ -275,7 +286,7 @@ static bool run_headless(fs::path const& root, memory::vector<memory::string>& m
 		CountryInstanceManager const& country_instance_manager =
 			game_manager.get_instance_manager()->get_country_instance_manager();
 
-		OpenVic::utility::forwardable_span<CountryInstance* const> great_powers = country_instance_manager.get_great_powers();
+		OpenVic::forwardable_span<CountryInstance* const> great_powers = country_instance_manager.get_great_powers();
 		print_ranking_list("Great Powers", great_powers);
 		print_ranking_list("Secondary Powers", country_instance_manager.get_secondary_powers());
 		print_ranking_list("All countries", country_instance_manager.get_total_ranking());
@@ -373,7 +384,7 @@ static bool run_headless(fs::path const& root, memory::vector<memory::string>& m
 */
 
 int main(int argc, char const* argv[]) {
-	char const* program_name = StringUtils::get_filename(argc > 0 ? argv[0] : nullptr, "<program>");
+	char const* program_name = OpenVic::get_filename(argc > 0 ? argv[0] : nullptr, "<program>");
 	fs::path root;
 	memory::vector<memory::string> mods;
 	mods.reserve(argc);

src/openvic-simulation/Alias.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <cstdint>
+
+namespace OpenVic {
+	using building_level_t = std::int16_t;
+	using life_rating_t = std::int8_t;
+	using pop_size_t = std::int32_t;
+	using pop_sprite_t = std::uint8_t;
+	using technology_unlock_level_t = std::int8_t;
+	using unique_id_t = std::uint64_t;
+	using unit_variant_t = std::uint8_t;
+}

src/openvic-simulation/GameManager.cpp

@@ -1,17 +1,17 @@
 #include "GameManager.hpp"
 
 #include <chrono>
-#include <cstddef>
 #include <string_view>
 
 #include <range/v3/algorithm/contains.hpp>
 #include <range/v3/algorithm/find_if.hpp>
 
 #include <spdlog/spdlog.h>
 
+#include "openvic-simulation/core/Logger.hpp"
+#include "openvic-simulation/core/memory/OrderedSet.hpp"
+#include "openvic-simulation/core/memory/Vector.hpp"
 #include "openvic-simulation/dataloader/Dataloader.hpp"
-#include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/utility/Logger.hpp"
 
 using namespace OpenVic;
 
@@ -77,7 +77,7 @@ bool GameManager::load_mods(memory::vector<memory::string> const& mods_to_find)
 
 	bool ret = true;
 
-	vector_ordered_set<Mod const*> load_list;
+	memory::vector_ordered_set<Mod const*> load_list;
 
 	/* Check loaded mod descriptors for requested mods, using either full name or user directory name
 	 * (Historical Project Mod 0.4.6 or HPM both valid, for example), and load them plus their dependencies.
@@ -96,7 +96,7 @@ bool GameManager::load_mods(memory::vector<memory::string> const& mods_to_find)
 		}
 
 		Mod const* mod_ptr = &*it;
-		vector_ordered_set<Mod const*> dependencies = mod_ptr->generate_dependency_list(&ret);
+		memory::vector_ordered_set<Mod const*> dependencies = mod_ptr->generate_dependency_list(&ret);
 		if(!ret) {
 			continue;
 		}
@@ -120,7 +120,7 @@ bool GameManager::load_mods(memory::vector<memory::string> const& mods_to_find)
 	Dataloader::path_vector_t roots = dataloader.get_roots();
 	roots.reserve(load_list.size() + roots.size());
 
-	vector_ordered_set<fs::path> replace_paths;
+	memory::vector_ordered_set<fs::path> replace_paths;
 
 	/* Actually registers all roots and replace paths to be loaded by the game. */
 	for (Mod const* mod : load_list) {

src/openvic-simulation/GameManager.hpp

@@ -1,15 +1,15 @@
 #pragma once
 
+#include <cstdint>
 #include <optional>
 #include <string_view>
 
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
-#include "openvic-simulation/dataloader/ModManager.hpp"
 #include "openvic-simulation/dataloader/Dataloader.hpp"
-#include "openvic-simulation/misc/GameRulesManager.hpp"
+#include "openvic-simulation/dataloader/ModManager.hpp"
 #include "openvic-simulation/gen/commit_info.gen.hpp"
-#include "openvic-simulation/utility/Containers.hpp"
+#include "openvic-simulation/misc/GameRulesManager.hpp"
 
 #include <function2/function2.hpp>
 

src/openvic-simulation/InstanceManager.cpp

@@ -2,7 +2,7 @@
 
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/console/ConsoleInstance.hpp"
-#include "openvic-simulation/utility/Logger.hpp"
+#include "openvic-simulation/core/Logger.hpp"
 
 using namespace OpenVic;
 

src/openvic-simulation/InstanceManager.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
 #include "openvic-simulation/console/ConsoleInstance.hpp"
+#include "openvic-simulation/core/container/FlagStrings.hpp"
+#include "openvic-simulation/core/object/Date.hpp"
+#include "openvic-simulation/core/thread/ThreadPool.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/country/CountryInstanceDeps.hpp"
 #include "openvic-simulation/diplomacy/CountryRelation.hpp"
@@ -16,10 +19,6 @@
 #include "openvic-simulation/misc/SimulationClock.hpp"
 #include "openvic-simulation/politics/PoliticsInstanceManager.hpp"
 #include "openvic-simulation/pop/PopDeps.hpp"
-#include "openvic-simulation/types/Date.hpp"
-#include "openvic-simulation/types/FlagStrings.hpp"
-#include "openvic-simulation/utility/ThreadPool.hpp"
-#include "openvic-simulation/utility/Containers.hpp"
 
 #include <function2/function2.hpp>
 

src/openvic-simulation/console/ConsoleInstance.cpp

@@ -6,22 +6,23 @@
 #include <optional>
 #include <string_view>
 #include <system_error>
+#include <utility>
 
 #include <fmt/format.h>
 
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
+#include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
+#include "openvic-simulation/core/object/Date.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
 #include "openvic-simulation/military/Wargoal.hpp"
 #include "openvic-simulation/misc/Event.hpp"
 #include "openvic-simulation/research/Invention.hpp"
 #include "openvic-simulation/research/Technology.hpp"
-#include "openvic-simulation/types/Colour.hpp"
-#include "openvic-simulation/types/Date.hpp"
-#include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/ErrorMacros.hpp"
 
 using namespace OpenVic;
 using namespace std::string_view_literals;

src/openvic-simulation/console/ConsoleInstance.hpp

@@ -1,18 +1,20 @@
 #pragma once
 
+#include <cstdint>
 #include <optional>
 #include <span>
 #include <string_view>
+#include <utility>
 
+#include <fmt/base.h>
 #include <fmt/color.h>
-#include <fmt/core.h>
 
-#include "openvic-simulation/types/Colour.hpp"
-#include "openvic-simulation/types/Date.hpp"
-#include "openvic-simulation/types/FunctionRef.hpp"
-#include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/utility/Containers.hpp"
-#include "openvic-simulation/utility/Getters.hpp"
+#include "openvic-simulation/core/Property.hpp"
+#include "openvic-simulation/core/container/FunctionRef.hpp"
+#include "openvic-simulation/core/memory/Format.hpp"
+#include "openvic-simulation/core/memory/StringMap.hpp"
+#include "openvic-simulation/core/object/Colour.hpp"
+#include "openvic-simulation/core/object/Date.hpp"
 
 #include <function2/function2.hpp>
 
@@ -99,7 +101,7 @@ namespace OpenVic {
 		Technology const* validate_tech_name(std::string_view value_string);
 
 	private:
-		string_map_t<execute_command_func_t> commands;
+		memory::string_map_t<execute_command_func_t> commands;
 
 		write_func_t write_func;