Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing bug in R version of eppasm.R #41

Merged
merged 2 commits into from
Aug 10, 2024
Merged

fixing bug in R version of eppasm.R #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b1da23
fixing bug in R version of eppasm.R
m-maheu-giroux Aug 9, 2024
090cf5f
fix adding previously tested new positive in R version
jeffeaton Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: first90
Version: 1.6.10
Version: 1.6.11
Title: The first90 model
Description: Implements the Shiny90 model for estimating progress towards the UNAIDS "first 90" target for HIV awareness of status in sub-Saharan Africa.
Authors@R:
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# first90 1.6.11

* Fix bug in R version of simmod() where new infections previously tested negative were
subtracted from (instead of added to) the hiv positive. Implementation in C++ version was
correct (thanks Andrey Kutsyh).

# first90 1.6.10

* Implement recovery to next higher CD4 category following ART interruption for those on ART greater than one year.
Expand Down
2 changes: 1 addition & 1 deletion R/eppasm.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ simmod <- function(fp, VERSION = "C") {
testneg_infections_ha <- infections_ha * (testnegpop[,,hivn.idx,i] / hivn_pop_ha)

grad_tn[ , , hivn.idx] <- grad_tn[ , , hivn.idx] - testneg_infections_ha
grad_tn[ , , hivp.idx] <- grad_tn[ , , hivp.idx] - testneg_infections_ha
grad_tn[ , , hivp.idx] <- grad_tn[ , , hivp.idx] + testneg_infections_ha
}

## Do new diagnoses
Expand Down
Loading