Merge pull request #64 from OpenVicProject/modifier-instance

ModifierEffects stored as instances

1 files changed, 120 insertions, 336 deletions

diff --git a/src/openvic-simulation/history/CountryHistory.cpp b/src/openvic-simulation/history/CountryHistory.cpp
index 2dfc171..04a5e09 100644
--- a/src/openvic-simulation/history/CountryHistory.cpp
+++ b/src/openvic-simulation/history/CountryHistory.cpp
@@ -5,154 +5,103 @@
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
-CountryHistory::CountryHistory(
-	Culture const* new_primary_culture, std::vector<Culture const*>&& new_accepted_cultures, Religion const* new_religion,
-	CountryParty const* new_ruling_party, Date new_last_election, std::map<Ideology const*, fixed_point_t>&& new_upper_house,
-	Province const* new_capital, GovernmentType const* new_government_type, fixed_point_t new_plurality,
-	NationalValue const* new_national_value, bool new_civilised, fixed_point_t new_prestige,
-	std::vector<Reform const*>&& new_reforms, Deployment const* new_inital_oob
-) : primary_culture { new_primary_culture }, accepted_cultures { std::move(new_accepted_cultures) },
-	religion { new_religion }, ruling_party { new_ruling_party }, last_election { new_last_election },
-	upper_house { std::move(new_upper_house) }, capital { new_capital }, government_type { new_government_type },
-	plurality { new_plurality }, national_value { new_national_value }, civilised { new_civilised },
-	prestige { new_prestige }, reforms { std::move(new_reforms) }, inital_oob { new_inital_oob } {}
+CountryHistoryEntry::CountryHistoryEntry(Country const& new_country, Date new_date)
+	: HistoryEntry { new_date }, country { new_country } {}
 
-Culture const* CountryHistory::get_primary_culture() const {
-	return primary_culture;
-}
-
-const std::vector<Culture const*>& CountryHistory::get_accepted_cultures() const {
-	return accepted_cultures;
-}
-
-Religion const* CountryHistory::get_religion() const {
-	return religion;
-}
-
-CountryParty const* CountryHistory::get_ruling_party() const {
-	return ruling_party;
-}
-
-const Date CountryHistory::get_last_election() const {
-	return last_election;
-}
-
-const std::map<Ideology const*, fixed_point_t>& CountryHistory::get_upper_house() const {
-	return upper_house;
-}
-
-Province const* CountryHistory::get_capital() const {
-	return capital;
-}
-
-GovernmentType const* CountryHistory::get_government_type() const {
-	return government_type;
-}
-
-const fixed_point_t CountryHistory::get_plurality() const {
-	return plurality;
-}
-
-NationalValue const* CountryHistory::get_national_value() const {
-	return national_value;
-}
-
-const bool CountryHistory::is_civilised() const {
-	return civilised;
-}
-
-const fixed_point_t CountryHistory::get_prestige() const {
-	return prestige;
-}
-
-const std::vector<Reform const*>& CountryHistory::get_reforms() const {
-	return reforms;
-}
+CountryHistoryMap::CountryHistoryMap(Country const& new_country) : country { new_country } {}
 
-Deployment const* CountryHistory::get_inital_oob() const {
-	return inital_oob;
+std::unique_ptr<CountryHistoryEntry> CountryHistoryMap::_make_entry(Date date) const {
+	return std::unique_ptr<CountryHistoryEntry> { new CountryHistoryEntry { country, date } };
 }
 
-bool CountryHistoryManager::add_country_history_entry(
-	Country const* country, Date date, Culture const* primary_culture, std::vector<Culture const*>&& accepted_cultures,
-	Religion const* religion, CountryParty const* ruling_party, Date last_election,
-	std::map<Ideology const*, fixed_point_t>&& upper_house, Province const* capital, GovernmentType const* government_type,
-	fixed_point_t plurality, NationalValue const* national_value, bool civilised, fixed_point_t prestige,
-	std::vector<Reform const*>&& reforms, Deployment const* initial_oob, bool updated_accepted_cultures,
-	bool updated_upper_house, bool updated_reforms
+bool CountryHistoryMap::_load_history_entry(
+	GameManager const& game_manager, Dataloader const& dataloader, DeploymentManager& deployment_manager,
+	CountryHistoryEntry& entry, ast::NodeCPtr root
 ) {
-	if (locked) {
-		Logger::error("Cannot add new history entry to country history registry: locked!");
-		return false;
-	}
-
-	/* combine duplicate histories, priority to current (defined later) */
-	auto& country_registry = country_histories[country];
-	const auto existing_entry = country_registry.find(date);
-
-	if (existing_entry != country_registry.end()) {
-		if (primary_culture != nullptr) {
-			existing_entry->second.primary_culture = primary_culture;
-		}
-		if (updated_accepted_cultures) {
-			existing_entry->second.accepted_cultures = std::move(accepted_cultures);
-		}
-		if (religion != nullptr) {
-			existing_entry->second.religion = religion;
-		}
-		if (ruling_party != nullptr) {
-			existing_entry->second.ruling_party = ruling_party;
-		}
-		if (last_election != Date(0)) {
-			existing_entry->second.last_election = last_election;
-		}
-		if (updated_upper_house) {
-			existing_entry->second.upper_house = std::move(upper_house);
-		}
-		if (capital != nullptr) {
-			existing_entry->second.capital = capital;
-		}
-		if (government_type != nullptr) {
-			existing_entry->second.government_type = government_type;
-		}
-		if (plurality >= 0) {
-			existing_entry->second.plurality = plurality;
-		}
-		if (national_value != nullptr) {
-			existing_entry->second.national_value = national_value;
-		}
-		if (civilised) {
-			existing_entry->second.civilised = true;
-		}
-		if (prestige >= 0) {
-			existing_entry->second.prestige = prestige;
-		}
-		if (updated_reforms) {
-			existing_entry->second.reforms = std::move(reforms);
-		}
-		if (initial_oob != nullptr) {
-			existing_entry->second.inital_oob = initial_oob;
-		}
-	} else {
-		country_registry.emplace( date,
-			CountryHistory {
-				primary_culture, std::move(accepted_cultures), religion, ruling_party, last_election,
-				std::move(upper_house), capital, government_type, plurality, national_value, civilised,
-				prestige, std::move(reforms), initial_oob
+	PoliticsManager const& politics_manager = game_manager.get_politics_manager();
+	IssueManager const& issue_manager = politics_manager.get_issue_manager();
+	CultureManager const& culture_manager = game_manager.get_pop_manager().get_culture_manager();
+
+	return expect_dictionary_keys_and_default(
+		[this, &game_manager, &dataloader, &deployment_manager, &issue_manager, &entry](
+			std::string_view key, ast::NodeCPtr value) -> bool {
+			ReformGroup const* reform_group = issue_manager.get_reform_group_by_identifier(key);
+			if (reform_group != nullptr) {
+				return issue_manager.expect_reform_identifier([&entry, reform_group](Reform const& reform) -> bool {
+					if (&reform.get_reform_group() != reform_group) {
+						Logger::warning(
+							"Listing ", reform.get_identifier(), " as belonging to the reform group ",
+							reform_group->get_identifier(), " when it actually belongs to ",
+							reform.get_reform_group().get_identifier(), " in history of ", entry.get_country().get_identifier()
+						);
+					}
+					if (std::find(entry.reforms.begin(), entry.reforms.end(), &reform) != entry.reforms.end()) {
+						Logger::error(
+							"Redefinition of reform ", reform.get_identifier(), " in history of ",
+							entry.get_country().get_identifier()
+						);
+						return false;
+					}
+					entry.reforms.push_back(&reform);
+					return true;
+				})(value);
 			}
-		);
-	}
-	return true;
+			// TODO: technologies & inventions
+			return _load_history_sub_entry_callback(
+				game_manager, dataloader, deployment_manager, entry.get_date(), value, key, value, key_value_success_callback
+			);
+		},
+		/* we have to use a lambda, assign_variable_callback_pointer
+		 * apparently doesn't play nice with const & non-const accessors */
+		// TODO - fix this issue (cause by provinces having non-const accessors)
+		"capital", ZERO_OR_ONE,
+			game_manager.get_map().expect_province_identifier(assign_variable_callback_pointer(entry.capital)),
+		"primary_culture", ZERO_OR_ONE,
+			culture_manager.expect_culture_identifier(assign_variable_callback_pointer(entry.primary_culture)),
+		"culture", ZERO_OR_MORE, culture_manager.expect_culture_identifier(
+			[&entry](Culture const& culture) -> bool {
+				entry.accepted_cultures.push_back(&culture);
+				return true;
+			}
+		),
+		"religion", ZERO_OR_ONE, game_manager.get_pop_manager().get_religion_manager().expect_religion_identifier(
+			assign_variable_callback_pointer(entry.religion)
+		),
+		"government", ZERO_OR_ONE, politics_manager.get_government_type_manager().expect_government_type_identifier(
+			assign_variable_callback_pointer(entry.government_type)
+		),
+		"plurality", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(entry.plurality)),
+		"nationalvalue", ZERO_OR_ONE, politics_manager.get_national_value_manager().expect_national_value_identifier(
+			assign_variable_callback_pointer(entry.national_value)
+		),
+		"civilized", ZERO_OR_ONE, expect_bool(assign_variable_callback(entry.civilised)),
+		"prestige", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(entry.prestige)),
+		"ruling_party", ZERO_OR_ONE, country.expect_party_identifier(assign_variable_callback_pointer(entry.ruling_party)),
+		"last_election", ZERO_OR_ONE, expect_date(assign_variable_callback(entry.last_election)),
+		"upper_house", ZERO_OR_ONE, politics_manager.get_ideology_manager().expect_ideology_dictionary(
+			[&entry](Ideology const& ideology, ast::NodeCPtr value) -> bool {
+				return expect_fixed_point([&entry, &ideology](fixed_point_t val) -> bool {
+					entry.upper_house[&ideology] = val;
+					return true;
+				})(value);
+			}
+		),
+		"oob", ZERO_OR_ONE, expect_identifier_or_string(
+			[&game_manager, &deployment_manager, &dataloader, &entry](std::string_view path) -> bool {
+				Deployment const* deployment = nullptr;
+				const bool ret = deployment_manager.load_oob_file(game_manager, dataloader, path, deployment, false);
+				if (deployment != nullptr) {
+					entry.inital_oob = deployment;
+				}
+				return ret;
+			}
+		),
+		"schools", ZERO_OR_ONE, success_callback, // TODO: technology school
+		"foreign_investment", ZERO_OR_ONE, success_callback // TODO: foreign investment
+	)(root);
 }
 
 void CountryHistoryManager::lock_country_histories() {
-	for (const auto& entry : country_histories) {
-		if (entry.second.size() == 0) {
-			Logger::error(
-				"Attempted to lock country histories - country ", entry.first->get_identifier(), " has no history entries!"
-			);
-		}
-	}
 	Logger::info("Locked country history registry after registering ", country_histories.size(), " items");
 	locked = true;
 }
@@ -161,214 +110,49 @@ bool CountryHistoryManager::is_locked() const {
 	return locked;
 }
 
-CountryHistory const* CountryHistoryManager::get_country_history(Country const* country, Date entry) const {
-	Date closest_entry;
-	auto country_registry = country_histories.find(country);
-
-	if (country_registry == country_histories.end()) {
-		Logger::error("Attempted to access history of undefined country ", country->get_identifier());
+CountryHistoryMap const* CountryHistoryManager::get_country_history(Country const* country) const {
+	if (country == nullptr) {
+		Logger::error("Attempted to access history of null country");
 		return nullptr;
 	}
-
-	for (const auto& current : country_registry->second) {
-		if (current.first == entry) {
-			return &current.second;
-		}
-		if (current.first > entry) {
-			continue;
-		}
-		if (current.first > closest_entry && current.first < entry) {
-			closest_entry = current.first;
-		}
-	}
-
-	auto entry_registry = country_registry->second.find(closest_entry);
-	if (entry_registry != country_registry->second.end()) {
-		return &entry_registry->second;
+	decltype(country_histories)::const_iterator country_registry = country_histories.find(country);
+	if (country_registry != country_histories.end()) {
+		return &country_registry->second;
+	} else {
+		Logger::error("Attempted to access history of country ", country->get_identifier(), " but none has been defined!");
+		return nullptr;
 	}
-	/* warned about lack of entries earlier, return nullptr */
-	return nullptr;
 }
 
-inline CountryHistory const* CountryHistoryManager::get_country_history(Country const* country, Bookmark const* entry) const {
-	return get_country_history(country, entry->get_date());
-}
-
-inline bool CountryHistoryManager::_load_country_history_entry(
-	GameManager& game_manager, std::string_view name, Date const& date, ast::NodeCPtr root
+bool CountryHistoryManager::load_country_history_file(
+	GameManager& game_manager, Dataloader const& dataloader, Country const& country, ast::NodeCPtr root
 ) {
-	Province const* capital = nullptr;
-	Culture const* primary_culture = nullptr;
-	Religion const* religion = nullptr;
-	GovernmentType const* government_type = nullptr;
-	NationalValue const* national_value = nullptr;
-	CountryParty const* ruling_party = nullptr;
-	std::vector<Culture const*> accepted_cultures;
-	std::vector<Reform const*> reforms;
-	std::map<Ideology const*, fixed_point_t> upper_house;
-	fixed_point_t plurality = -1, prestige = -1;
-	bool civilised = false;
-	Date last_election = Date(0);
-	Deployment const* initial_oob = nullptr;
-
-	bool updated_accepted_cultures = false, updated_upper_house = false, updated_reforms = false;
-
-	bool ret = expect_dictionary_keys_and_default(
-		[this, &game_manager, &reforms, &updated_reforms, &name](std::string_view key, ast::NodeCPtr value) -> bool {
-			if (game_manager.get_politics_manager().get_issue_manager().has_reform_group_identifier(key)) {
-				updated_reforms = true;
-
-				Reform const* reform;
-
-				bool ret = game_manager.get_politics_manager().get_issue_manager()
-					.expect_reform_identifier(assign_variable_callback_pointer(reform))(value);
-				if (std::find(reforms.begin(), reforms.end(), reform) != reforms.end()) {
-					Logger::error("Redefinition of reform ", reform->get_identifier(), " in history of ", name);
-					return false;
-				}
-
-				reforms.push_back(reform);
-				return ret;
-			}
-			// TODO: technologies & inventions
-			return true;
-		},
-		/* we have to use a lambda, assign_variable_callback_pointer
-		 * apparently doesn't play nice with const & non-const accessors */
-		"capital", ZERO_OR_ONE,
-			game_manager.get_map().expect_province_identifier([&capital](Province const& province) -> bool {
-				capital = &province;
-				return true;
-			}),
-		"primary_culture", ZERO_OR_ONE,
-			game_manager.get_pop_manager().get_culture_manager().expect_culture_identifier(
-				assign_variable_callback_pointer(primary_culture)
-			),
-		"culture", ZERO_OR_MORE,
-			game_manager.get_pop_manager().get_culture_manager().expect_culture_identifier(
-				[&game_manager, &accepted_cultures, &updated_accepted_cultures](Culture const& culture) -> bool {
-					updated_accepted_cultures = true;
-					accepted_cultures.push_back(&culture);
-					return true;
-				}
-			),
-		"religion", ZERO_OR_ONE,
-			game_manager.get_pop_manager().get_religion_manager().expect_religion_identifier(
-				assign_variable_callback_pointer(religion)
-			),
-		"government", ZERO_OR_ONE,
-			game_manager.get_politics_manager().get_government_type_manager().expect_government_type_identifier(
-				assign_variable_callback_pointer(government_type)
-			),
-		"plurality", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(plurality)),
-		"nationalvalue", ZERO_OR_ONE,
-			game_manager.get_politics_manager().get_national_value_manager().expect_national_value_identifier(
-				assign_variable_callback_pointer(national_value)
-			),
-		"civilized", ZERO_OR_ONE, expect_bool(assign_variable_callback(civilised)),
-		"prestige", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(prestige)),
-		"ruling_party", ZERO_OR_ONE,
-			expect_identifier([this, &game_manager, &ruling_party, &name, &date](std::string_view identifier) -> bool {
-				const std::vector<CountryParty>* parties =
-					&game_manager.get_country_manager().get_country_by_identifier(name)->get_parties();
-				for (auto& party : *parties) {
-					if (party.get_name() == identifier) {
-						if (party.get_start_date() <= date && date <= party.get_end_date()) {
-							ruling_party = &party;
-							return true;
-						} else {
-							if (party.get_start_date() > date) {
-								Logger::warning(
-									"Ruling party ", identifier, " of country ", name, " has invalid start date ",
-									party.get_start_date(), " for bookmark: ", date.to_string()
-								);
-							}
-							if (party.get_end_date() < date) {
-								Logger::warning(
-									"Ruling party ", identifier, " of country ", name, " has invalid end date ",
-									party.get_end_date(), " for bookmark: ", date.to_string()
-								);
-							}
-							ruling_party = &party;
-							return true;
-						}
-					}
-				}
-				Logger::error("Ruling party ", identifier, " of country ", name, " is not defined!");
-				return false;
-			}),
-		"last_election", ZERO_OR_ONE, expect_date(assign_variable_callback(last_election)),
-		"upper_house", ZERO_OR_ONE,
-			game_manager.get_politics_manager().get_ideology_manager().expect_ideology_dictionary(
-				[&upper_house, &updated_upper_house](Ideology const& ideology, ast::NodeCPtr value) -> bool {
-					fixed_point_t popularity;
-
-					updated_upper_house = true;
-					bool ret = expect_fixed_point(assign_variable_callback(popularity))(value);
-					upper_house.emplace(&ideology, popularity);
-					return ret;
-				}
-			),
-		"oob", ZERO_OR_ONE,
-			[&game_manager, &initial_oob](ast::NodeCPtr node) -> bool {
-				std::string_view string;
-				expect_string(assign_variable_callback(string))(node);
-
-				if (string.starts_with('/')) {
-					if (game_manager.get_military_manager().get_deployment_manager()
-						.has_deployment_identifier(string.substr(1))) {
-						initial_oob = game_manager.get_military_manager().get_deployment_manager()
-							.get_deployment_by_identifier(string.substr(1));
-						return true;
-					}
-				} else {
-					if (game_manager.get_military_manager().get_deployment_manager().has_deployment_identifier(string)) {
-						initial_oob =
-							game_manager.get_military_manager().get_deployment_manager().get_deployment_by_identifier(string);
-					}
-				}
-
-				initial_oob =
-					game_manager.get_military_manager().get_deployment_manager().get_deployment_by_identifier("NULL");
-				return true;
-			},
-		"schools", ZERO_OR_ONE, success_callback, // TODO: technology school
-		"foreign_investment", ZERO_OR_ONE, success_callback // TODO: foreign investment
-	)(root);
-
-	ret &= add_country_history_entry(
-		game_manager.get_country_manager().get_country_by_identifier(name), date, primary_culture, std::move(accepted_cultures),
-		religion, ruling_party, last_election, std::move(upper_house), capital, government_type, plurality, national_value,
-		civilised, prestige, std::move(reforms), initial_oob, updated_accepted_cultures, updated_upper_house, updated_reforms
-	);
-	return ret;
-}
+	if (locked) {
+		Logger::error(
+			"Attempted to load country history file for ", country.get_identifier(),
+			" after country history registry was locked!"
+		);
+		return false;
+	}
 
-bool CountryHistoryManager::load_country_history_file(GameManager& game_manager, std::string_view name, ast::NodeCPtr root) {
-	if (game_manager.get_country_manager().get_country_by_identifier(name)->is_dynamic_tag()) {
+	if (country.is_dynamic_tag()) {
 		return true; /* as far as I can tell dynamic countries are hardcoded, broken, and unused */
 	}
 
-	bool ret = _load_country_history_entry(game_manager, name, game_manager.get_define_manager().get_start_date(), root);
-
-	ret &= expect_dictionary([this, &game_manager, &name](std::string_view key, ast::NodeCPtr value) -> bool {
-		bool is_date = false;
-		Date entry = Date().from_string(key, &is_date, true);
-		if (!is_date) {
-			return true;
-		}
-
-		Date const& end_date = game_manager.get_define_manager().get_end_date();
-		if (entry > end_date) {
-			Logger::error(
-				"History entry ", entry.to_string(), " of country ", name, " defined after defined end date ",
-				end_date.to_string()
-			);
+	decltype(country_histories)::iterator it = country_histories.find(&country);
+	if (it == country_histories.end()) {
+		const std::pair<decltype(country_histories)::iterator, bool> result =
+			country_histories.emplace(&country, CountryHistoryMap { country });
+		if (result.second) {
+			it = result.first;
+		} else {
+			Logger::error("Failed to create country history map for country ", country.get_identifier());
 			return false;
 		}
+	}
+	CountryHistoryMap& country_history = it->second;
 
-		return _load_country_history_entry(game_manager, name, entry, value);
-	})(root);
-
-	return ret;
+	return country_history._load_history_file(
+		game_manager, dataloader, game_manager.get_military_manager().get_deployment_manager(), root
+	);
 }