Include ntdmc output date #36
Conversation
| @@ -27,7 +27,8 @@ extern Statistics stats; | |||
| void Model::runScenarios(ScenariosList &scenarios, Population &popln, | |||
| Vector &vectors, Worm &worms, int replicates, | |||
| double timestep, int index, int outputEndgame, | |||
| int outputEndgameDate, int reduceImpViaXml, | |||
| int outputEndgameDate, bool outputNTDMC, | |||
There was a problem hiding this comment.
💚 This is good to be using boolean rather than an int with the others, makes it clear what the intention of the variable is, and prevents passing muddling up the two parameters.
One neat way to encode this common pair (of some data, and a boolean flag to say whether to use the data) is std::optional:
| int outputEndgameDate, bool outputNTDMC, | |
| int outputEndgameDate, std::optional<int> outputNTDMCDate, |
And then when you use it you can do:
if(outputNTDMCDate.hasValue()){
outputNTDMCDateInYears = (outputNTDMCDate.value - BASEYEAR) * 12;
}But no need to do that for now.
|
I've removed the unsupported Mac job from CI - so if you merge main into this you'll get a green tick - but since it is only that job that is failing I don't think you need to. |
README.md
Outdated
|
|
||
| * -D 2026: year from which to output IHME data from. Change to whatever year we want to do this from. Default is 2000. | ||
|
|
||
| * -m 0 : indicator for outputting NTDMC data. If this is omitted it will be output. If set to 0, this will not be done. Any other integer input will lead to it being output. |
There was a problem hiding this comment.
💡 Use the same sentence structure as for -e:
* -m 1 or 0 (1 is default): set to 0 if we want don't want to output the NTDMC data.
(I don't think we need to document that they can also provide 42)
|
AFAICT this is failing now because GH have updated "ubuntu-latest" to 24.04, and this is failing because GSL is not installed (I am surprised it is installed on 22.04 - I'll raise a PR fixing this. |
|
Fixed in #38 - I'll post here when it is merged. Clearly this PR is cursed 😆 |
|
#38 is merged, so if you merge main into this CI should pass 👍 |
merge main to NTDMC output date changes
…ling-Consortium/LF into includeNTDMCOutputDate
the output of IHME and NTDMC data has been linked in the code up to this point, not allowing us to output all of the NTDMC data without outputting all of the IHME data. Include an indicator and date of NTDMC outputs, so that we can separate these two data sets and allow us to output them from different dates, or output one without the other.