Correcting minor bug in dist functions and adding optional overwrite to read and add params #54
Conversation
This file contains 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
…to read and add params
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #54 +/- ##
==========================================
- Coverage 84.12% 84.03% -0.09%
==========================================
Files 42 42
Lines 2822 2825 +3
==========================================
Hits 2374 2374
- Misses 448 451 +3 ☔ View full report in Codecov by Sentry. |
apulsipher
requested changes
Feb 26, 2025
| if (n_to_sample > static_cast<int>(n)) | ||
|
|
||
| // Correcting for possible overflow | ||
| if (n_to_sample == (static_cast<int>(n) + 1)) | ||
| --n_to_sample; |
There was a problem hiding this comment.
Two questions here:
- Why not set
n_to_sample = static_cast<int>(n);instead of--n_to_sample? - Is it impossible for
n_to_sampleto be greater than(static_cast<int>(n) + 1))? Or does it just not need to be corrected if so?
| n_to_distribute--; | ||
| // Correcting for possible rounding errors | ||
| if (n_to_distribute == (n + 1)) | ||
| --n_to_distribute; |
There was a problem hiding this comment.
Same questions as above: why not set = n? and can n_to_distribute exceed (n+1)?
| n_to_sample--; | ||
| // Correcting for possible overflow | ||
| if (n_to_sample == (n + 1)) | ||
| --n_to_sample; |
There was a problem hiding this comment.
Same questions as above
| ) { | ||
|
|
||
| if (parameters.find(pname) == parameters.end()) | ||
| parameters[pname] = initial_value; | ||
| else if (!overwrite) | ||
| throw std::logic_error("The parameter " + pname + " already exists."); |
There was a problem hiding this comment.
Add tests to cover this case and specific error message
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.
This pull request includes several changes to the
epiworldlibrary, focusing on version updates, parameter handling, and correcting potential overflow and rounding errors in distribution functions. The most important changes are summarized below:Version Update:
epiworld.hppandinclude/epiworld/epiworld.hpp. [1] [2]Parameter Handling:
add_paramandread_paramsmethods inclass Modelto include anoverwriteflag, allowing parameters to be overwritten if they already exist. [1] [2]add_paramandread_paramsmethods to handle theoverwriteflag correctly inepiworld.hppandinclude/epiworld/model-meat.hpp. [1] [2] [3] [4]Overflow and Rounding Corrections:
distribute_virus_randomly,distribute_tool_randomly, anddistribute_entity_randomlyfunctions by adjusting the conditions under which the number of items to distribute is decremented. [1] [2] [3] [4] [5]