Convert pops to equivalents & calculate rgo size

1 files changed, 7 insertions, 1 deletions

diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp
index 5863a97..c8168a9 100644
--- a/src/openvic-simulation/map/ProvinceInstance.hpp
+++ b/src/openvic-simulation/map/ProvinceInstance.hpp
@@ -13,6 +13,7 @@
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "economy/production/ResourceGatheringOperation.hpp"
+#include "types/fixed_point/FixedPoint.hpp"
 
 
 namespace OpenVic {
@@ -101,6 +102,8 @@ namespace OpenVic {
 
 		void _add_pop(Pop&& pop);
 		void _update_pops(DefineManager const& define_manager);
+		fixed_point_t calculate_rgo_size(ProductionType const& production_type) const;
+		void convert_rgo_worker_pops_to_equivalent(ProductionType const& production_type);
 
 	public:
 		ProvinceInstance(ProvinceInstance&&) = default;
@@ -140,7 +143,10 @@ namespace OpenVic {
 		bool remove_unit_instance_group(UnitInstanceGroup<Branch>& group);
 
 		bool setup(BuildingTypeManager const& building_type_manager);
-		bool apply_history_to_province(ProvinceHistoryEntry const& entry, CountryInstanceManager& country_manager, ProductionTypeManager const& production_type_manager);
+		bool apply_history_to_province(ProvinceHistoryEntry const& entry, CountryInstanceManager& country_manager);
+
+		//after history and pops!
+		void setup_rgo(ProductionType const& rgo_production_type);
 
 		void setup_pop_test_values(IssueManager const& issue_manager);
 	};