small changes

Author: mknaranja

cpp-tutorials/abm/tutorial_abm_households.cpp

@@ -125,9 +125,9 @@ int main(int argc, char* argv[])
     // creates the actual persons and their home locations.
     //
     // CLI parameters (see usage at top of main):
-    //   argv[1] = n_households       (population size: 50, 125, 500)
-    //   argv[2] = infected_frac      (initial infected fraction: 0.05, 0.2, 0.5)
-    //   argv[3] = sim_days           (simulation duration: 15, 30, 90)
+    //   argv[1] = n_households       (number of households, default: 125)
+    //   argv[2] = infected_frac      (initial infected fraction, default: 0.2)
+    //   argv[3] = sim_days           (simulation duration, default: 30)
     int n_households = arg_n_households;
 
     // --- Type A: two-person household (1 parent + 1 child) -------------------
@@ -242,9 +242,8 @@ int main(int argc, char* argv[])
     }
 
     // *** Run the simulation. ***
-    // We simulate 30 days. The Simulation object takes ownership of the model.
-    // A History logger records the number of persons in each InfectionState
-    // at every time step.
+    // By default, we simulate 30 days. The Simulation object takes ownership of the model.
+    // A History logger records the number of persons in each InfectionState at every time step.
     auto t0   = mio::abm::TimePoint(0);
     auto tmax = t0 + mio::abm::days(arg_sim_days);
     auto sim  = mio::abm::Simulation(t0, std::move(model));

cpp-tutorials/abm/viz_and_run_abm_tutorials.py

@@ -19,8 +19,8 @@
 # ══════════════════════════════════════════════════════════════════════
 # CONFIGURATION – pick ONE tutorial and ONE run (1, 2, or 3)
 # ══════════════════════════════════════════════════════════════════════
-TUTORIAL = "vaccination"       # "household", "testing", or "vaccination"
-RUN      = 4               # 1, 2, or 3  (see tables below)
+TUTORIAL = "household"       # "household", "testing", or "vaccination"
+RUN = 2               # 1, 2, or 3  (see tables below)
 
 # ── 3 runs per tutorial ──────────────────────────────────────────────
 #
@@ -67,12 +67,12 @@
     "vaccination": {"exe": "tutorial_abm_vaccination",  "file": "abm_vaccination.txt",   "title": "Tutorial 3 – Vaccination"},
 }
 
-cfg       = _config[TUTORIAL]
-run_cfg   = RUNS[TUTORIAL][RUN]
-root_dir  = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
-bin_dir   = os.path.join(root_dir, "build", "bin")
-exe_path  = os.path.join(bin_dir, cfg["exe"])
-fpath     = os.path.join(bin_dir, cfg["file"])
+cfg = _config[TUTORIAL]
+run_cfg = RUNS[TUTORIAL][RUN]
+root_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
+bin_dir = os.path.join(root_dir, "build", "bin")
+exe_path = os.path.join(bin_dir, cfg["exe"])
+fpath = os.path.join(bin_dir, cfg["file"])
 
 # ── Run the executable ────────────────────────────────────────────────
 cmd = [exe_path] + run_cfg["args"]
@@ -88,7 +88,8 @@
 
 # ── Infection-state columns & colours ─────────────────────────────────
 states = ['S', 'E', 'I_NS', 'I_Sy', 'I_Sev', 'I_Crit', 'R', 'D']
-colors = ['blue', 'orange', 'gold', 'red', 'darkred', 'purple', 'green', 'black']
+colors = ['blue', 'orange', 'gold', 'red',
+          'darkred', 'purple', 'green', 'black']
 labels = ['Susceptible', 'Exposed', 'Infected (No Symptoms)',
           'Infected (Symptomatic)', 'Infected (Severe)',
           'Infected (Critical)', 'Recovered', 'Dead']
@@ -110,8 +111,8 @@
 ax.set_ylim(bottom=0)
 
 plt.tight_layout()
-outpng = f'abm_{TUTORIAL}_run{RUN}.png'
+outpng = os.path.join(fpath, f'abm_{TUTORIAL}_run{RUN}.png')
 plt.savefig(outpng, dpi=300, bbox_inches='tight')
 print(f"\nFinal counts:\n{final.to_string()}")
-print(f"Plot saved as '{outpng}'")
+print(f"Plot saved at '{outpng}'")
 plt.show()