Merge pull request #637 from OpenVicProject/fix/with-stable-sort

Fix occurrences of sort to be stable_sort for determinism

Author: Spartan322

src/openvic-simulation/country/CountryInstance.cpp

@@ -2,6 +2,7 @@
 #include "CountryInstanceDeps.hpp"
 #include "CountryInstanceManager.hpp"
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdint>
 
@@ -1284,11 +1285,11 @@ void CountryInstance::_update_production() {
 
 	industrial_power.set(industrial_power_running_total);
 
-	std::sort(
+	std::stable_sort(
 		industrial_power_from_states.begin(), industrial_power_from_states.end(),
 		[](auto const& a, auto const& b) -> bool { return a.second > b.second; }
 	);
-	std::sort(
+	std::stable_sort(
 		industrial_power_from_investments.begin(), industrial_power_from_investments.end(),
 		[](auto const& a, auto const& b) -> bool { return a.second > b.second; }
 	);

src/openvic-simulation/country/CountryInstanceManager.cpp

@@ -1,4 +1,5 @@
 #include "CountryInstanceManager.hpp"
+#include <algorithm>
 
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/defines/CountryDefines.hpp"
@@ -59,27 +60,27 @@ void CountryInstanceManager::update_rankings(const Date today) {
 	industrial_power_ranking = total_ranking;
 	military_power_ranking = total_ranking;
 
-	std::sort(
+	std::stable_sort(
 		total_ranking.begin(), total_ranking.end(),
 		[](CountryInstance* a, CountryInstance* b) -> bool {
 			const bool a_civilised = a->is_civilised();
 			const bool b_civilised = b->is_civilised();
 			return a_civilised != b_civilised ? a_civilised : a->total_score.get_untracked() > b->total_score.get_untracked();
 		}
 	);
-	std::sort(
+	std::stable_sort(
 		prestige_ranking.begin(), prestige_ranking.end(),
 		[](CountryInstance const* a, CountryInstance const* b) -> bool {
 			return a->get_prestige_untracked() > b->get_prestige_untracked();
 		}
 	);
-	std::sort(
+	std::stable_sort(
 		industrial_power_ranking.begin(), industrial_power_ranking.end(),
 		[](CountryInstance const* a, CountryInstance const* b) -> bool {
 			return a->get_industrial_power_untracked() > b->get_industrial_power_untracked();
 		}
 	);
-	std::sort(
+	std::stable_sort(
 		military_power_ranking.begin(), military_power_ranking.end(),
 		[](CountryInstance* a, CountryInstance* b) -> bool {
 			return a->military_power.get_untracked() > b->military_power.get_untracked();
@@ -158,7 +159,7 @@ void CountryInstanceManager::update_rankings(const Date today) {
 
 	// Sort the great powers list by total rank, as pre-existing great powers may have changed rank order and new great
 	// powers will have been added to the end of the list regardless of rank.
-	std::sort(great_powers.begin(), great_powers.end(), [](CountryInstance const* a, CountryInstance const* b) -> bool {
+	std::stable_sort(great_powers.begin(), great_powers.end(), [](CountryInstance const* a, CountryInstance const* b) -> bool {
 		return a->get_total_rank() < b->get_total_rank();
 	});
 

src/openvic-simulation/history/HistoryMap.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <system_error>
 
 #include "openvic-simulation/dataloader/NodeTools.hpp"
@@ -115,7 +116,7 @@ namespace OpenVic {
 			for (typename decltype(entries)::value_type const& entry : entries) {
 				keys.push_back(entry.first);
 			}
-			std::sort(keys.begin(), keys.end());
+			std::stable_sort(keys.begin(), keys.end());
 			ordered_map<Date, memory::unique_ptr<entry_type>> new_entries;
 			for (Date const& key : keys) {
 				new_entries.emplace(key, std::move(entries[key]));

src/openvic-simulation/pop/PopValuesFromProvince.cpp

@@ -1,4 +1,5 @@
 #include "PopValuesFromProvince.hpp"
+#include <algorithm>
 
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/defines/PopsDefines.hpp"
@@ -90,7 +91,7 @@ void PopValuesFromProvince::update_pop_values_from_province(ProvinceInstance& pr
 	}
 
 	if (!ranked_artisanal_production_types.empty()) {
-		std::sort(ranked_artisanal_production_types.begin(), ranked_artisanal_production_types.end(),
+		std::stable_sort(ranked_artisanal_production_types.begin(), ranked_artisanal_production_types.end(),
 			[](const auto& a, const auto& b) {
 				return a.second > b.second;
 			}