Merge pull request #167 from tolziplohu/main

Add inflow rate for limited resources and update Catch to 2.13.9
anyaevostinar · Jul 15, 2022 · 79ee260 · 79ee260
2 parents 8f379af + 30ad0de
commit 79ee260
Show file tree

Hide file tree

Showing 4 changed files with 801 additions and 384 deletions.
diff --git a/source/ConfigSetup.h b/source/ConfigSetup.h
@@ -17,7 +17,8 @@ EMP_BUILD_CONFIG(SymConfigBase,
     VALUE(START_MOI, double, 1, "Ratio of symbionts to hosts that experiment should start with"),
     VALUE(UPDATES, int, 1001, "Number of updates to run before quitting"),
     VALUE(RES_DISTRIBUTE, int, 100, "Number of resources to give to each host each update if they are available"),
-    VALUE(LIMITED_RES_TOTAL, int, -1, "Number of total resources available over the entire run, -1 for unlimited"),
+    VALUE(LIMITED_RES_TOTAL, int, -1, "Starting number of total resources available over the entire run, -1 for unlimited"),
+    VALUE(LIMITED_RES_INFLOW, int, 0, "Number of resources to add to the total every update, only used if LIMITED_RES_TOTAL is not -1"),
     VALUE(HORIZ_TRANS, bool, 1, "Should non-lytic horizontal transmission occur? 0 for no, 1 for yes"),
     VALUE(HOST_REPRO_RES, double, 1000, "How many resources required for host reproduction"),
     VALUE(SYM_HORIZ_TRANS_RES, double, 100, "How many resources required for symbiont non-lytic horizontal transmission"),