changing classes

pph-collective · Sep 18, 2023 · f2bee38 · f2bee38
1 parent d200b7b
commit f2bee38
Show file tree

Hide file tree

Showing 4 changed files with 21,240 additions and 21,463 deletions.
diff --git a/titan/settings/philly-gis/classes.yml b/titan/settings/philly-gis/classes.yml
@@ -1,22 +1,33 @@
 classes:
   races: #changing the names within races
-    disadvantaged:
-      hispanic: false
-    notdisadvantaged:
+    black:
       hispanic: false
 
   sex_types:
-    HM:
+    D_HM:
+      gender: M
+      cis_trans: cis
+      sleeps_with:
+        - D_HF
+        - ND_HF
+    ND_HM:
       gender: M
       cis_trans: cis
       sleeps_with:
-        - HF
-    HF:
+        - D_HF
+        - ND_HF
+    D_HF:
       gender: F
       cis_trans: cis
       sleeps_with:
-        - HM
-
+        - D_HM
+        - ND_HM
+    ND_HF:
+      gender: F
+      cis_trans: cis
+      sleeps_with:
+        - D_HM
+        - ND_HM
   bond_types:
     Main:
       acts_allowed:

diff --git a/titan/settings/philly-gis/demographics.yml b/titan/settings/philly-gis/demographics.yml
@@ -1,9 +1,9 @@
 demographics:
-  notdisadvantaged:
-    ppl: 0.3367
+  black:
+    ppl: 1.0
     sex_type:
-      HM:
-        ppl: 0.50
+      ND_HM:
+        ppl: 0.137
         sex_role:
           init:
             insertive: 1.0
@@ -83,8 +83,8 @@ demographics:
                     value_type: float
                     value: 4
 
-      HF:
-        ppl: 0.50
+      ND_HF:
+        ppl: 0.184
         sex_role:
           init:
             receptive: 1.0
@@ -150,12 +150,8 @@ demographics:
                     value_type: float
                     value: 1.0
 
-
-  disadvantaged:
-    ppl: 0.6633
-    sex_type:
-      HM:
-        ppl: 0.4
+      D_HM:
+        ppl: 0.276
         sex_role:
           init:
             insertive: 1.0
@@ -235,8 +231,8 @@ demographics:
                     value_type: float
                     value: 2
 
-      HF:
-        ppl: 0.6
+      D_HF:
+        ppl: 0.403
         sex_role:
           init:
             receptive: 1.0

diff --git a/titan/settings/philly-gis/high_risk.yml b/titan/settings/philly-gis/high_risk.yml
@@ -2,9 +2,13 @@ high_risk:
   partner_scale: 3
   prob: 0.39
   sex_based:
-    HM:
+    D_HM:
       duration: 6
-    HF:
+    D_HF:
+      duration: 6
+    ND_HM:
+      duration: 6
+    ND_HF:
       duration: 6
   partnership_types:
     - Main