Skip to content

Commit ad4aec9

Browse files
committed
Fix segfauly
1 parent 526c42d commit ad4aec9

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

source/ConfigSetup.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ EMP_BUILD_CONFIG(SymConfigBase,
9898
VALUE(HOST_STARTING_TAGS_ONE_PROB, double, 0, "What probability should initializing bits in tags have of being 1s? Hosted symbionts will be assigned their host's tag. (0 for basic, all-0 only tags)"),
9999

100100
GROUP(ANTIBIOTIC_RESISTANCE, "Settings for antibiotic resistance"),
101-
VALUE(R0_WINDOW, double, 100, "How many updates should be used to calculate R0?")
101+
VALUE(R0_WINDOW, double, 100, "How many updates should be used to calculate R0?"),
102+
VALUE(TRACK_R0, bool, 0, "Should the world track R0? (0 for no, 1 for yes)")
102103
)
103104
#endif

source/default_mode/DataNodes.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ void SymWorld::CreateDataFiles() {
2121
SetupTransmissionFile(my_config->FILE_PATH()+"TransmissionRates"+my_config->FILE_NAME()+file_ending).SetTimingRepeat(TIMING_REPEAT);
2222
SetupSymDiversityFile(my_config->FILE_PATH()+"SymDiversity"+my_config->FILE_NAME()+file_ending).SetTimingRepeat(TIMING_REPEAT);
2323
SetupReproHistFile(my_config->FILE_PATH() + "ReproHist" + my_config->FILE_NAME() + file_ending).SetTimingRepeat(TIMING_REPEAT);
24-
SetupAntibioticResistanceFile(my_config->FILE_PATH() + "AntibioticResistance" + my_config->FILE_NAME() + file_ending).SetTimingRepeat(TIMING_REPEAT);
24+
if (my_config->TRACK_R0() == 1) {
25+
emp_assert(my_config->PHYLOGENY() == 1, "Cannot track R0 without tracking phylogeny.");
26+
emp_assert(my_config->PHYLOGENY_TAXON_TYPE() == "horizontal-clade", "Need horizontal clade tracking to track R0.");
27+
emp_assert(my_config->STORE_EXTINCT() == 1, "R0 will be biased if we don't store extinct");
28+
SetupAntibioticResistanceFile(my_config->FILE_PATH() + "AntibioticResistance" + my_config->FILE_NAME() + file_ending).SetTimingRepeat(TIMING_REPEAT);
29+
}
30+
2531
if (my_config->FREE_LIVING_SYMS() == 1) {
2632
SetupFreeLivingSymFile(my_config->FILE_PATH()+"FreeLivingSyms_"+my_config->FILE_NAME()+file_ending).SetTimingRepeat(TIMING_REPEAT);
2733
}

0 commit comments

Comments
 (0)