Merge pull request #89 from OpenVicProject/dataloading-pop-history

Pop History Loading (with the new system)

3 files changed, 21 insertions, 9 deletions

diff --git a/src/openvic-simulation/map/Map.cpp b/src/openvic-simulation/map/Map.cpp
index 44443a4..b272f1f 100644
--- a/src/openvic-simulation/map/Map.cpp
+++ b/src/openvic-simulation/map/Map.cpp
@@ -294,8 +294,15 @@ bool Map::apply_history_to_provinces(ProvinceHistoryManager const& history_manag
 		if (!province.get_water()) {
 			ProvinceHistoryMap const* history_map = history_manager.get_province_history(&province);
 			if (history_map != nullptr) {
+				ProvinceHistoryEntry const* pop_history_entry = nullptr;
 				for (ProvinceHistoryEntry const* entry : history_map->get_entries_up_to(date)) {
 					province.apply_history_to_province(entry);
+					if (!entry->get_pops().empty()) {
+						pop_history_entry = entry;
+					}
+				}
+				if (pop_history_entry != nullptr) {
+					province.add_pop_vec(pop_history_entry->get_pops());
 				}
 			}
 		}
diff --git a/src/openvic-simulation/map/Province.cpp b/src/openvic-simulation/map/Province.cpp
index 363be6c..8094463 100644
--- a/src/openvic-simulation/map/Province.cpp
+++ b/src/openvic-simulation/map/Province.cpp
@@ -58,14 +58,6 @@ bool Province::expand_building(std::string_view building_type_identifier) {
 	return building->expand();
 }
 
-bool Province::load_pop_list(PopManager const& pop_manager, ast::NodeCPtr root) {
-	return expect_dictionary_reserve_length(pops,
-		[this, &pop_manager](std::string_view pop_type_identifier, ast::NodeCPtr pop_node) -> bool {
-			return pop_manager.load_pop_into_province(*this, pop_type_identifier, pop_node);
-		}
-	)(root);
-}
-
 bool Province::add_pop(Pop&& pop) {
 	if (!get_water()) {
 		pops.push_back(std::move(pop));
@@ -76,6 +68,19 @@ bool Province::add_pop(Pop&& pop) {
 	}
 }
 
+bool Province::add_pop_vec(std::vector<Pop> const& pop_vec) {
+	if (!get_water()) {
+		pops.reserve(pops.size() + pop_vec.size());
+		for (Pop const& pop : pop_vec) {
+			pops.push_back(pop);
+		}
+		return true;
+	} else {
+		Logger::error("Trying to add pop vector to water province ", get_identifier());
+		return false;
+	}
+}
+
 size_t Province::get_pop_count() const {
 	return pops.size();
 }
diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp
index e73dec3..37ecdaa 100644
--- a/src/openvic-simulation/map/Province.hpp
+++ b/src/openvic-simulation/map/Province.hpp
@@ -101,8 +101,8 @@ namespace OpenVic {
 
 		bool expand_building(std::string_view building_type_identifier);
 
-		bool load_pop_list(PopManager const& pop_manager, ast::NodeCPtr root);
 		bool add_pop(Pop&& pop);
+		bool add_pop_vec(std::vector<Pop> const& pop_vec);
 		size_t get_pop_count() const;
 		void update_pops();