Merge pull request #628 from OpenVicProject/simplify_rng_wrapper

Spartan322 · web-flow · commit 624e2f81bb8b · 2025-11-06T05:22:10.000-05:00
Allow RNG wrapper to be forwarded
diff --git a/src/openvic-simulation/utility/RandomGenerator.hpp b/src/openvic-simulation/utility/RandomGenerator.hpp
@@ -66,18 +66,18 @@ namespace OpenVic {
 			return lhs._generator != rhs._generator;
 		}
 
-		OV_ALWAYS_INLINE constexpr T& generator() {
+		[[nodiscard]] OV_ALWAYS_INLINE constexpr T& generator() {
 			return _generator;
 		}
 
-		OV_ALWAYS_INLINE constexpr T const& generator() const {
+		[[nodiscard]] OV_ALWAYS_INLINE constexpr T const& generator() const {
 			return _generator;
 		}
 
 	private:
 		T _generator;
 	};
 
-	using RandomU32 = RandomGenerator<XoshiroCpp::Xoshiro128StarStar>;
-	using RandomU64 = RandomGenerator<XoshiroCpp::Xoshiro256StarStar>;
+	struct RandomU32 : RandomGenerator<XoshiroCpp::Xoshiro128StarStar> { using RandomGenerator::RandomGenerator; };
+	struct RandomU64 : RandomGenerator<XoshiroCpp::Xoshiro256StarStar> { using RandomGenerator::RandomGenerator; };
 }

Original file line number	Diff line number	Diff line change
`@@ -66,18 +66,18 @@ namespace OpenVic {`
`66`	`66`	`return lhs._generator != rhs._generator;`
`67`	`67`	`}`
`68`	`68`
`69`		`- OV_ALWAYS_INLINE constexpr T& generator() {`
	`69`	`+ [[nodiscard]] OV_ALWAYS_INLINE constexpr T& generator() {`
`70`	`70`	`return _generator;`
`71`	`71`	`}`
`72`	`72`
`73`		`- OV_ALWAYS_INLINE constexpr T const& generator() const {`
	`73`	`+ [[nodiscard]] OV_ALWAYS_INLINE constexpr T const& generator() const {`
`74`	`74`	`return _generator;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`private:`
`78`	`78`	`T _generator;`
`79`	`79`	`};`
`80`	`80`
`81`		`- using RandomU32 = RandomGenerator<XoshiroCpp::Xoshiro128StarStar>;`
`82`		`- using RandomU64 = RandomGenerator<XoshiroCpp::Xoshiro256StarStar>;`
	`81`	`+ struct RandomU32 : RandomGenerator<XoshiroCpp::Xoshiro128StarStar> { using RandomGenerator::RandomGenerator; };`
	`82`	`+ struct RandomU64 : RandomGenerator<XoshiroCpp::Xoshiro256StarStar> { using RandomGenerator::RandomGenerator; };`
`83`	`83`	`}`