Skip to content

Accept truncations in pops smaller than 16 #740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wvpm wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −3
Open

Accept truncations in pops smaller than 16 #740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/openvic-simulation/population/Pop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@

using namespace OpenVic;

constexpr pop_size_t TRUNCATION_ACCEPTABLE_BELOW_SIZE = 16;

PopBase::PopBase(
PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size,
fixed_point_t new_militancy, fixed_point_t new_consciousness, RebelType const* new_rebel_type
Expand Down Expand Up @@ -296,7 +298,9 @@ void Pop::pay_income_tax(fixed_point_t& income) {
template<bool IsTaxable>
void Pop::add_artisanal_revenue(const fixed_point_t revenue) {
if (OV_unlikely(revenue == 0)) {
spdlog::warn_s("Adding artisanal_revenue of 0 to pop. Context{}", get_pop_context_text());
if (size >= TRUNCATION_ACCEPTABLE_BELOW_SIZE) {
spdlog::warn_s("Adding artisanal_revenue of 0 to pop. Context{}", get_pop_context_text());
}
return;
}

Expand Down Expand Up @@ -331,7 +335,9 @@ template void Pop::add_artisanal_revenue<false>(const fixed_point_t revenue);
#define DEFINE_ADD_INCOME_FUNCTIONS(name) \
void Pop::add_##name(fixed_point_t amount){ \
if (OV_unlikely(amount == 0)) { \
spdlog::warn_s("Adding " #name " of 0 to pop. Context{}", get_pop_context_text()); \
if (size >= TRUNCATION_ACCEPTABLE_BELOW_SIZE) { \
spdlog::warn_s("Adding " #name " of 0 to pop. Context{}", get_pop_context_text()); \
} \
return; \
} \
if (OV_unlikely(amount < 0)) { \
Expand All @@ -350,7 +356,9 @@ OV_DO_FOR_ALL_TYPES_OF_POP_INCOME(DEFINE_ADD_INCOME_FUNCTIONS)
#define DEFINE_ADD_EXPENSE_FUNCTIONS(name) \
void Pop::add_##name(const fixed_point_t amount){ \
if (OV_unlikely(amount == 0)) { \
spdlog::warn_s("Adding " #name " of 0 to pop. Context:{}", get_pop_context_text()); \
if (size >= TRUNCATION_ACCEPTABLE_BELOW_SIZE) { \
spdlog::warn_s("Adding " #name " of 0 to pop. Context:{}", get_pop_context_text()); \
} \
return; \
} \
name += amount; \
Expand Down
Loading