Merge pull request #1866 from ineveraskedforthis/ui-fixes

Use median prices in UI

src/economy/economy.cpp

@@ -162,6 +162,19 @@ float price(sys::state& state, dcon::commodity_id c) {
 	return total_cost / total_supply;
 }
 
+float median_price(sys::state& state, dcon::commodity_id c) {
+	std::vector<float> prices{};
+	state.world.for_each_market([&](auto m) {
+		auto local_price = price(state, m, c);
+		prices.push_back(local_price);
+	});
+	std::sort(prices.begin(), prices.end());
+	if(prices.size() % 2 == 0) {
+		return (prices[prices.size() / 2] + prices[prices.size() / 2 + 1]) / 2.f;
+	}
+	return (prices[prices.size() / 2]);
+}
+
 template<typename T>
 ve::fp_vector ve_price(sys::state const& state, T s, dcon::commodity_id c) {
 	return state.world.market_get_price(s, c);

src/economy/economy.hpp

@@ -199,6 +199,10 @@ float price(
 	sys::state& state,
 	dcon::commodity_id c
 );
+float median_price(
+	sys::state& state,
+	dcon::commodity_id c
+);
 ve::fp_vector price(
 	sys::state const& state,
 	ve::tagged_vector<dcon::market_id> s,

src/gamestate/system_state.cpp

@@ -4416,7 +4416,7 @@ void state::single_game_tick() {
 	if((current_date.value % 16) == 0) {
 		auto index = economy::most_recent_price_record_index(*this);
 		for(auto c : world.in_commodity) {
-			c.set_price_record(index, economy::price(*this, c));
+			c.set_price_record(index, economy::median_price(*this, c));
 		}
 	}
 

src/gui/topbar_subwindows/gui_trade_window.hpp

@@ -551,16 +551,16 @@ std::string name_view_commodity_id(sys::state& state, element_base* container, d
 };
 
 bool compare_price(sys::state& state, element_base* container, const dcon::commodity_id a, const  dcon::commodity_id b) {
-	auto av = economy::price(state, a);
-	auto bv = economy::price(state, b);
+	auto av = economy::median_price(state, a);
+	auto bv = economy::median_price(state, b);
 	if(av != bv)
 		return av > bv;
 	else
 		return a.index() < b.index();
 }
 
 std::string price_view_commodity_id(sys::state& state, element_base* container, dcon::commodity_id item) {
-	return text::format_money(economy::price(state, item));
+	return text::format_money(economy::median_price(state, item));
 };
 std::string supply_view_commodity_id(sys::state& state, element_base* container, dcon::commodity_id item) {
 	return text::format_float(economy::supply(state, item));
@@ -1388,7 +1388,7 @@ class commodity_price_text : public simple_text_element_base {
 public:
 	void on_update(sys::state& state) noexcept override {
 		auto commodity_id = retrieve<dcon::commodity_id>(state, parent);
-		set_text(state, text::format_money(economy::price(state, commodity_id)));
+		set_text(state, text::format_money(economy::median_price(state, commodity_id)));
 	}
 };