Add missing dependencies to IncludeCategories

.clang-format

@@ -71,6 +71,9 @@ InsertNewlineAtEOF: true
 InsertBraces: true
 MaxEmptyLinesToKeep: 2
 RequiresClausePosition: OwnLine
+SortIncludes:
+  Enabled: true
+  IgnoreCase: true
 IncludeCategories:
   - Regex: <[[:alnum:]_]+>
     Priority: 1
@@ -80,17 +83,29 @@ IncludeCategories:
     Priority: 3
   - Regex: ^<lexy-vdf/
     Priority: 4
-  - Regex: ^<tsl/
+  - Regex: ^<boost/
     Priority: 5
   - Regex: ^<dryad/
     Priority: 6
   - Regex: ^<fmt/
     Priority: 7
-  - Regex: ^<range
+  - Regex: ^<foonathan
     Priority: 8
-  - Regex: ^<spdlog/
+  - Regex: ^<function2/
     Priority: 9
-  - Regex: ^"openvic-simulation/
+  - Regex: ^<plf_colony.h>
     Priority: 10
-  - Regex: .*
+  - Regex: ^<range
     Priority: 11
+  - Regex: ^<spdlog/
+    Priority: 12
+  - Regex: ^<tsl/
+    Priority: 13
+  - Regex: ^<type_safe/
+    Priority: 14
+  - Regex: ^<XoshiroCpp.hpp>
+    Priority: 15
+  - Regex: ^"openvic-simulation/
+    Priority: 16
+  - Regex: .*
+    Priority: 17

src/openvic-simulation/GameManager.hpp

@@ -3,15 +3,15 @@
 #include <optional>
 #include <string_view>
 
+#include <function2/function2.hpp>
+
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/dataloader/Dataloader.hpp"
+#include "openvic-simulation/dataloader/ModManager.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
+#include "openvic-simulation/gen/commit_info.gen.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/gen/commit_info.gen.hpp"
-
-#include <function2/function2.hpp>
 
 namespace OpenVic {
 	struct GameManager {

src/openvic-simulation/InstanceManager.hpp

@@ -4,10 +4,10 @@
 
 #include <function2/function2.hpp>
 
-#include "openvic-simulation/core/memory/Vector.hpp"
 #include "openvic-simulation/console/ConsoleInstance.hpp"
-#include "openvic-simulation/country/CountryInstanceManager.hpp"
+#include "openvic-simulation/core/memory/Vector.hpp"
 #include "openvic-simulation/country/CountryInstanceDeps.hpp"
+#include "openvic-simulation/country/CountryInstanceManager.hpp"
 #include "openvic-simulation/diplomacy/CountryRelation.hpp"
 #include "openvic-simulation/economy/GoodInstance.hpp"
 #include "openvic-simulation/economy/production/ArtisanalProducerDeps.hpp"
@@ -44,7 +44,7 @@ namespace OpenVic {
 		GameRulesManager const& game_rules_manager;
 		GoodInstanceManager PROPERTY_REF(good_instance_manager);
 		MarketInstance PROPERTY_REF(market_instance);
-		
+
 		ArtisanalProducerDeps artisanal_producer_deps;
 		CountryInstanceDeps country_instance_deps;
 		PopsAggregateDeps pops_aggregate_deps;

src/openvic-simulation/console/ConsoleInstance.cpp

@@ -9,12 +9,12 @@
 
 #include <fmt/format.h>
 
+#include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/core/memory/String.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
-#include "openvic-simulation/core/error/ErrorMacros.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"

src/openvic-simulation/console/ConsoleInstance.hpp

@@ -7,15 +7,15 @@
 #include <fmt/color.h>
 #include <fmt/core.h>
 
+#include <function2/function2.hpp>
+
 #include "openvic-simulation/core/memory/Formatting.hpp"
 #include "openvic-simulation/core/memory/String.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"
 
-#include <function2/function2.hpp>
-
 namespace OpenVic {
 	struct ProvinceInstance;
 	struct CountryInstance;

src/openvic-simulation/core/memory/SmartPtr.hpp

@@ -16,14 +16,14 @@ namespace OpenVic::memory {
 
 	template<>
 	struct will_optimize_deleter_for<foonathan::memory::heap_allocator> : std::true_type {};
-	
+
 	template<>
 	struct will_optimize_deleter_for<foonathan::memory::malloc_allocator> : std::true_type {};
-	
+
 	template<>
 	struct will_optimize_deleter_for<foonathan::memory::new_allocator> : std::true_type {};
 
-	
+
 #ifdef DEBUG_ENABLED
 	template<typename T, class RawAllocator = foonathan::memory::default_allocator>
 	using unique_ptr = foonathan::memory::unique_ptr<T, tracker<RawAllocator>>;
@@ -137,4 +137,4 @@ namespace OpenVic::memory {
 	static inline std::shared_ptr<T> make_shared(Args&&... args) {
 		return allocate_shared<T>(RawAllocator {}, std::forward<Args>(args)...);
 	}
-}
+}

src/openvic-simulation/core/memory/StringStream.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <sstream>
+#include <string>
 
 #include <foonathan/memory/default_allocator.hpp>
 #include <foonathan/memory/std_allocator.hpp>
@@ -23,4 +23,4 @@ namespace OpenVic::memory {
 
 	using stringstream = stringstream_alloc<>;
 	using wstringstream = wstringstream_alloc<>;
-}
+}

src/openvic-simulation/core/random/RandomGenerator.hpp

@@ -6,10 +6,10 @@
 #include <type_traits>
 #include <utility>
 
-#include "openvic-simulation/core/Typedefs.hpp"
-
 #include <XoshiroCpp.hpp>
 
+#include "openvic-simulation/core/Typedefs.hpp"
+
 namespace OpenVic {
 	template<std::uniform_random_bit_generator T>
 	struct RandomGenerator {

src/openvic-simulation/core/string/Utility.hpp

@@ -5,12 +5,12 @@
 #include <concepts>
 #include <string_view>
 
-#include <tsl/ordered_map.h>
-
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/view/join.hpp>
 #include <range/v3/view/transform.hpp>
 
+#include <tsl/ordered_map.h>
+
 #include "openvic-simulation/core/memory/String.hpp"
 
 namespace OpenVic {

src/openvic-simulation/country/CountryInstance.cpp

@@ -1,6 +1,4 @@
 #include "CountryInstance.hpp"
-#include "CountryInstanceDeps.hpp"
-#include "CountryInstanceManager.hpp"
 
 #include <algorithm>
 #include <cstddef>
@@ -11,8 +9,9 @@
 #include <type_safe/strong_typedef.hpp>
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
-#include "openvic-simulation/country/SharedCountryValues.hpp"
+#include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
+#include "openvic-simulation/country/SharedCountryValues.hpp"
 #include "openvic-simulation/defines/CountryDefines.hpp"
 #include "openvic-simulation/defines/DiplomacyDefines.hpp"
 #include "openvic-simulation/defines/EconomyDefines.hpp"
@@ -26,9 +25,9 @@
 #include "openvic-simulation/history/CountryHistory.hpp"
 #include "openvic-simulation/map/Crime.hpp"
 #include "openvic-simulation/map/MapInstance.hpp"
-#include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/military/UnitInstanceGroup.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
+#include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/modifier/StaticModifierCache.hpp"
 #include "openvic-simulation/politics/Government.hpp"
@@ -40,6 +39,8 @@
 #include "openvic-simulation/population/Culture.hpp"
 #include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/population/PopsAggregateDeps.hpp"
+#include "openvic-simulation/population/PopSize.hpp"
+#include "openvic-simulation/population/PopSum.hpp"
 #include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/research/Invention.hpp"
 #include "openvic-simulation/research/Technology.hpp"
@@ -48,11 +49,11 @@
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
-#include "openvic-simulation/population/PopSize.hpp"
-#include "openvic-simulation/population/PopSum.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
-#include "openvic-simulation/core/Typedefs.hpp"
+
+#include "CountryInstanceDeps.hpp"
+#include "CountryInstanceManager.hpp"
 
 using namespace OpenVic;
 
@@ -82,7 +83,7 @@ CountryInstance::CountryInstance(
 	market_instance { country_instance_deps.market_instance },
 	modifier_effect_cache { country_instance_deps.modifier_effect_cache },
 	unit_type_manager { country_instance_deps.unit_type_manager },
-	
+
 	fallback_date_for_never_completing_research { country_instance_deps.fallback_date_for_never_completing_research },
 	country_defines { country_instance_deps.country_defines },
 	diplomacy_defines { country_instance_deps.diplomacy_defines },
@@ -357,7 +358,7 @@ bool CountryInstance::may_build_in(const BuildingRestrictionCategory restriction
 				return rule_set.may_build_factory_domestically();
 		}
 	}
-	
+
 	if (is_at_war_with(owner)) {
 		//Not allowed to build in hostile lands.
 		return false;
@@ -535,7 +536,7 @@ fixed_point_t CountryInstance::get_taxable_income_by_strata(Strata const& strata
 			running_total += taxable_income;
 		}
 	}
-	
+
 	return running_total;
 }
 DerivedState<fixed_point_t>& CountryInstance::get_effective_tax_rate_by_strata(Strata const& strata) {
@@ -1425,7 +1426,7 @@ void CountryInstance::_update_budget() {
 	if (total_non_colonial_population == 0) {
 		administrative_efficiency_from_administrators.set(fixed_point_t::_1);
 		administrator_percentage.set(fixed_point_t::_0);
-	} else {		
+	} else {
 		administrator_percentage.set(fp::from_fraction<pop_sum_t>(administrators, total_non_colonial_population));
 
 		const pop_sum_t desired_administrators = fp::multiply_truncate(
@@ -1436,7 +1437,7 @@ void CountryInstance::_update_budget() {
 			administrators,
 			fixed_point_t::_1 + get_modifier_effect_value(*modifier_effect_cache.get_administrative_efficiency())
 		);
-		const fixed_point_t administrative_efficiency_from_administrators_unclamped = 
+		const fixed_point_t administrative_efficiency_from_administrators_unclamped =
 			desired_administrators == 0
 			? fixed_point_t::_1
 			: std::min(
@@ -2159,7 +2160,7 @@ void CountryInstance::manage_national_stockpile(
 	for (auto [good_instance, good_data] : goods_data) {
 		const good_index_t good_index = good_instance.index;
 		if (good_data.is_automated || !good_data.is_selling) {
-			const fixed_point_t quantity_to_allocate_for = good_data.is_automated 
+			const fixed_point_t quantity_to_allocate_for = good_data.is_automated
 				? good_data.government_needs - good_data.stockpile_amount
 				: good_data.stockpile_cutoff - good_data.stockpile_amount;
 			const fixed_point_t max_quantity_to_buy = good_data.is_automated
@@ -2213,13 +2214,13 @@ void CountryInstance::manage_national_stockpile(
 
 				const fixed_point_t weight = weights[good_index];
 				const fixed_point_t max_costs = max_costs_per_good[good_index];
-				
+
 				fixed_point_t cash_available_for_good = fp::mul_div(
 					cash_left_to_spend_draft,
 					weight,
 					weights_sum
 				);
-				
+
 				if (cash_available_for_good >= max_costs) {
 					cash_left_to_spend_draft -= max_costs;
 					money_to_spend_per_good[good_index] = max_costs;
@@ -2239,7 +2240,7 @@ void CountryInstance::manage_national_stockpile(
 				}
 			}
 		}
-		
+
 		for (const good_index_t good_index : good_indices_to_buy) {
 			const fixed_point_t max_quantity_to_buy = max_quantity_to_buy_per_good[good_index];
 			const fixed_point_t money_to_spend = money_to_spend_per_good[good_index];

src/openvic-simulation/country/CountryInstance.hpp

@@ -16,6 +16,7 @@
 #include "openvic-simulation/modifier/ModifierSum.hpp"
 #include "openvic-simulation/politics/RuleSet.hpp"
 #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"
@@ -24,7 +25,6 @@
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
-#include "openvic-simulation/research/TechnologyUnlockLevel.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/types/UnitVariant.hpp"
@@ -220,7 +220,7 @@ namespace OpenVic {
 		bool PROPERTY(was_social_budget_cut_yesterday, false);
 		atomic_fixed_point_t PROPERTY(actual_pensions_spending);
 		atomic_fixed_point_t PROPERTY(actual_unemployment_subsidies_spending);
-		
+
 		//base here means not scaled by slider or pop size
 		IndexedFlatMap<PopType, DerivedState<fixed_point_t>> administration_salary_base_by_pop_type;
 		IndexedFlatMap<PopType, DerivedState<fixed_point_t>> education_salary_base_by_pop_type;
@@ -298,7 +298,7 @@ namespace OpenVic {
 		DerivedState<fixed_point_t> projected_import_subsidies;
 		DerivedState<fixed_point_t> projected_spending;
 		DerivedState<bool> has_import_subsidies;
-		
+
 		fixed_point_t get_taxable_income_by_strata(Strata const& strata) const;
 		// TODO - national foci
 
@@ -694,4 +694,4 @@ namespace OpenVic {
 	};
 }
 
-extern template struct fmt::formatter<OpenVic::CountryInstance>;
+extern template struct fmt::formatter<OpenVic::CountryInstance>;

src/openvic-simulation/dataloader/Dataloader.cpp

@@ -12,13 +12,13 @@
 
 #include <fmt/std.h>
 
+#include "openvic-simulation/core/string/Utility.hpp"
+#include "openvic-simulation/core/template/Concepts.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/interface/UI.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/misc/SoundEffect.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
-#include "openvic-simulation/core/string/Utility.hpp"
-#include "openvic-simulation/core/template/Concepts.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;

src/openvic-simulation/dataloader/Dataloader.hpp

@@ -6,13 +6,13 @@
 #include <openvic-dataloader/csv/Parser.hpp>
 #include <openvic-dataloader/v2script/Parser.hpp>
 
-#include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/dataloader/ModManager.hpp"
-#include "openvic-simulation/core/template/Concepts.hpp"
-#include "openvic-simulation/core/memory/Vector.hpp"
-
 #include <function2/function2.hpp>
 
+#include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/template/Concepts.hpp"
+#include "openvic-simulation/dataloader/ModManager.hpp"
+#include "openvic-simulation/dataloader/NodeTools.hpp"
+
 namespace OpenVic {
 	namespace fs = std::filesystem;