Skip to content

Typed fixed vector #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wvpm wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Typed fixed vector #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78533c4
FixedVector size_type as template argument
wvpm May 15, 2026
5dbe7a8
Replace even more maps with typed FixedVector
wvpm May 19, 2026
3822399
.
wvpm May 19, 2026
8c21ba6
.
wvpm May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/headless/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,17 @@ static void print_rgo(ProvinceInstance const& province) {
);

bool logged_employees = false;
for (auto [pop_type, employees_of_type] : rgo.get_employee_count_per_type_cache()) {
if (employees_of_type > 0) {
if (!logged_employees) {
SPDLOG_INFO("\temployess:");
logged_employees = true;
{
pop_type_index_t pop_type_index {};
for (const pop_size_t employees_of_type : rgo.get_employee_count_per_type_cache()) {
if (employees_of_type > 0) {
if (!logged_employees) {
SPDLOG_INFO("\temployess:");
logged_employees = true;
}
SPDLOG_INFO("\t\t{} {}", employees_of_type, pop_type_index);
}
SPDLOG_INFO("\t\t{} {}", employees_of_type, pop_type);
++pop_type_index;
}
}
}
Expand Down
53 changes: 40 additions & 13 deletions src/openvic-simulation/InstanceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "openvic-simulation/DefinitionManager.hpp"
#include "openvic-simulation/console/ConsoleInstance.hpp"
#include "openvic-simulation/misc/GameAction.hpp"
#include "openvic-simulation/types/TypedSpan.hpp"
#include "openvic-simulation/utility/Logger.hpp"

using namespace OpenVic;
Expand Down Expand Up @@ -37,6 +38,7 @@ InstanceManager::InstanceManager(
new_definition_manager.get_define_manager().get_end_date(),
new_definition_manager.get_define_manager().get_diplomacy_defines(),
new_definition_manager.get_define_manager().get_economy_defines(),
new_definition_manager.get_politics_manager().get_ideology_manager().get_ideologies(),
new_definition_manager.get_research_manager().get_invention_manager().get_inventions(),
new_game_rules_manager,
good_instance_manager.get_good_instances(),
Expand All @@ -45,10 +47,22 @@ InstanceManager::InstanceManager(
market_instance,
new_definition_manager.get_define_manager().get_military_defines(),
new_definition_manager.get_modifier_manager().get_modifier_effect_cache(),
{
new_definition_manager.get_politics_manager().get_ideology_manager().get_ideologies(),
new_definition_manager.get_politics_manager().get_issue_manager().get_party_policies(),
new_definition_manager.get_politics_manager().get_issue_manager().get_reforms()
PopsAggregateDeps{
ideology_index_t(
new_definition_manager.get_politics_manager().get_ideology_manager().get_ideology_count()
),
party_policy_index_t(
new_definition_manager.get_politics_manager().get_issue_manager().get_party_policy_count()
),
pop_type_index_t(
new_definition_manager.get_pop_manager().get_pop_type_count()
),
reform_index_t(
new_definition_manager.get_politics_manager().get_issue_manager().get_reform_count()
),
strata_index_t(
new_definition_manager.get_pop_manager().get_strata_count()
)
},
new_definition_manager.get_pop_manager().get_pop_types(),
new_definition_manager.get_politics_manager().get_issue_manager().get_reform_groups(),
Expand All @@ -59,10 +73,22 @@ InstanceManager::InstanceManager(
new_definition_manager.get_military_manager().get_unit_type_manager()
},
pops_aggregate_deps {
new_definition_manager.get_politics_manager().get_ideology_manager().get_ideologies(),
new_definition_manager.get_politics_manager().get_issue_manager().get_party_policies(),
new_definition_manager.get_politics_manager().get_issue_manager().get_reforms()
},
ideology_index_t(
new_definition_manager.get_politics_manager().get_ideology_manager().get_ideology_count()
),
party_policy_index_t(
new_definition_manager.get_politics_manager().get_issue_manager().get_party_policy_count()
),
pop_type_index_t(
new_definition_manager.get_pop_manager().get_pop_type_count()
),
reform_index_t(
new_definition_manager.get_politics_manager().get_issue_manager().get_reform_count()
),
strata_index_t(
new_definition_manager.get_pop_manager().get_strata_count()
)
},
pop_deps {
artisanal_producer_deps,
market_instance,
Expand All @@ -71,13 +97,12 @@ InstanceManager::InstanceManager(
rgo_deps {
market_instance,
new_definition_manager.get_modifier_manager().get_modifier_effect_cache(),
new_definition_manager.get_pop_manager().get_pop_types()
pop_type_index_t(new_definition_manager.get_pop_manager().get_pop_type_count())
},
province_instance_deps {
new_definition_manager.get_economy_manager().get_building_type_manager(),
new_game_rules_manager,
pops_aggregate_deps,
new_definition_manager.get_pop_manager().get_pop_types(),
rgo_deps,
new_definition_manager.get_pop_manager().get_stratas()
},
Expand All @@ -89,6 +114,7 @@ InstanceManager::InstanceManager(
good_instance_manager,
new_definition_manager.get_define_manager().get_pops_defines(),
new_definition_manager.get_pop_manager().get_pop_types(),
new_definition_manager.get_military_manager().get_unit_type_manager().get_regiment_types(),
thread_pool
},
unit_instance_manager {
Expand Down Expand Up @@ -213,8 +239,7 @@ bool InstanceManager::setup() {
definition_manager.get_modifier_manager().get_modifier_effect_cache(),
definition_manager.get_define_manager().get_pops_defines(),
definition_manager.get_economy_manager().get_production_type_manager(),
definition_manager.get_economy_manager().get_good_definition_manager().get_good_definitions(),
definition_manager.get_pop_manager().get_stratas(),
strata_index_t(definition_manager.get_pop_manager().get_strata_count()),
good_instance_manager.get_good_instances(),
country_instance_manager.get_country_instances(),
map_instance.get_province_instances()
Expand Down Expand Up @@ -251,7 +276,9 @@ bool InstanceManager::load_bookmark(Bookmark const& new_bookmark) {
definition_manager.get_history_manager().get_province_manager(), today,
country_instance_manager,
definition_manager.get_define_manager().get_military_defines(),
pop_deps
pop_deps,
definition_manager.get_pop_manager().get_pop_types(),
definition_manager.get_politics_manager().get_issue_manager().get_reforms()
);

// It is important that province history is applied before country history as province history includes
Expand Down
9 changes: 7 additions & 2 deletions src/openvic-simulation/country/CountryDefinition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
#include "openvic-simulation/politics/PartyPolicy.hpp"
#include "openvic-simulation/population/Culture.hpp"
#include "openvic-simulation/types/Colour.hpp"
#include "openvic-simulation/types/FixedVector.hpp"
#include "openvic-simulation/types/IdentifierRegistry.hpp"
#include "openvic-simulation/types/TypedIndices.hpp"
#include "openvic-simulation/utility/Logger.hpp"

using namespace OpenVic;
Expand Down Expand Up @@ -141,13 +143,16 @@ node_callback_t CountryDefinitionManager::load_country_party(
std::string_view party_name;
Date start_date, end_date;
Ideology const* ideology = nullptr;
IndexedFlatMap<PartyPolicyGroup, PartyPolicy const*> policies { politics_manager.get_issue_manager().get_party_policy_groups() };
memory::FixedVector<PartyPolicy const*, party_policy_group_index_t> policies {
party_policy_group_index_t(politics_manager.get_issue_manager().get_party_policy_group_count()),
nullptr
};

bool ret = expect_dictionary_keys_and_default(
[&politics_manager, &policies, &party_name](std::string_view key, ast::NodeCPtr value) -> bool {
return politics_manager.get_issue_manager().expect_party_policy_group_str(
[&politics_manager, &policies, value, &party_name](PartyPolicyGroup const& party_policy_group) -> bool {
PartyPolicy const*& policy = policies.at(party_policy_group);
PartyPolicy const*& policy = policies[party_policy_group.index];

if (policy != nullptr) {
spdlog::error_s(
Expand Down
Loading
Loading