Skip to content

Commit

Permalink
Merge pull request #194 from mrc-ide/infections-metadata
Browse files Browse the repository at this point in the history
fix new infections output scaling
  • Loading branch information
r-ash authored Dec 10, 2020
2 parents 2db62dc + c928b7a commit a69325b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: naomi
Title: Naomi Model for Subnational HIV Estimates
Version: 2.1.9
Version: 2.1.10
Authors@R:
person(given = "Jeff",
family = "Eaton",
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# naomi 2.1.10

* Fix new infections scaling. In plotting outputs number of new infections were being inadvertently scaled x100 (reported by Lesotho estimates team).

# naomi 2.1.9

* Increase eppasm dependency to 0.5.9.
Expand Down
4 changes: 2 additions & 2 deletions inst/metadata/metadata.csv
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ output,choropleth,art_current,mean,lower,upper,indicator,art_current,t_(ART_NUMB
output,choropleth,population,mean,lower,upper,indicator,population,t_(POPULATION),1,1000,0
output,choropleth,plhiv,mean,lower,upper,indicator,plhiv,t_(PLHIV),1,100,0
output,choropleth,incidence,mean,lower,upper,indicator,incidence,t_(INCIDENCE),1000,,0
output,choropleth,infections,mean,lower,upper,indicator,infections,t_(NEW_INFECTIONS),100,100,0
output,choropleth,infections,mean,lower,upper,indicator,infections,t_(NEW_INFECTIONS),1,100,0
output,choropleth,aware_plhiv_prop,mean,lower,upper,indicator,aware_plhiv_prop,t_(AWARE_PLHIV_PROP),1,,0.0%
output,choropleth,unaware_plhiv_num,mean,lower,upper,indicator,unaware_plhiv_num,t_(UNAWARE_PLHIV_NUM),1,10,0
output,choropleth,untreated_plhiv_num,mean,lower,upper,indicator,untreated_plhiv_num,t_(UNTREATED_PLHIV_NUM),1,10,0
Expand All @@ -33,7 +33,7 @@ output,barchart,art_current,mean,lower,upper,indicator,art_current,t_(ART_NUMBER
output,barchart,population,mean,lower,upper,indicator,population,t_(POPULATION),1,1000,0
output,barchart,plhiv,mean,lower,upper,indicator,plhiv,t_(PLHIV),1,100,0
output,barchart,incidence,mean,lower,upper,indicator,incidence,t_(INCIDENCE),1000,,0
output,barchart,infections,mean,lower,upper,indicator,infections,t_(NEW_INFECTIONS),100,100,0
output,barchart,infections,mean,lower,upper,indicator,infections,t_(NEW_INFECTIONS),1,100,0
output,barchart,aware_plhiv_prop,mean,lower,upper,indicator,aware_plhiv_prop,t_(AWARE_PLHIV_PROP),1,,0.0%
output,barchart,unaware_plhiv_num,mean,lower,upper,indicator,unaware_plhiv_num,t_(UNAWARE_PLHIV_NUM),1,10,0
output,barchart,untreated_plhiv_num,mean,lower,upper,indicator,untreated_plhiv_num,t_(UNTREATED_PLHIV_NUM),1,10,0
Expand Down

0 comments on commit a69325b

Please sign in to comment.