add export to csv to ode tutorials, adapt numbering, adapt cmakelists

Author: annawendler

cpp-tutorials/CMakeLists.txt

@@ -46,29 +46,20 @@ target_link_libraries(tutorial_ide PRIVATE memilio ide_secir)
 add_executable(tutorial_lct tutorial_lct.cpp)
 target_link_libraries(tutorial_lct PRIVATE memilio lct_secir)
 
-add_executable(tutorial1 tutorial1.cpp)
-target_link_libraries(tutorial1 PRIVATE memilio ode_secir Boost::filesystem)
+add_executable(tutorial01 tutorial01.cpp)
+target_link_libraries(tutorial01 PRIVATE memilio ode_secir Boost::filesystem)
 
-add_executable(tutorial2 tutorial2.cpp)
-target_link_libraries(tutorial2 PRIVATE memilio ode_secir Boost::filesystem)
+add_executable(tutorial02 tutorial02.cpp)
+target_link_libraries(tutorial02 PRIVATE memilio ode_secir Boost::filesystem)
 
-add_executable(tutorial3 tutorial3.cpp)
-target_link_libraries(tutorial3 PRIVATE memilio ode_secir Boost::filesystem)
+add_executable(tutorial03 tutorial03.cpp)
+target_link_libraries(tutorial03 PRIVATE memilio ode_secir Boost::filesystem)
 
-add_executable(exercise3 exercises/exercise3.cpp)
-target_link_libraries(exercise3 PRIVATE memilio ode_secir Boost::filesystem)
+add_executable(tutorial05 tutorial05.cpp)
+target_link_libraries(tutorial05 PRIVATE memilio ode_secir Boost::filesystem)
 
-add_executable(tutorial5 tutorial5.cpp)
-target_link_libraries(tutorial5 PRIVATE memilio ode_secir Boost::filesystem)
-
-add_executable(exercise5 exercises/exercise5.cpp)
-target_link_libraries(exercise5 PRIVATE memilio ode_secir Boost::filesystem)
-
-add_executable(tutorial7 tutorial7.cpp)
-target_link_libraries(tutorial7 PRIVATE memilio ode_secir Boost::filesystem)
-
-add_executable(exercise7 exercises/exercise7.cpp)
-target_link_libraries(exercise7 PRIVATE memilio ode_secir Boost::filesystem)
+add_executable(tutorial07 tutorial07.cpp)
+target_link_libraries(tutorial07 PRIVATE memilio ode_secir Boost::filesystem)
 
 add_executable(tutorial10 tutorial10.cpp)
 target_link_libraries(tutorial10 PRIVATE memilio ode_secir Boost::filesystem)

cpp-tutorials/exercises/CMakeLists.txt

@@ -1,9 +1,18 @@
 
-add_executable(exercise1 exercise1.cpp)
-target_link_libraries(exercise1 PRIVATE memilio ode_secir Boost::filesystem)
+add_executable(exercise01 exercise01.cpp)
+target_link_libraries(exercise01 PRIVATE memilio ode_secir Boost::filesystem)
 
-add_executable(exercise2 exercise2.cpp)
-target_link_libraries(exercise2 PRIVATE memilio ode_secir Boost::filesystem)
+add_executable(exercise02 exercise02.cpp)
+target_link_libraries(exercise02 PRIVATE memilio ode_secir Boost::filesystem)
+
+add_executable(exercise03 exercise03.cpp)
+target_link_libraries(exercise03 PRIVATE memilio ode_secir Boost::filesystem)
+
+add_executable(exercise05 exercise05.cpp)
+target_link_libraries(exercise05 PRIVATE memilio ode_secir Boost::filesystem)
+
+add_executable(exercise07 exercise07.cpp)
+target_link_libraries(exercise07 PRIVATE memilio ode_secir Boost::filesystem)
 
 add_executable(exercise10 exercise10.cpp)
 target_link_libraries(exercise10 PRIVATE memilio ode_secir Boost::filesystem)

cpp-tutorials/exercises/exercise1.cpp cpp-tutorials/exercises/exercise01.cppcpp-tutorials/exercises/exercise1.cpp renamed to cpp-tutorials/exercises/exercise01.cpp

@@ -60,4 +60,7 @@ int main()
 
     // *** Print results. ***
     interpolated_result.print_table({"S", "E", "C", "C_confirmed", "I", "I_confirmed", "H", "U", "R", "D"}, 12, 4);
+
+    // We export the results as csv which is saved in the current folder. Then we can plot the results using plot_secir_results.py.
+    auto export_status = result.export_csv("../../cpp-tutorials/exercises/results_ode.csv");
 }

cpp-tutorials/exercises/exercise2.cpp cpp-tutorials/exercises/exercise02.cppcpp-tutorials/exercises/exercise2.cpp renamed to cpp-tutorials/exercises/exercise02.cpp

@@ -58,4 +58,7 @@ int main()
 
     // *** Print results. ***
     interpolated_result.print_table({"S", "E", "C", "C_confirmed", "I", "I_confirmed", "H", "U", "R", "D"}, 12, 4);
+
+    // We export the results as csv which is saved in the current folder. Then we can plot the results using plot_secir_results.py.
+    auto export_status = result.export_csv("../../cpp-tutorials/exercises/results_ode_npis.csv");
 }

cpp-tutorials/exercises/exercise3.cpp cpp-tutorials/exercises/exercise03.cppcpp-tutorials/exercises/exercise3.cpp renamed to cpp-tutorials/exercises/exercise03.cpp

@@ -44,6 +44,8 @@ int main()
     model.parameters.get<mio::osecir::CriticalPerSevere<ScalarType>>()[mio::AgeGroup(1)]         = 0.25 * 1.5;
     model.parameters.get<mio::osecir::CriticalPerSevere<ScalarType>>()[mio::AgeGroup(2)]         = 0.25 * 2;
 
+    //EXERCISE: Please increase the percentage of severe cases per symptomatic cases in age group 2 by 10%.
+
     //Set contact frequency
     ScalarType contact_frequency = 10;
     mio::ContactMatrixGroup<ScalarType>& contact_matrix =
@@ -69,4 +71,7 @@ int main()
 
     // *** Print results. ***
     interpolated_result.print_table();
+
+    // We export the results as csv which is saved in the current folder. Then we can plot the results using plot_secir_results.py.
+    auto export_status = result.export_csv("../../cpp-tutorials/exercises/results_ode_ageres.csv");
 }

cpp-tutorials/tutorial5.cpp cpp-tutorials/exercises/exercise05.cppcpp-tutorials/tutorial5.cpp renamed to cpp-tutorials/exercises/exercise05.cpp

@@ -111,4 +111,7 @@ int main()
 
     // *** Print results. ***
     interpolated_result_r0.print_table();
+
+    // We export the results for region 0 as csv which is saved in the current folder. Then we can plot the results using plot_secir_results.py.
+    auto export_status = result_region0.export_csv("../../cpp-tutorials/exercises/results_ode_region0.csv");
 }

cpp-tutorials/exercises/exercise7.cpp cpp-tutorials/exercises/exercise07.cppcpp-tutorials/exercises/exercise7.cpp renamed to cpp-tutorials/exercises/exercise07.cpp

@@ -155,5 +155,5 @@ int main()
         {"S->E", "E->C", "C->I", "C->R", "I->H", "I->R", "H->U", "H->R", "U->D", "U->R"}, 12, 4);
 
     // We export the results as csv which is saved in the current folder. Then we can plot the results using plot_secir_results.py.
-    auto export_status = sim.get_result().export_csv("../../cpp-tutorials/results_ide.csv");
+    auto export_status = sim.get_result().export_csv("../../cpp-tutorials/exercises/results_ide.csv");
 }

cpp-tutorials/exercises/exercise_ide.cpp

@@ -132,5 +132,12 @@ int main()
     interpolated_results.print_table({"S", "E", "C", "I", "H", "U", "R", "D "}, 12, 4);
 
     // We export the results as csv which is saved in the current folder. Then we can plot the results using plot_secir_results.py.
-    auto export_status = population_no_subcompartments.export_csv("../../cpp-tutorials/results_lct.csv");
+    auto export_status = population_no_subcompartments.export_csv("../../cpp-tutorials/exercises/results_lct.csv");
+
+    if (export_status == mio::success()) {
+        std::cout << "success \n";
+    }
+    else {
+        std::cout << "no success\n";
+    }
 }

cpp-tutorials/exercises/exercise_lct.cpp

@@ -57,4 +57,7 @@ int main()
 
     // *** Print results. ***
     interpolated_result.print_table({"S", "E", "C", "C_confirmed", "I", "I_confirmed", "H", "U", "R", "D"}, 12, 4);
+
+    // We export the results as csv which is saved in the current folder. Then we can plot the results using plot_secir_results.py.
+    auto export_status = result.export_csv("../../cpp-tutorials/results_ode.csv");
 }