Add type-safe pop_sum_t for large value sums of pops and refactor pop_size_t to be type-safe #677
+324
−107
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Spartan322
force-pushed
the
refactor/pop-size-type
branch
3 times, most recently
from
cdaa3ff to
9fddcce
Compare
schombert
reviewed
Dec 5, 2025
Spartan322
force-pushed
the
refactor/pop-size-type
branch
from
9fddcce to
f8b5c23
Compare
Spartan322
force-pushed
the
refactor/pop-size-type
branch
from
f8b5c23 to
3bdc2d4
Compare
Spartan322
changed the title
Spartan322
changed the title
Spartan322
changed the title
Spartan322
force-pushed
the
refactor/pop-size-type
branch
2 times, most recently
from
752014c to
7857b24
Compare
Refactor pop_size_t to be type-safe Move pop_size_t to population/PopSize.hpp Add equalable to Concepts.hpp Add expect_strong_typedef to NodeTools.hpp Add `&& equalable<ValueType, OtherValueType>` requirement to IndexedFlatMap's divide_assign_handle_zero Fix ovdl::detail vs. OpenVic::detail namespace ambiguity in Dataloader.cpp
Spartan322
force-pushed
the
refactor/pop-size-type
branch
from
7857b24 to
298ff10
Compare
This was referenced Dec 30, 2025
wvpm
reviewed
Jan 1, 2026
wvpm
reviewed
Jan 1, 2026
| struct ProductionType; | ||
| struct ProvinceInstance; | ||
| struct RandomU32; | ||
| struct pop_size_t; |
wvpm
reviewed
Jan 1, 2026
| "type", ZERO_OR_ONE, | ||
| expect_identifier(expect_mapped_string(template_type_map, assign_variable_callback(template_type))), | ||
| "workforce", ZERO_OR_ONE, expect_uint(assign_variable_callback(base_workforce_size)), | ||
| "workforce", ZERO_OR_ONE, expect_strong_typedef<pop_size_t>(assign_variable_callback(base_workforce_size)), |
Contributor
There was a problem hiding this comment.
Do you use pop_size_t here for Vic2 restrictions?
If so, we should use pop_size_t for base_workforce_size as well
If not, use pop_sum_t
wvpm
reviewed
Jan 1, 2026
|
|
||
| const fixed_point_t size_modifier = calculate_size_modifier(); | ||
| const fixed_point_t base_workforce_size = production_type.base_workforce_size; | ||
| const fixed_point_t base_workforce_size = type_safe::get(production_type.base_workforce_size); |
Contributor
There was a problem hiding this comment.
If base_workforce_size is uint64, it won't fit in a fixed_point_t.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move pop_size_t to population/PopSize.hpp
Add equalable to Concepts.hpp
Add expect_strong_typedef to NodeTools.hpp
Add
&& equalable<ValueType, OtherValueType>requirement to IndexedFlatMap's divide_assign_handle_zeroFix ovdl::detail vs. OpenVic::detail namespace ambiguity in Dataloader.cpp