Skip to content

Commit

Permalink
Merge branch 'master' into 2025-update
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffeaton committed Nov 11, 2024
2 parents 174bbdf + d80ab65 commit 0c418dc
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -28,10 +28,16 @@

* Fix bug in R version for end-year net migration in first year of ART eligibility

# first90 1.6.11
# first90 1.6.12

* Update plots and tables to end in 2023.

# 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.
2 changes: 1 addition & 1 deletion R/eppasm.R
Original file line number Diff line number Diff line change
@@ -270,7 +270,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

0 comments on commit 0c418dc

Please sign in to comment.