1304 renamed compartmentalmodel.h to compartmental_model.h (#1305)

Spiritedswordsman · web-flow · commit ddb324d8333d · 2025-06-30T10:08:41.000+02:00
- Renamed compartmentalmodel.h to compartmental_model.h
diff --git a/cpp/memilio/CMakeLists.txt b/cpp/memilio/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(memilio
     geography/regions.cpp
     epidemiology/simulation_day.h
     geography/holiday_data.ipp
-    compartments/compartmentalmodel.h
+    compartments/compartmental_model.h
     compartments/flow_model.h
     compartments/simulation.h
     compartments/flow_simulation.h
diff --git a/cpp/memilio/compartments/compartmental_model.h b/cpp/memilio/compartments/compartmental_model.h
diff --git a/cpp/memilio/compartments/flow_model.h b/cpp/memilio/compartments/flow_model.h
@@ -21,7 +21,7 @@
 #ifndef MIO_FLOW_MODEL_H_
 #define MIO_FLOW_MODEL_H_
 
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/utils/index_range.h"
 #include "memilio/utils/flow.h"
 #include "memilio/utils/type_list.h"
diff --git a/cpp/memilio/compartments/simulation.h b/cpp/memilio/compartments/simulation.h
@@ -21,7 +21,7 @@
 #define SIMULATION_H
 
 #include "memilio/config.h"
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/utils/metaprogramming.h"
 #include "memilio/math/stepper_wrapper.h"
 #include "memilio/utils/time_series.h"
diff --git a/cpp/models/glct_secir/model.h b/cpp/models/glct_secir/model.h
@@ -24,7 +24,7 @@
 #include "glct_secir/parameters.h"
 #include "glct_secir/infection_state.h"
 #include "memilio/epidemiology/lct_infection_state.h"
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/epidemiology/populations.h"
 #include "memilio/config.h"
 #include "memilio/utils/logging.h"
diff --git a/cpp/models/lct_secir/model.h b/cpp/models/lct_secir/model.h
@@ -23,7 +23,7 @@
 
 #include "lct_secir/parameters.h"
 #include "lct_secir/infection_state.h"
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/epidemiology/lct_populations.h"
 #include "memilio/epidemiology/lct_infection_state.h"
 #include "memilio/config.h"
diff --git a/cpp/models/ode_seair/model.h b/cpp/models/ode_seair/model.h
@@ -21,7 +21,7 @@
 #ifndef ODESEAIR_MODEL_H
 #define ODESEAIR_MODEL_H
 
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/config.h"
 #include "memilio/epidemiology/populations.h"
 #include "ode_seair/infection_state.h"
diff --git a/cpp/models/ode_sir/model.h b/cpp/models/ode_sir/model.h
@@ -21,7 +21,7 @@
 #ifndef ODESIR_MODEL_H
 #define ODESIR_MODEL_H
 
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/epidemiology/age_group.h"
 #include "memilio/epidemiology/populations.h"
 #include "memilio/epidemiology/contact_matrix.h"
diff --git a/cpp/models/smm/model.h b/cpp/models/smm/model.h
@@ -23,7 +23,7 @@
 
 #include "memilio/config.h"
 #include "smm/parameters.h"
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/epidemiology/populations.h"
 #include "memilio/geography/regions.h"
 
diff --git a/cpp/sbml_model_generation/sbml_to_memilio.cpp b/cpp/sbml_model_generation/sbml_to_memilio.cpp
@@ -582,7 +582,7 @@ mio::IOResult<void> create_model_h(Model& model, const std::string& filename, co
     if (model_h) {
         //Add generic code
         model_h << "#ifndef " << uppercase_name << "_MODEL_H\n#define " << uppercase_name << "_MODEL_H" << std::endl;
-        model_h << "\n#include <cmath>\n#include \"memilio/compartments/compartmentalmodel.h\"\n#include "
+        model_h << "\n#include <cmath>\n#include \"memilio/compartments/compartmental_model.h\"\n#include "
                    "\"memilio/epidemiology/age_group.h\"\n#include \"memilio/epidemiology/populations.h\"\n#include "
                    "\"memilio/epidemiology/contact_matrix.h\""
                 << std::endl;
diff --git a/cpp/tests/test_feedback.cpp b/cpp/tests/test_feedback.cpp
@@ -18,7 +18,7 @@
 * limitations under the License.
 */
 #include "load_test_data.h"
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/compartments/flow_simulation.h"
 #include "memilio/compartments/simulation.h"
 #include "memilio/compartments/feedback_simulation.h"
diff --git a/cpp/tests/test_flows.cpp b/cpp/tests/test_flows.cpp
@@ -18,7 +18,7 @@
 * limitations under the License.
 */
 #include "load_test_data.h"
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/compartments/flow_simulation.h"
 #include "memilio/compartments/simulation.h"
 #include "ode_seir/infection_state.h"
diff --git a/cpp/tests/test_model.cpp b/cpp/tests/test_model.cpp
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "memilio/epidemiology/populations.h"
 #include "memilio/epidemiology/parameterset.h"
 #include "memilio/compartments/simulation.h"
diff --git a/pycode/memilio-generation/memilio/generation/template/template_string.py b/pycode/memilio-generation/memilio/generation/template/template_string.py
@@ -58,7 +58,7 @@ def includes(intermed_repr: IntermediateRepresentation) -> str:
     if intermed_repr.is_compartmentalmodel:
         substitution_string += (
             "#include \"compartments/simulation.h\"\n"
-            "#include \"compartments/compartmentalmodel.h\"\n"
+            "#include \"compartments/compartmental_model.h\"\n"
             "#include \"epidemiology/populations.h\"\n"
         )
 
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/compartments/compartmental_model.h b/pycode/memilio-simulation/memilio/simulation/bindings/compartments/compartmental_model.h
@@ -20,7 +20,7 @@
 #ifndef PYMIO_COMPARTMENTALMODEL_H
 #define PYMIO_COMPARTMENTALMODEL_H
 
-#include "memilio/compartments/compartmentalmodel.h"
+#include "memilio/compartments/compartmental_model.h"
 #include "pybind_util.h"
 
 #include "pybind11/pybind11.h"
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/osecir.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/osecir.cpp
@@ -22,7 +22,7 @@
 #include "pybind_util.h"
 #include "compartments/simulation.h"
 #include "compartments/flow_simulation.h"
-#include "compartments/compartmentalmodel.h"
+#include "compartments/compartmental_model.h"
 #include "epidemiology/age_group.h"
 #include "epidemiology/populations.h"
 #include "utils/custom_index_array.h"
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/osecirvvs.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/osecirvvs.cpp
@@ -23,7 +23,7 @@
 #include "utils/parameter_set.h"
 #include "compartments/simulation.h"
 #include "compartments/flow_simulation.h"
-#include "compartments/compartmentalmodel.h"
+#include "compartments/compartmental_model.h"
 #include "mobility/graph_simulation.h"
 #include "mobility/metapopulation_mobility_instant.h"
 #include "epidemiology/age_group.h"
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/oseir.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/oseir.cpp
@@ -25,7 +25,7 @@
 #include "utils/parameter_set.h"
 #include "compartments/simulation.h"
 #include "compartments/flow_simulation.h"
-#include "compartments/compartmentalmodel.h"
+#include "compartments/compartmental_model.h"
 #include "epidemiology/age_group.h"
 #include "epidemiology/populations.h"
 
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/osir.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/osir.cpp
@@ -25,7 +25,7 @@
 #include "utils/parameter_set.h"
 #include "compartments/simulation.h"
 #include "compartments/flow_simulation.h"
-#include "compartments/compartmentalmodel.h"
+#include "compartments/compartmental_model.h"
 #include "epidemiology/age_group.h"
 #include "epidemiology/populations.h"
 
