Merge branch 'main' of github.com:SciCompMod/memilio-tutorials

Author: kilianvolmer

cpp-tutorials/abm/tutorial_abm_testing.cpp

@@ -64,7 +64,7 @@ const auto age_group_80_plus  = mio::AgeGroup(5);
 //   - Is active for the full 30-day simulation window.
 //   - Uses a PCR test (sensitivity/specificity come from TestData defaults).
 //   - Tests are valid for `validity_days`; a negative result exempts retesting for validity_days days (Default: 3).
-//   - Targets persons in any infected state (Exposed through Critical).
+//   - Targets persons in any infected state (Exposed to Critical).
 //   - Applies to all age groups except school children (5-14).
 //   - Tests with `testing_probability` probability upon entry (Default: 100%).
 //   - Applies to all public locations (SocialEvent, School, Work, BasicsShop)
@@ -90,7 +90,7 @@ void add_npi_testing_strategies_to_world(mio::abm::Model& model, double testing_
 
     auto testing_criteria = mio::abm::TestingCriteria(ages_to_test, states_to_test);
     auto testing_scheme   = mio::abm::TestingScheme(testing_criteria, validity, start_date_test, end_date_test,
-                                                  pcr_test_parameters, testing_probability);
+                                                    pcr_test_parameters, testing_probability);
 
     // Attach the scheme to all public location types.
     model.get_testing_strategy().add_scheme(mio::abm::LocationType::SocialEvent, testing_scheme);
@@ -291,4 +291,4 @@ int main(int argc, char* argv[])
     std::cout << "Results written to abm_tests.txt\n";
 
     return 0;
-}
+}

cpp-tutorials/abm/tutorial_abm_vaccination.cpp

@@ -186,7 +186,7 @@ int main(int argc, char* argv[])
     //   use_data_vacc     : 1 = apply JSON data-driven vaccination, 0 = skip (default: 0)
     //                         Note that no vaccination takes place if json file should be used but cannot be found!
     double arg_vacc_rate       = (argc > 1) ? std::atof(argv[1]) : 0.0;
-    int arg_n_households       = (argc > 2) ? std::atoi(argv[2]) : 1000;
+    int arg_n_households       = (argc > 2) ? std::atoi(argv[2]) : 125;
     double arg_protection_peak = (argc > 3) ? std::atof(argv[3]) : 0.67;
     int arg_use_data_vacc      = (argc > 4) ? std::atoi(argv[4]) : 0;
 
@@ -419,8 +419,7 @@ int main(int argc, char* argv[])
         // ── Data-driven mode ─────────────────────────────────────────
         // Read real-world vaccination counts from a JSON file and apply
         // them day-by-day to the model's persons.
-        const std::string vacc_json_path =
-            "/Users/saschakorf/Documents/Promotion/memilio-tutorials/cpp-tutorials/abm/vacc_county_ageinf_ma7.json";
+        const std::string vacc_json_path = "./vacc_county_ageinf_ma7.json";
         const int county_id       = 1002;
         const mio::Date sim_start = mio::Date(2020, 10, 1);
 
@@ -452,4 +451,4 @@ int main(int argc, char* argv[])
     std::cout << "Results written to abm_vaccination.txt\n";
 
     return 0;
-}
+}

exercises/exercise01.py

@@ -250,7 +250,7 @@ def _(mo):
 
 @app.cell
 def _(result):
-    result.print_table()
+    print(result.print_table(return_string=True))
     return
 
 
@@ -280,7 +280,7 @@ def _(mo):
 
 @app.cell
 def _(interpolated_result):
-    interpolated_result.print_table()
+    print(interpolated_result.print_table(return_string=True))
     return
 
 

exercises/exercise03.py

@@ -170,7 +170,7 @@ def _(mo):
 def _(dt, model, osecir, t0, tmax):
     # Simulate model from t0 to tmax with initial step size dt
     result = osecir.simulate(t0, tmax, dt, model)
-    result.print_table()
+    print(result.print_table(return_string=True))
     return (result,)
 
 
@@ -186,7 +186,7 @@ def _(mo):
 def _(osecir, result):
     # Interpolate result to full days
     interpolated_result = osecir.interpolate_simulation_result(result)
-    interpolated_result.print_table()
+    print(interpolated_result.print_table(return_string=True))
     return
 
 

exercises/exercise05.py

@@ -184,7 +184,7 @@ def _(mo):
 def _(dt, model, osecir, t0, tmax):
     # Simulate model from t0 to tmax with initial step size dt
     result = osecir.simulate(t0, tmax, dt, model)
-    result.print_table()
+    print(result.print_table(return_string=True))
     return (result,)
 
 
@@ -200,7 +200,7 @@ def _(mo):
 def _(osecir, result):
     # Interpolate result to full days
     interpolated_result = osecir.interpolate_simulation_result(result)
-    interpolated_result.print_table()
+    print(interpolated_result.print_table(return_string=True))
     return
 
 

hello-world.ipynb

@@ -221,7 +221,7 @@ def _(mo):
 
 @app.cell
 def _(result):
-    result.print_table()
+    print(result.print_table(return_string=True))
     return
 
 
@@ -251,7 +251,7 @@ def _(mo):
 
 @app.cell
 def _(interpolated_result):
-    interpolated_result.print_table()
+    print(interpolated_result.print_table(return_string=True))
     return
 
 

tutorial01.py

@@ -140,7 +140,7 @@ def _(mo):
 def _(dt, model, osecir, t0, tmax):
     # Simulate model from t0 to tmax with initial step size dt
     result = osecir.simulate(t0, tmax, dt, model)
-    result.print_table()
+    print(result.print_table(return_string=True))
     return (result,)
 
 
@@ -156,7 +156,7 @@ def _(mo):
 def _(osecir, result):
     # Interpolate result to full days
     interpolated_result = osecir.interpolate_simulation_result(result)
-    interpolated_result.print_table()
+    print(interpolated_result.print_table(return_string=True))
     return
 
 

tutorial03.py

@@ -171,7 +171,7 @@ def _(dt, model, osecir, t0, tmax):
     result = osecir.simulate(t0, tmax, dt, model)
     # Interpolate result to full days
     interpolated_result = osecir.interpolate_simulation_result(result)
-    interpolated_result.print_table()
+    print(interpolated_result.print_table(return_string=True))
     return (result,)