fix warning: The naming option = 'indicator.scenario' is deprecated... #51
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
johanneskoch94
requested changes
Nov 18, 2024
| years = paste0("y", c(2005, seq(2010, 2100, by = 10))), | ||
| round = 6) | ||
| pop <- collapseNames(pop[,,"SSP2"]) | ||
| pop <- collapseNames(calcOutput("Population", |
There was a problem hiding this comment.
You can drop "collapseNames" entirely :)
There was a problem hiding this comment.
No that would lead to different output:
> waldo::compare(a,b)
`names(dimnames([email protected]))`: "iso" "year" "scenario.variable"
`names(dimnames([email protected]))`: "iso" "year" "scenario"
`dimnames([email protected])$scenario.variable` is a character vector ('SSP2.pop_SSP2', 'SSP2_SPA2_26I_D.pop_SSP2')
`dimnames([email protected])$scenario.variable` is absent
`dimnames([email protected])$scenario` is absent
`dimnames([email protected])$scenario` is a character vector ('SSP2', 'SSP2_SPA2_26I_D')
comment(old) vs comment(new)
- " origin: readSource(type = \"S4Nproject_input\", subtype = \"bioenergy\", convert = \"onlycorrect\") (madrat 3.15.3 | mrland 0.65.1)"
+ " origin: readSource(type = \"S4Nproject_input\", subtype = \"bioenergy\", convert = \"onlycorrect\") (madrat 3.15.3 | mrland 0.65.0)"
- " creation date: Mon Nov 18 16:29:58 2024"
+ " creation date: Mon Nov 18 14:49:35 2024"
`names(dimnames(old))`: "iso" "year" "scenario.variable"
`names(dimnames(new))`: "iso" "year" "scenario"
`dimnames(old)$scenario.variable` is a character vector ('SSP2.pop_SSP2', 'SSP2_SPA2_26I_D.pop_SSP2')
`dimnames(new)$scenario.variable` is absent
`dimnames(old)$scenario` is absent
`dimnames(new)$scenario` is a character vector ('SSP2', 'SSP2_SPA2_26I_D')
There was a problem hiding this comment.
Did you run the comparison with scenario = "SSP2"?
There was a problem hiding this comment.
Ok, I see... collapseNames deletes the data name, if only 1 data dimension exists.
johanneskoch94
approved these changes
Nov 18, 2024
Comment on lines
+79
to
+89
| popReg <- toolAggregate(pop, rel = regionmapping, weight = NULL) | ||
| popReg <- as.data.frame(popReg) | ||
| popReg <- data.frame(Region = popReg$Region, | ||
| year = as.character(popReg$Year), | ||
| Value = popReg$Value, | ||
| stringsAsFactors = FALSE) | ||
| popReg <- merge(popReg, regionmapping, "Region") | ||
| popReg <- collapseNames(as.magpie(data.frame(iso = popReg$iso, year = popReg$year, Value = popReg$Value))) | ||
|
|
||
| # country population share | ||
| pop_shr <- pop/pop_reg | ||
|
|
||
| # bioenergy demand weighted by population | ||
| x <- x * pop/pop_reg | ||
| x <- x * pop / popReg |
There was a problem hiding this comment.
Just a comment, but can't one simply do x <- toolAggregate(x, rel = regionmapping, from = "Region", to = "iso", weight = pop) to disaggregate x?
(I didn't test this!)
There was a problem hiding this comment.
Seems reasonable, but I didn't want to change more than necessary (to fix the warning + linter), so I don't need to test more than necessary 😉
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.
see b838c93 for actual changes, the rest is linter/formatting, but note I removed an unused variable