Merge pull request #194 from pph-collective/develop

MS correction
pph-collective · May 25, 2021 · 4dc15bd · 4dc15bd
2 parents f52df65 + 7b90c13
commit 4dc15bd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "titan-model"
-version = "2.6.0"
+version = "2.6.1"
 description = "TITAN Agent Based Model"
 license = "GPL-3.0-only"
 authors = ["Sam Bessey <[email protected]>", "Mary McGrath <[email protected]>"]

diff --git a/titan/settings/mississippi/demographics.yml b/titan/settings/mississippi/demographics.yml
@@ -19,9 +19,9 @@ demographics:
           None:
             ppl: 1.0
             hiv:
-              init: 0.48
+              init: 0.591
               dx:
-                init: 0.4715
+                init: 0.778
                 prob: 0.0342
               aids:
                 init: 0.46
@@ -56,8 +56,8 @@ demographics:
                 dist_type: negative_binomial
                 vars:
                   1:
-                    value: 12.459
-                    value_type: float
+                    value: 48
+                    value_type: int
                   2:
                     value: 0.931
                     value_type: float
diff --git a/titan/settings/mississippi/model.yml b/titan/settings/mississippi/model.yml
@@ -12,6 +12,7 @@ features:
   prep: true
   high_risk: false
   haart: true
+  die_and_replace: true
 
 classes:
   drug_types:
@@ -30,6 +31,9 @@ classes:
       acts_allowed:
         - sex
 
+haart:
+  use_reinit: true
+
 partnership:
   sex:
     frequency:
@@ -71,8 +75,8 @@ partnership:
 prep:
   type:
     - Oral
-  cap: 0.049
-  init: 0.25
+  cap: 0.025
+  init: 0.1
   cap_as_prob: true
   efficacy:
     adherent: 0.96
@@ -94,3 +98,6 @@ timeline_scaling:
       start_time: -47
       stop_time: 100
       scalar: 0.1088
+
+calibration: 
+  test_frequency: 0.55