Name change to get_unemployment_fraction

OpenVicProject · Feb 27, 2025 · dfa9423 · dfa9423
1 parent 2d7af6a
commit dfa9423
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation
diff --git a/extension/src/openvic-extension/singletons/PopulationMenu.cpp b/extension/src/openvic-extension/singletons/PopulationMenu.cpp
@@ -463,7 +463,7 @@ MenuSingleton::sort_func_t MenuSingleton::_get_population_menu_sort_func(PopSort
 		};
 	case SORT_UNEMPLOYMENT:
 		return [](Pop const* a, Pop const* b) -> bool {
-			return a->get_unemployment() < b->get_unemployment();
+			return a->get_unemployment_fraction() < b->get_unemployment_fraction();
 		};
 	case SORT_CASH:
 		return [](Pop const* a, Pop const* b) -> bool {
@@ -734,7 +734,7 @@ TypedArray<Dictionary> MenuSingleton::get_population_menu_pop_rows(int32_t start
 		pop_dict[pop_consciousness_key] = pop->get_consciousness().to_float();
 		pop_dict[pop_ideology_key] = generate_population_menu_pop_row_pie_chart_data(pop->get_ideology_distribution());
 		pop_dict[pop_issues_key] = generate_population_menu_pop_row_pie_chart_data(pop->get_issue_distribution());
-		pop_dict[pop_unemployment_key] = pop->get_unemployment().to_float();
+		pop_dict[pop_unemployment_key] = pop->get_unemployment_fraction().to_float();
 		pop_dict[pop_cash_key] = pop->get_cash().get_copy_of_value().to_float();
 		pop_dict[pop_daily_money_key] = pop->get_income().to_float();
 		pop_dict[pop_life_needs_key] = pop->get_life_needs_fulfilled().to_float();
+1 −1		deps/openvic-dataloader
+1 −1		scripts
+2 −1		src/openvic-simulation/InstanceManager.cpp
+25 −6		src/openvic-simulation/country/CountryInstance.cpp
+6 −1		src/openvic-simulation/country/CountryInstance.hpp
+5 −0		src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp
+3 −0		src/openvic-simulation/map/MapInstance.cpp
+14 −1		src/openvic-simulation/pop/Pop.cpp
+15 −1		src/openvic-simulation/pop/Pop.hpp
+2 −2		src/openvic-simulation/pop/PopType.cpp
+2 −2		src/openvic-simulation/pop/PopType.hpp
+17 −13		src/openvic-simulation/utility/ThreadPool.cpp
+3 −4		src/openvic-simulation/utility/ThreadPool.hpp