Merge pull request #354 from OpenVicProject/rgo_employment

Record pop employment for RGOs and calculate unemployment fraction.

Author: wvpm

src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp

@@ -208,8 +208,13 @@ void ResourceGatheringOperation::hire() {
 		for (Job const& job : jobs) {
 			if (job.get_pop_type() == &pop_type) {
 				const pop_size_t pop_size_to_hire = static_cast<pop_size_t>((proportion_to_hire * pop.get_size()).floor());
+				if (pop_size_to_hire <= 0) {
+					continue;
+				}
+
 				employee_count_per_type_cache[pop_type] += pop_size_to_hire;
 				employees.emplace_back(pop, pop_size_to_hire);
+				pop.hire(pop_size_to_hire);
 				total_employees_count_cache += pop_size_to_hire;
 				if (!pop_type.get_is_slave()) {
 					total_paid_employees_count_cache += pop_size_to_hire;

src/openvic-simulation/map/MapInstance.cpp

@@ -155,6 +155,9 @@ void MapInstance::update_gamestate(const Date today, DefineManager const& define
 
 void MapInstance::map_tick() {
 	thread_pool.process_province_ticks();
+	//state tick
+	//after provice tick as province tick sets pop employment to 0
+	//state tick will update pop employment via factories
 }
 
 void MapInstance::initialise_for_new_game(

src/openvic-simulation/pop/Pop.cpp

@@ -20,6 +20,7 @@
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/pop/PopValuesFromProvince.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/utility/Logger.hpp"
 #include "openvic-simulation/utility/Utility.hpp"
 
 using namespace OpenVic;
@@ -108,7 +109,6 @@ void Pop::setup_pop_test_values(IssueManager const& issue_manager) {
 		return (rand() % 256) * max / 256;
 	};
 
-	unemployment = test_range();
 	cash = test_range(20);
 	income = test_range(5);
 	expenses = test_range(5);
@@ -353,6 +353,7 @@ void Pop::pop_tick_without_cleanup(PopValuesFromProvince& shared_values) {
 	DO_FOR_ALL_TYPES_OF_POP_EXPENSES(SET_TO_ZERO)
 	#undef SET_TO_ZERO
 	income = expenses = fixed_point_t::_0();
+	employed = 0;
 
 	auto& [
 		reusable_map_0,
@@ -543,6 +544,18 @@ void Pop::report_artisanal_produce(const fixed_point_t quantity) {
 	artisanal_produce_left_to_sell = quantity;
 }
 
+void Pop::hire(pop_size_t count) {
+	if (OV_unlikely(count <= 0)) {
+		Logger::warning("Tried employing non-positive number of pops. ", count, " Context", get_pop_context_text().str());
+	}
+	employed += count;
+	if (OV_unlikely(employed > size)) {
+		Logger::error("Employed count became greater than pop size. ", employed, " Context", get_pop_context_text().str());
+	} else if (OV_unlikely(employed < 0)) {
+		Logger::error("Employed count became negative. ", employed ," Context", get_pop_context_text().str());
+	}
+}
+
 #undef DO_FOR_ALL_TYPES_OF_POP_INCOME
 #undef DO_FOR_ALL_TYPES_OF_POP_EXPENSES
 #undef DO_FOR_ALL_NEED_CATEGORIES

src/openvic-simulation/pop/Pop.hpp

@@ -6,6 +6,8 @@
 #include "openvic-simulation/economy/production/ArtisanalProducerFactoryPattern.hpp"
 #include "openvic-simulation/pop/PopType.hpp"
 #include "openvic-simulation/types/fixed_point/Atomic.hpp"
+#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/types/PopSize.hpp"
 
 namespace OpenVic {
 	struct CountryInstance;
@@ -99,7 +101,18 @@ namespace OpenVic {
 		fixed_point_map_t<Issue const*> PROPERTY(issue_distribution);
 		IndexedMap<CountryParty, fixed_point_t> PROPERTY(vote_distribution);
 
-		fixed_point_t PROPERTY(unemployment);
+		pop_size_t employed = 0;
+	public:
+		constexpr pop_size_t get_unemployed() const {
+			return size - employed;
+		}
+		constexpr fixed_point_t get_unemployment_fraction() const {
+			if (!type->get_can_be_unemployed()) {
+				return fixed_point_t::_0();
+			}
+			return fixed_point_t::parse(get_unemployed()) / size;
+		}
+	private:
 		fixed_point_t PROPERTY(income);
 		fixed_point_t PROPERTY(savings);
 		moveable_atomic_fixed_point_t PROPERTY(cash);
@@ -172,6 +185,7 @@ namespace OpenVic {
 		void pop_tick(PopValuesFromProvince& shared_values);
 		void allocate_cash_for_artisanal_spending(const fixed_point_t money_to_spend);
 		void report_artisanal_produce(const fixed_point_t quantity);
+		void hire(pop_size_t count);
 	};
 }
 #ifndef KEEP_DO_FOR_ALL_TYPES_OF_INCOME

src/openvic-simulation/pop/PopType.cpp

@@ -48,7 +48,7 @@ PopType::PopType(
 	bool new_can_invest,
 	bool new_factory,
 	bool new_can_work_factory,
-	bool new_unemployment,
+	bool new_can_be_unemployed,
 	fixed_point_t new_research_points,
 	fixed_point_t new_leadership_points,
 	fixed_point_t new_research_leadership_optimum,
@@ -83,7 +83,7 @@ PopType::PopType(
 	can_invest { new_can_invest },
 	factory { new_factory },
 	can_work_factory { new_can_work_factory },
-	unemployment { new_unemployment },
+	can_be_unemployed { new_can_be_unemployed },
 	research_points { new_research_points },
 	leadership_points { new_leadership_points },
 	research_leadership_optimum { new_research_leadership_optimum },

src/openvic-simulation/pop/PopType.hpp

@@ -76,7 +76,7 @@ namespace OpenVic {
 		const bool PROPERTY(can_invest);
 		const bool PROPERTY(factory);
 		const bool PROPERTY(can_work_factory);
-		const bool PROPERTY(unemployment);
+		const bool PROPERTY(can_be_unemployed);
 		const fixed_point_t PROPERTY(research_points);
 		const fixed_point_t PROPERTY(leadership_points);
 		const fixed_point_t PROPERTY(research_leadership_optimum);
@@ -115,7 +115,7 @@ namespace OpenVic {
 			bool new_can_invest,
 			bool new_factory,
 			bool new_can_work_factory,
-			bool new_unemployment,
+			bool new_can_be_unemployed,
 			fixed_point_t new_research_points,
 			fixed_point_t new_leadership_points,
 			fixed_point_t new_research_leadership_optimum,