From ed6c198a12b8e5b10b81e64862b46e2d7d372e1a Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Wed, 20 May 2026 07:51:49 -0400 Subject: [PATCH] Add missing dependencies to IncludeCategories Format potentially category-related header includes Add SortIncludes format option --- .clang-format | 25 +++++++++++--- src/openvic-simulation/GameManager.hpp | 10 +++--- src/openvic-simulation/InstanceManager.hpp | 6 ++-- .../console/ConsoleInstance.cpp | 4 +-- .../console/ConsoleInstance.hpp | 4 +-- .../core/memory/SmartPtr.hpp | 8 ++--- .../core/memory/StringStream.hpp | 4 +-- .../core/random/RandomGenerator.hpp | 4 +-- .../core/string/Utility.hpp | 4 +-- .../country/CountryInstance.cpp | 33 ++++++++++--------- .../country/CountryInstance.hpp | 8 ++--- .../dataloader/Dataloader.cpp | 4 +-- .../dataloader/Dataloader.hpp | 10 +++--- .../dataloader/NodeTools.cpp | 2 +- .../dataloader/NodeTools.hpp | 22 ++++++------- .../defines/MilitaryDefines.cpp | 4 +-- .../diplomacy/DiplomaticAction.hpp | 4 +-- .../economy/production/ArtisanalProducer.cpp | 19 ++++++----- .../production/ResourceGatheringOperation.cpp | 9 ++--- .../history/ProvinceHistory.cpp | 2 +- src/openvic-simulation/map/MapDefinition.cpp | 2 +- src/openvic-simulation/map/Mapmode.hpp | 4 +-- src/openvic-simulation/map/State.hpp | 4 +-- src/openvic-simulation/military/Wargoal.cpp | 4 +-- src/openvic-simulation/misc/GameAction.hpp | 6 ++-- .../misc/SimulationClock.hpp | 4 +-- .../pathfinding/AStarPathing.cpp | 6 ++-- .../pathfinding/FringePathing.cpp | 6 ++-- .../pathfinding/PathingBase.hpp | 6 ++-- .../pathfinding/PointMap.cpp | 6 ++-- .../pathfinding/PointMap.hpp | 2 ++ src/openvic-simulation/pch.hpp | 3 +- src/openvic-simulation/population/Pop.cpp | 31 ++++++++--------- src/openvic-simulation/population/Pop.hpp | 8 ++--- .../population/PopManager.cpp | 12 +++---- src/openvic-simulation/population/PopSize.hpp | 4 +-- src/openvic-simulation/population/PopSum.hpp | 4 +-- .../population/PopsAggregate.cpp | 6 ++-- .../population/PopsAggregate.hpp | 8 ++--- src/openvic-simulation/testing/Testing.hpp | 2 +- src/openvic-simulation/types/Colour.hpp | 10 +++--- src/openvic-simulation/types/Date.hpp | 8 ++--- .../types/HasIdentifier.hpp | 4 +-- .../types/IndexedFlatMap.hpp | 14 ++++---- .../types/OrderedContainers.hpp | 14 ++++---- .../types/OrderedContainersMath.hpp | 4 +-- src/openvic-simulation/types/TypedSpan.hpp | 4 +-- src/openvic-simulation/types/Vector.hpp | 6 ++-- .../types/fixed_point/FixedPoint.cpp | 5 +-- .../utility/reactive/DerivedState.hpp | 6 ++-- 50 files changed, 206 insertions(+), 183 deletions(-) diff --git a/.clang-format b/.clang-format index 8400c69e4..a7d996cf5 100644 --- a/.clang-format +++ b/.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: ^ Priority: 10 - - Regex: .* + - Regex: ^ + Priority: 15 + - Regex: ^"openvic-simulation/ + Priority: 16 + - Regex: .* + Priority: 17 diff --git a/src/openvic-simulation/GameManager.hpp b/src/openvic-simulation/GameManager.hpp index 2ee594f1c..95e37dd9b 100644 --- a/src/openvic-simulation/GameManager.hpp +++ b/src/openvic-simulation/GameManager.hpp @@ -3,15 +3,15 @@ #include #include +#include + #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 namespace OpenVic { struct GameManager { diff --git a/src/openvic-simulation/InstanceManager.hpp b/src/openvic-simulation/InstanceManager.hpp index fbaaeac58..0b82ad79b 100644 --- a/src/openvic-simulation/InstanceManager.hpp +++ b/src/openvic-simulation/InstanceManager.hpp @@ -4,10 +4,10 @@ #include -#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; diff --git a/src/openvic-simulation/console/ConsoleInstance.cpp b/src/openvic-simulation/console/ConsoleInstance.cpp index b280c479f..ff035f9ab 100644 --- a/src/openvic-simulation/console/ConsoleInstance.cpp +++ b/src/openvic-simulation/console/ConsoleInstance.cpp @@ -9,12 +9,12 @@ #include +#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" diff --git a/src/openvic-simulation/console/ConsoleInstance.hpp b/src/openvic-simulation/console/ConsoleInstance.hpp index f2791eb3b..3eeb5f18f 100644 --- a/src/openvic-simulation/console/ConsoleInstance.hpp +++ b/src/openvic-simulation/console/ConsoleInstance.hpp @@ -7,6 +7,8 @@ #include #include +#include + #include "openvic-simulation/core/memory/Formatting.hpp" #include "openvic-simulation/core/memory/String.hpp" #include "openvic-simulation/types/Colour.hpp" @@ -14,8 +16,6 @@ #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/utility/Getters.hpp" -#include - namespace OpenVic { struct ProvinceInstance; struct CountryInstance; diff --git a/src/openvic-simulation/core/memory/SmartPtr.hpp b/src/openvic-simulation/core/memory/SmartPtr.hpp index eab0157de..6605e883f 100644 --- a/src/openvic-simulation/core/memory/SmartPtr.hpp +++ b/src/openvic-simulation/core/memory/SmartPtr.hpp @@ -16,14 +16,14 @@ namespace OpenVic::memory { template<> struct will_optimize_deleter_for : std::true_type {}; - + template<> struct will_optimize_deleter_for : std::true_type {}; - + template<> struct will_optimize_deleter_for : std::true_type {}; - + #ifdef DEBUG_ENABLED template using unique_ptr = foonathan::memory::unique_ptr>; @@ -137,4 +137,4 @@ namespace OpenVic::memory { static inline std::shared_ptr make_shared(Args&&... args) { return allocate_shared(RawAllocator {}, std::forward(args)...); } -} \ No newline at end of file +} diff --git a/src/openvic-simulation/core/memory/StringStream.hpp b/src/openvic-simulation/core/memory/StringStream.hpp index 3e537e657..cec91ec8a 100644 --- a/src/openvic-simulation/core/memory/StringStream.hpp +++ b/src/openvic-simulation/core/memory/StringStream.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include #include @@ -23,4 +23,4 @@ namespace OpenVic::memory { using stringstream = stringstream_alloc<>; using wstringstream = wstringstream_alloc<>; -} \ No newline at end of file +} diff --git a/src/openvic-simulation/core/random/RandomGenerator.hpp b/src/openvic-simulation/core/random/RandomGenerator.hpp index f569f5001..a010c146a 100644 --- a/src/openvic-simulation/core/random/RandomGenerator.hpp +++ b/src/openvic-simulation/core/random/RandomGenerator.hpp @@ -6,10 +6,10 @@ #include #include -#include "openvic-simulation/core/Typedefs.hpp" - #include +#include "openvic-simulation/core/Typedefs.hpp" + namespace OpenVic { template struct RandomGenerator { diff --git a/src/openvic-simulation/core/string/Utility.hpp b/src/openvic-simulation/core/string/Utility.hpp index 1522fe1d9..cb7cb274e 100644 --- a/src/openvic-simulation/core/string/Utility.hpp +++ b/src/openvic-simulation/core/string/Utility.hpp @@ -5,12 +5,12 @@ #include #include -#include - #include #include #include +#include + #include "openvic-simulation/core/memory/String.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp index 30d9e3109..fd99cc8a6 100644 --- a/src/openvic-simulation/country/CountryInstance.cpp +++ b/src/openvic-simulation/country/CountryInstance.cpp @@ -1,6 +1,4 @@ #include "CountryInstance.hpp" -#include "CountryInstanceDeps.hpp" -#include "CountryInstanceManager.hpp" #include #include @@ -11,8 +9,9 @@ #include #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& 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(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]; diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp index 0854e6f45..d73edb066 100644 --- a/src/openvic-simulation/country/CountryInstance.hpp +++ b/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> administration_salary_base_by_pop_type; IndexedFlatMap> education_salary_base_by_pop_type; @@ -298,7 +298,7 @@ namespace OpenVic { DerivedState projected_import_subsidies; DerivedState projected_spending; DerivedState 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; \ No newline at end of file +extern template struct fmt::formatter; diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 06986c5ec..8fe7603e8 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -12,13 +12,13 @@ #include +#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; diff --git a/src/openvic-simulation/dataloader/Dataloader.hpp b/src/openvic-simulation/dataloader/Dataloader.hpp index d5d5fc237..9e433a9cb 100644 --- a/src/openvic-simulation/dataloader/Dataloader.hpp +++ b/src/openvic-simulation/dataloader/Dataloader.hpp @@ -6,13 +6,13 @@ #include #include -#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 +#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; diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp index df0a52f4f..a2ae665fc 100644 --- a/src/openvic-simulation/dataloader/NodeTools.cpp +++ b/src/openvic-simulation/dataloader/NodeTools.cpp @@ -15,8 +15,8 @@ #include #include -#include "openvic-simulation/types/Colour.hpp" #include "openvic-simulation/core/ui/TextFormat.hpp" +#include "openvic-simulation/types/Colour.hpp" #include "openvic-simulation/types/fixed_point/String.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 index 736631897..343be7659 100644 --- a/src/openvic-simulation/dataloader/NodeTools.hpp +++ b/src/openvic-simulation/dataloader/NodeTools.hpp @@ -9,26 +9,26 @@ #include #include -#include +#include #include +#include + #include +#include "openvic-simulation/core/FormatValidate.hpp" +#include "openvic-simulation/core/memory/String.hpp" +#include "openvic-simulation/core/memory/Vector.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/core/ui/TextFormat.hpp" #include "openvic-simulation/types/Vector.hpp" -#include "openvic-simulation/core/FormatValidate.hpp" #include "openvic-simulation/utility/TslHelper.hpp" -#include "openvic-simulation/core/memory/String.hpp" -#include "openvic-simulation/core/memory/Vector.hpp" -#include "openvic-simulation/core/string/Utility.hpp" -#include "openvic-simulation/core/template/Concepts.hpp" - -#include #define MOV(...) static_cast&&>(__VA_ARGS__) #define FWD(...) static_cast(__VA_ARGS__) @@ -95,7 +95,7 @@ using namespace std::string_view_literals; template concept MapKeyValueCallback = Callback; - + template constexpr static MapKeyValueCallback auto ignore_map(KeyValueCallback auto&& callback) { return [default_callback = MOV(callback)]( @@ -188,7 +188,7 @@ using namespace std::string_view_literals; } spdlog::error_s( "Invalid uint: {} (valid range: [0, {}])", - val, static_cast(std::numeric_limits::max()) + val, static_cast(std::numeric_limits::max()) ); return false; }, base); diff --git a/src/openvic-simulation/defines/MilitaryDefines.cpp b/src/openvic-simulation/defines/MilitaryDefines.cpp index 74ad976aa..38037be25 100644 --- a/src/openvic-simulation/defines/MilitaryDefines.cpp +++ b/src/openvic-simulation/defines/MilitaryDefines.cpp @@ -1,9 +1,9 @@ #include "MilitaryDefines.hpp" -#include "openvic-simulation/military/CombatWidth.hpp" - #include +#include "openvic-simulation/military/CombatWidth.hpp" + using namespace OpenVic; using namespace OpenVic::NodeTools; diff --git a/src/openvic-simulation/diplomacy/DiplomaticAction.hpp b/src/openvic-simulation/diplomacy/DiplomaticAction.hpp index 7b2eef30f..53db2c458 100644 --- a/src/openvic-simulation/diplomacy/DiplomaticAction.hpp +++ b/src/openvic-simulation/diplomacy/DiplomaticAction.hpp @@ -7,12 +7,12 @@ #include #include +#include + #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/diplomacy/CountryRelation.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" -#include - namespace OpenVic { struct InstanceManager; diff --git a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp index 18c4db0b8..c67c9ddf8 100644 --- a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp +++ b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp @@ -1,5 +1,4 @@ #include "ArtisanalProducer.hpp" -#include "ArtisanalProducerDeps.hpp" #include #include @@ -23,6 +22,8 @@ #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/fixed_point/Math.hpp" +#include "ArtisanalProducerDeps.hpp" + using namespace OpenVic; ArtisanalProducer::ArtisanalProducer(ArtisanalProducerDeps const& artisanal_producer_deps) : ArtisanalProducer( @@ -237,13 +238,13 @@ void ArtisanalProducer::artisan_tick_handler::allocate_money_for_inputs( max_possible_satisfaction_numerator, max_possible_satisfaction_denominator ); - + const fixed_point_t stockpiled_quantity = stockpile.at(input_good); if (stockpiled_quantity >= optimal_quantity) { at_or_below_optimum = false; wants_more = false; --distinct_goods_to_buy; - } + } } } @@ -342,7 +343,7 @@ void ArtisanalProducer::artisan_tick( old_production_type, wants_more_mask }; - + const bool should_report_input_demand = old_production_type_ptr == new_production_type_ptr; tick_handler.calculate_inputs(stockpile, should_report_input_demand); tick_handler.produce(costs_of_production, current_production, stockpile); @@ -357,7 +358,7 @@ void ArtisanalProducer::artisan_tick( ); } } - + if (new_production_type_ptr != old_production_type_ptr) { set_production_type(new_production_type_ptr); ProductionType const& new_production_type = *new_production_type_ptr; @@ -375,7 +376,7 @@ void ArtisanalProducer::artisan_tick( new_production_type, wants_more_mask }; - + constexpr bool should_report_input_demand = true; tick_handler.calculate_inputs(stockpile, should_report_input_demand); tick_handler.allocate_money_for_inputs( @@ -522,7 +523,7 @@ ProductionType const* ArtisanalProducer::pick_production_type( } else if (base_chance_to_switch_while_profitable > 0) { const fixed_point_t current_score = calculate_production_type_score( revenue, - costs, + costs, pop.get_size() ); @@ -576,7 +577,7 @@ ProductionType const* ArtisanalProducer::pick_production_type( if (!should_pick_new_production_type) { return production_type_nullable; } - + fixed_point_t weights_sum = 0; memory::vector weights {}; weights.reserve(ranked_artisanal_production_types.size()); @@ -595,4 +596,4 @@ ProductionType const* ArtisanalProducer::pick_production_type( assert(sample_index >= 0 && sample_index < ranked_artisanal_production_types.size()); return ranked_artisanal_production_types[sample_index].first; -} \ No newline at end of file +} diff --git a/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp index 4059db807..18975eaa0 100644 --- a/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp +++ b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp @@ -1,5 +1,6 @@ #include "ResourceGatheringOperation.hpp" -#include "ResourceGatheringOperationDeps.hpp" + +#include #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/economy/production/ProductionType.hpp" @@ -18,7 +19,7 @@ #include "openvic-simulation/types/TypedIndices.hpp" #include "openvic-simulation/utility/Logger.hpp" -#include +#include "ResourceGatheringOperationDeps.hpp" using namespace OpenVic; @@ -433,7 +434,7 @@ void ResourceGatheringOperation::pay_employees(memory::vector& re if (employee_pop_type.is_slave) { continue; } - + const fixed_point_t minimum_wage = employee.get_minimum_wage_cached(); if (minimum_wage > 0 && incomes[i] == minimum_wage) { continue; @@ -472,4 +473,4 @@ void ResourceGatheringOperation::pay_employees(memory::vector& re reusable_vector.clear(); } } -} \ No newline at end of file +} diff --git a/src/openvic-simulation/history/ProvinceHistory.cpp b/src/openvic-simulation/history/ProvinceHistory.cpp index f9268bacf..ed78f68d1 100644 --- a/src/openvic-simulation/history/ProvinceHistory.cpp +++ b/src/openvic-simulation/history/ProvinceHistory.cpp @@ -2,9 +2,9 @@ #include +#include "openvic-simulation/DefinitionManager.hpp" #include "openvic-simulation/core/error/ErrorMacros.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "openvic-simulation/DefinitionManager.hpp" #include "openvic-simulation/economy/BuildingLevel.hpp" #include "openvic-simulation/economy/GoodDefinition.hpp" #include "openvic-simulation/map/ProvinceDefinition.hpp" diff --git a/src/openvic-simulation/map/MapDefinition.cpp b/src/openvic-simulation/map/MapDefinition.cpp index cc3b4cd37..9a1c7ee7d 100644 --- a/src/openvic-simulation/map/MapDefinition.cpp +++ b/src/openvic-simulation/map/MapDefinition.cpp @@ -1,9 +1,9 @@ #include "MapDefinition.hpp" +#include #include #include #include -#include #include #include #include diff --git a/src/openvic-simulation/map/Mapmode.hpp b/src/openvic-simulation/map/Mapmode.hpp index 3baadb9ec..ec00028f9 100644 --- a/src/openvic-simulation/map/Mapmode.hpp +++ b/src/openvic-simulation/map/Mapmode.hpp @@ -1,13 +1,13 @@ #pragma once +#include + #include "openvic-simulation/types/Colour.hpp" #include "openvic-simulation/types/HasIdentifier.hpp" #include "openvic-simulation/types/HasIndex.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/types/TypedIndices.hpp" -#include - namespace OpenVic { struct BuildingTypeManager; struct MapmodeManager; diff --git a/src/openvic-simulation/map/State.hpp b/src/openvic-simulation/map/State.hpp index 257c84fee..674e43d34 100644 --- a/src/openvic-simulation/map/State.hpp +++ b/src/openvic-simulation/map/State.hpp @@ -6,10 +6,10 @@ #include "openvic-simulation/core/memory/Colony.hpp" #include "openvic-simulation/core/memory/Vector.hpp" +#include "openvic-simulation/core/portable/ForwardableSpan.hpp" #include "openvic-simulation/population/PopsAggregate.hpp" #include "openvic-simulation/types/ColonyStatus.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" -#include "openvic-simulation/core/portable/ForwardableSpan.hpp" #include "openvic-simulation/utility/Getters.hpp" namespace OpenVic { @@ -31,7 +31,7 @@ namespace OpenVic { friend struct StateManager; private: - CountryInstance* previous_country_ptr = nullptr; + CountryInstance* previous_country_ptr = nullptr; ProvinceInstance* PROPERTY_PTR(capital); memory::vector> SPAN_PROPERTY(provinces); diff --git a/src/openvic-simulation/military/Wargoal.cpp b/src/openvic-simulation/military/Wargoal.cpp index 3f5afeaa7..1945abb27 100644 --- a/src/openvic-simulation/military/Wargoal.cpp +++ b/src/openvic-simulation/military/Wargoal.cpp @@ -1,9 +1,9 @@ #include "Wargoal.hpp" -#include - #include +#include + #include "openvic-simulation/dataloader/NodeTools.hpp" using namespace OpenVic; diff --git a/src/openvic-simulation/misc/GameAction.hpp b/src/openvic-simulation/misc/GameAction.hpp index 101f55a51..8d4096034 100644 --- a/src/openvic-simulation/misc/GameAction.hpp +++ b/src/openvic-simulation/misc/GameAction.hpp @@ -99,8 +99,8 @@ X(start_land_unit_recruitment, regiment_type_index_t, province_index_t, pop_id_i struct none_argument_t : type_safe::strong_typedef { using strong_typedef::strong_typedef; constexpr none_argument_t(std::monostate const& value) : strong_typedef(value) {} - constexpr none_argument_t(std::monostate&& value) - : strong_typedef(static_cast(value)) {} + constexpr none_argument_t(std::monostate&& value) + : strong_typedef(static_cast(value)) {} }; #define USING_ARG_TYPE(name, ...) \ struct ARG_TYPE(name) \ @@ -184,4 +184,4 @@ namespace std { } #undef ARG_TYPE -#undef FOR_EACH_GAME_ACTION \ No newline at end of file +#undef FOR_EACH_GAME_ACTION diff --git a/src/openvic-simulation/misc/SimulationClock.hpp b/src/openvic-simulation/misc/SimulationClock.hpp index 5d7d9b8c8..f83d06d26 100644 --- a/src/openvic-simulation/misc/SimulationClock.hpp +++ b/src/openvic-simulation/misc/SimulationClock.hpp @@ -2,10 +2,10 @@ #include -#include "openvic-simulation/utility/Getters.hpp" - #include +#include "openvic-simulation/utility/Getters.hpp" + namespace OpenVic { /* Conditionally advances game depending on speed and pause state. */ class SimulationClock { diff --git a/src/openvic-simulation/pathfinding/AStarPathing.cpp b/src/openvic-simulation/pathfinding/AStarPathing.cpp index 4667ee138..062966390 100644 --- a/src/openvic-simulation/pathfinding/AStarPathing.cpp +++ b/src/openvic-simulation/pathfinding/AStarPathing.cpp @@ -1,13 +1,14 @@ #include "openvic-simulation/pathfinding/AStarPathing.hpp" -#include - #include #include #include #include +#include + +#include "openvic-simulation/core/Typedefs.hpp" #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/map/MapDefinition.hpp" #include "openvic-simulation/map/MapInstance.hpp" @@ -15,7 +16,6 @@ #include "openvic-simulation/military/UnitInstanceGroup.hpp" #include "openvic-simulation/pathfinding/PointMap.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" -#include "openvic-simulation/core/Typedefs.hpp" using namespace OpenVic; diff --git a/src/openvic-simulation/pathfinding/FringePathing.cpp b/src/openvic-simulation/pathfinding/FringePathing.cpp index 2381163be..67c9e1abc 100644 --- a/src/openvic-simulation/pathfinding/FringePathing.cpp +++ b/src/openvic-simulation/pathfinding/FringePathing.cpp @@ -1,14 +1,14 @@ #include "openvic-simulation/pathfinding/FringePathing.hpp" -#include -#include - #include #include #include #include +#include +#include + #include "openvic-simulation/pathfinding/PointMap.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" diff --git a/src/openvic-simulation/pathfinding/PathingBase.hpp b/src/openvic-simulation/pathfinding/PathingBase.hpp index 0ee32634a..ca7b73f34 100644 --- a/src/openvic-simulation/pathfinding/PathingBase.hpp +++ b/src/openvic-simulation/pathfinding/PathingBase.hpp @@ -4,6 +4,9 @@ #include +#include +#include + #include "openvic-simulation/core/error/ErrorMacros.hpp" #include "openvic-simulation/core/memory/Formatting.hpp" #include "openvic-simulation/core/memory/Vector.hpp" @@ -12,9 +15,6 @@ #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/fixed_point/Math.hpp" -#include -#include - namespace OpenVic { template struct PathingNodeBase { diff --git a/src/openvic-simulation/pathfinding/PointMap.cpp b/src/openvic-simulation/pathfinding/PointMap.cpp index 8489c32ac..fcabbcd40 100644 --- a/src/openvic-simulation/pathfinding/PointMap.cpp +++ b/src/openvic-simulation/pathfinding/PointMap.cpp @@ -5,16 +5,16 @@ #include #include +#include + #include #include -#include - #include "openvic-simulation/core/error/ErrorMacros.hpp" #include "openvic-simulation/core/memory/Formatting.hpp" #include "openvic-simulation/core/Typedefs.hpp" -#include "openvic-simulation/types/Vector.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" +#include "openvic-simulation/types/Vector.hpp" using namespace OpenVic; diff --git a/src/openvic-simulation/pathfinding/PointMap.hpp b/src/openvic-simulation/pathfinding/PointMap.hpp index c418f7f36..b4fee3665 100644 --- a/src/openvic-simulation/pathfinding/PointMap.hpp +++ b/src/openvic-simulation/pathfinding/PointMap.hpp @@ -4,6 +4,8 @@ #include #include +#include + #include #include diff --git a/src/openvic-simulation/pch.hpp b/src/openvic-simulation/pch.hpp index ed588dd1c..6acbbee09 100644 --- a/src/openvic-simulation/pch.hpp +++ b/src/openvic-simulation/pch.hpp @@ -16,5 +16,6 @@ #include #include -#include #include + +#include diff --git a/src/openvic-simulation/population/Pop.cpp b/src/openvic-simulation/population/Pop.cpp index c568daf7a..3c5b5764e 100644 --- a/src/openvic-simulation/population/Pop.cpp +++ b/src/openvic-simulation/population/Pop.cpp @@ -1,5 +1,4 @@ #include "Pop.hpp" -#include "PopDeps.hpp" #include // IWYU pragma: keep for lambda #include @@ -8,13 +7,14 @@ #include #include + #include -#include "openvic-simulation/core/error/ErrorMacros.hpp" #include "openvic-simulation/core/Typedefs.hpp" -#include "openvic-simulation/country/CountryParty.hpp" +#include "openvic-simulation/core/error/ErrorMacros.hpp" #include "openvic-simulation/country/CountryDefinition.hpp" #include "openvic-simulation/country/CountryInstance.hpp" +#include "openvic-simulation/country/CountryParty.hpp" #include "openvic-simulation/defines/MilitaryDefines.hpp" #include "openvic-simulation/defines/PopsDefines.hpp" #include "openvic-simulation/economy/GoodDefinition.hpp" @@ -23,8 +23,8 @@ #include "openvic-simulation/economy/production/ProductionType.hpp" #include "openvic-simulation/economy/trading/BuyResult.hpp" #include "openvic-simulation/economy/trading/BuyUpToOrder.hpp" -#include "openvic-simulation/economy/trading/MarketSellOrder.hpp" #include "openvic-simulation/economy/trading/MarketInstance.hpp" +#include "openvic-simulation/economy/trading/MarketSellOrder.hpp" #include "openvic-simulation/economy/trading/SellResult.hpp" #include "openvic-simulation/map/ProvinceInstance.hpp" #include "openvic-simulation/modifier/ModifierEffectCache.hpp" @@ -33,18 +33,19 @@ #include "openvic-simulation/politics/Reform.hpp" #include "openvic-simulation/population/Culture.hpp" #include "openvic-simulation/population/PopNeedsMacro.hpp" -#include "openvic-simulation/population/PopsAggregateDeps.hpp" #include "openvic-simulation/population/PopType.hpp" #include "openvic-simulation/population/PopValuesFromProvince.hpp" +#include "openvic-simulation/population/PopsAggregateDeps.hpp" #include "openvic-simulation/population/Religion.hpp" -#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" -#include "openvic-simulation/types/fixed_point/FixedPointMap.hpp" -#include "openvic-simulation/types/fixed_point/Math.hpp" #include "openvic-simulation/types/IndexedFlatMap.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/types/TypedIndices.hpp" +#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" +#include "openvic-simulation/types/fixed_point/FixedPointMap.hpp" +#include "openvic-simulation/types/fixed_point/Math.hpp" #include "openvic-simulation/utility/Logger.hpp" +#include "PopDeps.hpp" using namespace OpenVic; @@ -130,13 +131,13 @@ void Pop::setup_pop_test_values() { test_weight_indexed(supporter_equivalents_by_ideology, ideology, 1, 5); } supporter_equivalents_by_ideology.rescale(type_safe::get(size)); - + supporter_equivalents_by_party_policy.fill(0); for (PartyPolicy const& party_policy : supporter_equivalents_by_party_policy.get_keys()) { test_weight_indexed(supporter_equivalents_by_party_policy, party_policy, 3, 6); } supporter_equivalents_by_party_policy.rescale(type_safe::get(size)); - + supporter_equivalents_by_reform.fill(0); for (Reform const& reform : supporter_equivalents_by_reform.get_keys()) { if (!reform.group.is_civilizing()) { @@ -499,7 +500,7 @@ void Pop::pop_tick_without_cleanup( money_to_spend_per_good.resize(good_keys.size(), 0); cash_allocated_for_artisanal_spending = 0; fill_needs_fulfilled_goods_with_false(); - + fixed_point_map_t goods_to_sell {}; if (artisanal_producer_optional.has_value()) { //execute artisan_tick before needs @@ -532,7 +533,7 @@ void Pop::pop_tick_without_cleanup( if (country_to_report_economy_nullable != nullptr) { country_to_report_economy_nullable->request_salaries_and_welfare_and_import_subsidies(*this); } - + //unemployment subsidies are based on yesterdays unemployment employed = 0; //import subsidies are based on yesterday @@ -614,7 +615,7 @@ void Pop::pop_tick_without_cleanup( if (max_quantity_to_buy <= 0) { continue; } - + GoodDefinition const& good_definition = *it; const fixed_point_t money_to_spend = money_to_spend_per_good[i]; @@ -657,7 +658,7 @@ void Pop::after_buy(void* actor, BuyResult const& buy_result) { return; } - Pop& pop = *static_cast(actor); + Pop& pop = *static_cast(actor); CountryInstance* const country_to_report_economy_nullable = pop.get_location().get_country_to_report_economy(); fixed_point_t money_spent = buy_result.money_spent_total; @@ -776,4 +777,4 @@ bool Pop::try_recruit_understrength() { ++regiment_count; return true; -} \ No newline at end of file +} diff --git a/src/openvic-simulation/population/Pop.hpp b/src/openvic-simulation/population/Pop.hpp index 91c2b37ae..b8f1f110d 100644 --- a/src/openvic-simulation/population/Pop.hpp +++ b/src/openvic-simulation/population/Pop.hpp @@ -3,6 +3,8 @@ #include #include +#include + #include "openvic-simulation/core/memory/Vector.hpp" #include "openvic-simulation/core/portable/ForwardableSpan.hpp" #include "openvic-simulation/economy/production/ArtisanalProducer.hpp" @@ -15,8 +17,6 @@ #include "openvic-simulation/types/IndexedFlatMap.hpp" #include "openvic-simulation/types/UnitBranchType.hpp" -#include - namespace OpenVic { struct BuyResult; struct CountryInstance; @@ -128,7 +128,7 @@ namespace OpenVic { OV_IFLATMAP_PROPERTY(PartyPolicy, fixed_point_t, supporter_equivalents_by_party_policy); OV_IFLATMAP_PROPERTY(Reform, fixed_point_t, supporter_equivalents_by_reform); fixed_point_map_t PROPERTY(vote_equivalents_by_party); - + public: // The values returned by these functions are scaled by pop size, so they must be divided by pop size to get // the support as a proportion of 1.0 @@ -243,4 +243,4 @@ namespace OpenVic { bool try_recruit(); bool try_recruit_understrength(); }; -} \ No newline at end of file +} diff --git a/src/openvic-simulation/population/PopManager.cpp b/src/openvic-simulation/population/PopManager.cpp index 9e9fb80b5..db450958e 100644 --- a/src/openvic-simulation/population/PopManager.cpp +++ b/src/openvic-simulation/population/PopManager.cpp @@ -2,18 +2,18 @@ #include +#include + +#include "openvic-simulation/core/FormatValidate.hpp" #include "openvic-simulation/economy/GoodDefinition.hpp" +#include "openvic-simulation/military/UnitType.hpp" +#include "openvic-simulation/modifier/ModifierManager.hpp" #include "openvic-simulation/politics/Ideology.hpp" #include "openvic-simulation/politics/IssueManager.hpp" #include "openvic-simulation/politics/Rebel.hpp" #include "openvic-simulation/population/Pop.hpp" -#include "openvic-simulation/military/UnitType.hpp" -#include "openvic-simulation/modifier/ModifierManager.hpp" -#include "openvic-simulation/core/FormatValidate.hpp" -#include "openvic-simulation/utility/Logger.hpp" #include "openvic-simulation/population/PopSize.hpp" - -#include +#include "openvic-simulation/utility/Logger.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; diff --git a/src/openvic-simulation/population/PopSize.hpp b/src/openvic-simulation/population/PopSize.hpp index c1245842f..340ccae44 100644 --- a/src/openvic-simulation/population/PopSize.hpp +++ b/src/openvic-simulation/population/PopSize.hpp @@ -5,10 +5,10 @@ #include #include -#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" - #include +#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" + namespace OpenVic { struct pop_size_t : type_safe::strong_typedef, type_safe::strong_typedef_op::equality_comparison, diff --git a/src/openvic-simulation/population/PopSum.hpp b/src/openvic-simulation/population/PopSum.hpp index 9a5f9d773..59984489a 100644 --- a/src/openvic-simulation/population/PopSum.hpp +++ b/src/openvic-simulation/population/PopSum.hpp @@ -6,11 +6,11 @@ #include #include +#include + #include "openvic-simulation/population/PopSize.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" -#include - namespace OpenVic { namespace detail { template diff --git a/src/openvic-simulation/population/PopsAggregate.cpp b/src/openvic-simulation/population/PopsAggregate.cpp index 931a45122..2b79a3f15 100644 --- a/src/openvic-simulation/population/PopsAggregate.cpp +++ b/src/openvic-simulation/population/PopsAggregate.cpp @@ -2,6 +2,8 @@ #include +#include + #include "openvic-simulation/country/CountryDefinition.hpp" #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/politics/Ideology.hpp" @@ -13,8 +15,6 @@ #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/OrderedContainersMath.hpp" -#include - using namespace OpenVic; PopsAggregate::PopsAggregate( PopsAggregateDeps const& pops_aggregate_deps, @@ -240,4 +240,4 @@ void PopsAggregate::update_parties_for_votes(CountryInstance const* country_inst return; } update_parties_for_votes(&country_instance->country_definition); -} \ No newline at end of file +} diff --git a/src/openvic-simulation/population/PopsAggregate.hpp b/src/openvic-simulation/population/PopsAggregate.hpp index c078aa488..53108e5b4 100644 --- a/src/openvic-simulation/population/PopsAggregate.hpp +++ b/src/openvic-simulation/population/PopsAggregate.hpp @@ -1,15 +1,15 @@ #pragma once +#include + +#include "openvic-simulation/population/PopSum.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp" #include "openvic-simulation/types/IndexedFlatMap.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" -#include "openvic-simulation/population/PopSum.hpp" #include "openvic-simulation/utility/Getters.hpp" #include "openvic-simulation/utility/reactive/MutableState.hpp" -#include - namespace OpenVic { struct CountryDefinition; struct CountryInstance; @@ -78,4 +78,4 @@ namespace OpenVic { pop_sum_t get_population_by_culture(Culture const& culture) const; pop_sum_t get_population_by_religion(Religion const& religion) const; }; -} \ No newline at end of file +} diff --git a/src/openvic-simulation/testing/Testing.hpp b/src/openvic-simulation/testing/Testing.hpp index 2099d1386..0ec672c59 100644 --- a/src/openvic-simulation/testing/Testing.hpp +++ b/src/openvic-simulation/testing/Testing.hpp @@ -7,13 +7,13 @@ #include "openvic-simulation/core/memory/SmartPtr.hpp" #include "openvic-simulation/core/memory/Vector.hpp" #include "openvic-simulation/DefinitionManager.hpp" -#include "openvic-simulation/testing/TestScript.hpp" #include "openvic-simulation/testing/test_scripts/A_001_file_tests.cpp" #include "openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp" #include "openvic-simulation/testing/test_scripts/A_003_military_unit_tests.cpp" #include "openvic-simulation/testing/test_scripts/A_004_networking_tests.cpp" #include "openvic-simulation/testing/test_scripts/A_005_nation_tests.cpp" #include "openvic-simulation/testing/test_scripts/A_006_politics_tests.cpp" +#include "openvic-simulation/testing/TestScript.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/types/Colour.hpp b/src/openvic-simulation/types/Colour.hpp index acfb2605b..beb4a224c 100644 --- a/src/openvic-simulation/types/Colour.hpp +++ b/src/openvic-simulation/types/Colour.hpp @@ -25,10 +25,10 @@ #include -#include "openvic-simulation/types/StackString.hpp" -#include "openvic-simulation/core/template/Concepts.hpp" #include "openvic-simulation/core/string/CharConv.hpp" +#include "openvic-simulation/core/template/Concepts.hpp" #include "openvic-simulation/core/Typedefs.hpp" +#include "openvic-simulation/types/StackString.hpp" namespace OpenVic { template @@ -796,7 +796,7 @@ struct fmt::formatter { if (_specs.align() != align::none) { report_error("invalid format specifier"); } - + if (_specs.alt()) { report_error("invalid format specifier"); } @@ -865,7 +865,7 @@ struct fmt::formatter { out = detail::write(out, "0x"); } } - + if (!upper) { std::array lower; size_t i = 0; @@ -879,7 +879,7 @@ struct fmt::formatter { return detail::write(out, string_view { lower.data(), i }, specs, ctx.locale()); } } else if (_specs.alt()) { - *out++ = '#'; + *out++ = '#'; } return detail::write(out, string_view { result.data(), result.size() }, specs, ctx.locale()); diff --git a/src/openvic-simulation/types/Date.hpp b/src/openvic-simulation/types/Date.hpp index 7fb0fff13..93f4ef818 100644 --- a/src/openvic-simulation/types/Date.hpp +++ b/src/openvic-simulation/types/Date.hpp @@ -15,14 +15,14 @@ #include +#include "openvic-simulation/core/error/ErrorMacros.hpp" +#include "openvic-simulation/core/Hash.hpp" #include "openvic-simulation/core/memory/Formatting.hpp" #include "openvic-simulation/core/memory/String.hpp" -#include "openvic-simulation/core/error/ErrorMacros.hpp" -#include "openvic-simulation/types/StackString.hpp" -#include "openvic-simulation/utility/Getters.hpp" #include "openvic-simulation/core/string/CharConv.hpp" #include "openvic-simulation/core/Typedefs.hpp" -#include "openvic-simulation/core/Hash.hpp" +#include "openvic-simulation/types/StackString.hpp" +#include "openvic-simulation/utility/Getters.hpp" namespace OpenVic { // A relative period between points in time, measured in days diff --git a/src/openvic-simulation/types/HasIdentifier.hpp b/src/openvic-simulation/types/HasIdentifier.hpp index e51389339..d119c515b 100644 --- a/src/openvic-simulation/types/HasIdentifier.hpp +++ b/src/openvic-simulation/types/HasIdentifier.hpp @@ -3,8 +3,8 @@ #include #include #include -#include #include +#include #include @@ -131,4 +131,4 @@ namespace std { return std::hash{}(obj.get_identifier()); } }; -} \ No newline at end of file +} diff --git a/src/openvic-simulation/types/IndexedFlatMap.hpp b/src/openvic-simulation/types/IndexedFlatMap.hpp index 1b17503a0..82d0ec56d 100644 --- a/src/openvic-simulation/types/IndexedFlatMap.hpp +++ b/src/openvic-simulation/types/IndexedFlatMap.hpp @@ -7,14 +7,14 @@ #include #include -#include - #include +#include + #include "openvic-simulation/core/memory/Vector.hpp" -#include "openvic-simulation/types/FixedVector.hpp" -#include "openvic-simulation/core/template/Concepts.hpp" #include "openvic-simulation/core/portable/ForwardableSpan.hpp" +#include "openvic-simulation/core/template/Concepts.hpp" +#include "openvic-simulation/types/FixedVector.hpp" #include "openvic-simulation/utility/Logger.hpp" #define OV_IFLATMAP_PROPERTY(KEYTYPE, VALUETYPE, NAME) OV_IFLATMAP_PROPERTY_ACCESS(KEYTYPE, VALUETYPE, NAME, private) @@ -190,7 +190,7 @@ namespace OpenVic { // There is no check for keys.data() being identical as KeyType objects are considered functionally equivalent if their index values match. return true; } - + //vector constexpr IndexedFlatMap() requires std::is_move_constructible_v || std::is_copy_constructible_v @@ -551,7 +551,7 @@ namespace OpenVic { constexpr keys_span_type const& get_keys() const { return keys; } - + constexpr forwardable_span get_values() { return values; } @@ -1151,4 +1151,4 @@ namespace OpenVic { return scalar / map.at(key); }); } -} \ No newline at end of file +} diff --git a/src/openvic-simulation/types/OrderedContainers.hpp b/src/openvic-simulation/types/OrderedContainers.hpp index bcd316f6e..a88e84720 100644 --- a/src/openvic-simulation/types/OrderedContainers.hpp +++ b/src/openvic-simulation/types/OrderedContainers.hpp @@ -5,6 +5,9 @@ #include #include +#include +#include + #include #include @@ -13,9 +16,6 @@ #include "openvic-simulation/core/string/Utility.hpp" #include "openvic-simulation/core/template/Concepts.hpp" -#include -#include - namespace OpenVic { struct ordered_container_string_hash { using is_transparent = void; @@ -55,12 +55,12 @@ namespace OpenVic { // Specialization for reference_wrapper template - struct default_equal_to_selector> { - using type = std::equal_to>; + struct default_equal_to_selector> { + using type = std::equal_to>; }; template - struct default_equal_to_selector> { - using type = std::equal_to>; + struct default_equal_to_selector> { + using type = std::equal_to>; }; template diff --git a/src/openvic-simulation/types/OrderedContainersMath.hpp b/src/openvic-simulation/types/OrderedContainersMath.hpp index 5527ba03d..da099a363 100644 --- a/src/openvic-simulation/types/OrderedContainersMath.hpp +++ b/src/openvic-simulation/types/OrderedContainersMath.hpp @@ -3,8 +3,8 @@ #include #include -#include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/core/template/Concepts.hpp" +#include "openvic-simulation/types/OrderedContainers.hpp" namespace OpenVic { template @@ -170,4 +170,4 @@ namespace OpenVic { std::move(second_largest) ); } -} \ No newline at end of file +} diff --git a/src/openvic-simulation/types/TypedSpan.hpp b/src/openvic-simulation/types/TypedSpan.hpp index 6c01cc073..326a05a8c 100644 --- a/src/openvic-simulation/types/TypedSpan.hpp +++ b/src/openvic-simulation/types/TypedSpan.hpp @@ -4,8 +4,8 @@ #include -#include "openvic-simulation/core/template/Concepts.hpp" #include "openvic-simulation/core/portable/ForwardableSpan.hpp" +#include "openvic-simulation/core/template/Concepts.hpp" namespace OpenVic { template< @@ -30,4 +30,4 @@ namespace OpenVic { return TypedSpan{*this}; } }; -} \ No newline at end of file +} diff --git a/src/openvic-simulation/types/Vector.hpp b/src/openvic-simulation/types/Vector.hpp index 082bd1d03..bda83eb88 100644 --- a/src/openvic-simulation/types/Vector.hpp +++ b/src/openvic-simulation/types/Vector.hpp @@ -5,11 +5,11 @@ #include -#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/core/Math.hpp" // IWYU pragma: keep +#include "openvic-simulation/core/template/Concepts.hpp" // IWYU pragma: keep #include "openvic-simulation/core/Typedefs.hpp" // IWYU pragma: keep +#include "openvic-simulation/types/BasicIterator.hpp" // IWYU pragma: keep +#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #define VEC_TYPE vec2_t #define FOR_VEC_COMPONENTS(F, SEP) F(x) SEP F(y) diff --git a/src/openvic-simulation/types/fixed_point/FixedPoint.cpp b/src/openvic-simulation/types/fixed_point/FixedPoint.cpp index ba2481c97..1ae407b71 100644 --- a/src/openvic-simulation/types/fixed_point/FixedPoint.cpp +++ b/src/openvic-simulation/types/fixed_point/FixedPoint.cpp @@ -1,5 +1,4 @@ #include "FixedPoint.hpp" -#include "String.hpp" #include #include @@ -10,6 +9,8 @@ #include "openvic-simulation/core/Typedefs.hpp" #include "openvic-simulation/utility/Logger.hpp" +#include "String.hpp" + /* Base e exponential lookup table */ #include "openvic-simulation/types/fixed_point/FixedPointLUT_2_16_EXP_e.hpp" @@ -141,4 +142,4 @@ fixed_point_t fixed_point_t::exp(fixed_point_t const& x) { fixed_point_t fixed_point_t::exp_2001(fixed_point_t const& x) { return _exp_internal<_detail::LUT::_2_16_EXP_2001.size(), _detail::LUT::_2_16_EXP_2001>(x); -} \ No newline at end of file +} diff --git a/src/openvic-simulation/utility/reactive/DerivedState.hpp b/src/openvic-simulation/utility/reactive/DerivedState.hpp index 38c9369e2..ee19c263c 100644 --- a/src/openvic-simulation/utility/reactive/DerivedState.hpp +++ b/src/openvic-simulation/utility/reactive/DerivedState.hpp @@ -1,7 +1,5 @@ #pragma once -#include "DependencyTracker.hpp" - #include #include "openvic-simulation/types/Signal.hpp" @@ -9,6 +7,8 @@ #include "openvic-simulation/utility/Logger.hpp" #include "openvic-simulation/utility/reactive/DependencyTracker.hpp" +#include "DependencyTracker.hpp" + namespace OpenVic { template struct DerivedState : public DependencyTracker { @@ -77,7 +77,7 @@ namespace OpenVic { recalculate_if_dirty(); return cached_value; } - + //special case where connection may be discarded as the observer handles it template requires OpenVic::_detail::signal::Callable