adjust gdp calculation

Author: ineveraskedforthis

assets/localisation/en-US/alice.csv

@@ -1307,6 +1307,8 @@ alice_pnt_dominant_religion;?YDominant religion:?! $x$
 alice_pnt_dominant_ideology;?YDominant Ideology:?! $x$
 ledger_ppp_gdp;GDP(PPP)
 ledger_ppp_gdp_per_capita;GDP(PPP) per 1m people
+ledger_inflation_adjusted_gdp;GDP(inflation-adjusted)
+ledger_inflation_adjusted_gdp_per_capita;GDP(inflation-adjusted) per 1m people
 ledger_standard_of_living;Standard of Living
 alice_ledger_header_gdp_history;GDP(PPP) over time
 alice_countryalert_colonialgood_start;You can colonize $region$

src/economy/economy.cpp

@@ -158,15 +158,22 @@ int32_t previous_gdp_record_index(sys::state& state) {
 	return ((date.year * 4 + date.month / 3) + gdp_history_length - 1) % gdp_history_length;
 }
 
-float ideal_pound_conversion_rate(sys::state& state, dcon::market_id n) {
-	return state.world.market_get_life_needs_costs(n, state.culture_definitions.primary_factory_worker)
-		+ 0.1f * state.world.market_get_everyday_needs_costs(n, state.culture_definitions.primary_factory_worker);
+float ideal_pound_to_real_pound(sys::state& state) {
+	auto cost_of_needs = 0.f;
+	uint32_t total_commodities = state.world.commodity_size();
+	auto worker = state.culture_definitions.primary_factory_worker;
+	for(uint32_t i = 1; i < total_commodities; ++i) {
+		dcon::commodity_id c{ dcon::commodity_id::value_base_t(i) };
+		auto price = state.world.commodity_get_median_price(c);
+		auto life_base = state.world.pop_type_get_life_needs(worker, c);
+		auto everyday_base = state.world.pop_type_get_everyday_needs(worker, c);
+		cost_of_needs += price * (life_base + 0.1f * everyday_base);
+	}
+	return cost_of_needs;
 }
 
 float gdp(sys::state& state, dcon::market_id n) {
-	float raw = state.world.market_get_gdp(n);
-	//float ideal_pound = ideal_pound_conversion_rate(state, n);
-	return raw; /// ideal_pound;
+	return state.world.market_get_gdp(n);
 }
 
 float gdp(sys::state& state, dcon::nation_id n) {
@@ -179,6 +186,17 @@ float gdp(sys::state& state, dcon::nation_id n) {
 	return total;
 }
 
+float gdp_adjusted(sys::state& state, dcon::nation_id n) {
+	auto conversion = ideal_pound_to_real_pound(state);
+	auto total = 0.f;
+	state.world.nation_for_each_state_ownership(n, [&](auto soid) {
+		auto sid = state.world.state_ownership_get_state(soid);
+		auto market = state.world.state_instance_get_market_from_local_market(sid);
+		total = total + economy::gdp(state, market);
+	});
+	return total / conversion;
+}
+
 struct spending_cost {
 	float construction;
 	float other;

src/economy/economy.hpp

@@ -335,6 +335,7 @@ int32_t previous_gdp_record_index(sys::state& state);
 
 float gdp(sys::state& state, dcon::nation_id n);
 float gdp(sys::state& state, dcon::market_id n);
+float gdp_adjusted(sys::state& state, dcon::nation_id n);
 
 void prune_factories(sys::state& state); // get rid of closed factories in full states
 void go_bankrupt(sys::state& state, dcon::nation_id n);

src/gamestate/system_state.cpp

@@ -4540,7 +4540,7 @@ void state::single_game_tick() {
 	if(((ymd_date.month % 3) == 0) && (ymd_date.day == 1)) {
 		auto index = economy::most_recent_gdp_record_index(*this);
 		for(auto n : world.in_nation) {
-			n.set_gdp_record(index, economy::gdp(*this, n));
+			n.set_gdp_record(index, economy::gdp_adjusted(*this, n));
 		}
 	}
 

src/gui/gui_common_elements.hpp

@@ -645,15 +645,15 @@ class nation_total_score_text : public standard_nation_text {
 class nation_ppp_gdp_text : public standard_nation_text {
 public:
 	std::string get_text(sys::state& state, dcon::nation_id nation_id) noexcept override {		
-		return text::format_float(economy::gdp(state, nation_id));
+		return text::format_float(economy::gdp_adjusted(state, nation_id));
 	}
 };
 
 class nation_ppp_gdp_per_capita_text : public standard_nation_text {
 public:
 	std::string get_text(sys::state& state, dcon::nation_id nation_id) noexcept override {
 		float population = state.world.nation_get_demographics(nation_id, demographics::total);
-		return text::format_float(economy::gdp(state, nation_id) / population * 1000000.f);
+		return text::format_float(economy::gdp_adjusted(state, nation_id) / population * 1000000.f);
 	}
 };
 

src/gui/gui_ledger_window.hpp

@@ -172,13 +172,13 @@ class ledger_nation_ranking_buttons : public window_element_base {
 		}
 		{
 			auto ptr = make_element_by_type<ledger_generic_sort_button>(state, button_def, ledger_sort_type::gdp);
-			ptr->set_button_text(state, text::produce_simple_string(state, "ledger_ppp_gdp"));
+			ptr->set_button_text(state, text::produce_simple_string(state, "ledger_inflation_adjusted_gdp"));
 			apply_offset(ptr);
 			add_child_to_front(std::move(ptr));
 		}
 		{
 			auto ptr = make_element_by_type<ledger_generic_sort_button>(state, button_def, ledger_sort_type::gdp_capita);
-			ptr->set_button_text(state, text::produce_simple_string(state, "ledger_ppp_gdp_per_capita"));
+			ptr->set_button_text(state, text::produce_simple_string(state, "ledger_inflation_adjusted_gdp_per_capita"));
 			apply_offset(ptr);
 			add_child_to_front(std::move(ptr));
 		}
@@ -253,14 +253,14 @@ class ledger_nation_ranking_entry : public listbox_row_element_base<dcon::nation
 			apply_offset(ptr);
 			add_child_to_front(std::move(ptr));
 		}
-		// GDP PPP
+		// GDP (inflation adjusted)
 		{
 			auto ptr = make_element_by_type<nation_ppp_gdp_text>(state,
 					state.ui_state.defs_by_name.find(state.lookup_key("ledger_default_textbox"))->second.definition);
 			apply_offset(ptr);
 			add_child_to_front(std::move(ptr));
 		}
-		// GDP PPP per capita
+		// GDP (inflation adjusted) per capita
 		{
 			auto ptr = make_element_by_type<nation_ppp_gdp_per_capita_text>(state,
 					state.ui_state.defs_by_name.find(state.lookup_key("ledger_default_textbox"))->second.definition);
@@ -356,18 +356,18 @@ class ledger_nation_ranking_listbox : public listbox_element_base<ledger_nation_
 					float b_population = state.world.nation_get_demographics(b, demographics::total);
 
 					if(lsort.reversed) {
-						return economy::gdp(state, a) / a_population < economy::gdp(state, b) / b_population;
+						return economy::gdp_adjusted(state, a) / a_population < economy::gdp_adjusted(state, b) / b_population;
 					} else {
-						return economy::gdp(state, a) / a_population > economy::gdp(state, b) / b_population;
+						return economy::gdp_adjusted(state, a) / a_population > economy::gdp_adjusted(state, b) / b_population;
 					}
 				});
 				break;
 			case ledger_sort_type::gdp:	
 				std::sort(row_contents.begin(), row_contents.end(), [&](dcon::nation_id a, dcon::nation_id b) {
 					if(lsort.reversed) {
-						return economy::gdp(state, a) < economy::gdp(state, b);
+						return economy::gdp_adjusted(state, a) < economy::gdp_adjusted(state, b);
 					} else {
-						return economy::gdp(state, a) > economy::gdp(state, b);
+						return economy::gdp_adjusted(state, a) > economy::gdp_adjusted(state, b);
 					}
 				});
 				break;
@@ -2165,8 +2165,12 @@ class all_prices_graph : public window_element_base {
 			if((*ptr).data[commodity.index()]) {
 				for(uint32_t i = 0; i < graph_length; ++i) {
 					auto price = state.world.commodity_get_price_record(commodity, (newest_index + economy::price_history_length - graph_length + i + 1) % economy::price_history_length);
-					if(price > max) {
-						max = price;
+					auto log_price = log(price + 0.0001f);
+					if(log_price > max) {
+						max = log_price;
+					}
+					if (log_price < min) {
+						min = log_price;
 					}
 				}
 			}
@@ -2182,6 +2186,7 @@ class all_prices_graph : public window_element_base {
 
 				for(uint32_t i = 0; i < graph_length; ++i) {
 					datapoints[i] = state.world.commodity_get_price_record(commodity, (newest_index + economy::price_history_length - graph_length + i + 1) % economy::price_history_length);
+					datapoints[i] = log(datapoints[i] + 0.0001f);
 				}
 				graph_per_price[commodity.index()]->set_data_points(state, datapoints, min, max);
 			}