Merge pull request #683 from OpenVicProject/restrict_fixed_point_t_constructor_to_integral_max_size_4

Restrict fixed_point_t constructor to integral_max_size_4

Author: wvpm

src/openvic-simulation/country/CountryInstance.cpp

@@ -5,6 +5,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 
 #include <type_safe/strong_typedef.hpp>
 
@@ -1839,7 +1840,8 @@ void CountryInstance::update_gamestate(const Date today, MapInstance& map_instan
 	}
 
 	if (occupied_provinces_proportion != 0) {
-		occupied_provinces_proportion /= owned_provinces.size();
+		assert(owned_provinces.size() <= std::numeric_limits<int32_t>::max());
+		occupied_provinces_proportion /= static_cast<int32_t>(owned_provinces.size());
 	}
 
 	if (capital != nullptr) {

src/openvic-simulation/economy/BuildingInstance.cpp

@@ -32,7 +32,8 @@ void BuildingInstance::update_gamestate(Date today) {
 		end_date = start_date + building_type.get_build_time();
 		break;
 	case ExpansionState::Expanding:
-		expansion_progress = fixed_point_t { static_cast<int32_t>((today - start_date).to_int()) } / (end_date - start_date).to_int();
+		expansion_progress = fixed_point_t { static_cast<int32_t>((today - start_date).to_int()) }
+			/ static_cast<int32_t>((end_date - start_date).to_int());
 		break;
 	default: expansion_state = _can_expand() ? ExpansionState::CanExpand : ExpansionState::CannotExpand;
 	}

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

@@ -2,6 +2,7 @@
 #include "ArtisanalProducerDeps.hpp"
 
 #include <cstddef>
+#include <limits>
 
 #include <type_safe/strong_typedef.hpp>
 
@@ -521,6 +522,7 @@ ProductionType const* ArtisanalProducer::pick_production_type(
 		);
 
 		fixed_point_t relative_score = ranked_artisanal_production_types.empty() ? fixed_point_t::_1 : fixed_point_t::_0;
+		assert(ranked_artisanal_production_types.size() < std::numeric_limits<int32_t>::max());
 		for (auto it = ranked_artisanal_production_types.begin(); it < ranked_artisanal_production_types.end(); ++it) {
 			auto const& [production_type, score_estimate] = *it;
 			size_t i = it - ranked_artisanal_production_types.begin();
@@ -532,14 +534,15 @@ ProductionType const* ArtisanalProducer::pick_production_type(
 					relative_score = (
 						(current_score - score_estimate)
 						/ (previous_score_estimate - score_estimate)
-						+ ranked_artisanal_production_types.size() - i
-					) / (1 + ranked_artisanal_production_types.size());
+						+ static_cast<int32_t>(ranked_artisanal_production_types.size() - i)
+					) / static_cast<int32_t>(1 + ranked_artisanal_production_types.size());
 				}
 				break;
 			}
 
 			if (current_score == score_estimate) {
-				relative_score = fixed_point_t::parse(ranked_artisanal_production_types.size() - i) / (1 + ranked_artisanal_production_types.size());
+				relative_score = fixed_point_t::parse(ranked_artisanal_production_types.size() - i)
+					/ static_cast<int32_t>(1 + ranked_artisanal_production_types.size());
 			}
 		}
 

src/openvic-simulation/economy/production/ArtisanalProducer.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <optional>
 
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
@@ -91,7 +92,7 @@ namespace OpenVic {
 		private:
 			CountryInstance* const country_to_report_economy_nullable;
 			memory::vector<fixed_point_t>& demand_per_input;
-			size_t distinct_goods_to_buy = 0;
+			int32_t distinct_goods_to_buy = 0;
 			Fraction inputs_bought_fraction;
 			MarketInstance const& market_instance;
 			memory::vector<fixed_point_t>& max_price_per_input;

src/openvic-simulation/types/fixed_point/FixedPoint.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <cassert>
-#include <cctype>
 #include <charconv>
 #include <concepts>
 #include <cstddef>
@@ -78,7 +77,8 @@ namespace OpenVic {
 
 	public:
 		OV_ALWAYS_INLINE constexpr fixed_point_t() : value { 0 } {}
-		OV_ALWAYS_INLINE constexpr fixed_point_t(int32_t new_value) : value { static_cast<value_type>(new_value) << PRECISION } {}
+		template<integral_max_size_4 T>
+		OV_ALWAYS_INLINE constexpr fixed_point_t(T new_value) : value { static_cast<value_type>(new_value) << PRECISION } {}
 
 		static const fixed_point_t max;
 		static const fixed_point_t min;
@@ -238,7 +238,7 @@ namespace OpenVic {
 				return truncate();
 			}
 
-			return floor<value_type>();
+			return floor<int32_t>();
 		}
 
 		template<std::integral T>
@@ -255,7 +255,7 @@ namespace OpenVic {
 				return truncate();
 			}
 
-			return ceil<value_type>();
+			return ceil<int32_t>();
 		}
 
 		OV_SPEED_INLINE constexpr fixed_point_t round() const {

tests/src/core/random/WeightedSampling.cpp

@@ -18,8 +18,9 @@ TEST_CASE("WeightedSampling limits", "[WeightedSampling]") {
 	const fixed_point_t weights_sum = fixed_point_t::usable_max;
 	constexpr size_t perfect_divisor = 257; //4294967295 is perfectly divisible by 257
 	std::array<fixed_point_t, perfect_divisor> weights {};
+	assert(weights.size() < std::numeric_limits<int32_t>::max());
 	constexpr uint32_t step_size = max_random_value / weights.size();
-	weights.fill(weights_sum / weights.size());
+	weights.fill(weights_sum / static_cast<int32_t>(weights.size()));
 	for (size_t i = 0; i < weights.size(); ++i) {
 		CHECK(sample_weighted_index(
 			i * step_size,
@@ -33,8 +34,9 @@ TEST_CASE("WeightedSampling weights", "[WeightedSampling]") {
 	std::array<fixed_point_t, max_length> weights {};
 
 	fixed_point_t weights_sum = 0;
+	assert(weights.size() < std::numeric_limits<int32_t>::max());
 	for (size_t i = 0; i < weights.size(); ++i) {
-		const fixed_point_t weight = 1+i;
+		const fixed_point_t weight = static_cast<int32_t>(1+i);
 		weights_sum += weight;
 		weights[i] = weight;
 	}