From c928b7a724a75a6865cd76058a7d99e24475be56 Mon Sep 17 00:00:00 2001 From: Jeff Eaton Date: Thu, 10 Dec 2020 18:58:59 +0000 Subject: [PATCH] fix new infections output scaling --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ inst/metadata/metadata.csv | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index cc4e63de..bb2ec701 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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", diff --git a/NEWS.md b/NEWS.md index f0bf4b0c..93edd175 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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. diff --git a/inst/metadata/metadata.csv b/inst/metadata/metadata.csv index c47cc7ec..a5677227 100644 --- a/inst/metadata/metadata.csv +++ b/inst/metadata/metadata.csv @@ -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 @@ -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