Skip to content

Commit

Permalink
Updates for EMOD v2.7 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Lorton committed Jul 1, 2016
1 parent c7110f8 commit da98064
Show file tree
Hide file tree
Showing 21 changed files with 264 additions and 1,751 deletions.
37 changes: 37 additions & 0 deletions SamplesInput/PFA_Extra_Rel_Rate_10M_10F.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"Metadata": {
"Author": "dbridenbecker",
"NodeCount": 1,
"Tool": "notepad",
"IdReference": "0",
"DateCreated": "2015-3-21"
},
"Defaults": {
"Society" : {
"TRANSITORY" :
{
"Pair_Formation_Parameters" :
{
"Extra_Relational_Rate_Ratio_Male": 10,
"Extra_Relational_Rate_Ratio_Female": 10
}
},
"INFORMAL" :
{
"Pair_Formation_Parameters" :
{
"Extra_Relational_Rate_Ratio_Male": 10,
"Extra_Relational_Rate_Ratio_Female": 10
}
},
"MARITAL" :
{
"Pair_Formation_Parameters" :
{
"Extra_Relational_Rate_Ratio_Male": 10,
"Extra_Relational_Rate_Ratio_Female": 10
}
}
}
}
}
9 changes: 6 additions & 3 deletions ...Input_HIV/PFA_overlay_scenario_rates.json → SamplesInput/PFA_Extra_Rel_Rate_4M_2F.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,24 @@
{
"Pair_Formation_Parameters" :
{
"Formation_Rate_Constant": 0.0013699000000000001
"Extra_Relational_Rate_Ratio_Male": 4,
"Extra_Relational_Rate_Ratio_Female": 2
}
},
"INFORMAL" :
{
"Pair_Formation_Parameters" :
{
"Formation_Rate_Constant": 0.0014419999999999999
"Extra_Relational_Rate_Ratio_Male": 4,
"Extra_Relational_Rate_Ratio_Female": 2
}
},
"MARITAL" :
{
"Pair_Formation_Parameters" :
{
"Formation_Rate_Constant": 9.1323999999999995e-05
"Extra_Relational_Rate_Ratio_Male": 4,
"Extra_Relational_Rate_Ratio_Female": 2
}
}
}
Expand Down
50 changes: 47 additions & 3 deletions SamplesInput/PFA_overlay_scenario5_rates.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,26 @@
},
"Defaults": {
"Society" : {
"Concurrency_Configuration" :
{
"NONE":
{
"Extra_Relational_Flag_Type": "Correlated",
"Correlated_Relationship_Type_Order" : [ "TRANSITORY", "INFORMAL", "MARITAL", "COMMERCIAL" ]
}
},
"TRANSITORY" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 2,
"Max_Simultaneous_Relationships_Male" : 4,
"Prob_Extra_Relationship_Female" : 0.8,
"Prob_Extra_Relationship_Male" : 0.2
}
},
"Relationship_Parameters" :
{
"Condom_Usage_Probability" :
Expand All @@ -23,11 +41,23 @@
"Pair_Formation_Parameters" :
{
"Formation_Rate_Constant": 0.0013,
"Update_Period" : 7.0
"Update_Period" : 7.0,
"Extra_Relational_Rate_Ratio_Male": 5,
"Extra_Relational_Rate_Ratio_Female": 2
}
},
"INFORMAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 2,
"Max_Simultaneous_Relationships_Male" : 3,
"Prob_Extra_Relationship_Female" : 0.5,
"Prob_Extra_Relationship_Male" : 1.0
}
},
"Relationship_Parameters" :
{
"Condom_Usage_Probability" :
Expand All @@ -41,11 +71,23 @@
"Pair_Formation_Parameters" :
{
"Formation_Rate_Constant": 0.00035,
"Update_Period" : 7.0
"Update_Period" : 7.0,
"Extra_Relational_Rate_Ratio_Male": 5,
"Extra_Relational_Rate_Ratio_Female": 2
}
},
"MARITAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 2,
"Max_Simultaneous_Relationships_Male" : 2,
"Prob_Extra_Relationship_Female" : 0.5,
"Prob_Extra_Relationship_Male" : 0.5
}
},
"Relationship_Parameters" :
{
"Condom_Usage_Probability" :
Expand All @@ -59,7 +101,9 @@
"Pair_Formation_Parameters" :
{
"Formation_Rate_Constant": 7.8171373381041601e-05,
"Update_Period" : 30.0
"Update_Period" : 30.0,
"Extra_Relational_Rate_Ratio_Male": 5,
"Extra_Relational_Rate_Ratio_Female": 2
}
}
}
Expand Down
59 changes: 58 additions & 1 deletion SamplesInput/pfa_overlay.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,27 @@
},
"Defaults": {
"Society" : {
"Concurrency_Configuration" :
{
"Probability_Person_Is_Behavioral_Super_Spreader" : 0,
"Individual_Property_Name": "NONE",
"NONE":
{
"Extra_Relational_Flag_Type": "Independent"
}
},
"TRANSITORY" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 1,
"Max_Simultaneous_Relationships_Male" : 1,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -30,6 +49,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0.0027397260,
"Update_Period" : 7,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 20,
"Number_Age_Bins_Female" : 20,
"Age_of_First_Bin_Edge_Male" : 17.5,
Expand Down Expand Up @@ -67,6 +88,16 @@
},
"INFORMAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 1,
"Max_Simultaneous_Relationships_Male" : 1,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -87,6 +118,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0,
"Update_Period" : 7,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 20,
"Number_Age_Bins_Female" : 20,
"Age_of_First_Bin_Edge_Male" : 17.5,
Expand Down Expand Up @@ -124,6 +157,16 @@
},
"MARITAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 1,
"Max_Simultaneous_Relationships_Male" : 1,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -144,6 +187,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0,
"Update_Period" : 14,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 20,
"Number_Age_Bins_Female" : 20,
"Age_of_First_Bin_Edge_Male" : 17.5,
Expand Down Expand Up @@ -179,8 +224,18 @@
}
}
},
"TRANSACTIONAL" :
"COMMERCIAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 0,
"Max_Simultaneous_Relationships_Male" : 0,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -201,6 +256,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0.0,
"Update_Period" : 7.0,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 2,
"Number_Age_Bins_Female" : 2,
"Age_of_First_Bin_Edge_Male" : 50,
Expand Down
59 changes: 58 additions & 1 deletion SamplesInput/pfa_simple.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,27 @@
},
"Defaults": {
"Society" : {
"Concurrency_Configuration" :
{
"Probability_Person_Is_Behavioral_Super_Spreader" : 0,
"Individual_Property_Name": "NONE",
"NONE":
{
"Extra_Relational_Flag_Type": "Independent"
}
},
"TRANSITORY" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 1,
"Max_Simultaneous_Relationships_Male" : 1,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -30,6 +49,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0.0027397260,
"Update_Period" : 7,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 1,
"Number_Age_Bins_Female" : 1,
"Age_of_First_Bin_Edge_Male" : 100,
Expand All @@ -48,6 +69,16 @@
},
"INFORMAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 1,
"Max_Simultaneous_Relationships_Male" : 1,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -68,6 +99,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0,
"Update_Period" : 7,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 1,
"Number_Age_Bins_Female" : 1,
"Age_of_First_Bin_Edge_Male" : 100,
Expand All @@ -86,6 +119,16 @@
},
"MARITAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 1,
"Max_Simultaneous_Relationships_Male" : 1,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -106,6 +149,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0,
"Update_Period" : 14,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 1,
"Number_Age_Bins_Female" : 1,
"Age_of_First_Bin_Edge_Male" : 100,
Expand All @@ -122,8 +167,18 @@
}
}
},
"TRANSACTIONAL" :
"COMMERCIAL" :
{
"Concurrency_Parameters" :
{
"NONE":
{
"Max_Simultaneous_Relationships_Female": 0,
"Max_Simultaneous_Relationships_Male" : 0,
"Prob_Extra_Relationship_Female" : 0,
"Prob_Extra_Relationship_Male" : 0
}
},
"Relationship_Parameters" :
{
"Coital_Act_Rate" : 0.33,
Expand All @@ -144,6 +199,8 @@
"Formation_Rate_Type" : "CONSTANT",
"Formation_Rate_Constant": 0.0,
"Update_Period" : 7.0,
"Extra_Relational_Rate_Ratio_Male": 1,
"Extra_Relational_Rate_Ratio_Female": 1,
"Number_Age_Bins_Male" : 2,
"Number_Age_Bins_Female" : 2,
"Age_of_First_Bin_Edge_Male" : 50,
Expand Down
Loading

0 comments on commit da98064

Please sign in to comment.