From b6ed0bef52e0757360227302baf2526254248710 Mon Sep 17 00:00:00 2001
From: reneSchm <reneSchm@users.noreply.github.com>
Date: Fri, 29 Nov 2024 10:37:31 +0000
Subject: [PATCH] deploy: f76d14f2108a1662c8cf63517514dc84e3545f57

---
 coverage/cpp/index-sort-f.html                |  10 +-
 coverage/cpp/index-sort-l.html                |  10 +-
 coverage/cpp/index.html                       |  10 +-
 .../compartmentalmodel.h.func-sort-c.html     |   6 +-
 .../compartmentalmodel.h.func.html            |   6 +-
 .../compartmentalmodel.h.gcov.html            |  10 +-
 .../flow_model.h.func-sort-c.html             | 106 ++++----
 .../compartments/flow_model.h.func.html       |  82 +++---
 .../compartments/flow_model.h.gcov.html       |  46 ++--
 .../flow_simulation.h.func-sort-c.html        |   2 +-
 .../compartments/flow_simulation.h.func.html  |   2 +-
 .../compartments/flow_simulation.h.gcov.html  |   2 +-
 .../memilio/compartments/index-sort-f.html    |   2 +-
 .../memilio/compartments/index-sort-l.html    |   2 +-
 coverage/cpp/memilio/compartments/index.html  |   2 +-
 .../parameter_studies.h.func-sort-c.html      |   2 +-
 .../parameter_studies.h.func.html             |   2 +-
 .../parameter_studies.h.gcov.html             |   2 +-
 .../simulation.h.func-sort-c.html             |  14 +-
 .../compartments/simulation.h.func.html       |  14 +-
 .../compartments/simulation.h.gcov.html       |  18 +-
 .../cpp/memilio/config.h.func-sort-c.html     |   4 +-
 coverage/cpp/memilio/config.h.func.html       |   4 +-
 coverage/cpp/memilio/config.h.gcov.html       |   6 +-
 .../data/analyze_result.cpp.func-sort-c.html  |   2 +-
 .../memilio/data/analyze_result.cpp.func.html |   2 +-
 .../memilio/data/analyze_result.cpp.gcov.html |   2 +-
 .../data/analyze_result.h.func-sort-c.html    |   2 +-
 .../memilio/data/analyze_result.h.func.html   |   2 +-
 .../memilio/data/analyze_result.h.gcov.html   |   2 +-
 coverage/cpp/memilio/data/index-sort-f.html   |   2 +-
 coverage/cpp/memilio/data/index-sort-l.html   |   2 +-
 coverage/cpp/memilio/data/index.html          |   2 +-
 .../epidemiology/age_group.h.func-sort-c.html |   4 +-
 .../epidemiology/age_group.h.func.html        |   4 +-
 .../epidemiology/age_group.h.gcov.html        |   8 +-
 .../contact_matrix.h.func-sort-c.html         |  22 +-
 .../epidemiology/contact_matrix.h.func.html   |  22 +-
 .../epidemiology/contact_matrix.h.gcov.html   |  36 +--
 .../epidemiology/damping.h.func-sort-c.html   |  10 +-
 .../memilio/epidemiology/damping.h.func.html  |  10 +-
 .../memilio/epidemiology/damping.h.gcov.html  |  22 +-
 .../damping_sampling.h.func-sort-c.html       |   2 +-
 .../epidemiology/damping_sampling.h.func.html |   2 +-
 .../epidemiology/damping_sampling.h.gcov.html |   2 +-
 .../dynamic_npis.h.func-sort-c.html           |   2 +-
 .../epidemiology/dynamic_npis.h.func.html     |   2 +-
 .../epidemiology/dynamic_npis.h.gcov.html     |   2 +-
 .../memilio/epidemiology/index-sort-f.html    |   2 +-
 .../memilio/epidemiology/index-sort-l.html    |   2 +-
 coverage/cpp/memilio/epidemiology/index.html  |   2 +-
 .../lct_infection_state.h.func-sort-c.html    |   2 +-
 .../lct_infection_state.h.func.html           |   2 +-
 .../lct_infection_state.h.gcov.html           |   2 +-
 .../lct_populations.h.func-sort-c.html        |   2 +-
 .../epidemiology/lct_populations.h.func.html  |   2 +-
 .../epidemiology/lct_populations.h.gcov.html  |   2 +-
 .../populations.h.func-sort-c.html            |   6 +-
 .../epidemiology/populations.h.func.html      |   6 +-
 .../epidemiology/populations.h.gcov.html      |  12 +-
 .../state_age_function.h.func-sort-c.html     |   2 +-
 .../state_age_function.h.func.html            |   2 +-
 .../state_age_function.h.gcov.html            |   2 +-
 .../uncertain_matrix.h.func-sort-c.html       |   6 +-
 .../epidemiology/uncertain_matrix.h.func.html |   6 +-
 .../epidemiology/uncertain_matrix.h.gcov.html |  10 +-
 .../cpp/memilio/geography/index-sort-f.html   |   2 +-
 .../cpp/memilio/geography/index-sort-l.html   |   2 +-
 coverage/cpp/memilio/geography/index.html     |   2 +-
 .../geography/regions.cpp.func-sort-c.html    |   2 +-
 .../memilio/geography/regions.cpp.func.html   |   2 +-
 .../memilio/geography/regions.cpp.gcov.html   |   2 +-
 coverage/cpp/memilio/index-sort-f.html        |   2 +-
 coverage/cpp/memilio/index-sort-l.html        |   2 +-
 coverage/cpp/memilio/index.html               |   2 +-
 .../io/binary_serializer.h.func-sort-c.html   |   2 +-
 .../memilio/io/binary_serializer.h.func.html  |   2 +-
 .../memilio/io/binary_serializer.h.gcov.html  |   2 +-
 .../cpp/memilio/io/cli.h.func-sort-c.html     |   2 +-
 coverage/cpp/memilio/io/cli.h.func.html       |   2 +-
 coverage/cpp/memilio/io/cli.h.gcov.html       |   2 +-
 .../io/default_serialize.h.func-sort-c.html   |   2 +-
 .../memilio/io/default_serialize.h.func.html  |   2 +-
 .../memilio/io/default_serialize.h.gcov.html  |   2 +-
 .../memilio/io/epi_data.cpp.func-sort-c.html  |   2 +-
 .../cpp/memilio/io/epi_data.cpp.func.html     |   2 +-
 .../cpp/memilio/io/epi_data.cpp.gcov.html     |   2 +-
 .../memilio/io/epi_data.h.func-sort-c.html    |   2 +-
 coverage/cpp/memilio/io/epi_data.h.func.html  |   2 +-
 coverage/cpp/memilio/io/epi_data.h.gcov.html  |   2 +-
 .../memilio/io/hdf5_cpp.h.func-sort-c.html    |   2 +-
 coverage/cpp/memilio/io/hdf5_cpp.h.func.html  |   2 +-
 coverage/cpp/memilio/io/hdf5_cpp.h.gcov.html  |   2 +-
 .../cpp/memilio/io/history.h.func-sort-c.html |   2 +-
 coverage/cpp/memilio/io/history.h.func.html   |   2 +-
 coverage/cpp/memilio/io/history.h.gcov.html   |   2 +-
 coverage/cpp/memilio/io/index-sort-f.html     |  22 +-
 coverage/cpp/memilio/io/index-sort-l.html     |   2 +-
 coverage/cpp/memilio/io/index.html            |   2 +-
 .../cpp/memilio/io/io.cpp.func-sort-c.html    |   2 +-
 coverage/cpp/memilio/io/io.cpp.func.html      |   2 +-
 coverage/cpp/memilio/io/io.cpp.gcov.html      |   2 +-
 coverage/cpp/memilio/io/io.h.func-sort-c.html |   2 +-
 coverage/cpp/memilio/io/io.h.func.html        |   2 +-
 coverage/cpp/memilio/io/io.h.gcov.html        |   2 +-
 .../io/json_serializer.h.func-sort-c.html     |   2 +-
 .../memilio/io/json_serializer.h.func.html    |   2 +-
 .../memilio/io/json_serializer.h.gcov.html    |   2 +-
 .../io/mobility_io.cpp.func-sort-c.html       |   2 +-
 .../cpp/memilio/io/mobility_io.cpp.func.html  |   2 +-
 .../cpp/memilio/io/mobility_io.cpp.gcov.html  |   2 +-
 .../memilio/io/mobility_io.h.func-sort-c.html |   2 +-
 .../cpp/memilio/io/mobility_io.h.func.html    |   2 +-
 .../cpp/memilio/io/mobility_io.h.gcov.html    |   2 +-
 .../memilio/io/result_io.cpp.func-sort-c.html |   2 +-
 .../cpp/memilio/io/result_io.cpp.func.html    |   2 +-
 .../cpp/memilio/io/result_io.cpp.gcov.html    |   2 +-
 .../memilio/io/result_io.h.func-sort-c.html   |   2 +-
 coverage/cpp/memilio/io/result_io.h.func.html |   2 +-
 coverage/cpp/memilio/io/result_io.h.gcov.html |   2 +-
 .../io/serializer_base.h.func-sort-c.html     |   2 +-
 .../memilio/io/serializer_base.h.func.html    |   2 +-
 .../memilio/io/serializer_base.h.gcov.html    |   2 +-
 .../memilio/math/adapt_rk.h.func-sort-c.html  |   2 +-
 .../cpp/memilio/math/adapt_rk.h.func.html     |   2 +-
 .../cpp/memilio/math/adapt_rk.h.gcov.html     |   2 +-
 .../math/eigen_util.h.func-sort-c.html        |   4 +-
 .../cpp/memilio/math/eigen_util.h.func.html   |   4 +-
 .../cpp/memilio/math/eigen_util.h.gcov.html   |  14 +-
 .../cpp/memilio/math/euler.h.func-sort-c.html |   2 +-
 coverage/cpp/memilio/math/euler.h.func.html   |   2 +-
 coverage/cpp/memilio/math/euler.h.gcov.html   |   2 +-
 .../math/floating_point.h.func-sort-c.html    |   6 +-
 .../memilio/math/floating_point.h.func.html   |   6 +-
 .../memilio/math/floating_point.h.gcov.html   |  12 +-
 coverage/cpp/memilio/math/index-sort-f.html   |   2 +-
 coverage/cpp/memilio/math/index-sort-l.html   |  10 +-
 coverage/cpp/memilio/math/index.html          |   2 +-
 .../math/integrator.h.func-sort-c.html        |  14 +-
 .../cpp/memilio/math/integrator.h.func.html   |  10 +-
 .../cpp/memilio/math/integrator.h.gcov.html   |  70 +++---
 .../math/interpolation.h.func-sort-c.html     |   4 +-
 .../memilio/math/interpolation.h.func.html    |   4 +-
 .../memilio/math/interpolation.h.gcov.html    |  20 +-
 .../math/matrix_shape.h.func-sort-c.html      |  10 +-
 .../cpp/memilio/math/matrix_shape.h.func.html |  10 +-
 .../cpp/memilio/math/matrix_shape.h.gcov.html |  22 +-
 .../memilio/math/smoother.h.func-sort-c.html  |  12 +-
 .../cpp/memilio/math/smoother.h.func.html     |  12 +-
 .../cpp/memilio/math/smoother.h.gcov.html     |  24 +-
 .../math/stepper_wrapper.h.func-sort-c.html   |   6 +-
 .../memilio/math/stepper_wrapper.h.func.html  |   6 +-
 .../memilio/math/stepper_wrapper.h.gcov.html  |  40 +--
 .../time_series_functor.h.func-sort-c.html    |   2 +-
 .../math/time_series_functor.h.func.html      |   2 +-
 .../math/time_series_functor.h.gcov.html      |   2 +-
 .../memilio/mobility/graph.h.func-sort-c.html |   6 +-
 .../cpp/memilio/mobility/graph.h.func.html    |   6 +-
 .../cpp/memilio/mobility/graph.h.gcov.html    |  10 +-
 .../graph_simulation.h.func-sort-c.html       |   6 +-
 .../mobility/graph_simulation.h.func.html     |   6 +-
 .../mobility/graph_simulation.h.gcov.html     |  64 ++---
 .../cpp/memilio/mobility/index-sort-f.html    |   2 +-
 .../cpp/memilio/mobility/index-sort-l.html    |   2 +-
 coverage/cpp/memilio/mobility/index.html      |   2 +-
 ...lation_mobility_instant.h.func-sort-c.html |  10 +-
 ...etapopulation_mobility_instant.h.func.html |  10 +-
 ...etapopulation_mobility_instant.h.gcov.html |  24 +-
 ...ion_mobility_stochastic.h.func-sort-c.html |  10 +-
 ...population_mobility_stochastic.h.func.html |  10 +-
 ...population_mobility_stochastic.h.gcov.html |  34 +--
 .../compiler_diagnostics.h.func-sort-c.html   |   2 +-
 .../utils/compiler_diagnostics.h.func.html    |   2 +-
 .../utils/compiler_diagnostics.h.gcov.html    |   2 +-
 .../custom_index_array.h.func-sort-c.html     |  84 +++----
 .../utils/custom_index_array.h.func.html      |  84 +++----
 .../utils/custom_index_array.h.gcov.html      | 152 ++++++------
 .../cpp/memilio/utils/date.h.func-sort-c.html |   2 +-
 coverage/cpp/memilio/utils/date.h.func.html   |   2 +-
 coverage/cpp/memilio/utils/date.h.gcov.html   |   2 +-
 coverage/cpp/memilio/utils/index-sort-f.html  |   2 +-
 coverage/cpp/memilio/utils/index-sort-l.html  |   2 +-
 .../memilio/utils/index.h.func-sort-c.html    |  80 +++---
 coverage/cpp/memilio/utils/index.h.func.html  |  66 ++---
 coverage/cpp/memilio/utils/index.h.gcov.html  |  66 ++---
 coverage/cpp/memilio/utils/index.html         |   2 +-
 .../utils/index_range.h.func-sort-c.html      |  22 +-
 .../cpp/memilio/utils/index_range.h.func.html |  22 +-
 .../cpp/memilio/utils/index_range.h.gcov.html |  60 ++---
 .../memilio/utils/logging.h.func-sort-c.html  |   4 +-
 .../cpp/memilio/utils/logging.h.func.html     |   4 +-
 .../cpp/memilio/utils/logging.h.gcov.html     |   8 +-
 .../memilio/utils/memory.h.func-sort-c.html   |   2 +-
 coverage/cpp/memilio/utils/memory.h.func.html |   2 +-
 coverage/cpp/memilio/utils/memory.h.gcov.html |   2 +-
 .../utils/metaprogramming.h.func-sort-c.html  |   2 +-
 .../memilio/utils/metaprogramming.h.func.html |   2 +-
 .../memilio/utils/metaprogramming.h.gcov.html |   2 +-
 .../memilio/utils/miompi.cpp.func-sort-c.html |   2 +-
 .../cpp/memilio/utils/miompi.cpp.func.html    |   2 +-
 .../cpp/memilio/utils/miompi.cpp.gcov.html    |   2 +-
 ...parameter_distributions.h.func-sort-c.html |   2 +-
 .../utils/parameter_distributions.h.func.html |   2 +-
 .../utils/parameter_distributions.h.gcov.html |  10 +-
 .../utils/parameter_set.h.func-sort-c.html    | 234 +++++++++---------
 .../memilio/utils/parameter_set.h.func.html   | 138 +++++------
 .../memilio/utils/parameter_set.h.gcov.html   |  10 +-
 ...ndom_number_generator.cpp.func-sort-c.html |   4 +-
 .../random_number_generator.cpp.func.html     |   4 +-
 .../random_number_generator.cpp.gcov.html     |   8 +-
 ...random_number_generator.h.func-sort-c.html |  66 ++---
 .../utils/random_number_generator.h.func.html |  52 ++--
 .../utils/random_number_generator.h.gcov.html | 114 ++++-----
 .../cpp/memilio/utils/span.h.func-sort-c.html |  14 +-
 coverage/cpp/memilio/utils/span.h.func.html   |  14 +-
 coverage/cpp/memilio/utils/span.h.gcov.html   |  26 +-
 .../memilio/utils/stl_util.h.func-sort-c.html |  48 ++--
 .../cpp/memilio/utils/stl_util.h.func.html    |  32 +--
 .../cpp/memilio/utils/stl_util.h.gcov.html    |  36 +--
 .../utils/time_series.h.func-sort-c.html      |  52 ++--
 .../cpp/memilio/utils/time_series.h.func.html |  46 ++--
 .../cpp/memilio/utils/time_series.h.gcov.html | 114 ++++-----
 .../transform_iterator.h.func-sort-c.html     |   2 +-
 .../utils/transform_iterator.h.func.html      |   2 +-
 .../utils/transform_iterator.h.gcov.html      |   2 +-
 .../utils/type_list.h.func-sort-c.html        |   6 +-
 .../cpp/memilio/utils/type_list.h.func.html   |   6 +-
 .../cpp/memilio/utils/type_list.h.gcov.html   |   6 +-
 .../utils/type_safe.h.func-sort-c.html        |  84 +++----
 .../cpp/memilio/utils/type_safe.h.func.html   |  68 ++---
 .../cpp/memilio/utils/type_safe.h.gcov.html   |  40 +--
 .../utils/uncertain_value.h.func-sort-c.html  |   4 +-
 .../memilio/utils/uncertain_value.h.func.html |   4 +-
 .../memilio/utils/uncertain_value.h.gcov.html |   6 +-
 .../memilio/utils/visitor.h.func-sort-c.html  |   2 +-
 .../cpp/memilio/utils/visitor.h.func.html     |   2 +-
 .../cpp/memilio/utils/visitor.h.gcov.html     |   2 +-
 .../abm/analyze_result.h.func-sort-c.html     |   2 +-
 .../cpp/models/abm/analyze_result.h.func.html |   2 +-
 .../cpp/models/abm/analyze_result.h.gcov.html |   2 +-
 .../abm/common_abm_loggers.h.func-sort-c.html |   2 +-
 .../models/abm/common_abm_loggers.h.func.html |   2 +-
 .../models/abm/common_abm_loggers.h.gcov.html |  14 +-
 .../models/abm/household.cpp.func-sort-c.html |   2 +-
 .../cpp/models/abm/household.cpp.func.html    |   2 +-
 .../cpp/models/abm/household.cpp.gcov.html    |   2 +-
 .../models/abm/household.h.func-sort-c.html   |   2 +-
 coverage/cpp/models/abm/household.h.func.html |   2 +-
 coverage/cpp/models/abm/household.h.gcov.html |   2 +-
 coverage/cpp/models/abm/index-sort-f.html     |  52 ++--
 coverage/cpp/models/abm/index-sort-l.html     |  46 ++--
 coverage/cpp/models/abm/index.html            |  12 +-
 .../models/abm/infection.cpp.func-sort-c.html |   8 +-
 .../cpp/models/abm/infection.cpp.func.html    |   8 +-
 .../cpp/models/abm/infection.cpp.gcov.html    | 108 ++++----
 .../models/abm/infection.h.func-sort-c.html   |   2 +-
 coverage/cpp/models/abm/infection.h.func.html |   2 +-
 coverage/cpp/models/abm/infection.h.gcov.html |   2 +-
 .../models/abm/location.cpp.func-sort-c.html  |   2 +-
 .../cpp/models/abm/location.cpp.func.html     |   2 +-
 .../cpp/models/abm/location.cpp.gcov.html     |   2 +-
 .../models/abm/location.h.func-sort-c.html    |  10 +-
 coverage/cpp/models/abm/location.h.func.html  |  10 +-
 coverage/cpp/models/abm/location.h.gcov.html  |  20 +-
 .../models/abm/location_id.h.func-sort-c.html |   8 +-
 .../cpp/models/abm/location_id.h.func.html    |   8 +-
 .../cpp/models/abm/location_id.h.gcov.html    |  18 +-
 .../abm/lockdown_rules.cpp.func-sort-c.html   |   2 +-
 .../models/abm/lockdown_rules.cpp.func.html   |   2 +-
 .../models/abm/lockdown_rules.cpp.gcov.html   |   2 +-
 .../cpp/models/abm/mask.cpp.func-sort-c.html  |   4 +-
 coverage/cpp/models/abm/mask.cpp.func.html    |   4 +-
 coverage/cpp/models/abm/mask.cpp.gcov.html    |  10 +-
 .../cpp/models/abm/mask.h.func-sort-c.html    |   2 +-
 coverage/cpp/models/abm/mask.h.func.html      |   2 +-
 coverage/cpp/models/abm/mask.h.gcov.html      |   2 +-
 .../abm/mobility_rules.cpp.func-sort-c.html   |   4 +-
 .../models/abm/mobility_rules.cpp.func.html   |   4 +-
 .../models/abm/mobility_rules.cpp.gcov.html   |  32 +--
 .../cpp/models/abm/model.cpp.func-sort-c.html |   6 +-
 coverage/cpp/models/abm/model.cpp.func.html   |   6 +-
 coverage/cpp/models/abm/model.cpp.gcov.html   |  36 +--
 .../cpp/models/abm/model.h.func-sort-c.html   |  20 +-
 coverage/cpp/models/abm/model.h.func.html     |  20 +-
 coverage/cpp/models/abm/model.h.gcov.html     |  62 ++---
 .../abm/model_functions.cpp.func-sort-c.html  |   6 +-
 .../models/abm/model_functions.cpp.func.html  |   6 +-
 .../models/abm/model_functions.cpp.gcov.html  |  16 +-
 .../models/abm/parameters.h.func-sort-c.html  |   2 +-
 .../cpp/models/abm/parameters.h.func.html     |   2 +-
 .../cpp/models/abm/parameters.h.gcov.html     |   2 +-
 .../models/abm/person.cpp.func-sort-c.html    |  16 +-
 coverage/cpp/models/abm/person.cpp.func.html  |  16 +-
 coverage/cpp/models/abm/person.cpp.gcov.html  |  48 ++--
 .../cpp/models/abm/person.h.func-sort-c.html  |  10 +-
 coverage/cpp/models/abm/person.h.func.html    |  10 +-
 coverage/cpp/models/abm/person.h.gcov.html    |  20 +-
 .../models/abm/person_id.h.func-sort-c.html   |   2 +-
 coverage/cpp/models/abm/person_id.h.func.html |   2 +-
 coverage/cpp/models/abm/person_id.h.gcov.html |   2 +-
 .../abm/personal_rng.cpp.func-sort-c.html     |   2 +-
 .../cpp/models/abm/personal_rng.cpp.func.html |   2 +-
 .../cpp/models/abm/personal_rng.cpp.gcov.html |   2 +-
 .../abm/personal_rng.h.func-sort-c.html       |   8 +-
 .../cpp/models/abm/personal_rng.h.func.html   |   8 +-
 .../cpp/models/abm/personal_rng.h.gcov.html   |  16 +-
 .../abm/protection_event.h.func-sort-c.html   |   2 +-
 .../models/abm/protection_event.h.func.html   |   2 +-
 .../models/abm/protection_event.h.gcov.html   |   2 +-
 .../abm/random_events.h.func-sort-c.html      |  14 +-
 .../cpp/models/abm/random_events.h.func.html  |  10 +-
 .../cpp/models/abm/random_events.h.gcov.html  |  26 +-
 .../abm/simulation.cpp.func-sort-c.html       |   2 +-
 .../cpp/models/abm/simulation.cpp.func.html   |   2 +-
 .../cpp/models/abm/simulation.cpp.gcov.html   |   2 +-
 .../models/abm/simulation.h.func-sort-c.html  |   2 +-
 .../cpp/models/abm/simulation.h.func.html     |   2 +-
 .../cpp/models/abm/simulation.h.gcov.html     |   2 +-
 .../models/abm/test_type.h.func-sort-c.html   |   2 +-
 coverage/cpp/models/abm/test_type.h.func.html |   2 +-
 coverage/cpp/models/abm/test_type.h.gcov.html |   2 +-
 .../abm/testing_strategy.cpp.func-sort-c.html |   4 +-
 .../models/abm/testing_strategy.cpp.func.html |   4 +-
 .../models/abm/testing_strategy.cpp.gcov.html |  20 +-
 .../abm/testing_strategy.h.func-sort-c.html   |   2 +-
 .../models/abm/testing_strategy.h.func.html   |   2 +-
 .../models/abm/testing_strategy.h.gcov.html   |   2 +-
 .../cpp/models/abm/time.h.func-sort-c.html    |  48 ++--
 coverage/cpp/models/abm/time.h.func.html      |  32 +--
 coverage/cpp/models/abm/time.h.gcov.html      |  66 ++---
 .../models/abm/trip_list.cpp.func-sort-c.html |   2 +-
 .../cpp/models/abm/trip_list.cpp.func.html    |   2 +-
 .../cpp/models/abm/trip_list.cpp.gcov.html    |   2 +-
 .../models/abm/trip_list.h.func-sort-c.html   |   2 +-
 coverage/cpp/models/abm/trip_list.h.func.html |   2 +-
 coverage/cpp/models/abm/trip_list.h.gcov.html |   2 +-
 .../cpp/models/glct_secir/index-sort-f.html   |   2 +-
 .../cpp/models/glct_secir/index-sort-l.html   |   2 +-
 coverage/cpp/models/glct_secir/index.html     |   2 +-
 .../glct_secir/model.h.func-sort-c.html       |   2 +-
 .../cpp/models/glct_secir/model.h.func.html   |   2 +-
 .../cpp/models/glct_secir/model.h.gcov.html   |   2 +-
 .../glct_secir/parameters.h.func-sort-c.html  |   2 +-
 .../models/glct_secir/parameters.h.func.html  |   2 +-
 .../models/glct_secir/parameters.h.gcov.html  |   2 +-
 .../cpp/models/ide_secir/index-sort-f.html    |   2 +-
 .../cpp/models/ide_secir/index-sort-l.html    |   2 +-
 coverage/cpp/models/ide_secir/index.html      |   2 +-
 .../ide_secir/model.cpp.func-sort-c.html      |   2 +-
 .../cpp/models/ide_secir/model.cpp.func.html  |   2 +-
 .../cpp/models/ide_secir/model.cpp.gcov.html  |   2 +-
 .../models/ide_secir/model.h.func-sort-c.html |   2 +-
 .../cpp/models/ide_secir/model.h.func.html    |   2 +-
 .../cpp/models/ide_secir/model.h.gcov.html    |   2 +-
 .../ide_secir/parameters.h.func-sort-c.html   |   2 +-
 .../models/ide_secir/parameters.h.func.html   |   2 +-
 .../models/ide_secir/parameters.h.gcov.html   |   2 +-
 .../parameters_io.cpp.func-sort-c.html        |   2 +-
 .../ide_secir/parameters_io.cpp.func.html     |   2 +-
 .../ide_secir/parameters_io.cpp.gcov.html     |   2 +-
 .../ide_secir/simulation.cpp.func-sort-c.html |   2 +-
 .../models/ide_secir/simulation.cpp.func.html |   2 +-
 .../models/ide_secir/simulation.cpp.gcov.html |   2 +-
 .../ide_secir/simulation.h.func-sort-c.html   |   2 +-
 .../models/ide_secir/simulation.h.func.html   |   2 +-
 .../models/ide_secir/simulation.h.gcov.html   |   2 +-
 .../cpp/models/ide_seir/index-sort-f.html     |   2 +-
 .../cpp/models/ide_seir/index-sort-l.html     |   2 +-
 coverage/cpp/models/ide_seir/index.html       |   2 +-
 .../models/ide_seir/model.h.func-sort-c.html  |   2 +-
 .../cpp/models/ide_seir/model.h.func.html     |   2 +-
 .../cpp/models/ide_seir/model.h.gcov.html     |   2 +-
 .../ide_seir/parameters.h.func-sort-c.html    |   2 +-
 .../models/ide_seir/parameters.h.func.html    |   2 +-
 .../models/ide_seir/parameters.h.gcov.html    |   2 +-
 .../cpp/models/lct_secir/index-sort-f.html    |   2 +-
 .../cpp/models/lct_secir/index-sort-l.html    |   2 +-
 coverage/cpp/models/lct_secir/index.html      |   2 +-
 .../initializer_flows.h.func-sort-c.html      |   2 +-
 .../lct_secir/initializer_flows.h.func.html   |   2 +-
 .../lct_secir/initializer_flows.h.gcov.html   |   2 +-
 .../models/lct_secir/model.h.func-sort-c.html |   2 +-
 .../cpp/models/lct_secir/model.h.func.html    |   2 +-
 .../cpp/models/lct_secir/model.h.gcov.html    |   2 +-
 .../lct_secir/parameters.h.func-sort-c.html   |   2 +-
 .../models/lct_secir/parameters.h.func.html   |   2 +-
 .../models/lct_secir/parameters.h.gcov.html   |   2 +-
 .../parameters_io.h.func-sort-c.html          |   2 +-
 .../lct_secir/parameters_io.h.func.html       |   2 +-
 .../lct_secir/parameters_io.h.gcov.html       |   2 +-
 .../cpp/models/ode_seair/index-sort-f.html    |   2 +-
 .../cpp/models/ode_seair/index-sort-l.html    |   2 +-
 coverage/cpp/models/ode_seair/index.html      |   2 +-
 .../models/ode_seair/model.h.func-sort-c.html |   2 +-
 .../cpp/models/ode_seair/model.h.func.html    |   2 +-
 .../cpp/models/ode_seair/model.h.gcov.html    |   2 +-
 .../ode_seair/parameters.h.func-sort-c.html   |   2 +-
 .../models/ode_seair/parameters.h.func.html   |   2 +-
 .../models/ode_seair/parameters.h.gcov.html   |   2 +-
 .../analyze_result.h.func-sort-c.html         |   2 +-
 .../ode_secir/analyze_result.h.func.html      |   2 +-
 .../ode_secir/analyze_result.h.gcov.html      |   2 +-
 .../cpp/models/ode_secir/index-sort-f.html    |   2 +-
 .../cpp/models/ode_secir/index-sort-l.html    |   2 +-
 coverage/cpp/models/ode_secir/index.html      |   2 +-
 .../models/ode_secir/model.h.func-sort-c.html |   4 +-
 .../cpp/models/ode_secir/model.h.func.html    |   4 +-
 .../cpp/models/ode_secir/model.h.gcov.html    | 196 +++++++--------
 .../parameter_space.h.func-sort-c.html        |   2 +-
 .../ode_secir/parameter_space.h.func.html     |   2 +-
 .../ode_secir/parameter_space.h.gcov.html     |   2 +-
 .../ode_secir/parameters.h.func-sort-c.html   |   4 +-
 .../models/ode_secir/parameters.h.func.html   |   4 +-
 .../models/ode_secir/parameters.h.gcov.html   |   6 +-
 .../parameters_io.cpp.func-sort-c.html        |   2 +-
 .../ode_secir/parameters_io.cpp.func.html     |   2 +-
 .../ode_secir/parameters_io.cpp.gcov.html     |   2 +-
 .../parameters_io.h.func-sort-c.html          |   2 +-
 .../ode_secir/parameters_io.h.func.html       |   2 +-
 .../ode_secir/parameters_io.h.gcov.html       |   2 +-
 .../analyze_result.h.func-sort-c.html         |   2 +-
 .../ode_secirvvs/analyze_result.h.func.html   |   2 +-
 .../ode_secirvvs/analyze_result.h.gcov.html   |   2 +-
 .../cpp/models/ode_secirvvs/index-sort-f.html |   2 +-
 .../cpp/models/ode_secirvvs/index-sort-l.html |   2 +-
 coverage/cpp/models/ode_secirvvs/index.html   |   2 +-
 .../ode_secirvvs/model.h.func-sort-c.html     |   2 +-
 .../cpp/models/ode_secirvvs/model.h.func.html |   2 +-
 .../cpp/models/ode_secirvvs/model.h.gcov.html |   2 +-
 .../parameter_space.h.func-sort-c.html        |   2 +-
 .../ode_secirvvs/parameter_space.h.func.html  |   2 +-
 .../ode_secirvvs/parameter_space.h.gcov.html  |   2 +-
 .../parameters.h.func-sort-c.html             |   2 +-
 .../ode_secirvvs/parameters.h.func.html       |   2 +-
 .../ode_secirvvs/parameters.h.gcov.html       |   2 +-
 .../parameters_io.cpp.func-sort-c.html        |   2 +-
 .../ode_secirvvs/parameters_io.cpp.func.html  |   2 +-
 .../ode_secirvvs/parameters_io.cpp.gcov.html  |   2 +-
 .../parameters_io.h.func-sort-c.html          |   2 +-
 .../ode_secirvvs/parameters_io.h.func.html    |   2 +-
 .../ode_secirvvs/parameters_io.h.gcov.html    |   2 +-
 .../cpp/models/ode_seir/index-sort-f.html     |   2 +-
 .../cpp/models/ode_seir/index-sort-l.html     |   2 +-
 coverage/cpp/models/ode_seir/index.html       |   2 +-
 .../models/ode_seir/model.h.func-sort-c.html  |   4 +-
 .../cpp/models/ode_seir/model.h.func.html     |   4 +-
 .../cpp/models/ode_seir/model.h.gcov.html     |  50 ++--
 .../ode_seir/parameters.h.func-sort-c.html    |   2 +-
 .../models/ode_seir/parameters.h.func.html    |   2 +-
 .../models/ode_seir/parameters.h.gcov.html    |   2 +-
 coverage/cpp/models/ode_sir/index-sort-f.html |   2 +-
 coverage/cpp/models/ode_sir/index-sort-l.html |   2 +-
 coverage/cpp/models/ode_sir/index.html        |   2 +-
 .../models/ode_sir/model.h.func-sort-c.html   |   2 +-
 coverage/cpp/models/ode_sir/model.h.func.html |   2 +-
 coverage/cpp/models/ode_sir/model.h.gcov.html |   2 +-
 .../ode_sir/parameters.h.func-sort-c.html     |   2 +-
 .../cpp/models/ode_sir/parameters.h.func.html |   2 +-
 .../cpp/models/ode_sir/parameters.h.gcov.html |   2 +-
 .../cpp/models/sde_seirvv/index-sort-f.html   |   2 +-
 .../cpp/models/sde_seirvv/index-sort-l.html   |   2 +-
 coverage/cpp/models/sde_seirvv/index.html     |   2 +-
 .../sde_seirvv/model.h.func-sort-c.html       |   2 +-
 .../cpp/models/sde_seirvv/model.h.func.html   |   2 +-
 .../cpp/models/sde_seirvv/model.h.gcov.html   |   2 +-
 .../sde_seirvv/parameters.h.func-sort-c.html  |   2 +-
 .../models/sde_seirvv/parameters.h.func.html  |   2 +-
 .../models/sde_seirvv/parameters.h.gcov.html  |   2 +-
 .../sde_seirvv/simulation.h.func-sort-c.html  |   2 +-
 .../models/sde_seirvv/simulation.h.func.html  |   2 +-
 .../models/sde_seirvv/simulation.h.gcov.html  |   2 +-
 coverage/cpp/models/sde_sir/index-sort-f.html |   2 +-
 coverage/cpp/models/sde_sir/index-sort-l.html |   2 +-
 coverage/cpp/models/sde_sir/index.html        |   2 +-
 .../models/sde_sir/model.h.func-sort-c.html   |   2 +-
 coverage/cpp/models/sde_sir/model.h.func.html |   2 +-
 coverage/cpp/models/sde_sir/model.h.gcov.html |   2 +-
 .../sde_sir/parameters.h.func-sort-c.html     |   2 +-
 .../cpp/models/sde_sir/parameters.h.func.html |   2 +-
 .../cpp/models/sde_sir/parameters.h.gcov.html |   2 +-
 .../sde_sir/simulation.h.func-sort-c.html     |   2 +-
 .../cpp/models/sde_sir/simulation.h.func.html |   2 +-
 .../cpp/models/sde_sir/simulation.h.gcov.html |   2 +-
 .../cpp/models/sde_sirs/index-sort-f.html     |   2 +-
 .../cpp/models/sde_sirs/index-sort-l.html     |   2 +-
 coverage/cpp/models/sde_sirs/index.html       |   2 +-
 .../models/sde_sirs/model.h.func-sort-c.html  |   2 +-
 .../cpp/models/sde_sirs/model.h.func.html     |   2 +-
 .../cpp/models/sde_sirs/model.h.gcov.html     |   2 +-
 .../sde_sirs/parameters.h.func-sort-c.html    |   2 +-
 .../models/sde_sirs/parameters.h.func.html    |   2 +-
 .../models/sde_sirs/parameters.h.gcov.html    |   2 +-
 .../sde_sirs/simulation.h.func-sort-c.html    |   2 +-
 .../models/sde_sirs/simulation.h.func.html    |   2 +-
 .../models/sde_sirs/simulation.h.gcov.html    |   2 +-
 coverage/python/class_index.html              |   4 +-
 coverage/python/function_index.html           |   4 +-
 coverage/python/index.html                    |   4 +-
 .../z_0c24ffff949aeae7___init___py.html       |   4 +-
 .../z_0ea8cd790dc48d60___init___py.html       |   4 +-
 .../z_35d823b5d09d8cc6___init___py.html       |   4 +-
 .../z_3fc004d8eec66cca___init___py.html       |   4 +-
 ...z_3fc004d8eec66cca_data_generation_py.html |   4 +-
 .../python/z_3fc004d8eec66cca_model_py.html   |   4 +-
 ...04d8eec66cca_network_architectures_py.html |   4 +-
 .../z_4984fdf5492a4f01___init___py.html       |   4 +-
 ...z_4984fdf5492a4f01_data_generation_py.html |   4 +-
 .../python/z_4984fdf5492a4f01_model_py.html   |   4 +-
 ...fdf5492a4f01_network_architectures_py.html |   4 +-
 .../z_564950c39d8772a4___init___py.html       |   4 +-
 ...z_564950c39d8772a4_data_generation_py.html |   4 +-
 .../python/z_564950c39d8772a4_model_py.html   |   4 +-
 ...50c39d8772a4_network_architectures_py.html |   4 +-
 .../z_7d625457ac6be0e7___init___py.html       |   4 +-
 .../python/z_7d625457ac6be0e7_osecir_py.html  |   4 +-
 .../z_927a2fb05d3663b1___init___py.html       |   4 +-
 .../python/z_927a2fb05d3663b1_osecir_py.html  |   4 +-
 .../z_ab666848b4f949ff___init___py.html       |   4 +-
 .../z_cf1fd21791a8519d___init___py.html       |   4 +-
 ...z_cf1fd21791a8519d_data_generation_py.html |   4 +-
 .../python/z_cf1fd21791a8519d_model_py.html   |   4 +-
 ...d21791a8519d_network_architectures_py.html |   4 +-
 pylint/index.html                             |  91 ++++---
 523 files changed, 2540 insertions(+), 2505 deletions(-)

diff --git a/coverage/cpp/index-sort-f.html b/coverage/cpp/index-sort-f.html
index 542bde79ae..e6ffbed24e 100644
--- a/coverage/cpp/index-sort-f.html
+++ b/coverage/cpp/index-sort-f.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">11515</td>
+            <td class="headerCovTableEntry">11513</td>
             <td class="headerCovTableEntry">11873</td>
             <td class="headerCovTableEntryHi">97.0 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9729</td>
@@ -182,10 +182,10 @@
     <tr>
       <td class="coverFile"><a href="models/abm/index.html">models/abm</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.3%"><img src="snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.2%"><img src="snow.png" width=2 height=10 alt="98.2%"></td></tr></table>
       </td>
-      <td class="coverPerHi">98.3&nbsp;%</td>
-      <td class="coverNumHi">1720 / 1749</td>
+      <td class="coverPerHi">98.2&nbsp;%</td>
+      <td class="coverNumHi">1718 / 1749</td>
       <td class="coverPerHi">98.1&nbsp;%</td>
       <td class="coverNumHi">460 / 469</td>
     </tr>
diff --git a/coverage/cpp/index-sort-l.html b/coverage/cpp/index-sort-l.html
index 28dd924d5d..1600806cc7 100644
--- a/coverage/cpp/index-sort-l.html
+++ b/coverage/cpp/index-sort-l.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">11515</td>
+            <td class="headerCovTableEntry">11513</td>
             <td class="headerCovTableEntry">11873</td>
             <td class="headerCovTableEntryHi">97.0 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9729</td>
@@ -172,10 +172,10 @@
     <tr>
       <td class="coverFile"><a href="models/abm/index.html">models/abm</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.3%"><img src="snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.2%"><img src="snow.png" width=2 height=10 alt="98.2%"></td></tr></table>
       </td>
-      <td class="coverPerHi">98.3&nbsp;%</td>
-      <td class="coverNumHi">1720 / 1749</td>
+      <td class="coverPerHi">98.2&nbsp;%</td>
+      <td class="coverNumHi">1718 / 1749</td>
       <td class="coverPerHi">98.1&nbsp;%</td>
       <td class="coverNumHi">460 / 469</td>
     </tr>
diff --git a/coverage/cpp/index.html b/coverage/cpp/index.html
index 2743f4aec6..497441b79e 100644
--- a/coverage/cpp/index.html
+++ b/coverage/cpp/index.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">11515</td>
+            <td class="headerCovTableEntry">11513</td>
             <td class="headerCovTableEntry">11873</td>
             <td class="headerCovTableEntryHi">97.0 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9729</td>
@@ -162,10 +162,10 @@
     <tr>
       <td class="coverFile"><a href="models/abm/index.html">models/abm</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.3%"><img src="snow.png" width=2 height=10 alt="98.3%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="emerald.png" width=98 height=10 alt="98.2%"><img src="snow.png" width=2 height=10 alt="98.2%"></td></tr></table>
       </td>
-      <td class="coverPerHi">98.3&nbsp;%</td>
-      <td class="coverNumHi">1720 / 1749</td>
+      <td class="coverPerHi">98.2&nbsp;%</td>
+      <td class="coverNumHi">1718 / 1749</td>
       <td class="coverPerHi">98.1&nbsp;%</td>
       <td class="coverNumHi">460 / 469</td>
     </tr>
diff --git a/coverage/cpp/memilio/compartments/compartmentalmodel.h.func-sort-c.html b/coverage/cpp/memilio/compartments/compartmentalmodel.h.func-sort-c.html
index a5fc403e33..bcf01c3293 100644
--- a/coverage/cpp/memilio/compartments/compartmentalmodel.h.func-sort-c.html
+++ b/coverage/cpp/memilio/compartments/compartmentalmodel.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">111</td>
@@ -745,11 +745,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="compartmentalmodel.h.gcov.html#119">mio::CompartmentalModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt; &gt;::eval_right_hand_side(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">170001</td>
+              <td class="coverFnHi">170109</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="compartmentalmodel.h.gcov.html#119">mio::CompartmentalModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt; &gt;::eval_right_hand_side(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393810</td>
+              <td class="coverFnHi">414870</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/compartments/compartmentalmodel.h.func.html b/coverage/cpp/memilio/compartments/compartmentalmodel.h.func.html
index 66f0688ed2..41841a0cde 100644
--- a/coverage/cpp/memilio/compartments/compartmentalmodel.h.func.html
+++ b/coverage/cpp/memilio/compartments/compartmentalmodel.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">111</td>
@@ -557,7 +557,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="compartmentalmodel.h.gcov.html#119">mio::CompartmentalModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt; &gt;::eval_right_hand_side(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">170001</td>
+              <td class="coverFnHi">170109</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="compartmentalmodel.h.gcov.html#96">mio::CompartmentalModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::oseir::InfectionState, CatA, CatB, CatC&gt;, mio::oseir::Parameters&lt;double&gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
@@ -721,7 +721,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="compartmentalmodel.h.gcov.html#119">mio::CompartmentalModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt; &gt;::eval_right_hand_side(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393810</td>
+              <td class="coverFnHi">414870</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="compartmentalmodel.h.gcov.html#96">mio::CompartmentalModel&lt;double, mio::sseirvv::InfectionState, mio::Populations&lt;double, mio::sseirvv::InfectionState&gt;, mio::sseirvv::Parameters&gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
diff --git a/coverage/cpp/memilio/compartments/compartmentalmodel.h.gcov.html b/coverage/cpp/memilio/compartments/compartmentalmodel.h.gcov.html
index 79145813cc..b1d75de515 100644
--- a/coverage/cpp/memilio/compartments/compartmentalmodel.h.gcov.html
+++ b/coverage/cpp/memilio/compartments/compartmentalmodel.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">111</td>
@@ -180,12 +180,12 @@
 <a name="118"><span class="lineNum">     118 </span>            :      * @param[in] t The current time.</a>
 <a name="119"><span class="lineNum">     119 </span>            :      * @param[out] dydt A reference to the calculated output.</a>
 <a name="120"><span class="lineNum">     120 </span>            :      */</a>
-<a name="121"><span class="lineNum">     121 </span><span class="lineCov">     578907 :     void eval_right_hand_side(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
+<a name="121"><span class="lineNum">     121 </span><span class="lineCov">     600075 :     void eval_right_hand_side(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
 <a name="122"><span class="lineNum">     122 </span>            :                               Eigen::Ref&lt;Vector&lt;FP&gt;&gt; dydt) const</a>
 <a name="123"><span class="lineNum">     123 </span>            :     {</a>
-<a name="124"><span class="lineNum">     124 </span><span class="lineCov">     578907 :         dydt.setZero();</span></a>
-<a name="125"><span class="lineNum">     125 </span><span class="lineCov">     578907 :         this-&gt;get_derivatives(pop, y, t, dydt);</span></a>
-<a name="126"><span class="lineNum">     126 </span><span class="lineCov">     578907 :     }</span></a>
+<a name="124"><span class="lineNum">     124 </span><span class="lineCov">     600075 :         dydt.setZero();</span></a>
+<a name="125"><span class="lineNum">     125 </span><span class="lineCov">     600075 :         this-&gt;get_derivatives(pop, y, t, dydt);</span></a>
+<a name="126"><span class="lineNum">     126 </span><span class="lineCov">     600075 :     }</span></a>
 <a name="127"><span class="lineNum">     127 </span>            : </a>
 <a name="128"><span class="lineNum">     128 </span>            :     /**</a>
 <a name="129"><span class="lineNum">     129 </span>            :      * @brief Get the initial conditions for the ODE dydt = f(y, t).</a>
diff --git a/coverage/cpp/memilio/compartments/flow_model.h.func-sort-c.html b/coverage/cpp/memilio/compartments/flow_model.h.func-sort-c.html
index 61b097690f..e30fc6e7c9 100644
--- a/coverage/cpp/memilio/compartments/flow_model.h.func-sort-c.html
+++ b/coverage/cpp/memilio/compartments/flow_model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">193</td>
@@ -701,163 +701,163 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#135">mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">223893</td>
+              <td class="coverFnHi">224001</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;0ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
+              <td class="coverFnHi">413607</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;1ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
+              <td class="coverFnHi">413607</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;2ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
+              <td class="coverFnHi">413607</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="flow_model.h.gcov.html#109">mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
+              <td class="coverFnHi">413607</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#135">mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393858</td>
+              <td class="coverFnHi">414918</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#109">mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393930</td>
+              <td class="coverFnHi">414990</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;0ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;10ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;11ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;12ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;13ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;14ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;1ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;2ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;3ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;4ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;5ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;6ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;7ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;8ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;9ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;0ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">413499</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;1ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">413499</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;2ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">413499</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="flow_model.h.gcov.html#109">mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">413499</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">799923</td>
+              <td class="coverFnHi">800139</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">799923</td>
+              <td class="coverFnHi">800139</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">799923</td>
+              <td class="coverFnHi">800139</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">848793</td>
+              <td class="coverFnHi">890913</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/compartments/flow_model.h.func.html b/coverage/cpp/memilio/compartments/flow_model.h.func.html
index f077b0e10a..02673db7ea 100644
--- a/coverage/cpp/memilio/compartments/flow_model.h.func.html
+++ b/coverage/cpp/memilio/compartments/flow_model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">193</td>
@@ -125,23 +125,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;0ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">413499</td>
+              <td class="coverFnHi">413607</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;1ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">413499</td>
+              <td class="coverFnHi">413607</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;2ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">413499</td>
+              <td class="coverFnHi">413607</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#109">mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">413499</td>
+              <td class="coverFnHi">413607</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#135">mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">223893</td>
+              <td class="coverFnHi">224001</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#148">mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_initial_flows() const</a></td>
@@ -149,15 +149,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">799923</td>
+              <td class="coverFnHi">800139</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">799923</td>
+              <td class="coverFnHi">800139</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">799923</td>
+              <td class="coverFnHi">800139</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::oseir::InfectionState, mio::Populations&lt;double, mio::oseir::InfectionState, CatA, CatB, CatC&gt;, mio::oseir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt; &gt;::get_rhs_impl&lt;0ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;CatA, CatB, CatC&gt; const&amp;) const</a></td>
@@ -241,71 +241,71 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;0ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;10ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;11ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;12ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;13ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;14ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;1ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;2ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;3ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;4ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;5ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;6ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;7ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;8ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_rhs_impl&lt;9ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">406122</td>
+              <td class="coverFnHi">427182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#109">mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393930</td>
+              <td class="coverFnHi">414990</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#135">mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_derivatives(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393858</td>
+              <td class="coverFnHi">414918</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#148">mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_initial_flows() const</a></td>
@@ -313,63 +313,63 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">848793</td>
+              <td class="coverFnHi">890913</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#179">unsigned long mio::FlowModel&lt;double, mio::osecir::InfectionState, mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::osecir::Parameters&lt;double&gt;, mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt; &gt;::get_flat_flow_index&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812217</td>
+              <td class="coverFnHi">854337</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="flow_model.h.gcov.html#217">void mio::FlowModel&lt;double, mio::sseirvv::InfectionState, mio::Populations&lt;double, mio::sseirvv::InfectionState&gt;, mio::sseirvv::Parameters, mio::TypeList&lt;mio::Flow&lt;(mio::sseirvv::InfectionState)0, (mio::sseirvv::InfectionState)1&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)0, (mio::sseirvv::InfectionState)4&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)1, (mio::sseirvv::InfectionState)2&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)4, (mio::sseirvv::InfectionState)5&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)2, (mio::sseirvv::InfectionState)3&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)5, (mio::sseirvv::InfectionState)6&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)3, (mio::sseirvv::InfectionState)7&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)7, (mio::sseirvv::InfectionState)8&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)8, (mio::sseirvv::InfectionState)9&gt; &gt; &gt;::get_rhs_impl&lt;0ul&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;, mio::Index&lt;&gt; const&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/compartments/flow_model.h.gcov.html b/coverage/cpp/memilio/compartments/flow_model.h.gcov.html
index 60d5240d8e..7662ac148c 100644
--- a/coverage/cpp/memilio/compartments/flow_model.h.gcov.html
+++ b/coverage/cpp/memilio/compartments/flow_model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">193</td>
@@ -170,20 +170,20 @@
 <a name="108"><span class="lineNum">     108 </span>            :      * @param[in] flows The current flow values (as calculated by get_flows) as a flat array.</a>
 <a name="109"><span class="lineNum">     109 </span>            :      * @param[out] dydt A reference to the calculated output.</a>
 <a name="110"><span class="lineNum">     110 </span>            :      */</a>
-<a name="111"><span class="lineNum">     111 </span><span class="lineCov">     814503 :     void get_derivatives(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; flows, Eigen::Ref&lt;Vector&lt;FP&gt;&gt; dydt) const</span></a>
+<a name="111"><span class="lineNum">     111 </span><span class="lineCov">     835671 :     void get_derivatives(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; flows, Eigen::Ref&lt;Vector&lt;FP&gt;&gt; dydt) const</span></a>
 <a name="112"><span class="lineNum">     112 </span>            :     {</a>
 <a name="113"><span class="lineNum">     113 </span>            :         // set dydt to 0, then iteratively add all flow contributions</a>
-<a name="114"><span class="lineNum">     114 </span><span class="lineCov">     814503 :         dydt.setZero();</span></a>
+<a name="114"><span class="lineNum">     114 </span><span class="lineCov">     835671 :         dydt.setZero();</span></a>
 <a name="115"><span class="lineNum">     115 </span>            :         if constexpr (std::is_same_v&lt;FlowIndex, Index&lt;&gt;&gt;) {</a>
 <a name="116"><span class="lineNum">     116 </span>            :             // special case where PopIndex only contains Comp, hence FlowIndex has no dimensions to iterate over</a>
 <a name="117"><span class="lineNum">     117 </span><span class="lineCov">        162 :             get_rhs_impl(flows, dydt, Index&lt;&gt;{});</span></a>
 <a name="118"><span class="lineNum">     118 </span>            :         }</a>
 <a name="119"><span class="lineNum">     119 </span>            :         else {</a>
-<a name="120"><span class="lineNum">     120 </span><span class="lineCov">    2465043 :             for (FlowIndex I : make_index_range(reduce_index&lt;FlowIndex&gt;(this-&gt;populations.size()))) {</span></a>
-<a name="121"><span class="lineNum">     121 </span><span class="lineCov">     836361 :                 get_rhs_impl(flows, dydt, I);</span></a>
+<a name="120"><span class="lineNum">     120 </span><span class="lineCov">    2528547 :             for (FlowIndex I : make_index_range(reduce_index&lt;FlowIndex&gt;(this-&gt;populations.size()))) {</span></a>
+<a name="121"><span class="lineNum">     121 </span><span class="lineCov">     857529 :                 get_rhs_impl(flows, dydt, I);</span></a>
 <a name="122"><span class="lineNum">     122 </span>            :             }</a>
 <a name="123"><span class="lineNum">     123 </span>            :         }</a>
-<a name="124"><span class="lineNum">     124 </span><span class="lineCov">     814503 :     }</span></a>
+<a name="124"><span class="lineNum">     124 </span><span class="lineCov">     835671 :     }</span></a>
 <a name="125"><span class="lineNum">     125 </span>            : </a>
 <a name="126"><span class="lineNum">     126 </span>            :     /**</a>
 <a name="127"><span class="lineNum">     127 </span>            :      * @brief Compute the right-hand-side f(y, t) of the ODE and store it in dydt.</a>
@@ -196,13 +196,13 @@
 <a name="134"><span class="lineNum">     134 </span>            :      * @param[in] t The current time.</a>
 <a name="135"><span class="lineNum">     135 </span>            :      * @param[out] dydt A reference to the calculated output.</a>
 <a name="136"><span class="lineNum">     136 </span>            :      */</a>
-<a name="137"><span class="lineNum">     137 </span><span class="lineCov">     624717 :     void get_derivatives(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
+<a name="137"><span class="lineNum">     137 </span><span class="lineCov">     645885 :     void get_derivatives(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
 <a name="138"><span class="lineNum">     138 </span>            :                          Eigen::Ref&lt;Vector&lt;FP&gt;&gt; dydt) const override final</a>
 <a name="139"><span class="lineNum">     139 </span>            :     {</a>
-<a name="140"><span class="lineNum">     140 </span><span class="lineCov">     624717 :         m_flow_values.setZero();</span></a>
-<a name="141"><span class="lineNum">     141 </span><span class="lineCov">     624717 :         get_flows(pop, y, t, m_flow_values);</span></a>
-<a name="142"><span class="lineNum">     142 </span><span class="lineCov">     624717 :         get_derivatives(m_flow_values, dydt);</span></a>
-<a name="143"><span class="lineNum">     143 </span><span class="lineCov">     624717 :     }</span></a>
+<a name="140"><span class="lineNum">     140 </span><span class="lineCov">     645885 :         m_flow_values.setZero();</span></a>
+<a name="141"><span class="lineNum">     141 </span><span class="lineCov">     645885 :         get_flows(pop, y, t, m_flow_values);</span></a>
+<a name="142"><span class="lineNum">     142 </span><span class="lineCov">     645885 :         get_derivatives(m_flow_values, dydt);</span></a>
+<a name="143"><span class="lineNum">     143 </span><span class="lineCov">     645885 :     }</span></a>
 <a name="144"><span class="lineNum">     144 </span>            : </a>
 <a name="145"><span class="lineNum">     145 </span>            :     /**</a>
 <a name="146"><span class="lineNum">     146 </span>            :      * @brief Initial values for flows.</a>
@@ -240,15 +240,15 @@
 <a name="178"><span class="lineNum">     178 </span>            :      * @return A flat index into a data structure storing flow values.</a>
 <a name="179"><span class="lineNum">     179 </span>            :      */</a>
 <a name="180"><span class="lineNum">     180 </span>            :     template &lt;Comp Source, Comp Target&gt;</a>
-<a name="181"><span class="lineNum">     181 </span><span class="lineCov">   16206128 :     size_t get_flat_flow_index(const FlowIndex&amp; indices) const</span></a>
+<a name="181"><span class="lineNum">     181 </span><span class="lineCov">   16838576 :     size_t get_flat_flow_index(const FlowIndex&amp; indices) const</span></a>
 <a name="182"><span class="lineNum">     182 </span>            :     {</a>
 <a name="183"><span class="lineNum">     183 </span>            :         if constexpr (std::is_same_v&lt;FlowIndex, Index&lt;&gt;&gt;) {</a>
 <a name="184"><span class="lineNum">     184 </span><span class="lineCov">        756 :             return get_flat_flow_index&lt;Source, Target&gt;();</span></a>
 <a name="185"><span class="lineNum">     185 </span>            :         }</a>
 <a name="186"><span class="lineNum">     186 </span>            :         else {</a>
-<a name="187"><span class="lineNum">     187 </span><span class="lineCov">   16205372 :             const FlowIndex flow_index_dimensions = reduce_index&lt;FlowIndex&gt;(this-&gt;populations.size());</span></a>
-<a name="188"><span class="lineNum">     188 </span><span class="lineCov">   16205372 :             return flatten_index(indices, flow_index_dimensions) * Flows::size() +</span></a>
-<a name="189"><span class="lineNum">     189 </span><span class="lineCov">   16205372 :                    index_of_type_v&lt;Flow&lt;Source, Target&gt;, Flows&gt;;</span></a>
+<a name="187"><span class="lineNum">     187 </span><span class="lineCov">   16837820 :             const FlowIndex flow_index_dimensions = reduce_index&lt;FlowIndex&gt;(this-&gt;populations.size());</span></a>
+<a name="188"><span class="lineNum">     188 </span><span class="lineCov">   16837820 :             return flatten_index(indices, flow_index_dimensions) * Flows::size() +</span></a>
+<a name="189"><span class="lineNum">     189 </span><span class="lineCov">   16837820 :                    index_of_type_v&lt;Flow&lt;Source, Target&gt;, Flows&gt;;</span></a>
 <a name="190"><span class="lineNum">     190 </span>            :         }</a>
 <a name="191"><span class="lineNum">     191 </span>            :     }</a>
 <a name="192"><span class="lineNum">     192 </span>            : </a>
@@ -278,22 +278,22 @@
 <a name="216"><span class="lineNum">     216 </span>            :      * @tparam I The index of a flow in FlowChart.</a>
 <a name="217"><span class="lineNum">     217 </span>            :      */</a>
 <a name="218"><span class="lineNum">     218 </span>            :     template &lt;size_t I = 0&gt;</a>
-<a name="219"><span class="lineNum">     219 </span><span class="lineCov">    8086383 :     inline void get_rhs_impl(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; flows, Eigen::Ref&lt;Vector&lt;FP&gt;&gt; rhs,</span></a>
+<a name="219"><span class="lineNum">     219 </span><span class="lineCov">    8402607 :     inline void get_rhs_impl(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; flows, Eigen::Ref&lt;Vector&lt;FP&gt;&gt; rhs,</span></a>
 <a name="220"><span class="lineNum">     220 </span>            :                              const FlowIndex&amp; index) const</a>
 <a name="221"><span class="lineNum">     221 </span>            :     {</a>
 <a name="222"><span class="lineNum">     222 </span>            :         using Flow                 = type_at_index_t&lt;I, Flows&gt;;</a>
-<a name="223"><span class="lineNum">     223 </span><span class="lineCov">    8086383 :         const auto flat_flow_index = get_flat_flow_index&lt;Flow::source, Flow::target&gt;(index);</span></a>
+<a name="223"><span class="lineNum">     223 </span><span class="lineCov">    8402607 :         const auto flat_flow_index = get_flat_flow_index&lt;Flow::source, Flow::target&gt;(index);</span></a>
 <a name="224"><span class="lineNum">     224 </span>            :         const auto flat_source_population =</a>
-<a name="225"><span class="lineNum">     225 </span><span class="lineCov">    8086383 :             this-&gt;populations.get_flat_index(extend_index&lt;PopIndex&gt;(index, (size_t)Flow::source));</span></a>
+<a name="225"><span class="lineNum">     225 </span><span class="lineCov">    8402607 :             this-&gt;populations.get_flat_index(extend_index&lt;PopIndex&gt;(index, (size_t)Flow::source));</span></a>
 <a name="226"><span class="lineNum">     226 </span>            :         const auto flat_target_population =</a>
-<a name="227"><span class="lineNum">     227 </span><span class="lineCov">    8086383 :             this-&gt;populations.get_flat_index(extend_index&lt;PopIndex&gt;(index, (size_t)Flow::target));</span></a>
-<a name="228"><span class="lineNum">     228 </span><span class="lineCov">    8086383 :         rhs[flat_source_population] -= flows[flat_flow_index]; // subtract outflow from source compartment</span></a>
-<a name="229"><span class="lineNum">     229 </span><span class="lineCov">    8086383 :         rhs[flat_target_population] += flows[flat_flow_index]; // add outflow to target compartment</span></a>
+<a name="227"><span class="lineNum">     227 </span><span class="lineCov">    8402607 :             this-&gt;populations.get_flat_index(extend_index&lt;PopIndex&gt;(index, (size_t)Flow::target));</span></a>
+<a name="228"><span class="lineNum">     228 </span><span class="lineCov">    8402607 :         rhs[flat_source_population] -= flows[flat_flow_index]; // subtract outflow from source compartment</span></a>
+<a name="229"><span class="lineNum">     229 </span><span class="lineCov">    8402607 :         rhs[flat_target_population] += flows[flat_flow_index]; // add outflow to target compartment</span></a>
 <a name="230"><span class="lineNum">     230 </span>            :         // handle next flow (if there is one)</a>
 <a name="231"><span class="lineNum">     231 </span>            :         if constexpr (I + 1 &lt; Flows::size()) {</a>
-<a name="232"><span class="lineNum">     232 </span><span class="lineCov">    7249860 :             get_rhs_impl&lt;I + 1&gt;(flows, rhs, index);</span></a>
+<a name="232"><span class="lineNum">     232 </span><span class="lineCov">    7544916 :             get_rhs_impl&lt;I + 1&gt;(flows, rhs, index);</span></a>
 <a name="233"><span class="lineNum">     233 </span>            :         }</a>
-<a name="234"><span class="lineNum">     234 </span><span class="lineCov">    8086383 :     }</span></a>
+<a name="234"><span class="lineNum">     234 </span><span class="lineCov">    8402607 :     }</span></a>
 <a name="235"><span class="lineNum">     235 </span>            : };</a>
 <a name="236"><span class="lineNum">     236 </span>            : </a>
 <a name="237"><span class="lineNum">     237 </span>            : /**</a>
diff --git a/coverage/cpp/memilio/compartments/flow_simulation.h.func-sort-c.html b/coverage/cpp/memilio/compartments/flow_simulation.h.func-sort-c.html
index 04393f3955..749f99d47b 100644
--- a/coverage/cpp/memilio/compartments/flow_simulation.h.func-sort-c.html
+++ b/coverage/cpp/memilio/compartments/flow_simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
diff --git a/coverage/cpp/memilio/compartments/flow_simulation.h.func.html b/coverage/cpp/memilio/compartments/flow_simulation.h.func.html
index ca30568556..57afa91d05 100644
--- a/coverage/cpp/memilio/compartments/flow_simulation.h.func.html
+++ b/coverage/cpp/memilio/compartments/flow_simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
diff --git a/coverage/cpp/memilio/compartments/flow_simulation.h.gcov.html b/coverage/cpp/memilio/compartments/flow_simulation.h.gcov.html
index 8c0cd37295..4a38656dd4 100644
--- a/coverage/cpp/memilio/compartments/flow_simulation.h.gcov.html
+++ b/coverage/cpp/memilio/compartments/flow_simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
diff --git a/coverage/cpp/memilio/compartments/index-sort-f.html b/coverage/cpp/memilio/compartments/index-sort-f.html
index 2fa6ad6853..888d862ed9 100644
--- a/coverage/cpp/memilio/compartments/index-sort-f.html
+++ b/coverage/cpp/memilio/compartments/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">439</td>
diff --git a/coverage/cpp/memilio/compartments/index-sort-l.html b/coverage/cpp/memilio/compartments/index-sort-l.html
index c9a139a6d4..b9a31786e3 100644
--- a/coverage/cpp/memilio/compartments/index-sort-l.html
+++ b/coverage/cpp/memilio/compartments/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">439</td>
diff --git a/coverage/cpp/memilio/compartments/index.html b/coverage/cpp/memilio/compartments/index.html
index c3c88f2af5..d5d27d691d 100644
--- a/coverage/cpp/memilio/compartments/index.html
+++ b/coverage/cpp/memilio/compartments/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">439</td>
diff --git a/coverage/cpp/memilio/compartments/parameter_studies.h.func-sort-c.html b/coverage/cpp/memilio/compartments/parameter_studies.h.func-sort-c.html
index db9796f8ce..90b5250fb5 100644
--- a/coverage/cpp/memilio/compartments/parameter_studies.h.func-sort-c.html
+++ b/coverage/cpp/memilio/compartments/parameter_studies.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">13</td>
diff --git a/coverage/cpp/memilio/compartments/parameter_studies.h.func.html b/coverage/cpp/memilio/compartments/parameter_studies.h.func.html
index eda6813035..709c2a0ad7 100644
--- a/coverage/cpp/memilio/compartments/parameter_studies.h.func.html
+++ b/coverage/cpp/memilio/compartments/parameter_studies.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">13</td>
diff --git a/coverage/cpp/memilio/compartments/parameter_studies.h.gcov.html b/coverage/cpp/memilio/compartments/parameter_studies.h.gcov.html
index 7317f58d44..ee9c6a1b42 100644
--- a/coverage/cpp/memilio/compartments/parameter_studies.h.gcov.html
+++ b/coverage/cpp/memilio/compartments/parameter_studies.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">13</td>
diff --git a/coverage/cpp/memilio/compartments/simulation.h.func-sort-c.html b/coverage/cpp/memilio/compartments/simulation.h.func-sort-c.html
index 8bd9ae2da0..59873aa02a 100644
--- a/coverage/cpp/memilio/compartments/simulation.h.func-sort-c.html
+++ b/coverage/cpp/memilio/compartments/simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">101</td>
@@ -449,7 +449,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#96">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::advance(double)</a></td>
-              <td class="coverFnHi">27808</td>
+              <td class="coverFnHi">27826</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#135">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::get_model() const</a></td>
@@ -457,23 +457,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#99">auto mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::advance(double)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;, auto:3&amp;&amp;)#1}::operator()&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;, double&amp;&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;) const</a></td>
-              <td class="coverFnHi">170001</td>
+              <td class="coverFnHi">170109</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#140">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::get_model()</a></td>
-              <td class="coverFnHi">359537</td>
+              <td class="coverFnHi">359645</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#99">auto mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt;::advance(double)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;, auto:3&amp;&amp;)#1}::operator()&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;, double&amp;&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;) const</a></td>
-              <td class="coverFnHi">393810</td>
+              <td class="coverFnHi">414870</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#140">mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt;::get_model()</a></td>
-              <td class="coverFnHi">394710</td>
+              <td class="coverFnHi">415770</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#115">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::get_result()</a></td>
-              <td class="coverFnHi">919417</td>
+              <td class="coverFnHi">919489</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/compartments/simulation.h.func.html b/coverage/cpp/memilio/compartments/simulation.h.func.html
index aac632365d..83d214eb11 100644
--- a/coverage/cpp/memilio/compartments/simulation.h.func.html
+++ b/coverage/cpp/memilio/compartments/simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">101</td>
@@ -125,7 +125,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#115">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::get_result()</a></td>
-              <td class="coverFnHi">919417</td>
+              <td class="coverFnHi">919489</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#65">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::set_integrator(std::shared_ptr&lt;mio::IntegratorCore&lt;double&gt; &gt;)</a></td>
@@ -141,11 +141,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#96">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::advance(double)</a></td>
-              <td class="coverFnHi">27808</td>
+              <td class="coverFnHi">27826</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#140">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::get_model()</a></td>
-              <td class="coverFnHi">359537</td>
+              <td class="coverFnHi">359645</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#52">mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::Simulation(mio::oseir::Model&lt;double&gt; const&amp;, double, double)</a></td>
@@ -277,7 +277,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#140">mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt;::get_model()</a></td>
-              <td class="coverFnHi">394710</td>
+              <td class="coverFnHi">415770</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#52">mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt;::Simulation(mio::osecir::Model&lt;double&gt; const&amp;, double, double)</a></td>
@@ -441,7 +441,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#99">auto mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;::advance(double)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;, auto:3&amp;&amp;)#1}::operator()&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;, double&amp;&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;) const</a></td>
-              <td class="coverFnHi">170001</td>
+              <td class="coverFnHi">170109</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#99">auto mio::Simulation&lt;double, mio::lsecir::Model&lt;mio::LctInfectionState&lt;mio::lsecir::InfectionState, 1ul, 1ul, 1ul, 1ul, 1ul, 1ul, 1ul, 1ul&gt; &gt; &gt;::advance(double)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;, auto:3&amp;&amp;)#1}::operator()&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;, double&amp;&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;) const</a></td>
@@ -461,7 +461,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#99">auto mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt;::advance(double)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;, auto:3&amp;&amp;)#1}::operator()&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;, double&amp;&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;) const</a></td>
-              <td class="coverFnHi">393810</td>
+              <td class="coverFnHi">414870</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="simulation.h.gcov.html#99">auto mio::Simulation&lt;double, mio::glsecir::Model&lt;2ul, 6ul, 2ul, 2ul, 10ul&gt; &gt;::advance(double)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;, auto:3&amp;&amp;)#1}::operator()&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;, double&amp;&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/compartments/simulation.h.gcov.html b/coverage/cpp/memilio/compartments/simulation.h.gcov.html
index c1b8f0989c..2187555da0 100644
--- a/coverage/cpp/memilio/compartments/simulation.h.gcov.html
+++ b/coverage/cpp/memilio/compartments/simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">101</td>
@@ -157,13 +157,13 @@
 <a name="95"><span class="lineNum">      95 </span>            :      * tmax must be greater than get_result().get_last_time_point()</a>
 <a name="96"><span class="lineNum">      96 </span>            :      * @param tmax next stopping point of simulation</a>
 <a name="97"><span class="lineNum">      97 </span>            :      */</a>
-<a name="98"><span class="lineNum">      98 </span><span class="lineCov">      28727 :     Eigen::Ref&lt;Vector&lt;FP&gt;&gt; advance(FP tmax)</span></a>
+<a name="98"><span class="lineNum">      98 </span><span class="lineCov">      28745 :     Eigen::Ref&lt;Vector&lt;FP&gt;&gt; advance(FP tmax)</span></a>
 <a name="99"><span class="lineNum">      99 </span>            :     {</a>
 <a name="100"><span class="lineNum">     100 </span>            :         return m_integrator.advance(</a>
-<a name="101"><span class="lineNum">     101 </span><span class="lineCov">    1736793 :             [this](auto&amp;&amp; y, auto&amp;&amp; t, auto&amp;&amp; dydt) {</span></a>
-<a name="102"><span class="lineNum">     102 </span><span class="lineCov">    1157862 :                 get_model().eval_right_hand_side(y, y, t, dydt);</span></a>
+<a name="101"><span class="lineNum">     101 </span><span class="lineCov">    1800297 :             [this](auto&amp;&amp; y, auto&amp;&amp; t, auto&amp;&amp; dydt) {</span></a>
+<a name="102"><span class="lineNum">     102 </span><span class="lineCov">    1200198 :                 get_model().eval_right_hand_side(y, y, t, dydt);</span></a>
 <a name="103"><span class="lineNum">     103 </span>            :             },</a>
-<a name="104"><span class="lineNum">     104 </span><span class="lineCov">      28727 :             tmax, m_dt, m_result);</span></a>
+<a name="104"><span class="lineNum">     104 </span><span class="lineCov">      28745 :             tmax, m_dt, m_result);</span></a>
 <a name="105"><span class="lineNum">     105 </span>            :     }</a>
 <a name="106"><span class="lineNum">     106 </span>            : </a>
 <a name="107"><span class="lineNum">     107 </span>            :     /**</a>
@@ -176,9 +176,9 @@
 <a name="114"><span class="lineNum">     114 </span>            :      * For each simulated time step, the TimeSeries contains the population size in each compartment.</a>
 <a name="115"><span class="lineNum">     115 </span>            :      * @{</a>
 <a name="116"><span class="lineNum">     116 </span>            :      */</a>
-<a name="117"><span class="lineNum">     117 </span><span class="lineCov">     922861 :     TimeSeries&lt;FP&gt;&amp; get_result()</span></a>
+<a name="117"><span class="lineNum">     117 </span><span class="lineCov">     922933 :     TimeSeries&lt;FP&gt;&amp; get_result()</span></a>
 <a name="118"><span class="lineNum">     118 </span>            :     {</a>
-<a name="119"><span class="lineNum">     119 </span><span class="lineCov">     922861 :         return m_result;</span></a>
+<a name="119"><span class="lineNum">     119 </span><span class="lineCov">     922933 :         return m_result;</span></a>
 <a name="120"><span class="lineNum">     120 </span>            :     }</a>
 <a name="121"><span class="lineNum">     121 </span>            : </a>
 <a name="122"><span class="lineNum">     122 </span>            :     /**</a>
@@ -201,9 +201,9 @@
 <a name="139"><span class="lineNum">     139 </span><span class="lineCov">      65202 :         return *m_model;</span></a>
 <a name="140"><span class="lineNum">     140 </span>            :     }</a>
 <a name="141"><span class="lineNum">     141 </span>            : </a>
-<a name="142"><span class="lineNum">     142 </span><span class="lineCov">     772320 :     Model&amp; get_model()</span></a>
+<a name="142"><span class="lineNum">     142 </span><span class="lineCov">     793488 :     Model&amp; get_model()</span></a>
 <a name="143"><span class="lineNum">     143 </span>            :     {</a>
-<a name="144"><span class="lineNum">     144 </span><span class="lineCov">     772320 :         return *m_model;</span></a>
+<a name="144"><span class="lineNum">     144 </span><span class="lineCov">     793488 :         return *m_model;</span></a>
 <a name="145"><span class="lineNum">     145 </span>            :     }</a>
 <a name="146"><span class="lineNum">     146 </span>            :     /** @} */</a>
 <a name="147"><span class="lineNum">     147 </span>            : </a>
diff --git a/coverage/cpp/memilio/config.h.func-sort-c.html b/coverage/cpp/memilio/config.h.func-sort-c.html
index 6b7eb76b67..f9535a6929 100644
--- a/coverage/cpp/memilio/config.h.func-sort-c.html
+++ b/coverage/cpp/memilio/config.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="config.h.gcov.html#63">mio::Limits&lt;double&gt;::zero_tolerance()</a></td>
-              <td class="coverFnHi">876165</td>
+              <td class="coverFnHi">897333</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/config.h.func.html b/coverage/cpp/memilio/config.h.func.html
index f52e522b47..6f4f717fdd 100644
--- a/coverage/cpp/memilio/config.h.func.html
+++ b/coverage/cpp/memilio/config.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="config.h.gcov.html#63">mio::Limits&lt;double&gt;::zero_tolerance()</a></td>
-              <td class="coverFnHi">876165</td>
+              <td class="coverFnHi">897333</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/config.h.gcov.html b/coverage/cpp/memilio/config.h.gcov.html
index 5110b35c71..8ebc215692 100644
--- a/coverage/cpp/memilio/config.h.gcov.html
+++ b/coverage/cpp/memilio/config.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
@@ -124,9 +124,9 @@
 <a name="62"><span class="lineNum">      62 </span>            : template &lt;&gt;</a>
 <a name="63"><span class="lineNum">      63 </span>            : struct Limits&lt;double&gt; {</a>
 <a name="64"><span class="lineNum">      64 </span>            :     /// @brief Returns the limit under which a double may be rounded down to zero.</a>
-<a name="65"><span class="lineNum">      65 </span><span class="lineCov">     876165 :     static constexpr double zero_tolerance()</span></a>
+<a name="65"><span class="lineNum">      65 </span><span class="lineCov">     897333 :     static constexpr double zero_tolerance()</span></a>
 <a name="66"><span class="lineNum">      66 </span>            :     {</a>
-<a name="67"><span class="lineNum">      67 </span><span class="lineCov">     876165 :         return 1e-12;</span></a>
+<a name="67"><span class="lineNum">      67 </span><span class="lineCov">     897333 :         return 1e-12;</span></a>
 <a name="68"><span class="lineNum">      68 </span>            :     }</a>
 <a name="69"><span class="lineNum">      69 </span>            : };</a>
 <a name="70"><span class="lineNum">      70 </span>            : /** @} */</a>
diff --git a/coverage/cpp/memilio/data/analyze_result.cpp.func-sort-c.html b/coverage/cpp/memilio/data/analyze_result.cpp.func-sort-c.html
index 6433478b69..ebad33a098 100644
--- a/coverage/cpp/memilio/data/analyze_result.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/data/analyze_result.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/memilio/data/analyze_result.cpp.func.html b/coverage/cpp/memilio/data/analyze_result.cpp.func.html
index 0e894b0d1a..9c18a176db 100644
--- a/coverage/cpp/memilio/data/analyze_result.cpp.func.html
+++ b/coverage/cpp/memilio/data/analyze_result.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/memilio/data/analyze_result.cpp.gcov.html b/coverage/cpp/memilio/data/analyze_result.cpp.gcov.html
index cff4320865..d182d72469 100644
--- a/coverage/cpp/memilio/data/analyze_result.cpp.gcov.html
+++ b/coverage/cpp/memilio/data/analyze_result.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/memilio/data/analyze_result.h.func-sort-c.html b/coverage/cpp/memilio/data/analyze_result.h.func-sort-c.html
index 256dcac921..1d6230b47c 100644
--- a/coverage/cpp/memilio/data/analyze_result.h.func-sort-c.html
+++ b/coverage/cpp/memilio/data/analyze_result.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/memilio/data/analyze_result.h.func.html b/coverage/cpp/memilio/data/analyze_result.h.func.html
index 11a96ad820..21e417ab1d 100644
--- a/coverage/cpp/memilio/data/analyze_result.h.func.html
+++ b/coverage/cpp/memilio/data/analyze_result.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/memilio/data/analyze_result.h.gcov.html b/coverage/cpp/memilio/data/analyze_result.h.gcov.html
index a1dc97a22f..85ecb73f05 100644
--- a/coverage/cpp/memilio/data/analyze_result.h.gcov.html
+++ b/coverage/cpp/memilio/data/analyze_result.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/memilio/data/index-sort-f.html b/coverage/cpp/memilio/data/index-sort-f.html
index cbcff79317..b37786a918 100644
--- a/coverage/cpp/memilio/data/index-sort-f.html
+++ b/coverage/cpp/memilio/data/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/memilio/data/index-sort-l.html b/coverage/cpp/memilio/data/index-sort-l.html
index a223b9b34f..f401217cf8 100644
--- a/coverage/cpp/memilio/data/index-sort-l.html
+++ b/coverage/cpp/memilio/data/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/memilio/data/index.html b/coverage/cpp/memilio/data/index.html
index 8cc8afb190..fbcdf59fec 100644
--- a/coverage/cpp/memilio/data/index.html
+++ b/coverage/cpp/memilio/data/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/memilio/epidemiology/age_group.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/age_group.h.func-sort-c.html
index 8cd321257a..107c3dd74e 100644
--- a/coverage/cpp/memilio/epidemiology/age_group.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/age_group.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="age_group.h.gcov.html#31">mio::AgeGroup::AgeGroup(unsigned long)</a></td>
-              <td class="coverFnHi">5003507</td>
+              <td class="coverFnHi">5066705</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/epidemiology/age_group.h.func.html b/coverage/cpp/memilio/epidemiology/age_group.h.func.html
index 378caf60ea..e87970509b 100644
--- a/coverage/cpp/memilio/epidemiology/age_group.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/age_group.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="age_group.h.gcov.html#31">mio::AgeGroup::AgeGroup(unsigned long)</a></td>
-              <td class="coverFnHi">5003507</td>
+              <td class="coverFnHi">5066705</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/epidemiology/age_group.h.gcov.html b/coverage/cpp/memilio/epidemiology/age_group.h.gcov.html
index 90a495e3c6..0a496ea7cf 100644
--- a/coverage/cpp/memilio/epidemiology/age_group.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/age_group.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
@@ -92,10 +92,10 @@
 <a name="30"><span class="lineNum">      30 </span>            :  * sized tag for all age dependent categories</a>
 <a name="31"><span class="lineNum">      31 </span>            :  */</a>
 <a name="32"><span class="lineNum">      32 </span>            : struct AgeGroup : public Index&lt;AgeGroup&gt; {</a>
-<a name="33"><span class="lineNum">      33 </span><span class="lineCov">    5003507 :     AgeGroup(size_t val)</span></a>
-<a name="34"><span class="lineNum">      34 </span><span class="lineCov">    5003507 :         : Index&lt;AgeGroup&gt;(val)</span></a>
+<a name="33"><span class="lineNum">      33 </span><span class="lineCov">    5066705 :     AgeGroup(size_t val)</span></a>
+<a name="34"><span class="lineNum">      34 </span><span class="lineCov">    5066705 :         : Index&lt;AgeGroup&gt;(val)</span></a>
 <a name="35"><span class="lineNum">      35 </span>            :     {</a>
-<a name="36"><span class="lineNum">      36 </span><span class="lineCov">    5003507 :     }</span></a>
+<a name="36"><span class="lineNum">      36 </span><span class="lineCov">    5066705 :     }</span></a>
 <a name="37"><span class="lineNum">      37 </span>            : </a>
 <a name="38"><span class="lineNum">      38 </span>            :     /**</a>
 <a name="39"><span class="lineNum">      39 </span>            :      * Override deserialize of base class</a>
diff --git a/coverage/cpp/memilio/epidemiology/contact_matrix.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/contact_matrix.h.func-sort-c.html
index 36841f92eb..1dd03316e8 100644
--- a/coverage/cpp/memilio/epidemiology/contact_matrix.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/contact_matrix.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">129</td>
@@ -557,7 +557,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#133">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_baseline()</a></td>
-              <td class="coverFnHi">6012</td>
+              <td class="coverFnHi">6084</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#389">auto mio::DampingMatrixExpressionGroup&lt;mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; &gt;::get_matrix_at&lt;double&gt;(double) const</a></td>
@@ -581,39 +581,39 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#185">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">271462</td>
+              <td class="coverFnHi">271471</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#189">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_matrix_at(double) const</a></td>
-              <td class="coverFnHi">271462</td>
+              <td class="coverFnHi">271471</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#389">auto mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_matrix_at&lt;double&gt;(double) const</a></td>
-              <td class="coverFnHi">878813</td>
+              <td class="coverFnHi">899981</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#392">mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_matrix_at&lt;double&gt;(double) const::{lambda(long, long)#1}::operator()(long, long) const</a></td>
-              <td class="coverFnHi">878925</td>
+              <td class="coverFnHi">900093</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#393">auto mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_matrix_at&lt;double&gt;(double) const::{lambda(long, long)#1}::operator()(long, long) const::{lambda(double, auto:1&amp;)#1}::operator()&lt;mio::ContactMatrix const&gt;(double, mio::ContactMatrix const&amp;) const</a></td>
-              <td class="coverFnHi">879177</td>
+              <td class="coverFnHi">900345</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#185">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">879558</td>
+              <td class="coverFnHi">900726</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#189">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt;::get_matrix_at(double) const</a></td>
-              <td class="coverFnHi">879558</td>
+              <td class="coverFnHi">900726</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#332">mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_shape() const</a></td>
-              <td class="coverFnHi">1757626</td>
+              <td class="coverFnHi">1799962</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#153">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt;::get_shape() const</a></td>
-              <td class="coverFnHi">1758989</td>
+              <td class="coverFnHi">1801325</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/epidemiology/contact_matrix.h.func.html b/coverage/cpp/memilio/epidemiology/contact_matrix.h.func.html
index 273ddf809f..985e9e5d6e 100644
--- a/coverage/cpp/memilio/epidemiology/contact_matrix.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/contact_matrix.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">129</td>
@@ -153,7 +153,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#133">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_baseline()</a></td>
-              <td class="coverFnHi">6012</td>
+              <td class="coverFnHi">6084</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#121">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_dampings()</a></td>
@@ -457,11 +457,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#185">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">271462</td>
+              <td class="coverFnHi">271471</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#189">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_matrix_at(double) const</a></td>
-              <td class="coverFnHi">271462</td>
+              <td class="coverFnHi">271471</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#153">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::get_shape() const</a></td>
@@ -489,15 +489,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#185">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">879558</td>
+              <td class="coverFnHi">900726</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#189">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt;::get_matrix_at(double) const</a></td>
-              <td class="coverFnHi">879558</td>
+              <td class="coverFnHi">900726</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#153">mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt;::get_shape() const</a></td>
-              <td class="coverFnHi">1758989</td>
+              <td class="coverFnHi">1801325</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#209">void mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -513,7 +513,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#389">auto mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_matrix_at&lt;double&gt;(double) const</a></td>
-              <td class="coverFnHi">878813</td>
+              <td class="coverFnHi">899981</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#324">mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_num_matrices() const</a></td>
@@ -529,7 +529,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#332">mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_shape() const</a></td>
-              <td class="coverFnHi">1757626</td>
+              <td class="coverFnHi">1799962</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#435">void mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -601,7 +601,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#392">mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_matrix_at&lt;double&gt;(double) const::{lambda(long, long)#1}::operator()(long, long) const</a></td>
-              <td class="coverFnHi">878925</td>
+              <td class="coverFnHi">900093</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#392">mio::DampingMatrixExpressionGroup&lt;mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; &gt;::get_matrix_at&lt;double&gt;(double) const::{lambda(long, long)#1}::operator()(long, long) const</a></td>
@@ -609,7 +609,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#393">auto mio::DampingMatrixExpressionGroup&lt;mio::ContactMatrix&gt;::get_matrix_at&lt;double&gt;(double) const::{lambda(long, long)#1}::operator()(long, long) const::{lambda(double, auto:1&amp;)#1}::operator()&lt;mio::ContactMatrix const&gt;(double, mio::ContactMatrix const&amp;) const</a></td>
-              <td class="coverFnHi">879177</td>
+              <td class="coverFnHi">900345</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="contact_matrix.h.gcov.html#393">auto mio::DampingMatrixExpressionGroup&lt;mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; &gt;::get_matrix_at&lt;double&gt;(double) const::{lambda(long, long)#1}::operator()(long, long) const::{lambda(double, auto:1&amp;)#1}::operator()&lt;mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; const&gt;(double, mio::DampingMatrixExpression&lt;mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; const&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/epidemiology/contact_matrix.h.gcov.html b/coverage/cpp/memilio/epidemiology/contact_matrix.h.gcov.html
index b3659f1cb8..97d63d3291 100644
--- a/coverage/cpp/memilio/epidemiology/contact_matrix.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/contact_matrix.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">129</td>
@@ -194,9 +194,9 @@
 <a name="132"><span class="lineNum">     132 </span>            :     {</a>
 <a name="133"><span class="lineNum">     133 </span><span class="lineCov">         80 :         return m_baseline;</span></a>
 <a name="134"><span class="lineNum">     134 </span>            :     }</a>
-<a name="135"><span class="lineNum">     135 </span><span class="lineCov">       6764 :     Matrix&amp; get_baseline()</span></a>
+<a name="135"><span class="lineNum">     135 </span><span class="lineCov">       6836 :     Matrix&amp; get_baseline()</span></a>
 <a name="136"><span class="lineNum">     136 </span>            :     {</a>
-<a name="137"><span class="lineNum">     137 </span><span class="lineCov">       6764 :         return m_baseline;</span></a>
+<a name="137"><span class="lineNum">     137 </span><span class="lineCov">       6836 :         return m_baseline;</span></a>
 <a name="138"><span class="lineNum">     138 </span>            :     }</a>
 <a name="139"><span class="lineNum">     139 </span>            : </a>
 <a name="140"><span class="lineNum">     140 </span>            :     /**</a>
@@ -214,9 +214,9 @@
 <a name="152"><span class="lineNum">     152 </span>            :     /**</a>
 <a name="153"><span class="lineNum">     153 </span>            :      * dimensions of the matrix.</a>
 <a name="154"><span class="lineNum">     154 </span>            :      */</a>
-<a name="155"><span class="lineNum">     155 </span><span class="lineCov">    1975611 :     Shape get_shape() const</span></a>
+<a name="155"><span class="lineNum">     155 </span><span class="lineCov">    2017947 :     Shape get_shape() const</span></a>
 <a name="156"><span class="lineNum">     156 </span>            :     {</a>
-<a name="157"><span class="lineNum">     157 </span><span class="lineCov">    1975611 :         return Shape::get_shape_of(m_baseline);</span></a>
+<a name="157"><span class="lineNum">     157 </span><span class="lineCov">    2017947 :         return Shape::get_shape_of(m_baseline);</span></a>
 <a name="158"><span class="lineNum">     158 </span>            :     }</a>
 <a name="159"><span class="lineNum">     159 </span>            : </a>
 <a name="160"><span class="lineNum">     160 </span>            :     /**</a>
@@ -246,13 +246,13 @@
 <a name="184"><span class="lineNum">     184 </span>            :      * @param t time in the simulation</a>
 <a name="185"><span class="lineNum">     185 </span>            :      * @return matrix expression (num_groups x num_groups)</a>
 <a name="186"><span class="lineNum">     186 </span>            :      */</a>
-<a name="187"><span class="lineNum">     187 </span><span class="lineCov">    1151020 :     auto get_matrix_at(SimulationTime t) const</span></a>
+<a name="187"><span class="lineNum">     187 </span><span class="lineCov">    1172197 :     auto get_matrix_at(SimulationTime t) const</span></a>
 <a name="188"><span class="lineNum">     188 </span>            :     {</a>
-<a name="189"><span class="lineNum">     189 </span><span class="lineCov">    1151020 :         return m_baseline - (m_dampings.get_matrix_at(t).array() * (m_baseline - m_minimum).array()).matrix();</span></a>
+<a name="189"><span class="lineNum">     189 </span><span class="lineCov">    1172197 :         return m_baseline - (m_dampings.get_matrix_at(t).array() * (m_baseline - m_minimum).array()).matrix();</span></a>
 <a name="190"><span class="lineNum">     190 </span>            :     }</a>
-<a name="191"><span class="lineNum">     191 </span><span class="lineCov">    1151020 :     auto get_matrix_at(double t) const</span></a>
+<a name="191"><span class="lineNum">     191 </span><span class="lineCov">    1172197 :     auto get_matrix_at(double t) const</span></a>
 <a name="192"><span class="lineNum">     192 </span>            :     {</a>
-<a name="193"><span class="lineNum">     193 </span><span class="lineCov">    1151020 :         return get_matrix_at(SimulationTime(t));</span></a>
+<a name="193"><span class="lineNum">     193 </span><span class="lineCov">    1172197 :         return get_matrix_at(SimulationTime(t));</span></a>
 <a name="194"><span class="lineNum">     194 </span>            :     }</a>
 <a name="195"><span class="lineNum">     195 </span>            : </a>
 <a name="196"><span class="lineNum">     196 </span>            :     /**</a>
@@ -393,9 +393,9 @@
 <a name="331"><span class="lineNum">     331 </span>            :     /**</a>
 <a name="332"><span class="lineNum">     332 </span>            :      * get the number of groups.</a>
 <a name="333"><span class="lineNum">     333 </span>            :      */</a>
-<a name="334"><span class="lineNum">     334 </span><span class="lineCov">    1974070 :     Shape get_shape() const</span></a>
+<a name="334"><span class="lineNum">     334 </span><span class="lineCov">    2016406 :     Shape get_shape() const</span></a>
 <a name="335"><span class="lineNum">     335 </span>            :     {</a>
-<a name="336"><span class="lineNum">     336 </span><span class="lineCov">    1974070 :         return m_matrices[0].get_shape();</span></a>
+<a name="336"><span class="lineNum">     336 </span><span class="lineCov">    2016406 :         return m_matrices[0].get_shape();</span></a>
 <a name="337"><span class="lineNum">     337 </span>            :     }</a>
 <a name="338"><span class="lineNum">     338 </span>            : </a>
 <a name="339"><span class="lineNum">     339 </span>            :     /** </a>
@@ -450,14 +450,14 @@
 <a name="388"><span class="lineNum">     388 </span>            :      * @return matrix expression of size num_groups x num_groups</a>
 <a name="389"><span class="lineNum">     389 </span>            :      */</a>
 <a name="390"><span class="lineNum">     390 </span>            :     template &lt;class T&gt;</a>
-<a name="391"><span class="lineNum">     391 </span><span class="lineCov">     987013 :     auto get_matrix_at(T t) const</span></a>
+<a name="391"><span class="lineNum">     391 </span><span class="lineCov">    1008181 :     auto get_matrix_at(T t) const</span></a>
 <a name="392"><span class="lineNum">     392 </span>            :     {</a>
-<a name="393"><span class="lineNum">     393 </span><span class="lineCov">    3948052 :         return Eigen::MatrixXd::NullaryExpr(</span></a>
-<a name="394"><span class="lineNum">     394 </span><span class="lineCov">    8711444 :             get_shape().rows(), get_shape().cols(), [t, this](Eigen::Index i, Eigen::Index j) {</span></a>
-<a name="395"><span class="lineNum">     395 </span><span class="lineCov">    7171894 :                 return std::accumulate(m_matrices.begin(), m_matrices.end(), 0.0, [t, i, j](double s, auto&amp; m) {</span></a>
-<a name="396"><span class="lineNum">     396 </span><span class="lineCov">    2571822 :                     return s + m.get_matrix_at(t)(i, j);</span></a>
-<a name="397"><span class="lineNum">     397 </span><span class="lineCov">    1150081 :                 });</span></a>
-<a name="398"><span class="lineNum">     398 </span><span class="lineCov">    1974026 :             });</span></a>
+<a name="393"><span class="lineNum">     393 </span><span class="lineCov">    4032724 :         return Eigen::MatrixXd::NullaryExpr(</span></a>
+<a name="394"><span class="lineNum">     394 </span><span class="lineCov">    8880788 :             get_shape().rows(), get_shape().cols(), [t, this](Eigen::Index i, Eigen::Index j) {</span></a>
+<a name="395"><span class="lineNum">     395 </span><span class="lineCov">    7298902 :                 return std::accumulate(m_matrices.begin(), m_matrices.end(), 0.0, [t, i, j](double s, auto&amp; m) {</span></a>
+<a name="396"><span class="lineNum">     396 </span><span class="lineCov">    2614158 :                     return s + m.get_matrix_at(t)(i, j);</span></a>
+<a name="397"><span class="lineNum">     397 </span><span class="lineCov">    1171249 :                 });</span></a>
+<a name="398"><span class="lineNum">     398 </span><span class="lineCov">    2016362 :             });</span></a>
 <a name="399"><span class="lineNum">     399 </span>            :     }</a>
 <a name="400"><span class="lineNum">     400 </span>            : </a>
 <a name="401"><span class="lineNum">     401 </span>            :     /**</a>
diff --git a/coverage/cpp/memilio/epidemiology/damping.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/damping.h.func-sort-c.html
index f629d4e69e..93c837856b 100644
--- a/coverage/cpp/memilio/epidemiology/damping.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/damping.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">136</td>
@@ -669,19 +669,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#350">mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">271525</td>
+              <td class="coverFnHi">271534</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#356">auto mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#1}::operator()&lt;std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, mio::SimulationTime&gt; const&amp;&gt;(std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, mio::SimulationTime&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">543068</td>
+              <td class="coverFnHi">543086</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#350">mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">879693</td>
+              <td class="coverFnHi">900861</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#356">auto mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#1}::operator()&lt;std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, mio::SimulationTime&gt; const&amp;&gt;(std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, mio::SimulationTime&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">1789709</td>
+              <td class="coverFnHi">1832045</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/epidemiology/damping.h.func.html b/coverage/cpp/memilio/epidemiology/damping.h.func.html
index 13a9e7173e..54540f98d1 100644
--- a/coverage/cpp/memilio/epidemiology/damping.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/damping.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">136</td>
@@ -561,7 +561,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#350">mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">271525</td>
+              <td class="coverFnHi">271534</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#364">mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt;::get_matrix_at(double) const</a></td>
@@ -581,7 +581,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#350">mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const</a></td>
-              <td class="coverFnHi">879693</td>
+              <td class="coverFnHi">900861</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#364">mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt;::get_matrix_at(double) const</a></td>
@@ -677,11 +677,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#356">auto mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#1}::operator()&lt;std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, mio::SimulationTime&gt; const&amp;&gt;(std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, mio::SimulationTime&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">543068</td>
+              <td class="coverFnHi">543086</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="damping.h.gcov.html#356">auto mio::Dampings&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt;::get_matrix_at(mio::SimulationTime) const::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#1}::operator()&lt;std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, mio::SimulationTime&gt; const&amp;&gt;(std::tuple&lt;mio::SimulationTime&gt; const&amp;, std::tuple&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, mio::SimulationTime&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">1789709</td>
+              <td class="coverFnHi">1832045</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/epidemiology/damping.h.gcov.html b/coverage/cpp/memilio/epidemiology/damping.h.gcov.html
index a1d92c8f1e..82dbdb1c2a 100644
--- a/coverage/cpp/memilio/epidemiology/damping.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/damping.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">136</td>
@@ -411,19 +411,19 @@
 <a name="349"><span class="lineNum">     349 </span>            :      * @param t time in the simulation</a>
 <a name="350"><span class="lineNum">     350 </span>            :      * @return matrix expression </a>
 <a name="351"><span class="lineNum">     351 </span>            :      */</a>
-<a name="352"><span class="lineNum">     352 </span><span class="lineCov">    1151326 :     auto get_matrix_at(SimulationTime t) const</span></a>
+<a name="352"><span class="lineNum">     352 </span><span class="lineCov">    1172503 :     auto get_matrix_at(SimulationTime t) const</span></a>
 <a name="353"><span class="lineNum">     353 </span>            :     {</a>
-<a name="354"><span class="lineNum">     354 </span><span class="lineCov">    1151326 :         assert(!m_accumulated_dampings_cached.empty() &amp;&amp;</span></a>
+<a name="354"><span class="lineNum">     354 </span><span class="lineCov">    1172503 :         assert(!m_accumulated_dampings_cached.empty() &amp;&amp;</span></a>
 <a name="355"><span class="lineNum">     355 </span>            :                &quot;Cache is not current. Did you disable the automatic cache update?&quot;);</a>
-<a name="356"><span class="lineNum">     356 </span><span class="lineCov">    1151326 :         auto ub =</span></a>
-<a name="357"><span class="lineNum">     357 </span><span class="lineCov">    1151326 :             std::upper_bound(m_accumulated_dampings_cached.begin(), m_accumulated_dampings_cached.end(),</span></a>
-<a name="358"><span class="lineNum">     358 </span><span class="lineCov">    2333029 :                              std::make_tuple(t), [](auto&amp;&amp; tup1, auto&amp;&amp; tup2) {</span></a>
-<a name="359"><span class="lineNum">     359 </span><span class="lineCov">    2333029 :                                  return double(std::get&lt;SimulationTime&gt;(tup1)) &lt; double(std::get&lt;SimulationTime&gt;(tup2));</span></a>
+<a name="356"><span class="lineNum">     356 </span><span class="lineCov">    1172503 :         auto ub =</span></a>
+<a name="357"><span class="lineNum">     357 </span><span class="lineCov">    1172503 :             std::upper_bound(m_accumulated_dampings_cached.begin(), m_accumulated_dampings_cached.end(),</span></a>
+<a name="358"><span class="lineNum">     358 </span><span class="lineCov">    2375383 :                              std::make_tuple(t), [](auto&amp;&amp; tup1, auto&amp;&amp; tup2) {</span></a>
+<a name="359"><span class="lineNum">     359 </span><span class="lineCov">    2375383 :                                  return double(std::get&lt;SimulationTime&gt;(tup1)) &lt; double(std::get&lt;SimulationTime&gt;(tup2));</span></a>
 <a name="360"><span class="lineNum">     360 </span>            :                              });</a>
-<a name="361"><span class="lineNum">     361 </span><span class="lineCov">    1151326 :         auto damping =</span></a>
-<a name="362"><span class="lineNum">     362 </span><span class="lineCov">    2302652 :             smoother_cosine(double(t), double(std::get&lt;SimulationTime&gt;(*ub)) - 1, double(std::get&lt;SimulationTime&gt;(*ub)),</span></a>
-<a name="363"><span class="lineNum">     363 </span><span class="lineCov">    3453978 :                             std::get&lt;Matrix&gt;(*(ub - 1)), std::get&lt;Matrix&gt;(*ub));</span></a>
-<a name="364"><span class="lineNum">     364 </span><span class="lineCov">    2302652 :         return damping;</span></a>
+<a name="361"><span class="lineNum">     361 </span><span class="lineCov">    1172503 :         auto damping =</span></a>
+<a name="362"><span class="lineNum">     362 </span><span class="lineCov">    2345006 :             smoother_cosine(double(t), double(std::get&lt;SimulationTime&gt;(*ub)) - 1, double(std::get&lt;SimulationTime&gt;(*ub)),</span></a>
+<a name="363"><span class="lineNum">     363 </span><span class="lineCov">    3517509 :                             std::get&lt;Matrix&gt;(*(ub - 1)), std::get&lt;Matrix&gt;(*ub));</span></a>
+<a name="364"><span class="lineNum">     364 </span><span class="lineCov">    2345006 :         return damping;</span></a>
 <a name="365"><span class="lineNum">     365 </span>            :     }</a>
 <a name="366"><span class="lineNum">     366 </span><span class="lineCov">        306 :     auto get_matrix_at(double t) const</span></a>
 <a name="367"><span class="lineNum">     367 </span>            :     {</a>
diff --git a/coverage/cpp/memilio/epidemiology/damping_sampling.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/damping_sampling.h.func-sort-c.html
index 2197126c89..c927a2c1a0 100644
--- a/coverage/cpp/memilio/epidemiology/damping_sampling.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/damping_sampling.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">29</td>
diff --git a/coverage/cpp/memilio/epidemiology/damping_sampling.h.func.html b/coverage/cpp/memilio/epidemiology/damping_sampling.h.func.html
index 6c49ea0fc2..f98f4fe1e9 100644
--- a/coverage/cpp/memilio/epidemiology/damping_sampling.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/damping_sampling.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">29</td>
diff --git a/coverage/cpp/memilio/epidemiology/damping_sampling.h.gcov.html b/coverage/cpp/memilio/epidemiology/damping_sampling.h.gcov.html
index 4187674aa5..7861d0a120 100644
--- a/coverage/cpp/memilio/epidemiology/damping_sampling.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/damping_sampling.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">29</td>
diff --git a/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func-sort-c.html
index a78a125e03..8c33e01675 100644
--- a/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">40</td>
diff --git a/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func.html b/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func.html
index 299d760468..f2aeaefefd 100644
--- a/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/dynamic_npis.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">40</td>
diff --git a/coverage/cpp/memilio/epidemiology/dynamic_npis.h.gcov.html b/coverage/cpp/memilio/epidemiology/dynamic_npis.h.gcov.html
index 5f5f654dd8..7d10f398a9 100644
--- a/coverage/cpp/memilio/epidemiology/dynamic_npis.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/dynamic_npis.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">40</td>
diff --git a/coverage/cpp/memilio/epidemiology/index-sort-f.html b/coverage/cpp/memilio/epidemiology/index-sort-f.html
index 14180ad0cd..44a098c626 100644
--- a/coverage/cpp/memilio/epidemiology/index-sort-f.html
+++ b/coverage/cpp/memilio/epidemiology/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">741</td>
diff --git a/coverage/cpp/memilio/epidemiology/index-sort-l.html b/coverage/cpp/memilio/epidemiology/index-sort-l.html
index fddb5ad648..289b1532a9 100644
--- a/coverage/cpp/memilio/epidemiology/index-sort-l.html
+++ b/coverage/cpp/memilio/epidemiology/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">741</td>
diff --git a/coverage/cpp/memilio/epidemiology/index.html b/coverage/cpp/memilio/epidemiology/index.html
index 9f4976c0e5..757ecbd491 100644
--- a/coverage/cpp/memilio/epidemiology/index.html
+++ b/coverage/cpp/memilio/epidemiology/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">741</td>
diff --git a/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func-sort-c.html
index 15ceab8384..54ec21dfbd 100644
--- a/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">108</td>
diff --git a/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func.html b/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func.html
index c0cef5ee86..9ce43ca60b 100644
--- a/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/lct_infection_state.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">108</td>
diff --git a/coverage/cpp/memilio/epidemiology/lct_infection_state.h.gcov.html b/coverage/cpp/memilio/epidemiology/lct_infection_state.h.gcov.html
index 0dea6638c2..0ee1ca7a0f 100644
--- a/coverage/cpp/memilio/epidemiology/lct_infection_state.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/lct_infection_state.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">108</td>
diff --git a/coverage/cpp/memilio/epidemiology/lct_populations.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/lct_populations.h.func-sort-c.html
index 6ae309fcd0..1811ff20ad 100644
--- a/coverage/cpp/memilio/epidemiology/lct_populations.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/lct_populations.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">141</td>
diff --git a/coverage/cpp/memilio/epidemiology/lct_populations.h.func.html b/coverage/cpp/memilio/epidemiology/lct_populations.h.func.html
index bc7b68a579..c88e69ed7d 100644
--- a/coverage/cpp/memilio/epidemiology/lct_populations.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/lct_populations.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">141</td>
diff --git a/coverage/cpp/memilio/epidemiology/lct_populations.h.gcov.html b/coverage/cpp/memilio/epidemiology/lct_populations.h.gcov.html
index da619ed914..7356847ab1 100644
--- a/coverage/cpp/memilio/epidemiology/lct_populations.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/lct_populations.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">141</td>
diff --git a/coverage/cpp/memilio/epidemiology/populations.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/populations.h.func-sort-c.html
index 65e2066e19..ca070c8e6e 100644
--- a/coverage/cpp/memilio/epidemiology/populations.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/populations.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">77</td>
@@ -377,7 +377,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="populations.h.gcov.html#113">double mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_group_total&lt;mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt;) const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="populations.h.gcov.html#113">double mio::Populations&lt;double, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::get_group_total&lt;mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt;) const</a></td>
@@ -393,7 +393,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="populations.h.gcov.html#100">decltype(auto) mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_from&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812190</td>
+              <td class="coverFnHi">854310</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/epidemiology/populations.h.func.html b/coverage/cpp/memilio/epidemiology/populations.h.func.html
index 81f53df14a..bc85f334ac 100644
--- a/coverage/cpp/memilio/epidemiology/populations.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/populations.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">77</td>
@@ -341,7 +341,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="populations.h.gcov.html#113">double mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_group_total&lt;mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt;) const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="populations.h.gcov.html#80">mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_compartments() const</a></td>
@@ -361,7 +361,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="populations.h.gcov.html#100">decltype(auto) mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_from&lt;Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;&gt;(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">812190</td>
+              <td class="coverFnHi">854310</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="populations.h.gcov.html#152">mio::Populations&lt;double, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_total() const</a></td>
diff --git a/coverage/cpp/memilio/epidemiology/populations.h.gcov.html b/coverage/cpp/memilio/epidemiology/populations.h.gcov.html
index f543919173..d6156dff2b 100644
--- a/coverage/cpp/memilio/epidemiology/populations.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/populations.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">77</td>
@@ -161,10 +161,10 @@
 <a name="99"><span class="lineNum">      99 </span>            :      * @return the population of compartment</a>
 <a name="100"><span class="lineNum">     100 </span>            :      */</a>
 <a name="101"><span class="lineNum">     101 </span>            :     template &lt;class Arr&gt;</a>
-<a name="102"><span class="lineNum">     102 </span><span class="lineCov">     964121 :     decltype(auto) get_from(Arr&amp;&amp; y, Index const&amp; cats) const</span></a>
+<a name="102"><span class="lineNum">     102 </span><span class="lineCov">    1006241 :     decltype(auto) get_from(Arr&amp;&amp; y, Index const&amp; cats) const</span></a>
 <a name="103"><span class="lineNum">     103 </span>            :     {</a>
 <a name="104"><span class="lineNum">     104 </span>            :         static_assert(std::is_lvalue_reference&lt;Arr&gt;::value, &quot;get_from is disabled for temporary arrays.&quot;);</a>
-<a name="105"><span class="lineNum">     105 </span><span class="lineCov">     964121 :         return y[this-&gt;get_flat_index(cats)];</span></a>
+<a name="105"><span class="lineNum">     105 </span><span class="lineCov">    1006241 :         return y[this-&gt;get_flat_index(cats)];</span></a>
 <a name="106"><span class="lineNum">     106 </span>            :     }</a>
 <a name="107"><span class="lineNum">     107 </span>            : </a>
 <a name="108"><span class="lineNum">     108 </span>            :     /**</a>
@@ -174,10 +174,10 @@
 <a name="112"><span class="lineNum">     112 </span>            :      * @return total population of the group</a>
 <a name="113"><span class="lineNum">     113 </span>            :      */</a>
 <a name="114"><span class="lineNum">     114 </span>            :     template &lt;class T&gt;</a>
-<a name="115"><span class="lineNum">     115 </span><span class="lineCov">       5909 :     ScalarType get_group_total(mio::Index&lt;T&gt; group_idx) const</span></a>
+<a name="115"><span class="lineNum">     115 </span><span class="lineCov">       5927 :     ScalarType get_group_total(mio::Index&lt;T&gt; group_idx) const</span></a>
 <a name="116"><span class="lineNum">     116 </span>            :     {</a>
-<a name="117"><span class="lineNum">     117 </span><span class="lineCov">       5909 :         auto const s = this-&gt;template slice&lt;T&gt;({(size_t)group_idx, 1});</span></a>
-<a name="118"><span class="lineNum">     118 </span><span class="lineCov">      11818 :         return std::accumulate(s.begin(), s.end(), 0.);</span></a>
+<a name="117"><span class="lineNum">     117 </span><span class="lineCov">       5927 :         auto const s = this-&gt;template slice&lt;T&gt;({(size_t)group_idx, 1});</span></a>
+<a name="118"><span class="lineNum">     118 </span><span class="lineCov">      11854 :         return std::accumulate(s.begin(), s.end(), 0.);</span></a>
 <a name="119"><span class="lineNum">     119 </span>            :     }</a>
 <a name="120"><span class="lineNum">     120 </span>            : </a>
 <a name="121"><span class="lineNum">     121 </span>            :     /**</a>
diff --git a/coverage/cpp/memilio/epidemiology/state_age_function.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/state_age_function.h.func-sort-c.html
index f10c65ee06..252864bad4 100644
--- a/coverage/cpp/memilio/epidemiology/state_age_function.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/state_age_function.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">58</td>
diff --git a/coverage/cpp/memilio/epidemiology/state_age_function.h.func.html b/coverage/cpp/memilio/epidemiology/state_age_function.h.func.html
index e8ec3aa988..585d2099c0 100644
--- a/coverage/cpp/memilio/epidemiology/state_age_function.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/state_age_function.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">58</td>
diff --git a/coverage/cpp/memilio/epidemiology/state_age_function.h.gcov.html b/coverage/cpp/memilio/epidemiology/state_age_function.h.gcov.html
index 4384e829c1..e2a7dcf691 100644
--- a/coverage/cpp/memilio/epidemiology/state_age_function.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/state_age_function.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">58</td>
diff --git a/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func-sort-c.html b/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func-sort-c.html
index c2a89093c2..80e2a70e96 100644
--- a/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func-sort-c.html
+++ b/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -145,11 +145,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_matrix.h.gcov.html#99">mio::UncertainContactMatrix&lt;double&gt;::get_cont_freq_mat() const</a></td>
-              <td class="coverFnHi">386432</td>
+              <td class="coverFnHi">386540</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_matrix.h.gcov.html#62">mio::UncertainContactMatrix&lt;double&gt;::operator mio::ContactMatrixGroup const&amp;() const</a></td>
-              <td class="coverFnHi">401283</td>
+              <td class="coverFnHi">422343</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func.html b/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func.html
index e26409dfb1..23f9fa275a 100644
--- a/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func.html
+++ b/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -117,7 +117,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_matrix.h.gcov.html#99">mio::UncertainContactMatrix&lt;double&gt;::get_cont_freq_mat() const</a></td>
-              <td class="coverFnHi">386432</td>
+              <td class="coverFnHi">386540</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_matrix.h.gcov.html#207">void mio::UncertainContactMatrix&lt;double&gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -129,7 +129,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_matrix.h.gcov.html#62">mio::UncertainContactMatrix&lt;double&gt;::operator mio::ContactMatrixGroup const&amp;() const</a></td>
-              <td class="coverFnHi">401283</td>
+              <td class="coverFnHi">422343</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_matrix.h.gcov.html#246">auto mio::UncertainContactMatrix&lt;double&gt;::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)::{lambda(auto:1&amp;&amp;)#2}::operator()&lt;mio::ContactMatrixGroup const&amp;&gt;(mio::JsonContext&amp;&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.gcov.html b/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.gcov.html
index faf7cc8f90..9f53e9b79a 100644
--- a/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.gcov.html
+++ b/coverage/cpp/memilio/epidemiology/uncertain_matrix.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -123,9 +123,9 @@
 <a name="61"><span class="lineNum">      61 </span>            :      * @brief Conversion to const ContactMatrix reference by returning the </a>
 <a name="62"><span class="lineNum">      62 </span>            :      *        ContactMatrix contained in UncertainContactMatrix</a>
 <a name="63"><span class="lineNum">      63 </span>            :      */</a>
-<a name="64"><span class="lineNum">      64 </span><span class="lineCov">     401283 :     operator ContactMatrixGroup const &amp;() const</span></a>
+<a name="64"><span class="lineNum">      64 </span><span class="lineCov">     422343 :     operator ContactMatrixGroup const &amp;() const</span></a>
 <a name="65"><span class="lineNum">      65 </span>            :     {</a>
-<a name="66"><span class="lineNum">      66 </span><span class="lineCov">     401283 :         return m_cont_freq;</span></a>
+<a name="66"><span class="lineNum">      66 </span><span class="lineCov">     422343 :         return m_cont_freq;</span></a>
 <a name="67"><span class="lineNum">      67 </span>            :     }</a>
 <a name="68"><span class="lineNum">      68 </span>            : </a>
 <a name="69"><span class="lineNum">      69 </span>            :     /**</a>
@@ -160,9 +160,9 @@
 <a name="98"><span class="lineNum">      98 </span>            :      * @brief Returns the const ContactMatrix reference </a>
 <a name="99"><span class="lineNum">      99 </span>            :      *        of the UncertainContactMatrix object</a>
 <a name="100"><span class="lineNum">     100 </span>            :      */</a>
-<a name="101"><span class="lineNum">     101 </span><span class="lineCov">     386432 :     ContactMatrixGroup const&amp; get_cont_freq_mat() const</span></a>
+<a name="101"><span class="lineNum">     101 </span><span class="lineCov">     386540 :     ContactMatrixGroup const&amp; get_cont_freq_mat() const</span></a>
 <a name="102"><span class="lineNum">     102 </span>            :     {</a>
-<a name="103"><span class="lineNum">     103 </span><span class="lineCov">     386432 :         return m_cont_freq;</span></a>
+<a name="103"><span class="lineNum">     103 </span><span class="lineCov">     386540 :         return m_cont_freq;</span></a>
 <a name="104"><span class="lineNum">     104 </span>            :     }</a>
 <a name="105"><span class="lineNum">     105 </span>            : </a>
 <a name="106"><span class="lineNum">     106 </span>            :     /**</a>
diff --git a/coverage/cpp/memilio/geography/index-sort-f.html b/coverage/cpp/memilio/geography/index-sort-f.html
index f6ab3a6631..9186f1fa16 100644
--- a/coverage/cpp/memilio/geography/index-sort-f.html
+++ b/coverage/cpp/memilio/geography/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/geography/index-sort-l.html b/coverage/cpp/memilio/geography/index-sort-l.html
index 5dc23615c3..b667aaa638 100644
--- a/coverage/cpp/memilio/geography/index-sort-l.html
+++ b/coverage/cpp/memilio/geography/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/geography/index.html b/coverage/cpp/memilio/geography/index.html
index 6c9d69feb8..add3c3cf06 100644
--- a/coverage/cpp/memilio/geography/index.html
+++ b/coverage/cpp/memilio/geography/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/geography/regions.cpp.func-sort-c.html b/coverage/cpp/memilio/geography/regions.cpp.func-sort-c.html
index 9edcd93edb..39fb8c7f7e 100644
--- a/coverage/cpp/memilio/geography/regions.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/geography/regions.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/geography/regions.cpp.func.html b/coverage/cpp/memilio/geography/regions.cpp.func.html
index f2dfc42f17..ad05a82afc 100644
--- a/coverage/cpp/memilio/geography/regions.cpp.func.html
+++ b/coverage/cpp/memilio/geography/regions.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/geography/regions.cpp.gcov.html b/coverage/cpp/memilio/geography/regions.cpp.gcov.html
index 30237849de..b981dd9f87 100644
--- a/coverage/cpp/memilio/geography/regions.cpp.gcov.html
+++ b/coverage/cpp/memilio/geography/regions.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/index-sort-f.html b/coverage/cpp/memilio/index-sort-f.html
index 12720e984f..bd5f7d319e 100644
--- a/coverage/cpp/memilio/index-sort-f.html
+++ b/coverage/cpp/memilio/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/memilio/index-sort-l.html b/coverage/cpp/memilio/index-sort-l.html
index a135c2544c..809cd4e233 100644
--- a/coverage/cpp/memilio/index-sort-l.html
+++ b/coverage/cpp/memilio/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/memilio/index.html b/coverage/cpp/memilio/index.html
index fcbe4fe16b..2db76ee31b 100644
--- a/coverage/cpp/memilio/index.html
+++ b/coverage/cpp/memilio/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/memilio/io/binary_serializer.h.func-sort-c.html b/coverage/cpp/memilio/io/binary_serializer.h.func-sort-c.html
index c025e1583a..c0edc433fc 100644
--- a/coverage/cpp/memilio/io/binary_serializer.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/binary_serializer.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">115</td>
diff --git a/coverage/cpp/memilio/io/binary_serializer.h.func.html b/coverage/cpp/memilio/io/binary_serializer.h.func.html
index 6cc4a33e97..7765f3a832 100644
--- a/coverage/cpp/memilio/io/binary_serializer.h.func.html
+++ b/coverage/cpp/memilio/io/binary_serializer.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">115</td>
diff --git a/coverage/cpp/memilio/io/binary_serializer.h.gcov.html b/coverage/cpp/memilio/io/binary_serializer.h.gcov.html
index fea4f68407..86d76489bb 100644
--- a/coverage/cpp/memilio/io/binary_serializer.h.gcov.html
+++ b/coverage/cpp/memilio/io/binary_serializer.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">115</td>
diff --git a/coverage/cpp/memilio/io/cli.h.func-sort-c.html b/coverage/cpp/memilio/io/cli.h.func-sort-c.html
index b213560e7e..08f0d3d81a 100644
--- a/coverage/cpp/memilio/io/cli.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/cli.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">302</td>
diff --git a/coverage/cpp/memilio/io/cli.h.func.html b/coverage/cpp/memilio/io/cli.h.func.html
index 048d287218..693a5ebd65 100644
--- a/coverage/cpp/memilio/io/cli.h.func.html
+++ b/coverage/cpp/memilio/io/cli.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">302</td>
diff --git a/coverage/cpp/memilio/io/cli.h.gcov.html b/coverage/cpp/memilio/io/cli.h.gcov.html
index b916fbde53..1677a6b377 100644
--- a/coverage/cpp/memilio/io/cli.h.gcov.html
+++ b/coverage/cpp/memilio/io/cli.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">302</td>
diff --git a/coverage/cpp/memilio/io/default_serialize.h.func-sort-c.html b/coverage/cpp/memilio/io/default_serialize.h.func-sort-c.html
index 03e4006a2a..ba4ec2c204 100644
--- a/coverage/cpp/memilio/io/default_serialize.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/default_serialize.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">460</td>
diff --git a/coverage/cpp/memilio/io/default_serialize.h.func.html b/coverage/cpp/memilio/io/default_serialize.h.func.html
index f85984a444..5ebe96cc93 100644
--- a/coverage/cpp/memilio/io/default_serialize.h.func.html
+++ b/coverage/cpp/memilio/io/default_serialize.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">460</td>
diff --git a/coverage/cpp/memilio/io/default_serialize.h.gcov.html b/coverage/cpp/memilio/io/default_serialize.h.gcov.html
index beadc12b75..6504fcb2f7 100644
--- a/coverage/cpp/memilio/io/default_serialize.h.gcov.html
+++ b/coverage/cpp/memilio/io/default_serialize.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">460</td>
diff --git a/coverage/cpp/memilio/io/epi_data.cpp.func-sort-c.html b/coverage/cpp/memilio/io/epi_data.cpp.func-sort-c.html
index 5d40ce7d8b..9e95d61ab3 100644
--- a/coverage/cpp/memilio/io/epi_data.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/io/epi_data.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/memilio/io/epi_data.cpp.func.html b/coverage/cpp/memilio/io/epi_data.cpp.func.html
index 0a09b598e5..565611fdde 100644
--- a/coverage/cpp/memilio/io/epi_data.cpp.func.html
+++ b/coverage/cpp/memilio/io/epi_data.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/memilio/io/epi_data.cpp.gcov.html b/coverage/cpp/memilio/io/epi_data.cpp.gcov.html
index 4a00944efc..e8aba8c888 100644
--- a/coverage/cpp/memilio/io/epi_data.cpp.gcov.html
+++ b/coverage/cpp/memilio/io/epi_data.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/memilio/io/epi_data.h.func-sort-c.html b/coverage/cpp/memilio/io/epi_data.h.func-sort-c.html
index 53b96eedc3..3a49dd05f9 100644
--- a/coverage/cpp/memilio/io/epi_data.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/epi_data.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">28</td>
diff --git a/coverage/cpp/memilio/io/epi_data.h.func.html b/coverage/cpp/memilio/io/epi_data.h.func.html
index 95b2b94979..cd4337ed4f 100644
--- a/coverage/cpp/memilio/io/epi_data.h.func.html
+++ b/coverage/cpp/memilio/io/epi_data.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">28</td>
diff --git a/coverage/cpp/memilio/io/epi_data.h.gcov.html b/coverage/cpp/memilio/io/epi_data.h.gcov.html
index ee462b5e45..4700330b0e 100644
--- a/coverage/cpp/memilio/io/epi_data.h.gcov.html
+++ b/coverage/cpp/memilio/io/epi_data.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">28</td>
diff --git a/coverage/cpp/memilio/io/hdf5_cpp.h.func-sort-c.html b/coverage/cpp/memilio/io/hdf5_cpp.h.func-sort-c.html
index 0400e4dc04..9fc1344125 100644
--- a/coverage/cpp/memilio/io/hdf5_cpp.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/hdf5_cpp.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/hdf5_cpp.h.func.html b/coverage/cpp/memilio/io/hdf5_cpp.h.func.html
index f579911264..469e3b64ad 100644
--- a/coverage/cpp/memilio/io/hdf5_cpp.h.func.html
+++ b/coverage/cpp/memilio/io/hdf5_cpp.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/hdf5_cpp.h.gcov.html b/coverage/cpp/memilio/io/hdf5_cpp.h.gcov.html
index 3069142b38..23b21e3d6f 100644
--- a/coverage/cpp/memilio/io/hdf5_cpp.h.gcov.html
+++ b/coverage/cpp/memilio/io/hdf5_cpp.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/history.h.func-sort-c.html b/coverage/cpp/memilio/io/history.h.func-sort-c.html
index 0fdf1be5f3..9239f6b080 100644
--- a/coverage/cpp/memilio/io/history.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/history.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">30</td>
diff --git a/coverage/cpp/memilio/io/history.h.func.html b/coverage/cpp/memilio/io/history.h.func.html
index db282c0ca7..7f8b012e69 100644
--- a/coverage/cpp/memilio/io/history.h.func.html
+++ b/coverage/cpp/memilio/io/history.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">30</td>
diff --git a/coverage/cpp/memilio/io/history.h.gcov.html b/coverage/cpp/memilio/io/history.h.gcov.html
index 09d0a3193a..bc614e1106 100644
--- a/coverage/cpp/memilio/io/history.h.gcov.html
+++ b/coverage/cpp/memilio/io/history.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">30</td>
diff --git a/coverage/cpp/memilio/io/index-sort-f.html b/coverage/cpp/memilio/io/index-sort-f.html
index f70f8b6c5f..40b27cc937 100644
--- a/coverage/cpp/memilio/io/index-sort-f.html
+++ b/coverage/cpp/memilio/io/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2690</td>
@@ -149,16 +149,6 @@
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">1 / 1</td>
     </tr>
-    <tr>
-      <td class="coverFile"><a href="hdf5_cpp.h.gcov.html">hdf5_cpp.h</a></td>
-      <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
-      </td>
-      <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">12 / 12</td>
-      <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">4 / 4</td>
-    </tr>
     <tr>
       <td class="coverFile"><a href="serializer_base.h.gcov.html">serializer_base.h</a></td>
       <td class="coverBar" align="center">
@@ -179,6 +169,16 @@
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">4 / 4</td>
     </tr>
+    <tr>
+      <td class="coverFile"><a href="hdf5_cpp.h.gcov.html">hdf5_cpp.h</a></td>
+      <td class="coverBar" align="center">
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
+      </td>
+      <td class="coverPerHi">100.0&nbsp;%</td>
+      <td class="coverNumHi">12 / 12</td>
+      <td class="coverPerHi">100.0&nbsp;%</td>
+      <td class="coverNumHi">4 / 4</td>
+    </tr>
     <tr>
       <td class="coverFile"><a href="result_io.cpp.gcov.html">result_io.cpp</a></td>
       <td class="coverBar" align="center">
diff --git a/coverage/cpp/memilio/io/index-sort-l.html b/coverage/cpp/memilio/io/index-sort-l.html
index 8b3610bd2f..db44b1e151 100644
--- a/coverage/cpp/memilio/io/index-sort-l.html
+++ b/coverage/cpp/memilio/io/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2690</td>
diff --git a/coverage/cpp/memilio/io/index.html b/coverage/cpp/memilio/io/index.html
index 5c200f07aa..4c82e00718 100644
--- a/coverage/cpp/memilio/io/index.html
+++ b/coverage/cpp/memilio/io/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2690</td>
diff --git a/coverage/cpp/memilio/io/io.cpp.func-sort-c.html b/coverage/cpp/memilio/io/io.cpp.func-sort-c.html
index e9ed3d0f91..4d2b6670fc 100644
--- a/coverage/cpp/memilio/io/io.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/io/io.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/io.cpp.func.html b/coverage/cpp/memilio/io/io.cpp.func.html
index 7cd252a656..566da7252a 100644
--- a/coverage/cpp/memilio/io/io.cpp.func.html
+++ b/coverage/cpp/memilio/io/io.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/io.cpp.gcov.html b/coverage/cpp/memilio/io/io.cpp.gcov.html
index 477983cef1..5050e38d9c 100644
--- a/coverage/cpp/memilio/io/io.cpp.gcov.html
+++ b/coverage/cpp/memilio/io/io.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/io.h.func-sort-c.html b/coverage/cpp/memilio/io/io.h.func-sort-c.html
index 55af2f5683..4c4e2d12db 100644
--- a/coverage/cpp/memilio/io/io.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/io.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1261</td>
diff --git a/coverage/cpp/memilio/io/io.h.func.html b/coverage/cpp/memilio/io/io.h.func.html
index 56be55d9c7..795dcbc3da 100644
--- a/coverage/cpp/memilio/io/io.h.func.html
+++ b/coverage/cpp/memilio/io/io.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1261</td>
diff --git a/coverage/cpp/memilio/io/io.h.gcov.html b/coverage/cpp/memilio/io/io.h.gcov.html
index 744cfc4404..e01741e6de 100644
--- a/coverage/cpp/memilio/io/io.h.gcov.html
+++ b/coverage/cpp/memilio/io/io.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1261</td>
diff --git a/coverage/cpp/memilio/io/json_serializer.h.func-sort-c.html b/coverage/cpp/memilio/io/json_serializer.h.func-sort-c.html
index 05371a66a7..87e30780c2 100644
--- a/coverage/cpp/memilio/io/json_serializer.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/json_serializer.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">462</td>
diff --git a/coverage/cpp/memilio/io/json_serializer.h.func.html b/coverage/cpp/memilio/io/json_serializer.h.func.html
index c3523a67f3..bbca2076a1 100644
--- a/coverage/cpp/memilio/io/json_serializer.h.func.html
+++ b/coverage/cpp/memilio/io/json_serializer.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">462</td>
diff --git a/coverage/cpp/memilio/io/json_serializer.h.gcov.html b/coverage/cpp/memilio/io/json_serializer.h.gcov.html
index 273561d7df..2f2c5799ba 100644
--- a/coverage/cpp/memilio/io/json_serializer.h.gcov.html
+++ b/coverage/cpp/memilio/io/json_serializer.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">462</td>
diff --git a/coverage/cpp/memilio/io/mobility_io.cpp.func-sort-c.html b/coverage/cpp/memilio/io/mobility_io.cpp.func-sort-c.html
index b9814fda51..bebca0a4d8 100644
--- a/coverage/cpp/memilio/io/mobility_io.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/io/mobility_io.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/memilio/io/mobility_io.cpp.func.html b/coverage/cpp/memilio/io/mobility_io.cpp.func.html
index 3e85f06985..6512dc84f0 100644
--- a/coverage/cpp/memilio/io/mobility_io.cpp.func.html
+++ b/coverage/cpp/memilio/io/mobility_io.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/memilio/io/mobility_io.cpp.gcov.html b/coverage/cpp/memilio/io/mobility_io.cpp.gcov.html
index 15953a516d..53641ed87a 100644
--- a/coverage/cpp/memilio/io/mobility_io.cpp.gcov.html
+++ b/coverage/cpp/memilio/io/mobility_io.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/memilio/io/mobility_io.h.func-sort-c.html b/coverage/cpp/memilio/io/mobility_io.h.func-sort-c.html
index d0471eb2f6..c242af4676 100644
--- a/coverage/cpp/memilio/io/mobility_io.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/mobility_io.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/io/mobility_io.h.func.html b/coverage/cpp/memilio/io/mobility_io.h.func.html
index 6c828ce24e..864067a9df 100644
--- a/coverage/cpp/memilio/io/mobility_io.h.func.html
+++ b/coverage/cpp/memilio/io/mobility_io.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/io/mobility_io.h.gcov.html b/coverage/cpp/memilio/io/mobility_io.h.gcov.html
index 6e58badcb7..80992a2d3e 100644
--- a/coverage/cpp/memilio/io/mobility_io.h.gcov.html
+++ b/coverage/cpp/memilio/io/mobility_io.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/io/result_io.cpp.func-sort-c.html b/coverage/cpp/memilio/io/result_io.cpp.func-sort-c.html
index f196e205e1..5ec7e878cb 100644
--- a/coverage/cpp/memilio/io/result_io.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/io/result_io.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/memilio/io/result_io.cpp.func.html b/coverage/cpp/memilio/io/result_io.cpp.func.html
index 6b6063b38f..5cbc82978c 100644
--- a/coverage/cpp/memilio/io/result_io.cpp.func.html
+++ b/coverage/cpp/memilio/io/result_io.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/memilio/io/result_io.cpp.gcov.html b/coverage/cpp/memilio/io/result_io.cpp.gcov.html
index e84225f9b5..78ccbcf4a6 100644
--- a/coverage/cpp/memilio/io/result_io.cpp.gcov.html
+++ b/coverage/cpp/memilio/io/result_io.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/memilio/io/result_io.h.func-sort-c.html b/coverage/cpp/memilio/io/result_io.h.func-sort-c.html
index 1bfda63795..db0beec0d5 100644
--- a/coverage/cpp/memilio/io/result_io.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/result_io.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/memilio/io/result_io.h.func.html b/coverage/cpp/memilio/io/result_io.h.func.html
index a79241f3b7..8d3ef65ed1 100644
--- a/coverage/cpp/memilio/io/result_io.h.func.html
+++ b/coverage/cpp/memilio/io/result_io.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/memilio/io/result_io.h.gcov.html b/coverage/cpp/memilio/io/result_io.h.gcov.html
index 569ab074af..4bf7fc0f77 100644
--- a/coverage/cpp/memilio/io/result_io.h.gcov.html
+++ b/coverage/cpp/memilio/io/result_io.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/memilio/io/serializer_base.h.func-sort-c.html b/coverage/cpp/memilio/io/serializer_base.h.func-sort-c.html
index 1fb74a8adc..454cb9784f 100644
--- a/coverage/cpp/memilio/io/serializer_base.h.func-sort-c.html
+++ b/coverage/cpp/memilio/io/serializer_base.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/serializer_base.h.func.html b/coverage/cpp/memilio/io/serializer_base.h.func.html
index 8d94b9d126..353d76d0b1 100644
--- a/coverage/cpp/memilio/io/serializer_base.h.func.html
+++ b/coverage/cpp/memilio/io/serializer_base.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/io/serializer_base.h.gcov.html b/coverage/cpp/memilio/io/serializer_base.h.gcov.html
index 29de29b073..e02f387a99 100644
--- a/coverage/cpp/memilio/io/serializer_base.h.gcov.html
+++ b/coverage/cpp/memilio/io/serializer_base.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/math/adapt_rk.h.func-sort-c.html b/coverage/cpp/memilio/math/adapt_rk.h.func-sort-c.html
index 43f9cd486d..8d8471e7b0 100644
--- a/coverage/cpp/memilio/math/adapt_rk.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/adapt_rk.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/memilio/math/adapt_rk.h.func.html b/coverage/cpp/memilio/math/adapt_rk.h.func.html
index 66ce379b20..4696cfce12 100644
--- a/coverage/cpp/memilio/math/adapt_rk.h.func.html
+++ b/coverage/cpp/memilio/math/adapt_rk.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/memilio/math/adapt_rk.h.gcov.html b/coverage/cpp/memilio/math/adapt_rk.h.gcov.html
index 6f8672e4a2..63e2ddeb89 100644
--- a/coverage/cpp/memilio/math/adapt_rk.h.gcov.html
+++ b/coverage/cpp/memilio/math/adapt_rk.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/memilio/math/eigen_util.h.func-sort-c.html b/coverage/cpp/memilio/math/eigen_util.h.func-sort-c.html
index b0fc23347f..7a66745285 100644
--- a/coverage/cpp/memilio/math/eigen_util.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/eigen_util.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">112</td>
@@ -529,7 +529,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="eigen_util.h.gcov.html#34">mio::Seq&lt;unsigned long&gt;::Seq(unsigned long, unsigned long, unsigned long)</a></td>
-              <td class="coverFnHi">6011</td>
+              <td class="coverFnHi">6029</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="eigen_util.h.gcov.html#79">long mio::minor_size&lt;Eigen::Matrix&lt;double, -1, -1, 1, -1, -1&gt;&amp;&gt;(Eigen::Matrix&lt;double, -1, -1, 1, -1, -1&gt;&amp;)</a></td>
diff --git a/coverage/cpp/memilio/math/eigen_util.h.func.html b/coverage/cpp/memilio/math/eigen_util.h.func.html
index a78b3d2e51..94033923a0 100644
--- a/coverage/cpp/memilio/math/eigen_util.h.func.html
+++ b/coverage/cpp/memilio/math/eigen_util.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">112</td>
@@ -189,7 +189,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="eigen_util.h.gcov.html#34">mio::Seq&lt;unsigned long&gt;::Seq(unsigned long, unsigned long, unsigned long)</a></td>
-              <td class="coverFnHi">6011</td>
+              <td class="coverFnHi">6029</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="eigen_util.h.gcov.html#459">std::enable_if&lt;std::is_base_of&lt;Eigen::EigenBase&lt;Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; &gt;, Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; &gt;::value, mio::RowMajorIterator&lt;Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt;, true&gt; &gt;::type mio::end&lt;Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; &gt;(Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;)</a></td>
diff --git a/coverage/cpp/memilio/math/eigen_util.h.gcov.html b/coverage/cpp/memilio/math/eigen_util.h.gcov.html
index 26a671530c..0fe8ad5358 100644
--- a/coverage/cpp/memilio/math/eigen_util.h.gcov.html
+++ b/coverage/cpp/memilio/math/eigen_util.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">112</td>
@@ -95,15 +95,15 @@
 <a name="33"><span class="lineNum">      33 </span>            :  */</a>
 <a name="34"><span class="lineNum">      34 </span>            : template &lt;typename T&gt;</a>
 <a name="35"><span class="lineNum">      35 </span>            : struct Seq {</a>
-<a name="36"><span class="lineNum">      36 </span><span class="lineCov">      13551 :     Seq(T start_, T n_, T stride_ = 1)</span></a>
-<a name="37"><span class="lineNum">      37 </span><span class="lineCov">      13551 :         : start(start_)</span></a>
-<a name="38"><span class="lineNum">      38 </span><span class="lineCov">      13551 :         , n(n_)</span></a>
-<a name="39"><span class="lineNum">      39 </span><span class="lineCov">      13551 :         , stride(stride_)</span></a>
+<a name="36"><span class="lineNum">      36 </span><span class="lineCov">      13569 :     Seq(T start_, T n_, T stride_ = 1)</span></a>
+<a name="37"><span class="lineNum">      37 </span><span class="lineCov">      13569 :         : start(start_)</span></a>
+<a name="38"><span class="lineNum">      38 </span><span class="lineCov">      13569 :         , n(n_)</span></a>
+<a name="39"><span class="lineNum">      39 </span><span class="lineCov">      13569 :         , stride(stride_)</span></a>
 <a name="40"><span class="lineNum">      40 </span>            :     {</a>
 <a name="41"><span class="lineNum">      41 </span><span class="lineCov">       7540 :         assert(start &gt;= 0);</span></a>
 <a name="42"><span class="lineNum">      42 </span><span class="lineCov">       7540 :         assert(n &gt;= 0);</span></a>
-<a name="43"><span class="lineNum">      43 </span><span class="lineCov">      13551 :         assert(stride &gt;= 1);</span></a>
-<a name="44"><span class="lineNum">      44 </span><span class="lineCov">      13551 :     }</span></a>
+<a name="43"><span class="lineNum">      43 </span><span class="lineCov">      13569 :         assert(stride &gt;= 1);</span></a>
+<a name="44"><span class="lineNum">      44 </span><span class="lineCov">      13569 :     }</span></a>
 <a name="45"><span class="lineNum">      45 </span>            :     T start, n, stride = 1;</a>
 <a name="46"><span class="lineNum">      46 </span>            : };</a>
 <a name="47"><span class="lineNum">      47 </span>            : </a>
diff --git a/coverage/cpp/memilio/math/euler.h.func-sort-c.html b/coverage/cpp/memilio/math/euler.h.func-sort-c.html
index b5251a418a..42936169b0 100644
--- a/coverage/cpp/memilio/math/euler.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/euler.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/math/euler.h.func.html b/coverage/cpp/memilio/math/euler.h.func.html
index a27c36788a..fe4118bcb6 100644
--- a/coverage/cpp/memilio/math/euler.h.func.html
+++ b/coverage/cpp/memilio/math/euler.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/math/euler.h.gcov.html b/coverage/cpp/memilio/math/euler.h.gcov.html
index 3414e8277d..6d93247703 100644
--- a/coverage/cpp/memilio/math/euler.h.gcov.html
+++ b/coverage/cpp/memilio/math/euler.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/math/floating_point.h.func-sort-c.html b/coverage/cpp/memilio/math/floating_point.h.func-sort-c.html
index 98c33453b6..d9c9f60cdb 100644
--- a/coverage/cpp/memilio/math/floating_point.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/floating_point.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
@@ -125,11 +125,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="floating_point.h.gcov.html#35">double mio::abs_max&lt;double&gt;(double, double)</a></td>
-              <td class="coverFnHi">148234</td>
+              <td class="coverFnHi">150025</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="floating_point.h.gcov.html#53">bool mio::floating_point_equal&lt;double&gt;(double, double, double, double)</a></td>
-              <td class="coverFnHi">224758</td>
+              <td class="coverFnHi">227449</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/floating_point.h.func.html b/coverage/cpp/memilio/math/floating_point.h.func.html
index 0240913171..ca16624cfb 100644
--- a/coverage/cpp/memilio/math/floating_point.h.func.html
+++ b/coverage/cpp/memilio/math/floating_point.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
@@ -77,7 +77,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="floating_point.h.gcov.html#53">bool mio::floating_point_equal&lt;double&gt;(double, double, double, double)</a></td>
-              <td class="coverFnHi">224758</td>
+              <td class="coverFnHi">227449</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="floating_point.h.gcov.html#53">bool mio::floating_point_equal&lt;float&gt;(float, float, float, float)</a></td>
@@ -125,7 +125,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="floating_point.h.gcov.html#35">double mio::abs_max&lt;double&gt;(double, double)</a></td>
-              <td class="coverFnHi">148234</td>
+              <td class="coverFnHi">150025</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="floating_point.h.gcov.html#35">float mio::abs_max&lt;float&gt;(float, float)</a></td>
diff --git a/coverage/cpp/memilio/math/floating_point.h.gcov.html b/coverage/cpp/memilio/math/floating_point.h.gcov.html
index b43b347f37..95dbc882c1 100644
--- a/coverage/cpp/memilio/math/floating_point.h.gcov.html
+++ b/coverage/cpp/memilio/math/floating_point.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
@@ -96,11 +96,11 @@
 <a name="34"><span class="lineNum">      34 </span>            :  * @return maximum absolute value between v1 and v2</a>
 <a name="35"><span class="lineNum">      35 </span>            :  */</a>
 <a name="36"><span class="lineNum">      36 </span>            : template &lt;class T&gt;</a>
-<a name="37"><span class="lineNum">      37 </span><span class="lineCov">     150071 : T abs_max(T v1, T v2)</span></a>
+<a name="37"><span class="lineNum">      37 </span><span class="lineCov">     151862 : T abs_max(T v1, T v2)</span></a>
 <a name="38"><span class="lineNum">      38 </span>            : {</a>
 <a name="39"><span class="lineNum">      39 </span>            :     using std::abs;</a>
 <a name="40"><span class="lineNum">      40 </span>            :     using std::max;</a>
-<a name="41"><span class="lineNum">      41 </span><span class="lineCov">     150071 :     return max&lt;T&gt;(abs(v1), abs(v2));</span></a>
+<a name="41"><span class="lineNum">      41 </span><span class="lineCov">     151862 :     return max&lt;T&gt;(abs(v1), abs(v2));</span></a>
 <a name="42"><span class="lineNum">      42 </span>            : }</a>
 <a name="43"><span class="lineNum">      43 </span>            : </a>
 <a name="44"><span class="lineNum">      44 </span>            : /**</a>
@@ -114,11 +114,11 @@
 <a name="52"><span class="lineNum">      52 </span>            :  * @return true if v1 is within the specified relative OR absolute tolerance of v2  </a>
 <a name="53"><span class="lineNum">      53 </span>            :  */</a>
 <a name="54"><span class="lineNum">      54 </span>            : template &lt;class T&gt;</a>
-<a name="55"><span class="lineNum">      55 </span><span class="lineCov">     225137 : bool floating_point_equal(T v1, T v2, T abs_tol = 0, T rel_tol = std::numeric_limits&lt;T&gt;::min())</span></a>
+<a name="55"><span class="lineNum">      55 </span><span class="lineCov">     227828 : bool floating_point_equal(T v1, T v2, T abs_tol = 0, T rel_tol = std::numeric_limits&lt;T&gt;::min())</span></a>
 <a name="56"><span class="lineNum">      56 </span>            : {</a>
 <a name="57"><span class="lineNum">      57 </span>            :     using std::abs;</a>
-<a name="58"><span class="lineNum">      58 </span><span class="lineCov">     225137 :     auto diff = abs(v1 - v2);</span></a>
-<a name="59"><span class="lineNum">      59 </span><span class="lineCov">     225327 :     return diff &lt;= abs_tol || diff &lt;= abs_max(v1, v2) * rel_tol;</span></a>
+<a name="58"><span class="lineNum">      58 </span><span class="lineCov">     227828 :     auto diff = abs(v1 - v2);</span></a>
+<a name="59"><span class="lineNum">      59 </span><span class="lineCov">     228018 :     return diff &lt;= abs_tol || diff &lt;= abs_max(v1, v2) * rel_tol;</span></a>
 <a name="60"><span class="lineNum">      60 </span>            : }</a>
 <a name="61"><span class="lineNum">      61 </span>            : </a>
 <a name="62"><span class="lineNum">      62 </span>            : /**</a>
diff --git a/coverage/cpp/memilio/math/index-sort-f.html b/coverage/cpp/memilio/math/index-sort-f.html
index 26c54084b4..84cc05a532 100644
--- a/coverage/cpp/memilio/math/index-sort-f.html
+++ b/coverage/cpp/memilio/math/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">224</td>
diff --git a/coverage/cpp/memilio/math/index-sort-l.html b/coverage/cpp/memilio/math/index-sort-l.html
index fc8455c7cf..9948380924 100644
--- a/coverage/cpp/memilio/math/index-sort-l.html
+++ b/coverage/cpp/memilio/math/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">224</td>
@@ -110,24 +110,24 @@
       <td class="coverNumHi">7 / 7</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="interpolation.h.gcov.html">interpolation.h</a></td>
+      <td class="coverFile"><a href="floating_point.h.gcov.html">floating_point.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">14 / 14</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">3 / 3</td>
+      <td class="coverNumHi">18 / 18</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="floating_point.h.gcov.html">floating_point.h</a></td>
+      <td class="coverFile"><a href="interpolation.h.gcov.html">interpolation.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">14 / 14</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">18 / 18</td>
+      <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
       <td class="coverFile"><a href="matrix_shape.h.gcov.html">matrix_shape.h</a></td>
diff --git a/coverage/cpp/memilio/math/index.html b/coverage/cpp/memilio/math/index.html
index 99ce05645b..9b2a345e77 100644
--- a/coverage/cpp/memilio/math/index.html
+++ b/coverage/cpp/memilio/math/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">224</td>
diff --git a/coverage/cpp/memilio/math/integrator.h.func-sort-c.html b/coverage/cpp/memilio/math/integrator.h.func-sort-c.html
index 18dea4a1a0..be9ac73c4a 100644
--- a/coverage/cpp/memilio/math/integrator.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/integrator.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">17</td>
@@ -125,19 +125,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#146">mio::OdeIntegrator&lt;double&gt;::advance(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, double, double&amp;, mio::TimeSeries&lt;double&gt;&amp;)</a></td>
-              <td class="coverFnHi">55956</td>
+              <td class="coverFnHi">55974</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="integrator.h.gcov.html#108">mio::IntegratorCore&lt;double&gt;::get_dt_max() const</a></td>
-              <td class="coverFnHi">218628</td>
+              <td class="coverFn"><a href="integrator.h.gcov.html#88">mio::IntegratorCore&lt;double&gt;::get_dt_min()</a></td>
+              <td class="coverFnHi">223503</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="integrator.h.gcov.html#88">mio::IntegratorCore&lt;double&gt;::get_dt_min()</a></td>
-              <td class="coverFnHi">223413</td>
+              <td class="coverFn"><a href="integrator.h.gcov.html#108">mio::IntegratorCore&lt;double&gt;::get_dt_max() const</a></td>
+              <td class="coverFnHi">224010</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#92">mio::IntegratorCore&lt;double&gt;::get_dt_min() const</a></td>
-              <td class="coverFnHi">556635</td>
+              <td class="coverFnHi">570927</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/integrator.h.func.html b/coverage/cpp/memilio/math/integrator.h.func.html
index b9ae2ebe91..119f06deec 100644
--- a/coverage/cpp/memilio/math/integrator.h.func.html
+++ b/coverage/cpp/memilio/math/integrator.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">17</td>
@@ -77,7 +77,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#146">mio::OdeIntegrator&lt;double&gt;::advance(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, double, double&amp;, mio::TimeSeries&lt;double&gt;&amp;)</a></td>
-              <td class="coverFnHi">55956</td>
+              <td class="coverFnHi">55974</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#130">mio::OdeIntegrator&lt;double&gt;::OdeIntegrator(std::shared_ptr&lt;mio::IntegratorCore&lt;double&gt; &gt;)</a></td>
@@ -109,7 +109,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#88">mio::IntegratorCore&lt;double&gt;::get_dt_min()</a></td>
-              <td class="coverFnHi">223413</td>
+              <td class="coverFnHi">223503</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#47">mio::IntegratorCore&lt;double&gt;::IntegratorCore(double const&amp;, double const&amp;)</a></td>
@@ -133,11 +133,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#108">mio::IntegratorCore&lt;double&gt;::get_dt_max() const</a></td>
-              <td class="coverFnHi">218628</td>
+              <td class="coverFnHi">224010</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="integrator.h.gcov.html#92">mio::IntegratorCore&lt;double&gt;::get_dt_min() const</a></td>
-              <td class="coverFnHi">556635</td>
+              <td class="coverFnHi">570927</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/integrator.h.gcov.html b/coverage/cpp/memilio/math/integrator.h.gcov.html
index 0e63240645..2a5a2527e1 100644
--- a/coverage/cpp/memilio/math/integrator.h.gcov.html
+++ b/coverage/cpp/memilio/math/integrator.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">17</td>
@@ -149,13 +149,13 @@
 <a name="87"><span class="lineNum">      87 </span>            :      * @return A reference to the minimum possible value of dt.</a>
 <a name="88"><span class="lineNum">      88 </span>            :      * @{</a>
 <a name="89"><span class="lineNum">      89 </span>            :      */</a>
-<a name="90"><span class="lineNum">      90 </span><span class="lineCov">     223415 :     FP&amp; get_dt_min()</span></a>
+<a name="90"><span class="lineNum">      90 </span><span class="lineCov">     223505 :     FP&amp; get_dt_min()</span></a>
 <a name="91"><span class="lineNum">      91 </span>            :     {</a>
-<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     223415 :         return m_dt_min;</span></a>
+<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     223505 :         return m_dt_min;</span></a>
 <a name="93"><span class="lineNum">      93 </span>            :     }</a>
-<a name="94"><span class="lineNum">      94 </span><span class="lineCov">     556640 :     const FP&amp; get_dt_min() const</span></a>
+<a name="94"><span class="lineNum">      94 </span><span class="lineCov">     570932 :     const FP&amp; get_dt_min() const</span></a>
 <a name="95"><span class="lineNum">      95 </span>            :     {</a>
-<a name="96"><span class="lineNum">      96 </span><span class="lineCov">     556640 :         return m_dt_min;</span></a>
+<a name="96"><span class="lineNum">      96 </span><span class="lineCov">     570932 :         return m_dt_min;</span></a>
 <a name="97"><span class="lineNum">      97 </span>            :     }</a>
 <a name="98"><span class="lineNum">      98 </span>            :     /** @} */</a>
 <a name="99"><span class="lineNum">      99 </span>            : </a>
@@ -169,9 +169,9 @@
 <a name="107"><span class="lineNum">     107 </span>            :     {</a>
 <a name="108"><span class="lineNum">     108 </span><span class="lineCov">       1025 :         return m_dt_max;</span></a>
 <a name="109"><span class="lineNum">     109 </span>            :     }</a>
-<a name="110"><span class="lineNum">     110 </span><span class="lineCov">     218630 :     const FP&amp; get_dt_max() const</span></a>
+<a name="110"><span class="lineNum">     110 </span><span class="lineCov">     224012 :     const FP&amp; get_dt_max() const</span></a>
 <a name="111"><span class="lineNum">     111 </span>            :     {</a>
-<a name="112"><span class="lineNum">     112 </span><span class="lineCov">     218630 :         return m_dt_max;</span></a>
+<a name="112"><span class="lineNum">     112 </span><span class="lineCov">     224012 :         return m_dt_max;</span></a>
 <a name="113"><span class="lineNum">     113 </span>            :     }</a>
 <a name="114"><span class="lineNum">     114 </span>            :     /** @} */</a>
 <a name="115"><span class="lineNum">     115 </span>            : </a>
@@ -207,69 +207,69 @@
 <a name="145"><span class="lineNum">     145 </span>            :      * @return A reference to the last value in the results time series.</a>
 <a name="146"><span class="lineNum">     146 </span>            :      */</a>
 <a name="147"><span class="lineNum">     147 </span>            : </a>
-<a name="148"><span class="lineNum">     148 </span><span class="lineCov">      55957 :     Eigen::Ref&lt;Vector&lt;FP&gt;&gt; advance(const DerivFunction&lt;FP&gt;&amp; f, const FP tmax, FP&amp; dt, TimeSeries&lt;FP&gt;&amp; results)</span></a>
+<a name="148"><span class="lineNum">     148 </span><span class="lineCov">      55975 :     Eigen::Ref&lt;Vector&lt;FP&gt;&gt; advance(const DerivFunction&lt;FP&gt;&amp; f, const FP tmax, FP&amp; dt, TimeSeries&lt;FP&gt;&amp; results)</span></a>
 <a name="149"><span class="lineNum">     149 </span>            :     {</a>
 <a name="150"><span class="lineNum">     150 </span>            :         // hint at std functions for ADL</a>
 <a name="151"><span class="lineNum">     151 </span>            :         using std::fabs;</a>
 <a name="152"><span class="lineNum">     152 </span>            :         using std::max;</a>
 <a name="153"><span class="lineNum">     153 </span>            :         using std::min;</a>
-<a name="154"><span class="lineNum">     154 </span><span class="lineCov">      55957 :         const FP t0 = results.get_last_time();</span></a>
-<a name="155"><span class="lineNum">     155 </span><span class="lineCov">      55957 :         assert(tmax &gt; t0);</span></a>
-<a name="156"><span class="lineNum">     156 </span><span class="lineCov">      55957 :         assert(dt &gt; 0);</span></a>
+<a name="154"><span class="lineNum">     154 </span><span class="lineCov">      55975 :         const FP t0 = results.get_last_time();</span></a>
+<a name="155"><span class="lineNum">     155 </span><span class="lineCov">      55975 :         assert(tmax &gt; t0);</span></a>
+<a name="156"><span class="lineNum">     156 </span><span class="lineCov">      55975 :         assert(dt &gt; 0);</span></a>
 <a name="157"><span class="lineNum">     157 </span>            : </a>
-<a name="158"><span class="lineNum">     158 </span><span class="lineCov">      55957 :         const size_t num_steps =</span></a>
-<a name="159"><span class="lineNum">     159 </span><span class="lineCov">      55957 :             static_cast&lt;size_t&gt;(ceil((tmax - t0) / dt)); // estimated number of time steps (if equidistant)</span></a>
+<a name="158"><span class="lineNum">     158 </span><span class="lineCov">      55975 :         const size_t num_steps =</span></a>
+<a name="159"><span class="lineNum">     159 </span><span class="lineCov">      55975 :             static_cast&lt;size_t&gt;(ceil((tmax - t0) / dt)); // estimated number of time steps (if equidistant)</span></a>
 <a name="160"><span class="lineNum">     160 </span>            : </a>
-<a name="161"><span class="lineNum">     161 </span><span class="lineCov">      55957 :         results.reserve(results.get_num_time_points() + num_steps);</span></a>
+<a name="161"><span class="lineNum">     161 </span><span class="lineCov">      55975 :         results.reserve(results.get_num_time_points() + num_steps);</span></a>
 <a name="162"><span class="lineNum">     162 </span>            : </a>
-<a name="163"><span class="lineNum">     163 </span><span class="lineCov">      55957 :         bool step_okay = true;</span></a>
+<a name="163"><span class="lineNum">     163 </span><span class="lineCov">      55975 :         bool step_okay = true;</span></a>
 <a name="164"><span class="lineNum">     164 </span>            : </a>
 <a name="165"><span class="lineNum">     165 </span><span class="lineCov">          1 :         FP dt_copy; // used to check whether step sizing is adaptive</span></a>
-<a name="166"><span class="lineNum">     166 </span><span class="lineCov">      55957 :         FP dt_restore     = 0.0; // used to restore dt, if dt was decreased to reach tmax</span></a>
-<a name="167"><span class="lineNum">     167 </span><span class="lineCov">      55957 :         FP dt_min_restore = m_core-&gt;get_dt_min(); // used to restore dt_min, if it was decreased to reach tmax</span></a>
-<a name="168"><span class="lineNum">     168 </span><span class="lineCov">      55957 :         FP t              = t0;</span></a>
+<a name="166"><span class="lineNum">     166 </span><span class="lineCov">      55975 :         FP dt_restore     = 0.0; // used to restore dt, if dt was decreased to reach tmax</span></a>
+<a name="167"><span class="lineNum">     167 </span><span class="lineCov">      55975 :         FP dt_min_restore = m_core-&gt;get_dt_min(); // used to restore dt_min, if it was decreased to reach tmax</span></a>
+<a name="168"><span class="lineNum">     168 </span><span class="lineCov">      55975 :         FP t              = t0;</span></a>
 <a name="169"><span class="lineNum">     169 </span>            : </a>
-<a name="170"><span class="lineNum">     170 </span><span class="lineCov">     167018 :         for (size_t i = results.get_num_time_points() - 1; fabs((tmax - t) / (tmax - t0)) &gt; 1e-10; ++i) {</span></a>
+<a name="170"><span class="lineNum">     170 </span><span class="lineCov">     169727 :         for (size_t i = results.get_num_time_points() - 1; fabs((tmax - t) / (tmax - t0)) &gt; 1e-10; ++i) {</span></a>
 <a name="171"><span class="lineNum">     171 </span>            :             //we don't make timesteps too small as the error estimator of an adaptive integrator</a>
 <a name="172"><span class="lineNum">     172 </span>            :             //may not be able to handle it. this is very conservative and maybe unnecessary,</a>
 <a name="173"><span class="lineNum">     173 </span>            :             //but also unlikely to happen. may need to be reevaluated</a>
 <a name="174"><span class="lineNum">     174 </span>            : </a>
-<a name="175"><span class="lineNum">     175 </span><span class="lineCov">     111061 :             if (dt &gt; tmax - t) {</span></a>
-<a name="176"><span class="lineNum">     176 </span><span class="lineCov">      55687 :                 dt_restore = dt;</span></a>
-<a name="177"><span class="lineNum">     177 </span><span class="lineCov">      55687 :                 dt         = tmax - t;</span></a>
+<a name="175"><span class="lineNum">     175 </span><span class="lineCov">     113752 :             if (dt &gt; tmax - t) {</span></a>
+<a name="176"><span class="lineNum">     176 </span><span class="lineCov">      55714 :                 dt_restore = dt;</span></a>
+<a name="177"><span class="lineNum">     177 </span><span class="lineCov">      55714 :                 dt         = tmax - t;</span></a>
 <a name="178"><span class="lineNum">     178 </span>            :                 // if necessary, also reduce minimal step size such that we do not step past tmax</a>
-<a name="179"><span class="lineNum">     179 </span><span class="lineCov">      55687 :                 m_core-&gt;get_dt_min() = min(tmax - t, m_core-&gt;get_dt_min());</span></a>
+<a name="179"><span class="lineNum">     179 </span><span class="lineCov">      55714 :                 m_core-&gt;get_dt_min() = min(tmax - t, m_core-&gt;get_dt_min());</span></a>
 <a name="180"><span class="lineNum">     180 </span>            :                 // if dt_min was reduced, the following step will be the last due to dt == dt_min (see step method)</a>
 <a name="181"><span class="lineNum">     181 </span>            :                 // dt_min must be restored after this loop</a>
 <a name="182"><span class="lineNum">     182 </span>            :             }</a>
 <a name="183"><span class="lineNum">     183 </span>            : </a>
-<a name="184"><span class="lineNum">     184 </span><span class="lineCov">     111061 :             dt_copy = dt;</span></a>
+<a name="184"><span class="lineNum">     184 </span><span class="lineCov">     113752 :             dt_copy = dt;</span></a>
 <a name="185"><span class="lineNum">     185 </span>            : </a>
-<a name="186"><span class="lineNum">     186 </span><span class="lineCov">     111061 :             results.add_time_point();</span></a>
-<a name="187"><span class="lineNum">     187 </span><span class="lineCov">     111061 :             step_okay &amp;= m_core-&gt;step(f, results[i], t, dt, results[i + 1]);</span></a>
-<a name="188"><span class="lineNum">     188 </span><span class="lineCov">     111061 :             results.get_last_time() = t;</span></a>
+<a name="186"><span class="lineNum">     186 </span><span class="lineCov">     113752 :             results.add_time_point();</span></a>
+<a name="187"><span class="lineNum">     187 </span><span class="lineCov">     113752 :             step_okay &amp;= m_core-&gt;step(f, results[i], t, dt, results[i + 1]);</span></a>
+<a name="188"><span class="lineNum">     188 </span><span class="lineCov">     113752 :             results.get_last_time() = t;</span></a>
 <a name="189"><span class="lineNum">     189 </span>            : </a>
 <a name="190"><span class="lineNum">     190 </span>            :             // if dt has been changed (even slighly) by step, register the current m_core as adaptive</a>
-<a name="191"><span class="lineNum">     191 </span><span class="lineCov">     111061 :             m_is_adaptive |= !floating_point_equal(dt, dt_copy);</span></a>
+<a name="191"><span class="lineNum">     191 </span><span class="lineCov">     113752 :             m_is_adaptive |= !floating_point_equal(dt, dt_copy);</span></a>
 <a name="192"><span class="lineNum">     192 </span>            :         }</a>
-<a name="193"><span class="lineNum">     193 </span><span class="lineCov">      55957 :         m_core-&gt;get_dt_min() = dt_min_restore; // restore dt_min</span></a>
+<a name="193"><span class="lineNum">     193 </span><span class="lineCov">      55975 :         m_core-&gt;get_dt_min() = dt_min_restore; // restore dt_min</span></a>
 <a name="194"><span class="lineNum">     194 </span>            :         // if dt was decreased to reach tmax in the last time iteration,</a>
 <a name="195"><span class="lineNum">     195 </span>            :         // we restore it as it is now probably smaller than required for tolerances</a>
-<a name="196"><span class="lineNum">     196 </span><span class="lineCov">      55957 :         dt = max(dt, dt_restore);</span></a>
+<a name="196"><span class="lineNum">     196 </span><span class="lineCov">      55975 :         dt = max(dt, dt_restore);</span></a>
 <a name="197"><span class="lineNum">     197 </span>            : </a>
-<a name="198"><span class="lineNum">     198 </span><span class="lineCov">      55957 :         if (m_is_adaptive) {</span></a>
-<a name="199"><span class="lineNum">     199 </span><span class="lineCov">      55533 :             if (!step_okay) {</span></a>
+<a name="198"><span class="lineNum">     198 </span><span class="lineCov">      55975 :         if (m_is_adaptive) {</span></a>
+<a name="199"><span class="lineNum">     199 </span><span class="lineCov">      55551 :             if (!step_okay) {</span></a>
 <a name="200"><span class="lineNum">     200 </span><span class="lineNoCov">          0 :                 log_warning(&quot;Adaptive step sizing failed. Forcing an integration step of size dt_min.&quot;);</span></a>
 <a name="201"><span class="lineNum">     201 </span>            :             }</a>
-<a name="202"><span class="lineNum">     202 </span><span class="lineCov">      55533 :             else if (fabs((tmax - t) / (tmax - t0)) &gt; 1e-14) {</span></a>
+<a name="202"><span class="lineNum">     202 </span><span class="lineCov">      55551 :             else if (fabs((tmax - t) / (tmax - t0)) &gt; 1e-14) {</span></a>
 <a name="203"><span class="lineNum">     203 </span><span class="lineNoCov">          0 :                 log_warning(&quot;Last time step too small. Could not reach tmax exactly.&quot;);</span></a>
 <a name="204"><span class="lineNum">     204 </span>            :             }</a>
 <a name="205"><span class="lineNum">     205 </span>            :             else {</a>
-<a name="206"><span class="lineNum">     206 </span><span class="lineCov">     111066 :                 log_info(&quot;Adaptive step sizing successful to tolerances.&quot;);</span></a>
+<a name="206"><span class="lineNum">     206 </span><span class="lineCov">     111102 :                 log_info(&quot;Adaptive step sizing successful to tolerances.&quot;);</span></a>
 <a name="207"><span class="lineNum">     207 </span>            :             }</a>
 <a name="208"><span class="lineNum">     208 </span>            :         }</a>
 <a name="209"><span class="lineNum">     209 </span>            : </a>
-<a name="210"><span class="lineNum">     210 </span><span class="lineCov">     111914 :         return results.get_last_value();</span></a>
+<a name="210"><span class="lineNum">     210 </span><span class="lineCov">     111950 :         return results.get_last_value();</span></a>
 <a name="211"><span class="lineNum">     211 </span>            :     }</a>
 <a name="212"><span class="lineNum">     212 </span>            : </a>
 <a name="213"><span class="lineNum">     213 </span><span class="lineCov">        210 :     void set_integrator(std::shared_ptr&lt;IntegratorCore&lt;FP&gt;&gt; integrator)</span></a>
diff --git a/coverage/cpp/memilio/math/interpolation.h.func-sort-c.html b/coverage/cpp/memilio/math/interpolation.h.func-sort-c.html
index 396156aba6..aa9e30bf73 100644
--- a/coverage/cpp/memilio/math/interpolation.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/interpolation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="interpolation.h.gcov.html#41">auto mio::linear_interpolation&lt;double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(double const&amp;, double const&amp;, double const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">7926</td>
+              <td class="coverFnHi">8052</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="interpolation.h.gcov.html#58">mio::TimeSeries&lt;double&gt;::Vector mio::linear_interpolation&lt;double&gt;(double, mio::TimeSeries&lt;double&gt; const&amp;)</a></td>
diff --git a/coverage/cpp/memilio/math/interpolation.h.func.html b/coverage/cpp/memilio/math/interpolation.h.func.html
index a21e748259..0c8ad00f8f 100644
--- a/coverage/cpp/memilio/math/interpolation.h.func.html
+++ b/coverage/cpp/memilio/math/interpolation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="interpolation.h.gcov.html#41">auto mio::linear_interpolation&lt;double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt; &gt;(double const&amp;, double const&amp;, double const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">7926</td>
+              <td class="coverFnHi">8052</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="interpolation.h.gcov.html#41">auto mio::linear_interpolation&lt;double, double&gt;(double const&amp;, double const&amp;, double const&amp;, double const&amp;, double const&amp;)</a></td>
diff --git a/coverage/cpp/memilio/math/interpolation.h.gcov.html b/coverage/cpp/memilio/math/interpolation.h.gcov.html
index 717b548005..3ab8c8cc46 100644
--- a/coverage/cpp/memilio/math/interpolation.h.gcov.html
+++ b/coverage/cpp/memilio/math/interpolation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -102,10 +102,10 @@
 <a name="40"><span class="lineNum">      40 </span>            :  * @return Interpolation result.</a>
 <a name="41"><span class="lineNum">      41 </span>            :  */</a>
 <a name="42"><span class="lineNum">      42 </span>            : template &lt;typename X, typename V&gt;</a>
-<a name="43"><span class="lineNum">      43 </span><span class="lineCov">       8007 : auto linear_interpolation(const X&amp; x_eval, const X&amp; x_1, const X&amp; x_2, const V&amp; y1, const V&amp; y2)</span></a>
+<a name="43"><span class="lineNum">      43 </span><span class="lineCov">       8133 : auto linear_interpolation(const X&amp; x_eval, const X&amp; x_1, const X&amp; x_2, const V&amp; y1, const V&amp; y2)</span></a>
 <a name="44"><span class="lineNum">      44 </span>            : {</a>
-<a name="45"><span class="lineNum">      45 </span><span class="lineCov">       8007 :     const auto weight = (x_eval - x_1) / (x_2 - x_1);</span></a>
-<a name="46"><span class="lineNum">      46 </span><span class="lineCov">      15933 :     return y1 + weight * (y2 - y1);</span></a>
+<a name="45"><span class="lineNum">      45 </span><span class="lineCov">       8133 :     const auto weight = (x_eval - x_1) / (x_2 - x_1);</span></a>
+<a name="46"><span class="lineNum">      46 </span><span class="lineCov">      16185 :     return y1 + weight * (y2 - y1);</span></a>
 <a name="47"><span class="lineNum">      47 </span>            : }</a>
 <a name="48"><span class="lineNum">      48 </span>            : </a>
 <a name="49"><span class="lineNum">      49 </span>            : /**</a>
@@ -127,15 +127,15 @@
 <a name="65"><span class="lineNum">      65 </span><span class="lineCov">      10143 :     const auto next_tp = std::upper_bound(tp_range.begin(), tp_range.end(), time);</span></a>
 <a name="66"><span class="lineNum">      66 </span>            :     // interpolate in between values if possible, otherwise return first/last value</a>
 <a name="67"><span class="lineNum">      67 </span><span class="lineCov">      10143 :     if (next_tp == tp_range.begin()) { // time is before first data point</span></a>
-<a name="68"><span class="lineNum">      68 </span><span class="lineCov">       2187 :         return data.get_value(0);</span></a>
+<a name="68"><span class="lineNum">      68 </span><span class="lineCov">       2178 :         return data.get_value(0);</span></a>
 <a name="69"><span class="lineNum">      69 </span>            :     }</a>
-<a name="70"><span class="lineNum">      70 </span><span class="lineCov">       7956 :     else if (next_tp == tp_range.end()) { // time is past or equal to last data point</span></a>
-<a name="71"><span class="lineNum">      71 </span><span class="lineCov">       2115 :         return data.get_last_value();</span></a>
+<a name="70"><span class="lineNum">      70 </span><span class="lineCov">       7965 :     else if (next_tp == tp_range.end()) { // time is past or equal to last data point</span></a>
+<a name="71"><span class="lineNum">      71 </span><span class="lineCov">       1998 :         return data.get_last_value();</span></a>
 <a name="72"><span class="lineNum">      72 </span>            :     }</a>
 <a name="73"><span class="lineNum">      73 </span>            :     else { // time is in between data points</a>
-<a name="74"><span class="lineNum">      74 </span><span class="lineCov">       5841 :         const auto i = next_tp - tp_range.begin(); // index of strict upper bound</span></a>
-<a name="75"><span class="lineNum">      75 </span><span class="lineCov">       5841 :         return linear_interpolation(time, data.get_time(i - 1), data.get_time(i), data.get_value(i - 1),</span></a>
-<a name="76"><span class="lineNum">      76 </span><span class="lineCov">      11682 :                                     data.get_value(i));</span></a>
+<a name="74"><span class="lineNum">      74 </span><span class="lineCov">       5967 :         const auto i = next_tp - tp_range.begin(); // index of strict upper bound</span></a>
+<a name="75"><span class="lineNum">      75 </span><span class="lineCov">       5967 :         return linear_interpolation(time, data.get_time(i - 1), data.get_time(i), data.get_value(i - 1),</span></a>
+<a name="76"><span class="lineNum">      76 </span><span class="lineCov">      11934 :                                     data.get_value(i));</span></a>
 <a name="77"><span class="lineNum">      77 </span>            :     }</a>
 <a name="78"><span class="lineNum">      78 </span>            : }</a>
 <a name="79"><span class="lineNum">      79 </span>            : </a>
diff --git a/coverage/cpp/memilio/math/matrix_shape.h.func-sort-c.html b/coverage/cpp/memilio/math/matrix_shape.h.func-sort-c.html
index 39a7fd6e55..74057cfede 100644
--- a/coverage/cpp/memilio/math/matrix_shape.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/matrix_shape.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">23</td>
@@ -137,19 +137,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#177">mio::SquareMatrixShape::cols() const</a></td>
-              <td class="coverFnHi">883796</td>
+              <td class="coverFnHi">904964</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#169">mio::SquareMatrixShape::rows() const</a></td>
-              <td class="coverFnHi">884925</td>
+              <td class="coverFnHi">906093</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#159">mio::SquareMatrixShape mio::SquareMatrixShape::get_shape_of&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt;(Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">1763783</td>
+              <td class="coverFnHi">1806119</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#148">mio::SquareMatrixShape::SquareMatrixShape(long)</a></td>
-              <td class="coverFnHi">1768510</td>
+              <td class="coverFnHi">1810846</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/matrix_shape.h.func.html b/coverage/cpp/memilio/math/matrix_shape.h.func.html
index a2f7290845..1515150e0c 100644
--- a/coverage/cpp/memilio/math/matrix_shape.h.func.html
+++ b/coverage/cpp/memilio/math/matrix_shape.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">23</td>
@@ -93,11 +93,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#159">mio::SquareMatrixShape mio::SquareMatrixShape::get_shape_of&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt;(Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">1763783</td>
+              <td class="coverFnHi">1806119</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#148">mio::SquareMatrixShape::SquareMatrixShape(long)</a></td>
-              <td class="coverFnHi">1768510</td>
+              <td class="coverFnHi">1810846</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#80">mio::RectMatrixShape::cols() const</a></td>
@@ -133,11 +133,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#177">mio::SquareMatrixShape::cols() const</a></td>
-              <td class="coverFnHi">883796</td>
+              <td class="coverFnHi">904964</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#169">mio::SquareMatrixShape::rows() const</a></td>
-              <td class="coverFnHi">884925</td>
+              <td class="coverFnHi">906093</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="matrix_shape.h.gcov.html#184">mio::SquareMatrixShape::size() const</a></td>
diff --git a/coverage/cpp/memilio/math/matrix_shape.h.gcov.html b/coverage/cpp/memilio/math/matrix_shape.h.gcov.html
index 4a44cc384d..bf51c7eab8 100644
--- a/coverage/cpp/memilio/math/matrix_shape.h.gcov.html
+++ b/coverage/cpp/memilio/math/matrix_shape.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">23</td>
@@ -209,10 +209,10 @@
 <a name="147"><span class="lineNum">     147 </span>            :      * construct a square matrix of dimensions r</a>
 <a name="148"><span class="lineNum">     148 </span>            :      * @param r number of rows and columns</a>
 <a name="149"><span class="lineNum">     149 </span>            :      */</a>
-<a name="150"><span class="lineNum">     150 </span><span class="lineCov">    1768510 :     explicit SquareMatrixShape(Eigen::Index r)</span></a>
-<a name="151"><span class="lineNum">     151 </span><span class="lineCov">    1768510 :         : m_rows(r)</span></a>
+<a name="150"><span class="lineNum">     150 </span><span class="lineCov">    1810846 :     explicit SquareMatrixShape(Eigen::Index r)</span></a>
+<a name="151"><span class="lineNum">     151 </span><span class="lineCov">    1810846 :         : m_rows(r)</span></a>
 <a name="152"><span class="lineNum">     152 </span>            :     {</a>
-<a name="153"><span class="lineNum">     153 </span><span class="lineCov">    1768510 :     }</span></a>
+<a name="153"><span class="lineNum">     153 </span><span class="lineCov">    1810846 :     }</span></a>
 <a name="154"><span class="lineNum">     154 </span>            : </a>
 <a name="155"><span class="lineNum">     155 </span>            :     /**</a>
 <a name="156"><span class="lineNum">     156 </span>            :      * extract the shape of a square matrix.</a>
@@ -220,27 +220,27 @@
 <a name="158"><span class="lineNum">     158 </span>            :      * @tparam ME matrix expression.</a>
 <a name="159"><span class="lineNum">     159 </span>            :      */</a>
 <a name="160"><span class="lineNum">     160 </span>            :     template &lt;class ME&gt;</a>
-<a name="161"><span class="lineNum">     161 </span><span class="lineCov">    1766376 :     static SquareMatrixShape get_shape_of(const Eigen::MatrixBase&lt;ME&gt;&amp; m)</span></a>
+<a name="161"><span class="lineNum">     161 </span><span class="lineCov">    1808712 :     static SquareMatrixShape get_shape_of(const Eigen::MatrixBase&lt;ME&gt;&amp; m)</span></a>
 <a name="162"><span class="lineNum">     162 </span>            :     {</a>
-<a name="163"><span class="lineNum">     163 </span><span class="lineCov">    1766376 :         assert(m.rows() == m.cols());</span></a>
-<a name="164"><span class="lineNum">     164 </span><span class="lineCov">    1766376 :         return SquareMatrixShape{m.rows()};</span></a>
+<a name="163"><span class="lineNum">     163 </span><span class="lineCov">    1808712 :         assert(m.rows() == m.cols());</span></a>
+<a name="164"><span class="lineNum">     164 </span><span class="lineCov">    1808712 :         return SquareMatrixShape{m.rows()};</span></a>
 <a name="165"><span class="lineNum">     165 </span>            :     }</a>
 <a name="166"><span class="lineNum">     166 </span>            : </a>
 <a name="167"><span class="lineNum">     167 </span>            :     /**</a>
 <a name="168"><span class="lineNum">     168 </span>            :      * number of rows.</a>
 <a name="169"><span class="lineNum">     169 </span>            :      * equal to number of columns.</a>
 <a name="170"><span class="lineNum">     170 </span>            :      */</a>
-<a name="171"><span class="lineNum">     171 </span><span class="lineCov">     884925 :     Eigen::Index rows() const</span></a>
+<a name="171"><span class="lineNum">     171 </span><span class="lineCov">     906093 :     Eigen::Index rows() const</span></a>
 <a name="172"><span class="lineNum">     172 </span>            :     {</a>
-<a name="173"><span class="lineNum">     173 </span><span class="lineCov">     884925 :         return m_rows;</span></a>
+<a name="173"><span class="lineNum">     173 </span><span class="lineCov">     906093 :         return m_rows;</span></a>
 <a name="174"><span class="lineNum">     174 </span>            :     }</a>
 <a name="175"><span class="lineNum">     175 </span>            :     /**</a>
 <a name="176"><span class="lineNum">     176 </span>            :      * number of columns.</a>
 <a name="177"><span class="lineNum">     177 </span>            :      * equal to number of rows.</a>
 <a name="178"><span class="lineNum">     178 </span>            :      */</a>
-<a name="179"><span class="lineNum">     179 </span><span class="lineCov">     883796 :     Eigen::Index cols() const</span></a>
+<a name="179"><span class="lineNum">     179 </span><span class="lineCov">     904964 :     Eigen::Index cols() const</span></a>
 <a name="180"><span class="lineNum">     180 </span>            :     {</a>
-<a name="181"><span class="lineNum">     181 </span><span class="lineCov">     883796 :         return m_rows;</span></a>
+<a name="181"><span class="lineNum">     181 </span><span class="lineCov">     904964 :         return m_rows;</span></a>
 <a name="182"><span class="lineNum">     182 </span>            :     }</a>
 <a name="183"><span class="lineNum">     183 </span>            :     /**</a>
 <a name="184"><span class="lineNum">     184 </span>            :      * number of rows or columns.</a>
diff --git a/coverage/cpp/memilio/math/smoother.h.func-sort-c.html b/coverage/cpp/memilio/math/smoother.h.func-sort-c.html
index 06443fbf5d..7700355bac 100644
--- a/coverage/cpp/memilio/math/smoother.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/smoother.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
@@ -69,23 +69,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#64">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">271525</td>
+              <td class="coverFnHi">271534</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#67">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;)::{lambda(auto:1, auto:2)#1}::operator()&lt;double, double&gt;(double, double) const</a></td>
-              <td class="coverFnHi">271660</td>
+              <td class="coverFnHi">271669</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#64">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">879801</td>
+              <td class="coverFnHi">900969</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#67">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;)::{lambda(auto:1, auto:2)#1}::operator()&lt;double, double&gt;(double, double) const</a></td>
-              <td class="coverFnHi">880994</td>
+              <td class="coverFnHi">902162</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#41">mio::smoother_cosine(double, double, double, double, double)</a></td>
-              <td class="coverFnHi">2053471</td>
+              <td class="coverFnHi">2116768</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/smoother.h.func.html b/coverage/cpp/memilio/math/smoother.h.func.html
index 277c423db7..a69a848901 100644
--- a/coverage/cpp/memilio/math/smoother.h.func.html
+++ b/coverage/cpp/memilio/math/smoother.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#41">mio::smoother_cosine(double, double, double, double, double)</a></td>
-              <td class="coverFnHi">2053471</td>
+              <td class="coverFnHi">2116768</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#64">auto mio::smoother_cosine&lt;Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt;, Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt; &gt; const&amp;)</a></td>
@@ -69,11 +69,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#64">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">271525</td>
+              <td class="coverFnHi">271534</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#64">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">879801</td>
+              <td class="coverFnHi">900969</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#67">auto mio::smoother_cosine&lt;Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt;, Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::MatrixWrapper&lt;Eigen::CwiseUnaryOp&lt;Eigen::internal::scalar_cast_op&lt;mio::UncertainValue&lt;double&gt;, double&gt;, Eigen::Array&lt;mio::UncertainValue&lt;double&gt;, -1, 1, 0, -1, 1&gt; const&gt; const&gt; &gt; const&amp;)::{lambda(auto:1, auto:2)#1}::operator()&lt;double, double&gt;(double, double) const</a></td>
@@ -81,11 +81,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#67">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;)::{lambda(auto:1, auto:2)#1}::operator()&lt;double, double&gt;(double, double) const</a></td>
-              <td class="coverFnHi">271660</td>
+              <td class="coverFnHi">271669</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="smoother.h.gcov.html#67">auto mio::smoother_cosine&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt;(double, double, double, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;, Eigen::MatrixBase&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; &gt; const&amp;)::{lambda(auto:1, auto:2)#1}::operator()&lt;double, double&gt;(double, double) const</a></td>
-              <td class="coverFnHi">880994</td>
+              <td class="coverFnHi">902162</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/smoother.h.gcov.html b/coverage/cpp/memilio/math/smoother.h.gcov.html
index 42c43b9dc0..5e87aa3d2b 100644
--- a/coverage/cpp/memilio/math/smoother.h.gcov.html
+++ b/coverage/cpp/memilio/math/smoother.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
@@ -102,17 +102,17 @@
 <a name="40"><span class="lineNum">      40 </span>            :  * @param yright function value at right boundary</a>
 <a name="41"><span class="lineNum">      41 </span>            :  * @return double cosine-smoothed evaluation of discrete step function</a>
 <a name="42"><span class="lineNum">      42 </span>            :  */</a>
-<a name="43"><span class="lineNum">      43 </span><span class="lineCov">    2053471 : inline double smoother_cosine(double x, double xleft, double xright, double yleft, double yright)</span></a>
+<a name="43"><span class="lineNum">      43 </span><span class="lineCov">    2116768 : inline double smoother_cosine(double x, double xleft, double xright, double yleft, double yright)</span></a>
 <a name="44"><span class="lineNum">      44 </span>            : {</a>
-<a name="45"><span class="lineNum">      45 </span><span class="lineCov">    2053471 :     if (x &lt;= xleft) {</span></a>
-<a name="46"><span class="lineNum">      46 </span><span class="lineCov">    1266684 :         return yleft;</span></a>
+<a name="45"><span class="lineNum">      45 </span><span class="lineCov">    2116768 :     if (x &lt;= xleft) {</span></a>
+<a name="46"><span class="lineNum">      46 </span><span class="lineCov">    1286226 :         return yleft;</span></a>
 <a name="47"><span class="lineNum">      47 </span>            :     }</a>
-<a name="48"><span class="lineNum">      48 </span><span class="lineCov">     786787 :     if (x &gt;= xright) {</span></a>
-<a name="49"><span class="lineNum">      49 </span><span class="lineCov">     380093 :         return yright;</span></a>
+<a name="48"><span class="lineNum">      48 </span><span class="lineCov">     830542 :     if (x &gt;= xright) {</span></a>
+<a name="49"><span class="lineNum">      49 </span><span class="lineCov">     402980 :         return yright;</span></a>
 <a name="50"><span class="lineNum">      50 </span>            :     }</a>
 <a name="51"><span class="lineNum">      51 </span>            : </a>
-<a name="52"><span class="lineNum">      52 </span><span class="lineCov">     406694 :     return 0.5 * (yleft - yright) * std::cos(3.14159265358979323846 / (xright - xleft) * (x - xleft)) +</span></a>
-<a name="53"><span class="lineNum">      53 </span><span class="lineCov">     406694 :            0.5 * (yleft + yright);</span></a>
+<a name="52"><span class="lineNum">      52 </span><span class="lineCov">     427562 :     return 0.5 * (yleft - yright) * std::cos(3.14159265358979323846 / (xright - xleft) * (x - xleft)) +</span></a>
+<a name="53"><span class="lineNum">      53 </span><span class="lineCov">     427562 :            0.5 * (yleft + yright);</span></a>
 <a name="54"><span class="lineNum">      54 </span>            : }</a>
 <a name="55"><span class="lineNum">      55 </span>            : </a>
 <a name="56"><span class="lineNum">      56 </span>            : /**</a>
@@ -125,12 +125,12 @@
 <a name="63"><span class="lineNum">      63 </span>            :  * @return a matrix expression with yij = smoother_cosine(x, xleft, xright, yleftij, yrightij)</a>
 <a name="64"><span class="lineNum">      64 </span>            :  */</a>
 <a name="65"><span class="lineNum">      65 </span>            : template &lt;class LeftExpr, class RightExpr&gt;</a>
-<a name="66"><span class="lineNum">      66 </span><span class="lineCov">    1151410 : auto smoother_cosine(double x, double xleft, double xright, const Eigen::MatrixBase&lt;LeftExpr&gt;&amp; yleft_expr,</span></a>
+<a name="66"><span class="lineNum">      66 </span><span class="lineCov">    1172587 : auto smoother_cosine(double x, double xleft, double xright, const Eigen::MatrixBase&lt;LeftExpr&gt;&amp; yleft_expr,</span></a>
 <a name="67"><span class="lineNum">      67 </span>            :                      const Eigen::MatrixBase&lt;RightExpr&gt;&amp; yright_expr)</a>
 <a name="68"><span class="lineNum">      68 </span>            : {</a>
-<a name="69"><span class="lineNum">      69 </span><span class="lineCov">    3455459 :     return yleft_expr.binaryExpr(yright_expr, [=](auto yleft, auto yright) {</span></a>
-<a name="70"><span class="lineNum">      70 </span><span class="lineCov">    1152807 :         return smoother_cosine(x, xleft, xright, yleft, yright);</span></a>
-<a name="71"><span class="lineNum">      71 </span><span class="lineCov">    2302736 :     });</span></a>
+<a name="69"><span class="lineNum">      69 </span><span class="lineCov">    3518990 :     return yleft_expr.binaryExpr(yright_expr, [=](auto yleft, auto yright) {</span></a>
+<a name="70"><span class="lineNum">      70 </span><span class="lineCov">    1173984 :         return smoother_cosine(x, xleft, xright, yleft, yright);</span></a>
+<a name="71"><span class="lineNum">      71 </span><span class="lineCov">    2345090 :     });</span></a>
 <a name="72"><span class="lineNum">      72 </span>            : }</a>
 <a name="73"><span class="lineNum">      73 </span>            : </a>
 <a name="74"><span class="lineNum">      74 </span>            : } // namespace mio</a>
diff --git a/coverage/cpp/memilio/math/stepper_wrapper.h.func-sort-c.html b/coverage/cpp/memilio/math/stepper_wrapper.h.func-sort-c.html
index 0863cba3fe..2e9ff151ff 100644
--- a/coverage/cpp/memilio/math/stepper_wrapper.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/stepper_wrapper.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">29</td>
@@ -165,7 +165,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stepper_wrapper.h.gcov.html#77">mio::ControlledStepperWrapper&lt;double, boost::numeric::odeint::runge_kutta_cash_karp54&gt;::step(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double&amp;, double&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">106893</td>
+              <td class="coverFnHi">109584</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stepper_wrapper.h.gcov.html#213">mio::ExplicitStepperWrapper&lt;double, boost::numeric::odeint::runge_kutta_fehlberg78&gt;::step(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double&amp;, double&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const::{lambda(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double)#1}::operator()(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double) const</a></td>
@@ -173,7 +173,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stepper_wrapper.h.gcov.html#109">mio::ControlledStepperWrapper&lt;double, boost::numeric::odeint::runge_kutta_cash_karp54&gt;::step(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double&amp;, double&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const::{lambda(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double)#1}::operator()(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double) const</a></td>
-              <td class="coverFnHi">735561</td>
+              <td class="coverFnHi">756729</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/stepper_wrapper.h.func.html b/coverage/cpp/memilio/math/stepper_wrapper.h.func.html
index c7d850bf8a..017260775d 100644
--- a/coverage/cpp/memilio/math/stepper_wrapper.h.func.html
+++ b/coverage/cpp/memilio/math/stepper_wrapper.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">29</td>
@@ -149,7 +149,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stepper_wrapper.h.gcov.html#77">mio::ControlledStepperWrapper&lt;double, boost::numeric::odeint::runge_kutta_cash_karp54&gt;::step(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double&amp;, double&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">106893</td>
+              <td class="coverFnHi">109584</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stepper_wrapper.h.gcov.html#213">mio::ExplicitStepperWrapper&lt;double, boost::numeric::odeint::modified_midpoint&gt;::step(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double&amp;, double&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const::{lambda(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double)#1}::operator()(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double) const</a></td>
@@ -173,7 +173,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stepper_wrapper.h.gcov.html#109">mio::ControlledStepperWrapper&lt;double, boost::numeric::odeint::runge_kutta_cash_karp54&gt;::step(std::function&lt;void (Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;)&gt; const&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double&amp;, double&amp;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const::{lambda(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double)#1}::operator()(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;&amp;, double) const</a></td>
-              <td class="coverFnHi">735561</td>
+              <td class="coverFnHi">756729</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/math/stepper_wrapper.h.gcov.html b/coverage/cpp/memilio/math/stepper_wrapper.h.gcov.html
index 749f2ac1e6..c1895c9c8e 100644
--- a/coverage/cpp/memilio/math/stepper_wrapper.h.gcov.html
+++ b/coverage/cpp/memilio/math/stepper_wrapper.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">29</td>
@@ -138,29 +138,29 @@
 <a name="76"><span class="lineNum">      76 </span>            :      * @param[in,out] dt Current time step size h=dt. Overwritten by an estimated optimal step size for the next step.</a>
 <a name="77"><span class="lineNum">      77 </span>            :      * @param[out] ytp1 The approximated value of y(t').</a>
 <a name="78"><span class="lineNum">      78 </span>            :      */</a>
-<a name="79"><span class="lineNum">      79 </span><span class="lineCov">     107002 :     bool step(const mio::DerivFunction&lt;FP&gt;&amp; f, Eigen::Ref&lt;Vector&lt;FP&gt; const&gt; yt, FP&amp; t, FP&amp; dt,</span></a>
+<a name="79"><span class="lineNum">      79 </span><span class="lineCov">     109693 :     bool step(const mio::DerivFunction&lt;FP&gt;&amp; f, Eigen::Ref&lt;Vector&lt;FP&gt; const&gt; yt, FP&amp; t, FP&amp; dt,</span></a>
 <a name="80"><span class="lineNum">      80 </span>            :               Eigen::Ref&lt;Vector&lt;FP&gt;&gt; ytp1) const override</a>
 <a name="81"><span class="lineNum">      81 </span>            :     {</a>
 <a name="82"><span class="lineNum">      82 </span>            :         using boost::numeric::odeint::fail;</a>
 <a name="83"><span class="lineNum">      83 </span>            :         using std::max;</a>
-<a name="84"><span class="lineNum">      84 </span><span class="lineCov">     107002 :         assert(0 &lt;= this-&gt;get_dt_min());</span></a>
-<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     107002 :         assert(this-&gt;get_dt_min() &lt;= this-&gt;get_dt_max());</span></a>
+<a name="84"><span class="lineNum">      84 </span><span class="lineCov">     109693 :         assert(0 &lt;= this-&gt;get_dt_min());</span></a>
+<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     109693 :         assert(this-&gt;get_dt_min() &lt;= this-&gt;get_dt_max());</span></a>
 <a name="86"><span class="lineNum">      86 </span>            : </a>
-<a name="87"><span class="lineNum">      87 </span><span class="lineCov">     107002 :         if (dt &lt; this-&gt;get_dt_min() || dt &gt; this-&gt;get_dt_max()) {</span></a>
+<a name="87"><span class="lineNum">      87 </span><span class="lineCov">     109693 :         if (dt &lt; this-&gt;get_dt_min() || dt &gt; this-&gt;get_dt_max()) {</span></a>
 <a name="88"><span class="lineNum">      88 </span><span class="lineCov">         90 :             mio::log_warning(&quot;IntegratorCore: Restricting given step size dt = {} to [{}, {}].&quot;, dt, this-&gt;get_dt_min(),</span></a>
 <a name="89"><span class="lineNum">      89 </span><span class="lineCov">         45 :                              this-&gt;get_dt_max());</span></a>
 <a name="90"><span class="lineNum">      90 </span>            :         }</a>
 <a name="91"><span class="lineNum">      91 </span>            :         // set initial values for exit conditions</a>
-<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     107002 :         auto step_result = fail;</span></a>
-<a name="93"><span class="lineNum">      93 </span><span class="lineCov">     107002 :         bool is_dt_valid = true;</span></a>
+<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     109693 :         auto step_result = fail;</span></a>
+<a name="93"><span class="lineNum">      93 </span><span class="lineCov">     109693 :         bool is_dt_valid = true;</span></a>
 <a name="94"><span class="lineNum">      94 </span>            :         // copy vectors from the references, since the stepper cannot (trivially) handle Eigen::Ref</a>
-<a name="95"><span class="lineNum">      95 </span><span class="lineCov">     107002 :         m_ytp1 = ytp1; // y(t')</span></a>
-<a name="96"><span class="lineNum">      96 </span><span class="lineCov">     107002 :         m_yt   = yt; // y(t)</span></a>
+<a name="95"><span class="lineNum">      95 </span><span class="lineCov">     109693 :         m_ytp1 = ytp1; // y(t')</span></a>
+<a name="96"><span class="lineNum">      96 </span><span class="lineCov">     109693 :         m_yt   = yt; // y(t)</span></a>
 <a name="97"><span class="lineNum">      97 </span>            :         // make a integration step, adapting dt to a possibly larger value on success,</a>
 <a name="98"><span class="lineNum">      98 </span>            :         // or a strictly smaller value on fail.</a>
 <a name="99"><span class="lineNum">      99 </span>            :         // stop only on a successful step or a failed step size adaption (w.r.t. the minimal step size dt_min)</a>
-<a name="100"><span class="lineNum">     100 </span><span class="lineCov">     229730 :         while (step_result == fail &amp;&amp; is_dt_valid) {</span></a>
-<a name="101"><span class="lineNum">     101 </span><span class="lineCov">     122728 :             if (dt &lt; this-&gt;get_dt_min()) {</span></a>
+<a name="100"><span class="lineNum">     100 </span><span class="lineCov">     235949 :         while (step_result == fail &amp;&amp; is_dt_valid) {</span></a>
+<a name="101"><span class="lineNum">     101 </span><span class="lineCov">     126256 :             if (dt &lt; this-&gt;get_dt_min()) {</span></a>
 <a name="102"><span class="lineNum">     102 </span><span class="lineCov">         45 :                 is_dt_valid = false;</span></a>
 <a name="103"><span class="lineNum">     103 </span><span class="lineCov">         45 :                 dt          = this-&gt;get_dt_min();</span></a>
 <a name="104"><span class="lineNum">     104 </span>            :             }</a>
@@ -168,30 +168,30 @@
 <a name="106"><span class="lineNum">     106 </span>            :             // this is similiar to do_step, but it can adapt the step size dt. If successful, it also updates t.</a>
 <a name="107"><span class="lineNum">     107 </span>            :             // Note: the resizer used by m_stepper restricts dt to dt_max (via making a failed step)</a>
 <a name="108"><span class="lineNum">     108 </span>            :             if constexpr (!is_fsal_stepper) { // prevent compile time errors with fsal steppers</a>
-<a name="109"><span class="lineNum">     109 </span><span class="lineCov">     368184 :                 step_result = m_stepper.try_step(</span></a>
+<a name="109"><span class="lineNum">     109 </span><span class="lineCov">     378768 :                 step_result = m_stepper.try_step(</span></a>
 <a name="110"><span class="lineNum">     110 </span>            :                     // reorder arguments of the DerivFunction f for the stepper</a>
-<a name="111"><span class="lineNum">     111 </span><span class="lineCov">    1474194 :                     [&amp;](const Vector&lt;FP&gt;&amp; x, Vector&lt;FP&gt;&amp; dxds, FP s) {</span></a>
-<a name="112"><span class="lineNum">     112 </span><span class="lineCov">     737097 :                         dxds.resizeLike(x); // boost resizers cannot resize Eigen::Vector, hence we need to do that here</span></a>
-<a name="113"><span class="lineNum">     113 </span><span class="lineCov">     737097 :                         f(x, s, dxds);</span></a>
+<a name="111"><span class="lineNum">     111 </span><span class="lineCov">    1516530 :                     [&amp;](const Vector&lt;FP&gt;&amp; x, Vector&lt;FP&gt;&amp; dxds, FP s) {</span></a>
+<a name="112"><span class="lineNum">     112 </span><span class="lineCov">     758265 :                         dxds.resizeLike(x); // boost resizers cannot resize Eigen::Vector, hence we need to do that here</span></a>
+<a name="113"><span class="lineNum">     113 </span><span class="lineCov">     758265 :                         f(x, s, dxds);</span></a>
 <a name="114"><span class="lineNum">     114 </span>            :                     },</a>
-<a name="115"><span class="lineNum">     115 </span><span class="lineCov">     245456 :                     m_yt, t, m_ytp1, dt);</span></a>
+<a name="115"><span class="lineNum">     115 </span><span class="lineCov">     252512 :                     m_yt, t, m_ytp1, dt);</span></a>
 <a name="116"><span class="lineNum">     116 </span>            :             }</a>
 <a name="117"><span class="lineNum">     117 </span>            :         }</a>
 <a name="118"><span class="lineNum">     118 </span>            :         // output the new value by copying it back to the reference</a>
-<a name="119"><span class="lineNum">     119 </span><span class="lineCov">     107002 :         ytp1 = m_ytp1;</span></a>
+<a name="119"><span class="lineNum">     119 </span><span class="lineCov">     109693 :         ytp1 = m_ytp1;</span></a>
 <a name="120"><span class="lineNum">     120 </span>            :         // bound dt from below</a>
 <a name="121"><span class="lineNum">     121 </span>            :         // the last adaptive step (successful or not) may have calculated a new step size smaller than m_dt_min</a>
 <a name="122"><span class="lineNum">     122 </span>            : </a>
-<a name="123"><span class="lineNum">     123 </span><span class="lineCov">     107002 :         dt = max(dt, this-&gt;get_dt_min());</span></a>
+<a name="123"><span class="lineNum">     123 </span><span class="lineCov">     109693 :         dt = max(dt, this-&gt;get_dt_min());</span></a>
 <a name="124"><span class="lineNum">     124 </span>            :         // check whether the last step failed (which means that m_dt_min was still too large to suffice tolerances)</a>
-<a name="125"><span class="lineNum">     125 </span><span class="lineCov">     107002 :         if (step_result == fail) {</span></a>
+<a name="125"><span class="lineNum">     125 </span><span class="lineCov">     109693 :         if (step_result == fail) {</span></a>
 <a name="126"><span class="lineNum">     126 </span>            :             // adaptive stepping failed, but we still return the result of the last attempt</a>
 <a name="127"><span class="lineNum">     127 </span><span class="lineCov">         18 :             t += this-&gt;get_dt_min();</span></a>
 <a name="128"><span class="lineNum">     128 </span><span class="lineCov">         18 :             return false;</span></a>
 <a name="129"><span class="lineNum">     129 </span>            :         }</a>
 <a name="130"><span class="lineNum">     130 </span>            :         else {</a>
 <a name="131"><span class="lineNum">     131 </span>            :             // successfully made an integration step</a>
-<a name="132"><span class="lineNum">     132 </span><span class="lineCov">     106984 :             return true;</span></a>
+<a name="132"><span class="lineNum">     132 </span><span class="lineCov">     109675 :             return true;</span></a>
 <a name="133"><span class="lineNum">     133 </span>            :         }</a>
 <a name="134"><span class="lineNum">     134 </span>            :     }</a>
 <a name="135"><span class="lineNum">     135 </span>            : </a>
diff --git a/coverage/cpp/memilio/math/time_series_functor.h.func-sort-c.html b/coverage/cpp/memilio/math/time_series_functor.h.func-sort-c.html
index ebe950a447..497ebd1eb4 100644
--- a/coverage/cpp/memilio/math/time_series_functor.h.func-sort-c.html
+++ b/coverage/cpp/memilio/math/time_series_functor.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/memilio/math/time_series_functor.h.func.html b/coverage/cpp/memilio/math/time_series_functor.h.func.html
index 8fdfb678b1..25fbd17626 100644
--- a/coverage/cpp/memilio/math/time_series_functor.h.func.html
+++ b/coverage/cpp/memilio/math/time_series_functor.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/memilio/math/time_series_functor.h.gcov.html b/coverage/cpp/memilio/math/time_series_functor.h.gcov.html
index 72b8a4b39f..35b77e0d17 100644
--- a/coverage/cpp/memilio/math/time_series_functor.h.gcov.html
+++ b/coverage/cpp/memilio/math/time_series_functor.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/memilio/mobility/graph.h.func-sort-c.html b/coverage/cpp/memilio/mobility/graph.h.func-sort-c.html
index e1ee680d5e..2b137c000a 100644
--- a/coverage/cpp/memilio/mobility/graph.h.func-sort-c.html
+++ b/coverage/cpp/memilio/mobility/graph.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">89</td>
@@ -709,7 +709,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="graph.h.gcov.html#198">mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt;::edges()</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="graph.h.gcov.html#182">mio::Graph&lt;int, int&gt;::nodes()</a></td>
@@ -717,7 +717,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="graph.h.gcov.html#182">mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt;::nodes()</a></td>
-              <td class="coverFnHi">2646</td>
+              <td class="coverFnHi">2763</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="graph.h.gcov.html#198">mio::Graph&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdge&lt;double&gt; &gt;::edges()</a></td>
diff --git a/coverage/cpp/memilio/mobility/graph.h.func.html b/coverage/cpp/memilio/mobility/graph.h.func.html
index bf7fed9706..82951e5da7 100644
--- a/coverage/cpp/memilio/mobility/graph.h.func.html
+++ b/coverage/cpp/memilio/mobility/graph.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">89</td>
@@ -221,11 +221,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="graph.h.gcov.html#198">mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt;::edges()</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="graph.h.gcov.html#182">mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt;::nodes()</a></td>
-              <td class="coverFnHi">2646</td>
+              <td class="coverFnHi">2763</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="graph.h.gcov.html#167">mio::Edge&lt;mio::MobilityEdgeStochastic&gt;&amp; mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt;::add_edge&lt;Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&gt;(unsigned long, unsigned long, Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;&amp;)</a></td>
diff --git a/coverage/cpp/memilio/mobility/graph.h.gcov.html b/coverage/cpp/memilio/mobility/graph.h.gcov.html
index e755f1dcf0..e4cd3fb1e2 100644
--- a/coverage/cpp/memilio/mobility/graph.h.gcov.html
+++ b/coverage/cpp/memilio/mobility/graph.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">89</td>
@@ -243,9 +243,9 @@
 <a name="181"><span class="lineNum">     181 </span>            :     /**</a>
 <a name="182"><span class="lineNum">     182 </span>            :      * @brief range of nodes</a>
 <a name="183"><span class="lineNum">     183 </span>            :      */</a>
-<a name="184"><span class="lineNum">     184 </span><span class="lineCov">     239733 :     auto nodes()</span></a>
+<a name="184"><span class="lineNum">     184 </span><span class="lineCov">     239850 :     auto nodes()</span></a>
 <a name="185"><span class="lineNum">     185 </span>            :     {</a>
-<a name="186"><span class="lineNum">     186 </span><span class="lineCov">     239733 :         return make_range(begin(m_nodes), end(m_nodes));</span></a>
+<a name="186"><span class="lineNum">     186 </span><span class="lineCov">     239850 :         return make_range(begin(m_nodes), end(m_nodes));</span></a>
 <a name="187"><span class="lineNum">     187 </span>            :     }</a>
 <a name="188"><span class="lineNum">     188 </span>            : </a>
 <a name="189"><span class="lineNum">     189 </span>            :     /**</a>
@@ -259,9 +259,9 @@
 <a name="197"><span class="lineNum">     197 </span>            :     /**</a>
 <a name="198"><span class="lineNum">     198 </span>            :      * @brief range of edges</a>
 <a name="199"><span class="lineNum">     199 </span>            :      */</a>
-<a name="200"><span class="lineNum">     200 </span><span class="lineCov">      19320 :     auto edges()</span></a>
+<a name="200"><span class="lineNum">     200 </span><span class="lineCov">      19347 :     auto edges()</span></a>
 <a name="201"><span class="lineNum">     201 </span>            :     {</a>
-<a name="202"><span class="lineNum">     202 </span><span class="lineCov">      19320 :         return make_range(begin(m_edges), end(m_edges));</span></a>
+<a name="202"><span class="lineNum">     202 </span><span class="lineCov">      19347 :         return make_range(begin(m_edges), end(m_edges));</span></a>
 <a name="203"><span class="lineNum">     203 </span>            :     }</a>
 <a name="204"><span class="lineNum">     204 </span>            : </a>
 <a name="205"><span class="lineNum">     205 </span>            :     /**</a>
diff --git a/coverage/cpp/memilio/mobility/graph_simulation.h.func-sort-c.html b/coverage/cpp/memilio/mobility/graph_simulation.h.func-sort-c.html
index 9c81269c0a..fa41c257f4 100644
--- a/coverage/cpp/memilio/mobility/graph_simulation.h.func-sort-c.html
+++ b/coverage/cpp/memilio/mobility/graph_simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">27</td>
@@ -225,11 +225,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="graph_simulation.h.gcov.html#229">mio::GraphSimulationStochastic&lt;mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt; &gt;::get_rates(std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="graph_simulation.h.gcov.html#218">mio::GraphSimulationStochastic&lt;mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt; &gt;::get_cumulative_transition_rate()</a></td>
-              <td class="coverFnHi">288</td>
+              <td class="coverFnHi">297</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/mobility/graph_simulation.h.func.html b/coverage/cpp/memilio/mobility/graph_simulation.h.func.html
index 328e237511..c5237f37ad 100644
--- a/coverage/cpp/memilio/mobility/graph_simulation.h.func.html
+++ b/coverage/cpp/memilio/mobility/graph_simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">27</td>
@@ -149,7 +149,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="graph_simulation.h.gcov.html#218">mio::GraphSimulationStochastic&lt;mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt; &gt;::get_cumulative_transition_rate()</a></td>
-              <td class="coverFnHi">288</td>
+              <td class="coverFnHi">297</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="graph_simulation.h.gcov.html#143">mio::GraphSimulationStochastic&lt;mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt; &gt;::advance(double)</a></td>
@@ -157,7 +157,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="graph_simulation.h.gcov.html#229">mio::GraphSimulationStochastic&lt;mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt; &gt;::get_rates(std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="graph_simulation.h.gcov.html#135">mio::GraphSimulationStochastic&lt;mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt; &gt;::GraphSimulationStochastic(double, double, mio::Graph&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;, mio::MobilityEdgeStochastic&gt;&amp;&amp;, std::function&lt;void (double, double, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)&gt; const&amp;, std::function&lt;void (mio::MobilityEdgeStochastic&amp;, unsigned long, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)&gt; const&amp;&amp;)</a></td>
diff --git a/coverage/cpp/memilio/mobility/graph_simulation.h.gcov.html b/coverage/cpp/memilio/mobility/graph_simulation.h.gcov.html
index 9ac4b28045..a04a4b0c1d 100644
--- a/coverage/cpp/memilio/mobility/graph_simulation.h.gcov.html
+++ b/coverage/cpp/memilio/mobility/graph_simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">27</td>
@@ -221,38 +221,38 @@
 <a name="159"><span class="lineNum">     159 </span>            :                 normalized_waiting_time) { //at least one transition event during current time step</a>
 <a name="160"><span class="lineNum">     160 </span>            :                 do {</a>
 <a name="161"><span class="lineNum">     161 </span>            :                     //evaluate rates</a>
-<a name="162"><span class="lineNum">     162 </span><span class="lineCov">        126 :                     get_rates(m_rates);</span></a>
+<a name="162"><span class="lineNum">     162 </span><span class="lineCov">        135 :                     get_rates(m_rates);</span></a>
 <a name="163"><span class="lineNum">     163 </span>            :                     //draw transition event</a>
-<a name="164"><span class="lineNum">     164 </span><span class="lineCov">        126 :                     size_t event = mio::DiscreteDistribution&lt;size_t&gt;::get_instance()(m_rng, m_rates);</span></a>
+<a name="164"><span class="lineNum">     164 </span><span class="lineCov">        135 :                     size_t event = mio::DiscreteDistribution&lt;size_t&gt;::get_instance()(m_rng, m_rates);</span></a>
 <a name="165"><span class="lineNum">     165 </span>            :                     //edge that performs transition event</a>
-<a name="166"><span class="lineNum">     166 </span><span class="lineCov">        126 :                     auto&amp; event_edge = Base::m_graph.edges()[event / parameters_per_edge];</span></a>
+<a name="166"><span class="lineNum">     166 </span><span class="lineCov">        135 :                     auto&amp; event_edge = Base::m_graph.edges()[event / parameters_per_edge];</span></a>
 <a name="167"><span class="lineNum">     167 </span>            :                     //index for compartment and age group moving</a>
-<a name="168"><span class="lineNum">     168 </span><span class="lineCov">        126 :                     auto flat_index = event % parameters_per_edge;</span></a>
+<a name="168"><span class="lineNum">     168 </span><span class="lineCov">        135 :                     auto flat_index = event % parameters_per_edge;</span></a>
 <a name="169"><span class="lineNum">     169 </span>            : </a>
 <a name="170"><span class="lineNum">     170 </span>            :                     //advance nodes until t + (waiting_time / cumulative_rate)</a>
-<a name="171"><span class="lineNum">     171 </span><span class="lineCov">        378 :                     for (size_t node_iter = 0; node_iter &lt; Base::m_graph.nodes().size(); ++node_iter) {</span></a>
-<a name="172"><span class="lineNum">     172 </span><span class="lineCov">        252 :                         auto&amp; node = Base::m_graph.nodes()[node_iter];</span></a>
-<a name="173"><span class="lineNum">     173 </span><span class="lineCov">        252 :                         Base::m_node_func(Base::m_t, normalized_waiting_time / cumulative_rate, node.property);</span></a>
+<a name="171"><span class="lineNum">     171 </span><span class="lineCov">        405 :                     for (size_t node_iter = 0; node_iter &lt; Base::m_graph.nodes().size(); ++node_iter) {</span></a>
+<a name="172"><span class="lineNum">     172 </span><span class="lineCov">        270 :                         auto&amp; node = Base::m_graph.nodes()[node_iter];</span></a>
+<a name="173"><span class="lineNum">     173 </span><span class="lineCov">        270 :                         Base::m_node_func(Base::m_t, normalized_waiting_time / cumulative_rate, node.property);</span></a>
 <a name="174"><span class="lineNum">     174 </span>            :                     }</a>
 <a name="175"><span class="lineNum">     175 </span>            : </a>
 <a name="176"><span class="lineNum">     176 </span>            :                     //advance time</a>
-<a name="177"><span class="lineNum">     177 </span><span class="lineCov">        126 :                     Base::m_t += normalized_waiting_time / cumulative_rate;</span></a>
+<a name="177"><span class="lineNum">     177 </span><span class="lineCov">        135 :                     Base::m_t += normalized_waiting_time / cumulative_rate;</span></a>
 <a name="178"><span class="lineNum">     178 </span>            : </a>
 <a name="179"><span class="lineNum">     179 </span>            :                     //reduce remaining time of current time step</a>
-<a name="180"><span class="lineNum">     180 </span><span class="lineCov">        126 :                     Base::m_dt -= normalized_waiting_time / cumulative_rate;</span></a>
+<a name="180"><span class="lineNum">     180 </span><span class="lineCov">        135 :                     Base::m_dt -= normalized_waiting_time / cumulative_rate;</span></a>
 <a name="181"><span class="lineNum">     181 </span>            : </a>
 <a name="182"><span class="lineNum">     182 </span>            :                     //perform transition</a>
-<a name="183"><span class="lineNum">     183 </span><span class="lineCov">        252 :                     Base::m_edge_func(event_edge.property, flat_index,</span></a>
-<a name="184"><span class="lineNum">     184 </span><span class="lineCov">        252 :                                       Base::m_graph.nodes()[event_edge.start_node_idx].property,</span></a>
-<a name="185"><span class="lineNum">     185 </span><span class="lineCov">        252 :                                       Base::m_graph.nodes()[event_edge.end_node_idx].property);</span></a>
+<a name="183"><span class="lineNum">     183 </span><span class="lineCov">        270 :                     Base::m_edge_func(event_edge.property, flat_index,</span></a>
+<a name="184"><span class="lineNum">     184 </span><span class="lineCov">        270 :                                       Base::m_graph.nodes()[event_edge.start_node_idx].property,</span></a>
+<a name="185"><span class="lineNum">     185 </span><span class="lineCov">        270 :                                       Base::m_graph.nodes()[event_edge.end_node_idx].property);</span></a>
 <a name="186"><span class="lineNum">     186 </span>            : </a>
 <a name="187"><span class="lineNum">     187 </span>            :                     //calculate new cumulative rate</a>
-<a name="188"><span class="lineNum">     188 </span><span class="lineCov">        126 :                     cumulative_rate = get_cumulative_transition_rate();</span></a>
+<a name="188"><span class="lineNum">     188 </span><span class="lineCov">        135 :                     cumulative_rate = get_cumulative_transition_rate();</span></a>
 <a name="189"><span class="lineNum">     189 </span>            : </a>
 <a name="190"><span class="lineNum">     190 </span>            :                     //draw new normalized waiting time</a>
-<a name="191"><span class="lineNum">     191 </span><span class="lineCov">        126 :                     normalized_waiting_time = ExponentialDistribution&lt;ScalarType&gt;::get_instance()(m_rng, 1.0);</span></a>
+<a name="191"><span class="lineNum">     191 </span><span class="lineCov">        135 :                     normalized_waiting_time = ExponentialDistribution&lt;ScalarType&gt;::get_instance()(m_rng, 1.0);</span></a>
 <a name="192"><span class="lineNum">     192 </span>            : </a>
-<a name="193"><span class="lineNum">     193 </span><span class="lineCov">        126 :                 } while (cumulative_rate * Base::m_dt &gt; normalized_waiting_time);</span></a>
+<a name="193"><span class="lineNum">     193 </span><span class="lineCov">        135 :                 } while (cumulative_rate * Base::m_dt &gt; normalized_waiting_time);</span></a>
 <a name="194"><span class="lineNum">     194 </span>            :             }</a>
 <a name="195"><span class="lineNum">     195 </span>            :             else { //no transition event in current time step</a>
 <a name="196"><span class="lineNum">     196 </span><span class="lineCov">         72 :                 normalized_waiting_time -= cumulative_rate * Base::m_dt; //reduce waiting time by current time step</span></a>
@@ -279,31 +279,31 @@
 <a name="217"><span class="lineNum">     217 </span>            :     }</a>
 <a name="218"><span class="lineNum">     218 </span>            : </a>
 <a name="219"><span class="lineNum">     219 </span>            : private:</a>
-<a name="220"><span class="lineNum">     220 </span><span class="lineCov">        288 :     ScalarType get_cumulative_transition_rate()</span></a>
+<a name="220"><span class="lineNum">     220 </span><span class="lineCov">        297 :     ScalarType get_cumulative_transition_rate()</span></a>
 <a name="221"><span class="lineNum">     221 </span>            :     {</a>
 <a name="222"><span class="lineNum">     222 </span>            :         //compute current cumulative transition rate</a>
-<a name="223"><span class="lineNum">     223 </span><span class="lineCov">        288 :         ScalarType cumulative_transition_rate = 0;</span></a>
-<a name="224"><span class="lineNum">     224 </span><span class="lineCov">        576 :         for (auto&amp; e : Base::m_graph.edges()) {</span></a>
-<a name="225"><span class="lineNum">     225 </span><span class="lineCov">        288 :             cumulative_transition_rate +=</span></a>
-<a name="226"><span class="lineNum">     226 </span><span class="lineCov">        288 :                 e.property.get_transition_rates(Base::m_graph.nodes()[e.start_node_idx].property).sum();</span></a>
+<a name="223"><span class="lineNum">     223 </span><span class="lineCov">        297 :         ScalarType cumulative_transition_rate = 0;</span></a>
+<a name="224"><span class="lineNum">     224 </span><span class="lineCov">        594 :         for (auto&amp; e : Base::m_graph.edges()) {</span></a>
+<a name="225"><span class="lineNum">     225 </span><span class="lineCov">        297 :             cumulative_transition_rate +=</span></a>
+<a name="226"><span class="lineNum">     226 </span><span class="lineCov">        297 :                 e.property.get_transition_rates(Base::m_graph.nodes()[e.start_node_idx].property).sum();</span></a>
 <a name="227"><span class="lineNum">     227 </span>            :         }</a>
-<a name="228"><span class="lineNum">     228 </span><span class="lineCov">        288 :         return cumulative_transition_rate;</span></a>
+<a name="228"><span class="lineNum">     228 </span><span class="lineCov">        297 :         return cumulative_transition_rate;</span></a>
 <a name="229"><span class="lineNum">     229 </span>            :     }</a>
 <a name="230"><span class="lineNum">     230 </span>            : </a>
-<a name="231"><span class="lineNum">     231 </span><span class="lineCov">        126 :     void get_rates(std::vector&lt;ScalarType&gt;&amp; rates)</span></a>
+<a name="231"><span class="lineNum">     231 </span><span class="lineCov">        135 :     void get_rates(std::vector&lt;ScalarType&gt;&amp; rates)</span></a>
 <a name="232"><span class="lineNum">     232 </span>            :     {</a>
-<a name="233"><span class="lineNum">     233 </span><span class="lineCov">        126 :         size_t j = 0;</span></a>
-<a name="234"><span class="lineNum">     234 </span><span class="lineCov">        378 :         for (auto&amp; e : Base::m_graph.edges()) {</span></a>
-<a name="235"><span class="lineNum">     235 </span><span class="lineCov">        126 :             auto edge_rates = e.property.get_transition_rates(Base::m_graph.nodes()[e.start_node_idx].property);</span></a>
-<a name="236"><span class="lineNum">     236 </span><span class="lineCov">        630 :             for (Eigen::Index i = 0; i &lt; edge_rates.size(); ++i) {</span></a>
-<a name="237"><span class="lineNum">     237 </span><span class="lineCov">        504 :                 const auto compartment_value =</span></a>
-<a name="238"><span class="lineNum">     238 </span><span class="lineCov">        504 :                     Base::m_graph.nodes()[e.start_node_idx].property.get_result().get_last_value()[i];</span></a>
-<a name="239"><span class="lineNum">     239 </span><span class="lineCov">        504 :                 rates[j] = (compartment_value &lt; 1.) ? 0. : edge_rates(i);</span></a>
+<a name="233"><span class="lineNum">     233 </span><span class="lineCov">        135 :         size_t j = 0;</span></a>
+<a name="234"><span class="lineNum">     234 </span><span class="lineCov">        405 :         for (auto&amp; e : Base::m_graph.edges()) {</span></a>
+<a name="235"><span class="lineNum">     235 </span><span class="lineCov">        135 :             auto edge_rates = e.property.get_transition_rates(Base::m_graph.nodes()[e.start_node_idx].property);</span></a>
+<a name="236"><span class="lineNum">     236 </span><span class="lineCov">        675 :             for (Eigen::Index i = 0; i &lt; edge_rates.size(); ++i) {</span></a>
+<a name="237"><span class="lineNum">     237 </span><span class="lineCov">        540 :                 const auto compartment_value =</span></a>
+<a name="238"><span class="lineNum">     238 </span><span class="lineCov">        540 :                     Base::m_graph.nodes()[e.start_node_idx].property.get_result().get_last_value()[i];</span></a>
+<a name="239"><span class="lineNum">     239 </span><span class="lineCov">        540 :                 rates[j] = (compartment_value &lt; 1.) ? 0. : edge_rates(i);</span></a>
 <a name="240"><span class="lineNum">     240 </span>            : </a>
-<a name="241"><span class="lineNum">     241 </span><span class="lineCov">        504 :                 j++;</span></a>
+<a name="241"><span class="lineNum">     241 </span><span class="lineCov">        540 :                 j++;</span></a>
 <a name="242"><span class="lineNum">     242 </span>            :             }</a>
 <a name="243"><span class="lineNum">     243 </span>            :         }</a>
-<a name="244"><span class="lineNum">     244 </span><span class="lineCov">        126 :     }</span></a>
+<a name="244"><span class="lineNum">     244 </span><span class="lineCov">        135 :     }</span></a>
 <a name="245"><span class="lineNum">     245 </span>            : </a>
 <a name="246"><span class="lineNum">     246 </span>            :     std::vector&lt;ScalarType&gt; m_rates;</a>
 <a name="247"><span class="lineNum">     247 </span>            :     RandomNumberGenerator m_rng;</a>
diff --git a/coverage/cpp/memilio/mobility/index-sort-f.html b/coverage/cpp/memilio/mobility/index-sort-f.html
index 0e7ed37ff7..c0697b3973 100644
--- a/coverage/cpp/memilio/mobility/index-sort-f.html
+++ b/coverage/cpp/memilio/mobility/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">207</td>
diff --git a/coverage/cpp/memilio/mobility/index-sort-l.html b/coverage/cpp/memilio/mobility/index-sort-l.html
index 7464537fb2..6d7ac9d301 100644
--- a/coverage/cpp/memilio/mobility/index-sort-l.html
+++ b/coverage/cpp/memilio/mobility/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">207</td>
diff --git a/coverage/cpp/memilio/mobility/index.html b/coverage/cpp/memilio/mobility/index.html
index 9829aa35d5..b276a57d84 100644
--- a/coverage/cpp/memilio/mobility/index.html
+++ b/coverage/cpp/memilio/mobility/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">207</td>
diff --git a/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func-sort-c.html b/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func-sort-c.html
index d40c5634a5..d1140dc944 100644
--- a/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func-sort-c.html
+++ b/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">82</td>
@@ -505,11 +505,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#646">void mio::evolve_model&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;(double, double, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">27756</td>
+              <td class="coverFnHi">27774</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#93">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::evolve(double, double)</a></td>
-              <td class="coverFnHi">27756</td>
+              <td class="coverFnHi">27774</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#561">void mio::MobilityEdge&lt;double&gt;::apply_mobility&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;(double, double, mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
@@ -533,7 +533,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#83">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::get_last_state() const</a></td>
-              <td class="coverFnHi">58140</td>
+              <td class="coverFnHi">58320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#424">mio::MobilityEdge&lt;double&gt;::add_mobility_result_time_point(double)</a></td>
@@ -553,7 +553,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#63">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::get_result()</a></td>
-              <td class="coverFnHi">324297</td>
+              <td class="coverFnHi">324351</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func.html b/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func.html
index e8e8d31ed7..9e5be8df6e 100644
--- a/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func.html
+++ b/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">82</td>
@@ -105,7 +105,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#646">void mio::evolve_model&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;(double, double, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">27756</td>
+              <td class="coverFnHi">27774</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#646">void mio::evolve_model&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;(double, double, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
@@ -141,7 +141,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#63">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::get_result()</a></td>
-              <td class="coverFnHi">324297</td>
+              <td class="coverFnHi">324351</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#73">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::get_simulation()</a></td>
@@ -149,7 +149,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#93">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::evolve(double, double)</a></td>
-              <td class="coverFnHi">27756</td>
+              <td class="coverFnHi">27774</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#48">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::SimulationNode&lt;mio::oseir::Model&lt;double&gt;&amp;, double const&amp;, void&gt;(mio::oseir::Model&lt;double&gt;&amp;, double const&amp;)</a></td>
@@ -425,7 +425,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#83">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::get_last_state() const</a></td>
-              <td class="coverFnHi">58140</td>
+              <td class="coverFnHi">58320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_instant.h.gcov.html#88">mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;::get_t0() const</a></td>
diff --git a/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.gcov.html b/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.gcov.html
index 028d153ca0..dda4eea117 100644
--- a/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.gcov.html
+++ b/coverage/cpp/memilio/mobility/metapopulation_mobility_instant.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">82</td>
@@ -124,9 +124,9 @@
 <a name="62"><span class="lineNum">      62 </span>            :     {</a>
 <a name="63"><span class="lineNum">      63 </span><span class="lineCov">         26 :         return m_simulation.get_result();</span></a>
 <a name="64"><span class="lineNum">      64 </span>            :     }</a>
-<a name="65"><span class="lineNum">      65 </span><span class="lineCov">     648546 :     decltype(auto) get_result()</span></a>
+<a name="65"><span class="lineNum">      65 </span><span class="lineCov">     648600 :     decltype(auto) get_result()</span></a>
 <a name="66"><span class="lineNum">      66 </span>            :     {</a>
-<a name="67"><span class="lineNum">      67 </span><span class="lineCov">     648546 :         return m_simulation.get_result();</span></a>
+<a name="67"><span class="lineNum">      67 </span><span class="lineCov">     648600 :         return m_simulation.get_result();</span></a>
 <a name="68"><span class="lineNum">      68 </span>            :     }</a>
 <a name="69"><span class="lineNum">      69 </span>            :     /**@}*/</a>
 <a name="70"><span class="lineNum">      70 </span>            : </a>
@@ -144,9 +144,9 @@
 <a name="82"><span class="lineNum">      82 </span>            :     }</a>
 <a name="83"><span class="lineNum">      83 </span>            :     /**@}*/</a>
 <a name="84"><span class="lineNum">      84 </span>            : </a>
-<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     112259 :     Eigen::Ref&lt;const Eigen::VectorXd&gt; get_last_state() const</span></a>
+<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     112439 :     Eigen::Ref&lt;const Eigen::VectorXd&gt; get_last_state() const</span></a>
 <a name="86"><span class="lineNum">      86 </span>            :     {</a>
-<a name="87"><span class="lineNum">      87 </span><span class="lineCov">     112259 :         return m_last_state;</span></a>
+<a name="87"><span class="lineNum">      87 </span><span class="lineCov">     112439 :         return m_last_state;</span></a>
 <a name="88"><span class="lineNum">      88 </span>            :     }</a>
 <a name="89"><span class="lineNum">      89 </span>            : </a>
 <a name="90"><span class="lineNum">      90 </span><span class="lineCov">        166 :     double get_t0() const</span></a>
@@ -154,11 +154,11 @@
 <a name="92"><span class="lineNum">      92 </span><span class="lineCov">        166 :         return m_t0;</span></a>
 <a name="93"><span class="lineNum">      93 </span>            :     }</a>
 <a name="94"><span class="lineNum">      94 </span>            : </a>
-<a name="95"><span class="lineNum">      95 </span><span class="lineCov">      54914 :     void evolve(double t, double dt)</span></a>
+<a name="95"><span class="lineNum">      95 </span><span class="lineCov">      54932 :     void evolve(double t, double dt)</span></a>
 <a name="96"><span class="lineNum">      96 </span>            :     {</a>
-<a name="97"><span class="lineNum">      97 </span><span class="lineCov">      54914 :         m_simulation.advance(t + dt);</span></a>
-<a name="98"><span class="lineNum">      98 </span><span class="lineCov">      54914 :         m_last_state = m_simulation.get_result().get_last_value();</span></a>
-<a name="99"><span class="lineNum">      99 </span><span class="lineCov">      54914 :     }</span></a>
+<a name="97"><span class="lineNum">      97 </span><span class="lineCov">      54932 :         m_simulation.advance(t + dt);</span></a>
+<a name="98"><span class="lineNum">      98 </span><span class="lineCov">      54932 :         m_last_state = m_simulation.get_result().get_last_value();</span></a>
+<a name="99"><span class="lineNum">      99 </span><span class="lineCov">      54932 :     }</span></a>
 <a name="100"><span class="lineNum">     100 </span>            : </a>
 <a name="101"><span class="lineNum">     101 </span>            : private:</a>
 <a name="102"><span class="lineNum">     102 </span>            :     Sim m_simulation;</a>
@@ -707,10 +707,10 @@
 <a name="645"><span class="lineNum">     645 </span>            :  * @see SimulationNode::evolve</a>
 <a name="646"><span class="lineNum">     646 </span>            :  */</a>
 <a name="647"><span class="lineNum">     647 </span>            : template &lt;class Sim&gt;</a>
-<a name="648"><span class="lineNum">     648 </span><span class="lineCov">      54813 : void evolve_model(double t, double dt, SimulationNode&lt;Sim&gt;&amp; node)</span></a>
+<a name="648"><span class="lineNum">     648 </span><span class="lineCov">      54831 : void evolve_model(double t, double dt, SimulationNode&lt;Sim&gt;&amp; node)</span></a>
 <a name="649"><span class="lineNum">     649 </span>            : {</a>
-<a name="650"><span class="lineNum">     650 </span><span class="lineCov">      54813 :     node.evolve(t, dt);</span></a>
-<a name="651"><span class="lineNum">     651 </span><span class="lineCov">      54813 : }</span></a>
+<a name="650"><span class="lineNum">     650 </span><span class="lineCov">      54831 :     node.evolve(t, dt);</span></a>
+<a name="651"><span class="lineNum">     651 </span><span class="lineCov">      54831 : }</span></a>
 <a name="652"><span class="lineNum">     652 </span>            : </a>
 <a name="653"><span class="lineNum">     653 </span>            : /**</a>
 <a name="654"><span class="lineNum">     654 </span>            :  * edge functor for mobility-based simulation.</a>
diff --git a/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func-sort-c.html b/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func-sort-c.html
index 87b1cee517..ee34589017 100644
--- a/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func-sort-c.html
+++ b/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
@@ -105,19 +105,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#207">void mio::apply_mobility&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;, mio::MobilityEdgeStochastic&gt;(mio::MobilityEdgeStochastic&amp;, unsigned long, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#196">void mio::MobilityEdgeStochastic::apply_mobility&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;(unsigned long, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#172">Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; mio::MobilityEdgeStochastic::get_transition_rates&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;(mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">414</td>
+              <td class="coverFnHi">432</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#91">mio::MobilityParametersStochastic::get_coefficients()</a></td>
-              <td class="coverFnHi">1656</td>
+              <td class="coverFnHi">1728</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func.html b/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func.html
index 7184d78b3b..61a68eac83 100644
--- a/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func.html
+++ b/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#207">void mio::apply_mobility&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt;, mio::MobilityEdgeStochastic&gt;(mio::MobilityEdgeStochastic&amp;, unsigned long, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#207">void mio::apply_mobility&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt;, mio::MobilityEdgeStochastic&gt;(mio::MobilityEdgeStochastic&amp;, unsigned long, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
@@ -77,7 +77,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#196">void mio::MobilityEdgeStochastic::apply_mobility&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;(unsigned long, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#196">void mio::MobilityEdgeStochastic::apply_mobility&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;(unsigned long, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;&amp;, mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
@@ -85,7 +85,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#172">Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; mio::MobilityEdgeStochastic::get_transition_rates&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;(mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">414</td>
+              <td class="coverFnHi">432</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#172">Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; mio::MobilityEdgeStochastic::get_transition_rates&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;(mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt;&amp;)</a></td>
@@ -101,7 +101,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#91">mio::MobilityParametersStochastic::get_coefficients()</a></td>
-              <td class="coverFnHi">1656</td>
+              <td class="coverFnHi">1728</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="metapopulation_mobility_stochastic.h.gcov.html#59">mio::MobilityParametersStochastic::MobilityParametersStochastic(Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;)</a></td>
diff --git a/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.gcov.html b/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.gcov.html
index 21d2def199..950cc4b921 100644
--- a/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.gcov.html
+++ b/coverage/cpp/memilio/mobility/metapopulation_mobility_stochastic.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
@@ -152,9 +152,9 @@
 <a name="90"><span class="lineNum">      90 </span>            :     {</a>
 <a name="91"><span class="lineNum">      91 </span><span class="lineCov">         36 :         return m_coefficients;</span></a>
 <a name="92"><span class="lineNum">      92 </span>            :     }</a>
-<a name="93"><span class="lineNum">      93 </span><span class="lineCov">       1656 :     MobilityCoefficients&amp; get_coefficients()</span></a>
+<a name="93"><span class="lineNum">      93 </span><span class="lineCov">       1728 :     MobilityCoefficients&amp; get_coefficients()</span></a>
 <a name="94"><span class="lineNum">      94 </span>            :     {</a>
-<a name="95"><span class="lineNum">      95 </span><span class="lineCov">       1656 :         return m_coefficients;</span></a>
+<a name="95"><span class="lineNum">      95 </span><span class="lineCov">       1728 :         return m_coefficients;</span></a>
 <a name="96"><span class="lineNum">      96 </span>            :     }</a>
 <a name="97"><span class="lineNum">      97 </span>            :     /**</a>
 <a name="98"><span class="lineNum">      98 </span>            :      * @param coeffs the mobility coefficients.</a>
@@ -233,15 +233,15 @@
 <a name="171"><span class="lineNum">     171 </span>            :      * get the cumulative transition rate of the edge.</a>
 <a name="172"><span class="lineNum">     172 </span>            :     */</a>
 <a name="173"><span class="lineNum">     173 </span>            :     template &lt;class Sim&gt;</a>
-<a name="174"><span class="lineNum">     174 </span><span class="lineCov">        414 :     Eigen::VectorXd get_transition_rates(SimulationNode&lt;Sim&gt;&amp; node_from)</span></a>
+<a name="174"><span class="lineNum">     174 </span><span class="lineCov">        432 :     Eigen::VectorXd get_transition_rates(SimulationNode&lt;Sim&gt;&amp; node_from)</span></a>
 <a name="175"><span class="lineNum">     175 </span>            :     {</a>
-<a name="176"><span class="lineNum">     176 </span><span class="lineCov">        828 :         Eigen::VectorXd transitionRates(node_from.get_last_state().size());</span></a>
-<a name="177"><span class="lineNum">     177 </span><span class="lineCov">       2070 :         for (Eigen::Index i = 0; i &lt; node_from.get_last_state().size(); ++i) {</span></a>
-<a name="178"><span class="lineNum">     178 </span><span class="lineCov">       3312 :             transitionRates[i] =</span></a>
-<a name="179"><span class="lineNum">     179 </span><span class="lineCov">       3312 :                 node_from.get_last_state()(i) * m_parameters.get_coefficients().get_baseline()[(size_t)i];</span></a>
+<a name="176"><span class="lineNum">     176 </span><span class="lineCov">        864 :         Eigen::VectorXd transitionRates(node_from.get_last_state().size());</span></a>
+<a name="177"><span class="lineNum">     177 </span><span class="lineCov">       2160 :         for (Eigen::Index i = 0; i &lt; node_from.get_last_state().size(); ++i) {</span></a>
+<a name="178"><span class="lineNum">     178 </span><span class="lineCov">       3456 :             transitionRates[i] =</span></a>
+<a name="179"><span class="lineNum">     179 </span><span class="lineCov">       3456 :                 node_from.get_last_state()(i) * m_parameters.get_coefficients().get_baseline()[(size_t)i];</span></a>
 <a name="180"><span class="lineNum">     180 </span>            :         }</a>
-<a name="181"><span class="lineNum">     181 </span><span class="lineCov">        828 :         return transitionRates;</span></a>
-<a name="182"><span class="lineNum">     182 </span><span class="lineCov">        414 :     }</span></a>
+<a name="181"><span class="lineNum">     181 </span><span class="lineCov">        864 :         return transitionRates;</span></a>
+<a name="182"><span class="lineNum">     182 </span><span class="lineCov">        432 :     }</span></a>
 <a name="183"><span class="lineNum">     183 </span>            : </a>
 <a name="184"><span class="lineNum">     184 </span>            :     /**</a>
 <a name="185"><span class="lineNum">     185 </span>            :      * compute mobility from node_from to node_to for a given event</a>
@@ -257,22 +257,22 @@
 <a name="195"><span class="lineNum">     195 </span>            : };</a>
 <a name="196"><span class="lineNum">     196 </span>            : </a>
 <a name="197"><span class="lineNum">     197 </span>            : template &lt;class Sim&gt;</a>
-<a name="198"><span class="lineNum">     198 </span><span class="lineCov">        126 : void MobilityEdgeStochastic::apply_mobility(size_t event, SimulationNode&lt;Sim&gt;&amp; node_from, SimulationNode&lt;Sim&gt;&amp; node_to)</span></a>
+<a name="198"><span class="lineNum">     198 </span><span class="lineCov">        135 : void MobilityEdgeStochastic::apply_mobility(size_t event, SimulationNode&lt;Sim&gt;&amp; node_from, SimulationNode&lt;Sim&gt;&amp; node_to)</span></a>
 <a name="199"><span class="lineNum">     199 </span>            : {</a>
-<a name="200"><span class="lineNum">     200 </span><span class="lineCov">        126 :     node_from.get_result().get_last_value()[event] -= 1;</span></a>
-<a name="201"><span class="lineNum">     201 </span><span class="lineCov">        126 :     node_to.get_result().get_last_value()[event] += 1;</span></a>
-<a name="202"><span class="lineNum">     202 </span><span class="lineCov">        126 : }</span></a>
+<a name="200"><span class="lineNum">     200 </span><span class="lineCov">        135 :     node_from.get_result().get_last_value()[event] -= 1;</span></a>
+<a name="201"><span class="lineNum">     201 </span><span class="lineCov">        135 :     node_to.get_result().get_last_value()[event] += 1;</span></a>
+<a name="202"><span class="lineNum">     202 </span><span class="lineCov">        135 : }</span></a>
 <a name="203"><span class="lineNum">     203 </span>            : </a>
 <a name="204"><span class="lineNum">     204 </span>            : /**</a>
 <a name="205"><span class="lineNum">     205 </span>            :  * edge functor for mobility-based simulation.</a>
 <a name="206"><span class="lineNum">     206 </span>            :  * @see MobilityEdgeStochastic::apply_mobility</a>
 <a name="207"><span class="lineNum">     207 </span>            :  */</a>
 <a name="208"><span class="lineNum">     208 </span>            : template &lt;class Sim, class StochasticEdge&gt;</a>
-<a name="209"><span class="lineNum">     209 </span><span class="lineCov">        126 : void apply_mobility(StochasticEdge&amp; mobilityEdge, size_t event, SimulationNode&lt;Sim&gt;&amp; node_from,</span></a>
+<a name="209"><span class="lineNum">     209 </span><span class="lineCov">        135 : void apply_mobility(StochasticEdge&amp; mobilityEdge, size_t event, SimulationNode&lt;Sim&gt;&amp; node_from,</span></a>
 <a name="210"><span class="lineNum">     210 </span>            :                     SimulationNode&lt;Sim&gt;&amp; node_to)</a>
 <a name="211"><span class="lineNum">     211 </span>            : {</a>
-<a name="212"><span class="lineNum">     212 </span><span class="lineCov">        126 :     mobilityEdge.apply_mobility(event, node_from, node_to);</span></a>
-<a name="213"><span class="lineNum">     213 </span><span class="lineCov">        126 : }</span></a>
+<a name="212"><span class="lineNum">     212 </span><span class="lineCov">        135 :     mobilityEdge.apply_mobility(event, node_from, node_to);</span></a>
+<a name="213"><span class="lineNum">     213 </span><span class="lineCov">        135 : }</span></a>
 <a name="214"><span class="lineNum">     214 </span>            : </a>
 <a name="215"><span class="lineNum">     215 </span>            : /**</a>
 <a name="216"><span class="lineNum">     216 </span>            :  * create a mobility-based simulation.</a>
diff --git a/coverage/cpp/memilio/utils/compiler_diagnostics.h.func-sort-c.html b/coverage/cpp/memilio/utils/compiler_diagnostics.h.func-sort-c.html
index c469eca96b..fc95399a81 100644
--- a/coverage/cpp/memilio/utils/compiler_diagnostics.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/compiler_diagnostics.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">40</td>
diff --git a/coverage/cpp/memilio/utils/compiler_diagnostics.h.func.html b/coverage/cpp/memilio/utils/compiler_diagnostics.h.func.html
index 5dcd414246..7062c2f623 100644
--- a/coverage/cpp/memilio/utils/compiler_diagnostics.h.func.html
+++ b/coverage/cpp/memilio/utils/compiler_diagnostics.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">40</td>
diff --git a/coverage/cpp/memilio/utils/compiler_diagnostics.h.gcov.html b/coverage/cpp/memilio/utils/compiler_diagnostics.h.gcov.html
index 2fd22a7c95..7f5c74dcdc 100644
--- a/coverage/cpp/memilio/utils/compiler_diagnostics.h.gcov.html
+++ b/coverage/cpp/memilio/utils/compiler_diagnostics.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">40</td>
diff --git a/coverage/cpp/memilio/utils/custom_index_array.h.func-sort-c.html b/coverage/cpp/memilio/utils/custom_index_array.h.func-sort-c.html
index c3c92599aa..7da68126ce 100644
--- a/coverage/cpp/memilio/utils/custom_index_array.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/custom_index_array.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">915</td>
@@ -3201,23 +3201,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#646">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Slice(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::Seq&lt;unsigned long&gt;)</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#684">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::end() const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#672">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::begin() const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#660">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::numel() const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#824">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt; mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::slice&lt;mio::AgeGroup&gt;(mio::Seq&lt;unsigned long&gt;) const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#286">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::abm::MaskType&gt;::operator[](mio::Index&lt;mio::abm::MaskType&gt; const&amp;) const</a></td>
@@ -3225,11 +3225,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#786">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::begin() const</a></td>
-              <td class="coverFnHi">2413</td>
+              <td class="coverFnHi">2431</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#351">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::Iterator(mio::UncertainValue&lt;double&gt; const*)</a></td>
-              <td class="coverFnHi">2436</td>
+              <td class="coverFnHi">2454</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::abm::VirusVariant&gt; &gt;(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;, mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;)</a></td>
@@ -3281,7 +3281,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#43">unsigned long (anonymous namespace)::product&lt;mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">2761</td>
+              <td class="coverFnHi">2779</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#221">mio::Index&lt;mio::abm::CellIndex&gt; mio::CustomIndexArray&lt;boost::atomics::atomic&lt;double&gt;, mio::abm::CellIndex, mio::abm::VirusVariant&gt;::size&lt;mio::abm::CellIndex&gt;() const</a></td>
@@ -3337,7 +3337,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#434">mio::operator==(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
-              <td class="coverFnHi">3083</td>
+              <td class="coverFnHi">3101</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#646">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Slice(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::Seq&lt;unsigned long&gt;)</a></td>
@@ -3409,19 +3409,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#502">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::Iterator(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, unsigned long, unsigned long, mio::Seq&lt;unsigned long&gt; const&amp;, long)</a></td>
-              <td class="coverFnHi">4780</td>
+              <td class="coverFnHi">4816</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#37">std::enable_if&lt;(0)&lt;(2), unsigned long&gt;::type (anonymous namespace)::product&lt;0, mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5151</td>
+              <td class="coverFnHi">5187</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#37">std::enable_if&lt;(1)&lt;(2), unsigned long&gt;::type (anonymous namespace)::product&lt;1, mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5151</td>
+              <td class="coverFnHi">5187</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#31">std::enable_if&lt;(2)==(2), unsigned long&gt;::type (anonymous namespace)::product&lt;2, mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5151</td>
+              <td class="coverFnHi">5187</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::abm::MaskType&gt; &gt;(mio::Index&lt;mio::abm::MaskType&gt; const&amp;, mio::Index&lt;mio::abm::MaskType&gt; const&amp;)</a></td>
@@ -3461,11 +3461,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#286">mio::CustomIndexArray&lt;mio::abm::TimeSpan, mio::AgeGroup&gt;::operator[](mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">6544</td>
+              <td class="coverFnHi">6526</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::abm::TimeSpan, mio::AgeGroup&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">6680</td>
+              <td class="coverFnHi">6662</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#210">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, TestInfectionState, TestAgeGroup, TestContinent&gt;::numel() const</a></td>
@@ -3493,7 +3493,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#262">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::array() const</a></td>
-              <td class="coverFnHi">8375</td>
+              <td class="coverFnHi">8393</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#276">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::operator[](mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
@@ -3505,7 +3505,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#286">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::abm::VirusVariant, mio::AgeGroup&gt;::operator[](mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">10347</td>
+              <td class="coverFnHi">10275</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#276">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, TestInfectionState, TestAgeGroup, TestContinent&gt;::operator[](mio::Index&lt;TestInfectionState, TestAgeGroup, TestContinent&gt; const&amp;)</a></td>
@@ -3589,19 +3589,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::abm::VirusVariant, mio::AgeGroup&gt;::get_flat_index(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">12843</td>
+              <td class="coverFnHi">12771</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">14099</td>
+              <td class="coverFnHi">14027</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">14099</td>
+              <td class="coverFnHi">14027</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(1ul)==(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">14099</td>
+              <td class="coverFnHi">14027</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;TestInfectionState, TestAgeGroup, TestContinent&gt; &gt;(mio::Index&lt;TestInfectionState, TestAgeGroup, TestContinent&gt; const&amp;, mio::Index&lt;TestInfectionState, TestAgeGroup, TestContinent&gt; const&amp;)</a></td>
@@ -3649,19 +3649,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#540">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator*()</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#553">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator++()</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#377">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator[](long const&amp;)</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#612">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::outer_offset(long const&amp;) const</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::osir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osir::InfectionState&gt; const&amp;)</a></td>
@@ -3689,11 +3689,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#585">mio::operator==(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
-              <td class="coverFnHi">26290</td>
+              <td class="coverFnHi">26488</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#590">mio::operator!=(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
-              <td class="coverFnHi">26290</td>
+              <td class="coverFnHi">26488</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#266">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::array()</a></td>
@@ -3813,7 +3813,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#230">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::oseir::InfectionState&gt;::size() const</a></td>
-              <td class="coverFnHi">3199692</td>
+              <td class="coverFnHi">3200556</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -3833,55 +3833,55 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(1ul)==(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::oseir::InfectionState&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#230">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::size() const</a></td>
-              <td class="coverFnHi">12613761</td>
+              <td class="coverFnHi">13266621</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#286">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup&gt;::operator[](mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">16277541</td>
+              <td class="coverFnHi">16972845</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">16453445</td>
+              <td class="coverFnHi">17148749</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(1ul)==(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">35702185</td>
+              <td class="coverFnHi">37029919</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(0ul)==(mio::Index&lt;mio::AgeGroup&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">35702185</td>
+              <td class="coverFnHi">37029919</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/custom_index_array.h.func.html b/coverage/cpp/memilio/utils/custom_index_array.h.func.html
index fb15dcb123..35ee7358f8 100644
--- a/coverage/cpp/memilio/utils/custom_index_array.h.func.html
+++ b/coverage/cpp/memilio/utils/custom_index_array.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">915</td>
@@ -181,7 +181,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#37">std::enable_if&lt;(0)&lt;(2), unsigned long&gt;::type (anonymous namespace)::product&lt;0, mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5151</td>
+              <td class="coverFnHi">5187</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#37">std::enable_if&lt;(0)&lt;(2), unsigned long&gt;::type (anonymous namespace)::product&lt;0, mio::Index, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -321,7 +321,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#37">std::enable_if&lt;(1)&lt;(2), unsigned long&gt;::type (anonymous namespace)::product&lt;1, mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5151</td>
+              <td class="coverFnHi">5187</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#37">std::enable_if&lt;(1)&lt;(2), unsigned long&gt;::type (anonymous namespace)::product&lt;1, mio::Index, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -405,7 +405,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#31">std::enable_if&lt;(2)==(2), unsigned long&gt;::type (anonymous namespace)::product&lt;2, mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5151</td>
+              <td class="coverFnHi">5187</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#31">std::enable_if&lt;(2)==(2), unsigned long&gt;::type (anonymous namespace)::product&lt;2, mio::Index, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -577,7 +577,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#43">unsigned long (anonymous namespace)::product&lt;mio::Index, mio::AgeGroup, mio::osecir::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">2761</td>
+              <td class="coverFnHi">2779</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#43">unsigned long (anonymous namespace)::product&lt;mio::Index, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -649,7 +649,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">14099</td>
+              <td class="coverFnHi">14027</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; &gt;(mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;, mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;)</a></td>
@@ -693,7 +693,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">35702185</td>
+              <td class="coverFnHi">37029919</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; const&amp;)</a></td>
@@ -705,11 +705,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#110">unsigned long mio::flatten_index&lt;mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -1233,19 +1233,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#502">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::Iterator(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, unsigned long, unsigned long, mio::Seq&lt;unsigned long&gt; const&amp;, long)</a></td>
-              <td class="coverFnHi">4780</td>
+              <td class="coverFnHi">4816</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#540">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator*()</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#553">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator++()</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#646">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Slice(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::Seq&lt;unsigned long&gt;)</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#266">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::array()</a></td>
@@ -1253,7 +1253,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#351">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::Iterator(mio::UncertainValue&lt;double&gt; const*)</a></td>
-              <td class="coverFnHi">2436</td>
+              <td class="coverFnHi">2454</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#385">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator*()</a></td>
@@ -1261,7 +1261,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#377">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator[](long const&amp;)</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#398">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator++()</a></td>
@@ -2205,7 +2205,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">14099</td>
+              <td class="coverFnHi">14027</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; &gt;(mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;, mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;)</a></td>
@@ -2249,7 +2249,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(0ul)==(mio::Index&lt;mio::AgeGroup&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">35702185</td>
+              <td class="coverFnHi">37029919</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; const&amp;)</a></td>
@@ -2261,11 +2261,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(0ul)&lt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;0ul, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -2317,7 +2317,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(1ul)==(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">14099</td>
+              <td class="coverFnHi">14027</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#80">std::enable_if&lt;(1ul)&lt;(mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; &gt;(mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;, mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;)</a></td>
@@ -2345,11 +2345,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(1ul)==(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(1ul)==(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#72">std::enable_if&lt;(1ul)==(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::size-(1)), std::pair&lt;unsigned long, unsigned long&gt; &gt;::type mio::details::flatten_index&lt;1ul, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -2477,11 +2477,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#585">mio::operator==(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
-              <td class="coverFnHi">26290</td>
+              <td class="coverFnHi">26488</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#434">mio::operator==(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
-              <td class="coverFnHi">3083</td>
+              <td class="coverFnHi">3101</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#585">mio::operator==(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
@@ -2629,7 +2629,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#590">mio::operator!=(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
-              <td class="coverFnHi">26290</td>
+              <td class="coverFnHi">26488</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#438">mio::operator!=(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;)</a></td>
@@ -2889,7 +2889,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::abm::VirusVariant, mio::AgeGroup&gt;::get_flat_index(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">12843</td>
+              <td class="coverFnHi">12771</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#804">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::abm::VirusVariant, mio::AgeGroup&gt;::end() const</a></td>
@@ -2913,7 +2913,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#286">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::abm::VirusVariant, mio::AgeGroup&gt;::operator[](mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">10347</td>
+              <td class="coverFnHi">10275</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::abm::MaskType&gt;::get_flat_index(mio::Index&lt;mio::abm::MaskType&gt; const&amp;) const</a></td>
@@ -3001,7 +3001,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">16453445</td>
+              <td class="coverFnHi">17148749</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#804">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup&gt;::end() const</a></td>
@@ -3037,7 +3037,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#286">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup&gt;::operator[](mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">16277541</td>
+              <td class="coverFnHi">16972845</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osir::InfectionState&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup, mio::osir::InfectionState&gt; const&amp;) const</a></td>
@@ -3077,11 +3077,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::oseir::InfectionState&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#230">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::oseir::InfectionState&gt;::size() const</a></td>
-              <td class="coverFnHi">3199692</td>
+              <td class="coverFnHi">3200556</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#684">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::oseir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::oseir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::end() const</a></td>
@@ -3117,7 +3117,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">19370500</td>
+              <td class="coverFnHi">20360320</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#804">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::end() const</a></td>
@@ -3125,7 +3125,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#230">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::size() const</a></td>
-              <td class="coverFnHi">12613761</td>
+              <td class="coverFnHi">13266621</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#221">mio::Index&lt;mio::AgeGroup&gt; mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::size&lt;mio::AgeGroup&gt;() const</a></td>
@@ -3137,27 +3137,27 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#684">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::end() const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#672">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::begin() const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#660">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::numel() const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#612">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::outer_offset(long const&amp;) const</a></td>
-              <td class="coverFnHi">23900</td>
+              <td class="coverFnHi">24080</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#262">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::array() const</a></td>
-              <td class="coverFnHi">8375</td>
+              <td class="coverFnHi">8393</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#786">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::begin() const</a></td>
-              <td class="coverFnHi">2413</td>
+              <td class="coverFnHi">2431</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#210">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::numel() const</a></td>
@@ -3165,7 +3165,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#824">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Slice&lt;mio::AgeGroup, mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;, (void*)0&gt; mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::slice&lt;mio::AgeGroup&gt;(mio::Seq&lt;unsigned long&gt;) const</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#429">mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt;::operator-(mio::CustomIndexArray&lt;mio::UncertainValue&lt;double&gt;, mio::AgeGroup, mio::osecir::InfectionState&gt;::Iterator&lt;mio::UncertainValue&lt;double&gt; const&gt; const&amp;) const</a></td>
@@ -3377,7 +3377,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;mio::abm::TimeSpan, mio::AgeGroup&gt;::get_flat_index(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">6680</td>
+              <td class="coverFnHi">6662</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#804">mio::CustomIndexArray&lt;mio::abm::TimeSpan, mio::AgeGroup&gt;::end() const</a></td>
@@ -3401,7 +3401,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#286">mio::CustomIndexArray&lt;mio::abm::TimeSpan, mio::AgeGroup&gt;::operator[](mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">6544</td>
+              <td class="coverFnHi">6526</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="custom_index_array.h.gcov.html#321">mio::CustomIndexArray&lt;std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, Dim1&gt;::get_flat_index(mio::Index&lt;Dim1&gt; const&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/utils/custom_index_array.h.gcov.html b/coverage/cpp/memilio/utils/custom_index_array.h.gcov.html
index aeb6426eb8..f56dc65157 100644
--- a/coverage/cpp/memilio/utils/custom_index_array.h.gcov.html
+++ b/coverage/cpp/memilio/utils/custom_index_array.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">915</td>
@@ -92,21 +92,21 @@
 <a name="30"><span class="lineNum">      30 </span>            : //calculate the product of tuple elements</a>
 <a name="31"><span class="lineNum">      31 </span>            : // std::apply or fold expression in C++17</a>
 <a name="32"><span class="lineNum">      32 </span>            : template &lt;int I, template &lt;class...&gt; class Index, class... Ts&gt;</a>
-<a name="33"><span class="lineNum">      33 </span><span class="lineCov">     245086 : typename std::enable_if&lt;(I == sizeof...(Ts)), size_t&gt;::type product(Index&lt;Ts...&gt; const&amp;)</span></a>
+<a name="33"><span class="lineNum">      33 </span><span class="lineCov">     245122 : typename std::enable_if&lt;(I == sizeof...(Ts)), size_t&gt;::type product(Index&lt;Ts...&gt; const&amp;)</span></a>
 <a name="34"><span class="lineNum">      34 </span>            : {</a>
-<a name="35"><span class="lineNum">      35 </span><span class="lineCov">     245086 :     return 1;</span></a>
+<a name="35"><span class="lineNum">      35 </span><span class="lineCov">     245122 :     return 1;</span></a>
 <a name="36"><span class="lineNum">      36 </span>            : }</a>
 <a name="37"><span class="lineNum">      37 </span>            : </a>
 <a name="38"><span class="lineNum">      38 </span>            : template &lt;int I, template &lt;class...&gt; class Index, class... Ts&gt;</a>
-<a name="39"><span class="lineNum">      39 </span><span class="lineCov">     280332 : typename std::enable_if&lt;(I &lt; sizeof...(Ts)), size_t&gt;::type product(Index&lt;Ts...&gt; const&amp; t)</span></a>
+<a name="39"><span class="lineNum">      39 </span><span class="lineCov">     280404 : typename std::enable_if&lt;(I &lt; sizeof...(Ts)), size_t&gt;::type product(Index&lt;Ts...&gt; const&amp; t)</span></a>
 <a name="40"><span class="lineNum">      40 </span>            : {</a>
-<a name="41"><span class="lineNum">      41 </span><span class="lineCov">     280332 :     return (size_t)mio::get&lt;I&gt;(t) * product&lt;I + 1, Index, Ts...&gt;(t);</span></a>
+<a name="41"><span class="lineNum">      41 </span><span class="lineCov">     280404 :     return (size_t)mio::get&lt;I&gt;(t) * product&lt;I + 1, Index, Ts...&gt;(t);</span></a>
 <a name="42"><span class="lineNum">      42 </span>            : }</a>
 <a name="43"><span class="lineNum">      43 </span>            : </a>
 <a name="44"><span class="lineNum">      44 </span>            : template &lt;template &lt;class...&gt; class Index, class... Ts&gt;</a>
-<a name="45"><span class="lineNum">      45 </span><span class="lineCov">     239075 : size_t product(Index&lt;Ts...&gt; const&amp; t)</span></a>
+<a name="45"><span class="lineNum">      45 </span><span class="lineCov">     239093 : size_t product(Index&lt;Ts...&gt; const&amp; t)</span></a>
 <a name="46"><span class="lineNum">      46 </span>            : {</a>
-<a name="47"><span class="lineNum">      47 </span><span class="lineCov">     239075 :     return product&lt;0, Index, Ts...&gt;(t);</span></a>
+<a name="47"><span class="lineNum">      47 </span><span class="lineCov">     239093 :     return product&lt;0, Index, Ts...&gt;(t);</span></a>
 <a name="48"><span class="lineNum">      48 </span>            : }</a>
 <a name="49"><span class="lineNum">      49 </span>            : </a>
 <a name="50"><span class="lineNum">      50 </span>            : } // namespace</a>
@@ -133,23 +133,23 @@
 <a name="71"><span class="lineNum">      71 </span>            : </a>
 <a name="72"><span class="lineNum">      72 </span>            : // Internal implementation for flatten_index</a>
 <a name="73"><span class="lineNum">      73 </span>            : template &lt;size_t I, typename Index&gt;</a>
-<a name="74"><span class="lineNum">      74 </span><span class="lineCov">   64582168 : std::enable_if_t&lt;(I == (Index::size - 1)), std::pair&lt;size_t, size_t&gt;&gt; flatten_index(Index const&amp; indices,</span></a>
+<a name="74"><span class="lineNum">      74 </span><span class="lineCov">   66901054 : std::enable_if_t&lt;(I == (Index::size - 1)), std::pair&lt;size_t, size_t&gt;&gt; flatten_index(Index const&amp; indices,</span></a>
 <a name="75"><span class="lineNum">      75 </span>            :                                                                                     Index const&amp; dimensions)</a>
 <a name="76"><span class="lineNum">      76 </span>            : {</a>
-<a name="77"><span class="lineNum">      77 </span><span class="lineCov">   64582168 :     assert(get&lt;I&gt;(indices) &lt; get&lt;I&gt;(dimensions));</span></a>
-<a name="78"><span class="lineNum">      78 </span><span class="lineCov">   64582168 :     return {(size_t)mio::get&lt;I&gt;(indices), (size_t)mio::get&lt;I&gt;(dimensions)};</span></a>
+<a name="77"><span class="lineNum">      77 </span><span class="lineCov">   66901054 :     assert(get&lt;I&gt;(indices) &lt; get&lt;I&gt;(dimensions));</span></a>
+<a name="78"><span class="lineNum">      78 </span><span class="lineCov">   66901054 :     return {(size_t)mio::get&lt;I&gt;(indices), (size_t)mio::get&lt;I&gt;(dimensions)};</span></a>
 <a name="79"><span class="lineNum">      79 </span>            : }</a>
 <a name="80"><span class="lineNum">      80 </span>            : </a>
 <a name="81"><span class="lineNum">      81 </span>            : template &lt;size_t I, typename Index&gt;</a>
-<a name="82"><span class="lineNum">      82 </span><span class="lineCov">   28895304 : std::enable_if_t&lt;(I &lt; (Index::size - 1)), std::pair&lt;size_t, size_t&gt;&gt; flatten_index(Index const&amp; indices,</span></a>
+<a name="82"><span class="lineNum">      82 </span><span class="lineCov">   29886456 : std::enable_if_t&lt;(I &lt; (Index::size - 1)), std::pair&lt;size_t, size_t&gt;&gt; flatten_index(Index const&amp; indices,</span></a>
 <a name="83"><span class="lineNum">      83 </span>            :                                                                                    Index const&amp; dimensions)</a>
 <a name="84"><span class="lineNum">      84 </span>            : {</a>
-<a name="85"><span class="lineNum">      85 </span><span class="lineCov">   28895304 :     assert(mio::get&lt;I&gt;(indices) &lt; mio::get&lt;I&gt;(dimensions));</span></a>
+<a name="85"><span class="lineNum">      85 </span><span class="lineCov">   29886456 :     assert(mio::get&lt;I&gt;(indices) &lt; mio::get&lt;I&gt;(dimensions));</span></a>
 <a name="86"><span class="lineNum">      86 </span>            : </a>
-<a name="87"><span class="lineNum">      87 </span><span class="lineCov">   28895304 :     size_t val, prod;</span></a>
-<a name="88"><span class="lineNum">      88 </span><span class="lineCov">   28895304 :     std::tie(val, prod) = flatten_index&lt;I + 1&gt;(indices, dimensions);</span></a>
+<a name="87"><span class="lineNum">      87 </span><span class="lineCov">   29886456 :     size_t val, prod;</span></a>
+<a name="88"><span class="lineNum">      88 </span><span class="lineCov">   29886456 :     std::tie(val, prod) = flatten_index&lt;I + 1&gt;(indices, dimensions);</span></a>
 <a name="89"><span class="lineNum">      89 </span>            : </a>
-<a name="90"><span class="lineNum">      90 </span><span class="lineCov">   57778674 :     return {val + (size_t)mio::get&lt;I&gt;(indices) * prod, prod * (size_t)mio::get&lt;I&gt;(dimensions)};</span></a>
+<a name="90"><span class="lineNum">      90 </span><span class="lineCov">   59760978 :     return {val + (size_t)mio::get&lt;I&gt;(indices) * prod, prod * (size_t)mio::get&lt;I&gt;(dimensions)};</span></a>
 <a name="91"><span class="lineNum">      91 </span>            : }</a>
 <a name="92"><span class="lineNum">      92 </span>            : </a>
 <a name="93"><span class="lineNum">      93 </span>            : template &lt;typename T&gt;</a>
@@ -171,9 +171,9 @@
 <a name="109"><span class="lineNum">     109 </span>            :  * @return the corresponding flat index</a>
 <a name="110"><span class="lineNum">     110 </span>            :  */</a>
 <a name="111"><span class="lineNum">     111 </span>            : template &lt;typename MultiIndex&gt;</a>
-<a name="112"><span class="lineNum">     112 </span><span class="lineCov">   64582168 : size_t flatten_index(MultiIndex const&amp; indices, MultiIndex const&amp; dimensions)</span></a>
+<a name="112"><span class="lineNum">     112 </span><span class="lineCov">   66901054 : size_t flatten_index(MultiIndex const&amp; indices, MultiIndex const&amp; dimensions)</span></a>
 <a name="113"><span class="lineNum">     113 </span>            : {</a>
-<a name="114"><span class="lineNum">     114 </span><span class="lineCov">   64582168 :     return details::flatten_index&lt;0&gt;(indices, dimensions).first;</span></a>
+<a name="114"><span class="lineNum">     114 </span><span class="lineCov">   66901054 :     return details::flatten_index&lt;0&gt;(indices, dimensions).first;</span></a>
 <a name="115"><span class="lineNum">     115 </span>            : }</a>
 <a name="116"><span class="lineNum">     116 </span>            : </a>
 <a name="117"><span class="lineNum">     117 </span>            : /**</a>
@@ -291,9 +291,9 @@
 <a name="229"><span class="lineNum">     229 </span>            :      * @brief returns the size of the array along all dimensions.</a>
 <a name="230"><span class="lineNum">     230 </span>            :      * @return multi-index with size of the array along all dimensions.</a>
 <a name="231"><span class="lineNum">     231 </span>            :      */</a>
-<a name="232"><span class="lineNum">     232 </span><span class="lineCov">   17407169 :     Index size() const</span></a>
+<a name="232"><span class="lineNum">     232 </span><span class="lineCov">   18060893 :     Index size() const</span></a>
 <a name="233"><span class="lineNum">     233 </span>            :     {</a>
-<a name="234"><span class="lineNum">     234 </span><span class="lineCov">   17407169 :         return m_dimensions;</span></a>
+<a name="234"><span class="lineNum">     234 </span><span class="lineCov">   18060893 :         return m_dimensions;</span></a>
 <a name="235"><span class="lineNum">     235 </span>            :     }</a>
 <a name="236"><span class="lineNum">     236 </span>            : </a>
 <a name="237"><span class="lineNum">     237 </span>            :     /**</a>
@@ -323,9 +323,9 @@
 <a name="261"><span class="lineNum">     261 </span>            :      * @brief array returns a reference to the internally stored flat array.</a>
 <a name="262"><span class="lineNum">     262 </span>            :      * @return const reference to the CustomIndexArray::InternalArrayType instance</a>
 <a name="263"><span class="lineNum">     263 </span>            :      */</a>
-<a name="264"><span class="lineNum">     264 </span><span class="lineCov">      23249 :     auto const&amp; array() const</span></a>
+<a name="264"><span class="lineNum">     264 </span><span class="lineCov">      23267 :     auto const&amp; array() const</span></a>
 <a name="265"><span class="lineNum">     265 </span>            :     {</a>
-<a name="266"><span class="lineNum">     266 </span><span class="lineCov">      23249 :         return m_y;</span></a>
+<a name="266"><span class="lineNum">     266 </span><span class="lineCov">      23267 :         return m_y;</span></a>
 <a name="267"><span class="lineNum">     267 </span>            :     }</a>
 <a name="268"><span class="lineNum">     268 </span><span class="lineCov">     180265 :     auto&amp; array()</span></a>
 <a name="269"><span class="lineNum">     269 </span>            :     {</a>
@@ -347,9 +347,9 @@
 <a name="285"><span class="lineNum">     285 </span>            :      * @param index a flat index</a>
 <a name="286"><span class="lineNum">     286 </span>            :      * @return the value at the index</a>
 <a name="287"><span class="lineNum">     287 </span>            :      */</a>
-<a name="288"><span class="lineNum">     288 </span><span class="lineCov">   18875754 :     Type const&amp; operator[](Index const&amp; index) const</span></a>
+<a name="288"><span class="lineNum">     288 </span><span class="lineCov">   19570968 :     Type const&amp; operator[](Index const&amp; index) const</span></a>
 <a name="289"><span class="lineNum">     289 </span>            :     {</a>
-<a name="290"><span class="lineNum">     290 </span><span class="lineCov">   18875754 :         return m_y[get_flat_index(index)];</span></a>
+<a name="290"><span class="lineNum">     290 </span><span class="lineCov">   19570968 :         return m_y[get_flat_index(index)];</span></a>
 <a name="291"><span class="lineNum">     291 </span>            :     }</a>
 <a name="292"><span class="lineNum">     292 </span>            : </a>
 <a name="293"><span class="lineNum">     293 </span>            :     /**</a>
@@ -382,9 +382,9 @@
 <a name="320"><span class="lineNum">     320 </span>            :      * @param indices the custom indices for each category</a>
 <a name="321"><span class="lineNum">     321 </span>            :      * @return a flat index into the data structure storing the compartment populations</a>
 <a name="322"><span class="lineNum">     322 </span>            :      */</a>
-<a name="323"><span class="lineNum">     323 </span><span class="lineCov">   48376796 :     size_t get_flat_index(Index const&amp; index) const</span></a>
+<a name="323"><span class="lineNum">     323 </span><span class="lineCov">   50063234 :     size_t get_flat_index(Index const&amp; index) const</span></a>
 <a name="324"><span class="lineNum">     324 </span>            :     {</a>
-<a name="325"><span class="lineNum">     325 </span><span class="lineCov">   48376796 :         return (Eigen::Index)flatten_index(index, m_dimensions);</span></a>
+<a name="325"><span class="lineNum">     325 </span><span class="lineCov">   50063234 :         return (Eigen::Index)flatten_index(index, m_dimensions);</span></a>
 <a name="326"><span class="lineNum">     326 </span>            :     }</a>
 <a name="327"><span class="lineNum">     327 </span>            : </a>
 <a name="328"><span class="lineNum">     328 </span>            :     /**</a>
@@ -412,10 +412,10 @@
 <a name="350"><span class="lineNum">     350 </span>            :         using pointer           = value_type*;</a>
 <a name="351"><span class="lineNum">     351 </span>            :         using reference         = value_type&amp;;</a>
 <a name="352"><span class="lineNum">     352 </span>            : </a>
-<a name="353"><span class="lineNum">     353 </span><span class="lineCov">     119314 :         Iterator(pointer ptr)</span></a>
-<a name="354"><span class="lineNum">     354 </span><span class="lineCov">     119314 :             : m_ptr(ptr)</span></a>
+<a name="353"><span class="lineNum">     353 </span><span class="lineCov">     119332 :         Iterator(pointer ptr)</span></a>
+<a name="354"><span class="lineNum">     354 </span><span class="lineCov">     119332 :             : m_ptr(ptr)</span></a>
 <a name="355"><span class="lineNum">     355 </span>            :         {</a>
-<a name="356"><span class="lineNum">     356 </span><span class="lineCov">     119314 :         }</span></a>
+<a name="356"><span class="lineNum">     356 </span><span class="lineCov">     119332 :         }</span></a>
 <a name="357"><span class="lineNum">     357 </span>            : </a>
 <a name="358"><span class="lineNum">     358 </span>            :         Iterator&amp; operator=(pointer rhs)</a>
 <a name="359"><span class="lineNum">     359 </span>            :         {</a>
@@ -438,9 +438,9 @@
 <a name="376"><span class="lineNum">     376 </span>            :             return *this;</a>
 <a name="377"><span class="lineNum">     377 </span>            :         }</a>
 <a name="378"><span class="lineNum">     378 </span>            : </a>
-<a name="379"><span class="lineNum">     379 </span><span class="lineCov">     113945 :         reference operator[](const difference_type&amp; rhs)</span></a>
+<a name="379"><span class="lineNum">     379 </span><span class="lineCov">     114125 :         reference operator[](const difference_type&amp; rhs)</span></a>
 <a name="380"><span class="lineNum">     380 </span>            :         {</a>
-<a name="381"><span class="lineNum">     381 </span><span class="lineCov">     113945 :             return m_ptr[rhs];</span></a>
+<a name="381"><span class="lineNum">     381 </span><span class="lineCov">     114125 :             return m_ptr[rhs];</span></a>
 <a name="382"><span class="lineNum">     382 </span>            :         }</a>
 <a name="383"><span class="lineNum">     383 </span>            :         value_type const&amp; operator[](const difference_type&amp; rhs) const</a>
 <a name="384"><span class="lineNum">     384 </span>            :         {</a>
@@ -495,9 +495,9 @@
 <a name="433"><span class="lineNum">     433 </span><span class="lineCov">         14 :             return m_ptr - rhs.m_ptr;</span></a>
 <a name="434"><span class="lineNum">     434 </span>            :         }</a>
 <a name="435"><span class="lineNum">     435 </span>            : </a>
-<a name="436"><span class="lineNum">     436 </span><span class="lineCov">      42860 :         friend bool operator==(const Iterator&amp; a, const Iterator&amp; b)</span></a>
+<a name="436"><span class="lineNum">     436 </span><span class="lineCov">      42878 :         friend bool operator==(const Iterator&amp; a, const Iterator&amp; b)</span></a>
 <a name="437"><span class="lineNum">     437 </span>            :         {</a>
-<a name="438"><span class="lineNum">     438 </span><span class="lineCov">      42860 :             return a.m_ptr == b.m_ptr;</span></a>
+<a name="438"><span class="lineNum">     438 </span><span class="lineCov">      42878 :             return a.m_ptr == b.m_ptr;</span></a>
 <a name="439"><span class="lineNum">     439 </span>            :         }</a>
 <a name="440"><span class="lineNum">     440 </span><span class="lineCov">      36877 :         friend bool operator!=(const Iterator&amp; a, const Iterator&amp; b)</span></a>
 <a name="441"><span class="lineNum">     441 </span>            :         {</a>
@@ -563,14 +563,14 @@
 <a name="501"><span class="lineNum">     501 </span>            :             using pointer           = value_type*;</a>
 <a name="502"><span class="lineNum">     502 </span>            :             using reference         = value_type&amp;;</a>
 <a name="503"><span class="lineNum">     503 </span>            : </a>
-<a name="504"><span class="lineNum">     504 </span><span class="lineCov">      11987 :             Iterator(iter_type begin_, size_t di_, size_t dr_, Seq&lt;size_t&gt; const&amp; seq_, difference_type offset = 0)</span></a>
-<a name="505"><span class="lineNum">     505 </span><span class="lineCov">      11987 :                 : data_begin(begin_)</span></a>
-<a name="506"><span class="lineNum">     506 </span><span class="lineCov">      11987 :                 , di(di_)</span></a>
-<a name="507"><span class="lineNum">     507 </span><span class="lineCov">      11987 :                 , dr(dr_)</span></a>
-<a name="508"><span class="lineNum">     508 </span><span class="lineCov">      11987 :                 , seq(seq_)</span></a>
-<a name="509"><span class="lineNum">     509 </span><span class="lineCov">      11987 :                 , inner_offset(offset)</span></a>
+<a name="504"><span class="lineNum">     504 </span><span class="lineCov">      12023 :             Iterator(iter_type begin_, size_t di_, size_t dr_, Seq&lt;size_t&gt; const&amp; seq_, difference_type offset = 0)</span></a>
+<a name="505"><span class="lineNum">     505 </span><span class="lineCov">      12023 :                 : data_begin(begin_)</span></a>
+<a name="506"><span class="lineNum">     506 </span><span class="lineCov">      12023 :                 , di(di_)</span></a>
+<a name="507"><span class="lineNum">     507 </span><span class="lineCov">      12023 :                 , dr(dr_)</span></a>
+<a name="508"><span class="lineNum">     508 </span><span class="lineCov">      12023 :                 , seq(seq_)</span></a>
+<a name="509"><span class="lineNum">     509 </span><span class="lineCov">      12023 :                 , inner_offset(offset)</span></a>
 <a name="510"><span class="lineNum">     510 </span>            :             {</a>
-<a name="511"><span class="lineNum">     511 </span><span class="lineCov">      11987 :             }</span></a>
+<a name="511"><span class="lineNum">     511 </span><span class="lineCov">      12023 :             }</span></a>
 <a name="512"><span class="lineNum">     512 </span>            : </a>
 <a name="513"><span class="lineNum">     513 </span>            :             Iterator&amp; operator=(size_t rhs)</a>
 <a name="514"><span class="lineNum">     514 </span>            :             {</a>
@@ -601,9 +601,9 @@
 <a name="539"><span class="lineNum">     539 </span>            :             {</a>
 <a name="540"><span class="lineNum">     540 </span>            :                 return data_begin[outer_offset(inner_offset + rhs)];</a>
 <a name="541"><span class="lineNum">     541 </span>            :             }</a>
-<a name="542"><span class="lineNum">     542 </span><span class="lineCov">     113945 :             reference operator*()</span></a>
+<a name="542"><span class="lineNum">     542 </span><span class="lineCov">     114125 :             reference operator*()</span></a>
 <a name="543"><span class="lineNum">     543 </span>            :             {</a>
-<a name="544"><span class="lineNum">     544 </span><span class="lineCov">     113945 :                 return data_begin[outer_offset(inner_offset)];</span></a>
+<a name="544"><span class="lineNum">     544 </span><span class="lineCov">     114125 :                 return data_begin[outer_offset(inner_offset)];</span></a>
 <a name="545"><span class="lineNum">     545 </span>            :             }</a>
 <a name="546"><span class="lineNum">     546 </span>            :             value_type const&amp; operator*() const</a>
 <a name="547"><span class="lineNum">     547 </span>            :             {</a>
@@ -614,10 +614,10 @@
 <a name="552"><span class="lineNum">     552 </span>            :                 return data_begin + outer_offset(inner_offset);</a>
 <a name="553"><span class="lineNum">     553 </span>            :             }</a>
 <a name="554"><span class="lineNum">     554 </span>            : </a>
-<a name="555"><span class="lineNum">     555 </span><span class="lineCov">     113945 :             Iterator&amp; operator++()</span></a>
+<a name="555"><span class="lineNum">     555 </span><span class="lineCov">     114125 :             Iterator&amp; operator++()</span></a>
 <a name="556"><span class="lineNum">     556 </span>            :             {</a>
-<a name="557"><span class="lineNum">     557 </span><span class="lineCov">     113945 :                 inner_offset++;</span></a>
-<a name="558"><span class="lineNum">     558 </span><span class="lineCov">     113945 :                 return *this;</span></a>
+<a name="557"><span class="lineNum">     557 </span><span class="lineCov">     114125 :                 inner_offset++;</span></a>
+<a name="558"><span class="lineNum">     558 </span><span class="lineCov">     114125 :                 return *this;</span></a>
 <a name="559"><span class="lineNum">     559 </span>            :             }</a>
 <a name="560"><span class="lineNum">     560 </span>            :             Iterator operator++(int)</a>
 <a name="561"><span class="lineNum">     561 </span>            :             {</a>
@@ -646,14 +646,14 @@
 <a name="584"><span class="lineNum">     584 </span>            :                 return Iterator(data_begin, di, dr, seq, inner_offset - rhs);</a>
 <a name="585"><span class="lineNum">     585 </span>            :             }</a>
 <a name="586"><span class="lineNum">     586 </span>            : </a>
-<a name="587"><span class="lineNum">     587 </span><span class="lineCov">     119935 :             friend bool operator==(const Iterator&amp; a, const Iterator&amp; b)</span></a>
+<a name="587"><span class="lineNum">     587 </span><span class="lineCov">     120133 :             friend bool operator==(const Iterator&amp; a, const Iterator&amp; b)</span></a>
 <a name="588"><span class="lineNum">     588 </span>            :             {</a>
-<a name="589"><span class="lineNum">     589 </span><span class="lineCov">     125925 :                 return a.inner_offset == b.inner_offset &amp;&amp; a.data_begin == b.data_begin &amp;&amp; a.di == b.di &amp;&amp;</span></a>
-<a name="590"><span class="lineNum">     590 </span><span class="lineCov">     125925 :                        a.dr == b.dr &amp;&amp; a.seq.start == b.seq.start &amp;&amp; a.seq.n == b.seq.n &amp;&amp; a.seq.stride == b.seq.stride;</span></a>
+<a name="589"><span class="lineNum">     589 </span><span class="lineCov">     126141 :                 return a.inner_offset == b.inner_offset &amp;&amp; a.data_begin == b.data_begin &amp;&amp; a.di == b.di &amp;&amp;</span></a>
+<a name="590"><span class="lineNum">     590 </span><span class="lineCov">     126141 :                        a.dr == b.dr &amp;&amp; a.seq.start == b.seq.start &amp;&amp; a.seq.n == b.seq.n &amp;&amp; a.seq.stride == b.seq.stride;</span></a>
 <a name="591"><span class="lineNum">     591 </span>            :             }</a>
-<a name="592"><span class="lineNum">     592 </span><span class="lineCov">     119928 :             friend bool operator!=(const Iterator&amp; a, const Iterator&amp; b)</span></a>
+<a name="592"><span class="lineNum">     592 </span><span class="lineCov">     120126 :             friend bool operator!=(const Iterator&amp; a, const Iterator&amp; b)</span></a>
 <a name="593"><span class="lineNum">     593 </span>            :             {</a>
-<a name="594"><span class="lineNum">     594 </span><span class="lineCov">     119928 :                 return !(a == b);</span></a>
+<a name="594"><span class="lineNum">     594 </span><span class="lineCov">     120126 :                 return !(a == b);</span></a>
 <a name="595"><span class="lineNum">     595 </span>            :             }</a>
 <a name="596"><span class="lineNum">     596 </span>            :             friend bool operator&lt;(const Iterator&amp; a, const Iterator&amp; b)</a>
 <a name="597"><span class="lineNum">     597 </span>            :             {</a>
@@ -673,20 +673,20 @@
 <a name="611"><span class="lineNum">     611 </span>            :             }</a>
 <a name="612"><span class="lineNum">     612 </span>            : </a>
 <a name="613"><span class="lineNum">     613 </span>            :         private:</a>
-<a name="614"><span class="lineNum">     614 </span><span class="lineCov">     113973 :             inline Slice::difference_type outer_offset(difference_type const&amp; inner) const</span></a>
+<a name="614"><span class="lineNum">     614 </span><span class="lineCov">     114153 :             inline Slice::difference_type outer_offset(difference_type const&amp; inner) const</span></a>
 <a name="615"><span class="lineNum">     615 </span>            :             {</a>
 <a name="616"><span class="lineNum">     616 </span>            : </a>
 <a name="617"><span class="lineNum">     617 </span>            :                 // calculate the outer offset from the inner offset</a>
 <a name="618"><span class="lineNum">     618 </span>            : </a>
 <a name="619"><span class="lineNum">     619 </span>            :                 // first unravel the inner index into an index (i,j,k) for a 3-dim array with dims (dl, idx_sequence.n, dr)</a>
-<a name="620"><span class="lineNum">     620 </span><span class="lineCov">     113973 :                 auto dv           = std::div(inner, seq.n * dr);</span></a>
-<a name="621"><span class="lineNum">     621 </span><span class="lineCov">     113973 :                 difference_type i = dv.quot;</span></a>
-<a name="622"><span class="lineNum">     622 </span><span class="lineCov">     113973 :                 dv                = std::div(dv.rem, dr);</span></a>
-<a name="623"><span class="lineNum">     623 </span><span class="lineCov">     113973 :                 difference_type j = dv.quot * seq.stride + seq.start;</span></a>
-<a name="624"><span class="lineNum">     624 </span><span class="lineCov">     113973 :                 difference_type k = dv.rem;</span></a>
+<a name="620"><span class="lineNum">     620 </span><span class="lineCov">     114153 :                 auto dv           = std::div(inner, seq.n * dr);</span></a>
+<a name="621"><span class="lineNum">     621 </span><span class="lineCov">     114153 :                 difference_type i = dv.quot;</span></a>
+<a name="622"><span class="lineNum">     622 </span><span class="lineCov">     114153 :                 dv                = std::div(dv.rem, dr);</span></a>
+<a name="623"><span class="lineNum">     623 </span><span class="lineCov">     114153 :                 difference_type j = dv.quot * seq.stride + seq.start;</span></a>
+<a name="624"><span class="lineNum">     624 </span><span class="lineCov">     114153 :                 difference_type k = dv.rem;</span></a>
 <a name="625"><span class="lineNum">     625 </span>            : </a>
 <a name="626"><span class="lineNum">     626 </span>            :                 // then flatten the index for a 3-dim array with dims (dl, di, dr)</a>
-<a name="627"><span class="lineNum">     627 </span><span class="lineCov">     113973 :                 return i * di * dr + j * dr + k;</span></a>
+<a name="627"><span class="lineNum">     627 </span><span class="lineCov">     114153 :                 return i * di * dr + j * dr + k;</span></a>
 <a name="628"><span class="lineNum">     628 </span>            :             }</a>
 <a name="629"><span class="lineNum">     629 </span>            : </a>
 <a name="630"><span class="lineNum">     630 </span>            :             iter_type data_begin;</a>
@@ -707,23 +707,23 @@
 <a name="645"><span class="lineNum">     645 </span>            :          * @param start_iter An iterator to the first element of the data</a>
 <a name="646"><span class="lineNum">     646 </span>            :          * @param idx_sequence_ A sequence of indices into the slice</a>
 <a name="647"><span class="lineNum">     647 </span>            :          */</a>
-<a name="648"><span class="lineNum">     648 </span><span class="lineCov">       6011 :         Slice(Index const&amp; dimensions, iter_type const&amp; start_iter, Seq&lt;size_t&gt; idx_sequence_)</span></a>
-<a name="649"><span class="lineNum">     649 </span><span class="lineCov">       6011 :             : data_begin(start_iter)</span></a>
-<a name="650"><span class="lineNum">     650 </span><span class="lineCov">       6011 :             , idx_sequence(idx_sequence_)</span></a>
-<a name="651"><span class="lineNum">     651 </span><span class="lineCov">       6011 :             , m_dimensions(dimensions)</span></a>
-<a name="652"><span class="lineNum">     652 </span><span class="lineCov">       6011 :             , di(mio::get&lt;Tag&gt;(dimensions))</span></a>
-<a name="653"><span class="lineNum">     653 </span><span class="lineCov">       6011 :             , dr(product&lt;details::IndexPosition&lt;Tag, Index&gt;::value&gt;(dimensions) / di)</span></a>
-<a name="654"><span class="lineNum">     654 </span><span class="lineCov">       6011 :             , dl(product(dimensions) / (di * dr))</span></a>
+<a name="648"><span class="lineNum">     648 </span><span class="lineCov">       6029 :         Slice(Index const&amp; dimensions, iter_type const&amp; start_iter, Seq&lt;size_t&gt; idx_sequence_)</span></a>
+<a name="649"><span class="lineNum">     649 </span><span class="lineCov">       6029 :             : data_begin(start_iter)</span></a>
+<a name="650"><span class="lineNum">     650 </span><span class="lineCov">       6029 :             , idx_sequence(idx_sequence_)</span></a>
+<a name="651"><span class="lineNum">     651 </span><span class="lineCov">       6029 :             , m_dimensions(dimensions)</span></a>
+<a name="652"><span class="lineNum">     652 </span><span class="lineCov">       6029 :             , di(mio::get&lt;Tag&gt;(dimensions))</span></a>
+<a name="653"><span class="lineNum">     653 </span><span class="lineCov">       6029 :             , dr(product&lt;details::IndexPosition&lt;Tag, Index&gt;::value&gt;(dimensions) / di)</span></a>
+<a name="654"><span class="lineNum">     654 </span><span class="lineCov">       6029 :             , dl(product(dimensions) / (di * dr))</span></a>
 <a name="655"><span class="lineNum">     655 </span>            :         {</a>
-<a name="656"><span class="lineNum">     656 </span><span class="lineCov">       6011 :             assert((size_t)idx_sequence.start + idx_sequence.n &lt;= di);</span></a>
+<a name="656"><span class="lineNum">     656 </span><span class="lineCov">       6029 :             assert((size_t)idx_sequence.start + idx_sequence.n &lt;= di);</span></a>
 <a name="657"><span class="lineNum">     657 </span>            : </a>
-<a name="658"><span class="lineNum">     658 </span><span class="lineCov">       6011 :             mio::get&lt;Tag&gt;(m_dimensions) = mio::Index&lt;Tag&gt;(idx_sequence.n);</span></a>
-<a name="659"><span class="lineNum">     659 </span><span class="lineCov">       6011 :         }</span></a>
+<a name="658"><span class="lineNum">     658 </span><span class="lineCov">       6029 :             mio::get&lt;Tag&gt;(m_dimensions) = mio::Index&lt;Tag&gt;(idx_sequence.n);</span></a>
+<a name="659"><span class="lineNum">     659 </span><span class="lineCov">       6029 :         }</span></a>
 <a name="660"><span class="lineNum">     660 </span>            : </a>
 <a name="661"><span class="lineNum">     661 </span>            :         // returns the number of elements in a slice</a>
-<a name="662"><span class="lineNum">     662 </span><span class="lineCov">       6090 :         size_t numel() const</span></a>
+<a name="662"><span class="lineNum">     662 </span><span class="lineCov">       6108 :         size_t numel() const</span></a>
 <a name="663"><span class="lineNum">     663 </span>            :         {</a>
-<a name="664"><span class="lineNum">     664 </span><span class="lineCov">       6090 :             return dl * dr * (idx_sequence.n);</span></a>
+<a name="664"><span class="lineNum">     664 </span><span class="lineCov">       6108 :             return dl * dr * (idx_sequence.n);</span></a>
 <a name="665"><span class="lineNum">     665 </span>            :         }</a>
 <a name="666"><span class="lineNum">     666 </span>            : </a>
 <a name="667"><span class="lineNum">     667 </span>            :         // returns an stl-compatible random access iterator into the slice</a>
@@ -733,9 +733,9 @@
 <a name="671"><span class="lineNum">     671 </span>            :         }</a>
 <a name="672"><span class="lineNum">     672 </span>            : </a>
 <a name="673"><span class="lineNum">     673 </span>            :         // returns an stl-compatible random access iterator into the slice</a>
-<a name="674"><span class="lineNum">     674 </span><span class="lineCov">       5916 :         const_iterator begin() const</span></a>
+<a name="674"><span class="lineNum">     674 </span><span class="lineCov">       5934 :         const_iterator begin() const</span></a>
 <a name="675"><span class="lineNum">     675 </span>            :         {</a>
-<a name="676"><span class="lineNum">     676 </span><span class="lineCov">       5916 :             return const_iterator(data_begin, di, dr, idx_sequence, 0);</span></a>
+<a name="676"><span class="lineNum">     676 </span><span class="lineCov">       5934 :             return const_iterator(data_begin, di, dr, idx_sequence, 0);</span></a>
 <a name="677"><span class="lineNum">     677 </span>            :         }</a>
 <a name="678"><span class="lineNum">     678 </span>            : </a>
 <a name="679"><span class="lineNum">     679 </span>            :         // returns an stl-compatible end random access iterator into the slice</a>
@@ -745,9 +745,9 @@
 <a name="683"><span class="lineNum">     683 </span>            :         }</a>
 <a name="684"><span class="lineNum">     684 </span>            : </a>
 <a name="685"><span class="lineNum">     685 </span>            :         // returns an stl-compatible end random access iterator into the slice</a>
-<a name="686"><span class="lineNum">     686 </span><span class="lineCov">       5937 :         const_iterator end() const</span></a>
+<a name="686"><span class="lineNum">     686 </span><span class="lineCov">       5955 :         const_iterator end() const</span></a>
 <a name="687"><span class="lineNum">     687 </span>            :         {</a>
-<a name="688"><span class="lineNum">     688 </span><span class="lineCov">       5937 :             return const_iterator(data_begin, di, dr, idx_sequence, numel());</span></a>
+<a name="688"><span class="lineNum">     688 </span><span class="lineCov">       5955 :             return const_iterator(data_begin, di, dr, idx_sequence, numel());</span></a>
 <a name="689"><span class="lineNum">     689 </span>            :         }</a>
 <a name="690"><span class="lineNum">     690 </span>            : </a>
 <a name="691"><span class="lineNum">     691 </span>            :         // copies the slice elements into a CustomIndexArray of appropriate dimension</a>
@@ -847,9 +847,9 @@
 <a name="785"><span class="lineNum">     785 </span>            :      * @brief Get a start iterator for the elements</a>
 <a name="786"><span class="lineNum">     786 </span>            :      * @return random access iterator</a>
 <a name="787"><span class="lineNum">     787 </span>            :      */</a>
-<a name="788"><span class="lineNum">     788 </span><span class="lineCov">       6766 :     const_iterator begin() const</span></a>
+<a name="788"><span class="lineNum">     788 </span><span class="lineCov">       6784 :     const_iterator begin() const</span></a>
 <a name="789"><span class="lineNum">     789 </span>            :     {</a>
-<a name="790"><span class="lineNum">     790 </span><span class="lineCov">       6766 :         return const_iterator(array().data());</span></a>
+<a name="790"><span class="lineNum">     790 </span><span class="lineCov">       6784 :         return const_iterator(array().data());</span></a>
 <a name="791"><span class="lineNum">     791 </span>            :     }</a>
 <a name="792"><span class="lineNum">     792 </span>            : </a>
 <a name="793"><span class="lineNum">     793 </span>            :     /**</a>
@@ -885,9 +885,9 @@
 <a name="823"><span class="lineNum">     823 </span><span class="lineCov">        176 :         return Slice&lt;Tag, iterator&gt;(m_dimensions, begin(), idx_seq);</span></a>
 <a name="824"><span class="lineNum">     824 </span>            :     }</a>
 <a name="825"><span class="lineNum">     825 </span>            :     template &lt;typename Tag&gt;</a>
-<a name="826"><span class="lineNum">     826 </span><span class="lineCov">       5909 :     Slice&lt;Tag, const_iterator&gt; slice(Seq&lt;size_t&gt; idx_seq) const</span></a>
+<a name="826"><span class="lineNum">     826 </span><span class="lineCov">       5927 :     Slice&lt;Tag, const_iterator&gt; slice(Seq&lt;size_t&gt; idx_seq) const</span></a>
 <a name="827"><span class="lineNum">     827 </span>            :     {</a>
-<a name="828"><span class="lineNum">     828 </span><span class="lineCov">      11818 :         return Slice&lt;Tag, const_iterator&gt;(m_dimensions, begin(), idx_seq);</span></a>
+<a name="828"><span class="lineNum">     828 </span><span class="lineCov">      11854 :         return Slice&lt;Tag, const_iterator&gt;(m_dimensions, begin(), idx_seq);</span></a>
 <a name="829"><span class="lineNum">     829 </span>            :     }</a>
 <a name="830"><span class="lineNum">     830 </span>            :     /**@}*/</a>
 <a name="831"><span class="lineNum">     831 </span>            : </a>
diff --git a/coverage/cpp/memilio/utils/date.h.func-sort-c.html b/coverage/cpp/memilio/utils/date.h.func-sort-c.html
index c5774f64c1..7c02bde91f 100644
--- a/coverage/cpp/memilio/utils/date.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/date.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">16</td>
diff --git a/coverage/cpp/memilio/utils/date.h.func.html b/coverage/cpp/memilio/utils/date.h.func.html
index fe37db20de..a1db421be4 100644
--- a/coverage/cpp/memilio/utils/date.h.func.html
+++ b/coverage/cpp/memilio/utils/date.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">16</td>
diff --git a/coverage/cpp/memilio/utils/date.h.gcov.html b/coverage/cpp/memilio/utils/date.h.gcov.html
index 109ea80f98..96dc26ddaa 100644
--- a/coverage/cpp/memilio/utils/date.h.gcov.html
+++ b/coverage/cpp/memilio/utils/date.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">16</td>
diff --git a/coverage/cpp/memilio/utils/index-sort-f.html b/coverage/cpp/memilio/utils/index-sort-f.html
index 84c2f1594a..056c8bd005 100644
--- a/coverage/cpp/memilio/utils/index-sort-f.html
+++ b/coverage/cpp/memilio/utils/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4194</td>
diff --git a/coverage/cpp/memilio/utils/index-sort-l.html b/coverage/cpp/memilio/utils/index-sort-l.html
index f5cb9de615..23e13fe170 100644
--- a/coverage/cpp/memilio/utils/index-sort-l.html
+++ b/coverage/cpp/memilio/utils/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4194</td>
diff --git a/coverage/cpp/memilio/utils/index.h.func-sort-c.html b/coverage/cpp/memilio/utils/index.h.func-sort-c.html
index 8fbe68bf94..e17e40724a 100644
--- a/coverage/cpp/memilio/utils/index.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/index.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">325</td>
@@ -1073,7 +1073,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#226">mio::Index&lt;mio::AgeGroup&gt;&amp; mio::get&lt;mio::AgeGroup, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;&amp;)</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;TestAgeGroup&gt;::Index(unsigned long)</a></td>
@@ -1125,7 +1125,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#242">mio::Index&lt;mio::AgeGroup&gt; const&amp; mio::get&lt;mio::AgeGroup, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5019</td>
+              <td class="coverFnHi">5037</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#242">mio::Index&lt;mio::abm::VirusVariant&gt; const&amp; mio::get&lt;mio::abm::VirusVariant, mio::abm::CellIndex, mio::abm::VirusVariant, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::abm::CellIndex, mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
@@ -1209,7 +1209,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#128">mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::Index(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;, mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">25713</td>
+              <td class="coverFnHi">25641</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::AgeGroup&gt; const&amp;)</a></td>
@@ -1221,7 +1221,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#74">mio::Index&lt;mio::abm::VirusVariant&gt;::Index&lt;mio::abm::VirusVariant, (void*)0&gt;(mio::abm::VirusVariant)</a></td>
-              <td class="coverFnHi">51214</td>
+              <td class="coverFnHi">51142</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::abm::CellIndex&gt;, mio::Index&lt;mio::abm::VirusVariant&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::abm::CellIndex, mio::abm::VirusVariant, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::abm::CellIndex, mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
@@ -1249,11 +1249,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::abm::VirusVariant&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::abm::VirusVariant, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">68127</td>
+              <td class="coverFnHi">67839</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::abm::VirusVariant&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::abm::VirusVariant, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">68127</td>
+              <td class="coverFnHi">67839</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::SimulationDay&gt;::Index(unsigned long)</a></td>
@@ -1305,44 +1305,44 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#321">mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; mio::extend_index&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long)</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::oseir::InfectionState&gt;::Index(unsigned long)</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#272">mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; mio::details::extend_index_impl&lt;mio::AgeGroup, mio::oseir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;)</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::oseir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;)::{lambda()#2}::operator()() const</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::oseir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;)::{lambda()#1}::operator()() const</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#74">mio::Index&lt;mio::oseir::InfectionState&gt;::Index&lt;mio::oseir::InfectionState, (void*)0&gt;(mio::oseir::InfectionState)</a></td>
-              <td class="coverFnHi">2706111</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="index.h.gcov.html#65">mio::Index&lt;mio::AgeGroup&gt;::Zero()</a></td>
-              <td class="coverFnHi">3175161</td>
+              <td class="coverFnHi">2706867</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#305">mio::Index&lt;mio::AgeGroup&gt; mio::reduce_index&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">3199692</td>
+              <td class="coverFnHi">3200556</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#260">mio::Index&lt;mio::AgeGroup&gt; mio::details::reduce_index_impl&lt;mio::AgeGroup, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;)</a></td>
-              <td class="coverFnHi">3199692</td>
+              <td class="coverFnHi">3200556</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#128">mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt;::Index(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
               <td class="coverFnHi">3217442</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="index.h.gcov.html#65">mio::Index&lt;mio::AgeGroup&gt;::Zero()</a></td>
+              <td class="coverFnHi">3217929</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::SimulationDay&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::SimulationDay, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; const&amp;)</a></td>
               <td class="coverFnHi">4045096</td>
@@ -1353,51 +1353,51 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#128">mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;::Index(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5187098</td>
+              <td class="coverFnHi">5188502</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#74">mio::Index&lt;mio::osecir::InfectionState&gt;::Index&lt;mio::osecir::InfectionState, (void*)0&gt;(mio::osecir::InfectionState)</a></td>
-              <td class="coverFnHi">7189134</td>
+              <td class="coverFnHi">7547154</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#201">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type&amp; mio::get&lt;0ul, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::AgeGroup&gt;&amp;)</a></td>
-              <td class="coverFnHi">8025501</td>
+              <td class="coverFnHi">8132421</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::AgeGroup&gt;::Index(unsigned long)</a></td>
-              <td class="coverFnHi">11178423</td>
+              <td class="coverFnHi">11368989</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#321">mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; mio::extend_index&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long)</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#272">mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;)</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;)::{lambda()#2}::operator()() const</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;)::{lambda()#1}::operator()() const</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::osecir::InfectionState&gt;::Index(unsigned long)</a></td>
-              <td class="coverFnHi">12184824</td>
+              <td class="coverFnHi">12816624</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="index.h.gcov.html#305">mio::Index&lt;mio::AgeGroup&gt; mio::reduce_index&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">12613761</td>
+              <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::AgeGroup, mio::osecirvvs::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
+              <td class="coverFnHi">12875217</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="index.h.gcov.html#260">mio::Index&lt;mio::AgeGroup&gt; mio::details::reduce_index_impl&lt;mio::AgeGroup, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;)</a></td>
-              <td class="coverFnHi">12613761</td>
+              <td class="coverFn"><a href="index.h.gcov.html#305">mio::Index&lt;mio::AgeGroup&gt; mio::reduce_index&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
+              <td class="coverFnHi">13266621</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::AgeGroup, mio::osecirvvs::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">12875217</td>
+              <td class="coverFn"><a href="index.h.gcov.html#260">mio::Index&lt;mio::AgeGroup&gt; mio::details::reduce_index_impl&lt;mio::AgeGroup, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;)</a></td>
+              <td class="coverFnHi">13266621</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::osecirvvs::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -1405,27 +1405,27 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#128">mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::Index(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370862</td>
+              <td class="coverFnHi">20360682</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::oseir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::AgeGroup, mio::oseir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">20748599</td>
+              <td class="coverFnHi">20754215</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::oseir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::oseir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">23948291</td>
+              <td class="coverFnHi">23954771</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">77487151</td>
+              <td class="coverFnHi">81446467</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">90100912</td>
+              <td class="coverFnHi">94713088</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#218">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">160775849</td>
+              <td class="coverFnHi">166740617</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/index.h.func.html b/coverage/cpp/memilio/utils/index.h.func.html
index c7b4c79efe..30fc45625c 100644
--- a/coverage/cpp/memilio/utils/index.h.func.html
+++ b/coverage/cpp/memilio/utils/index.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">325</td>
@@ -93,11 +93,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#321">mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; mio::extend_index&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long)</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#321">mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; mio::extend_index&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long)</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#321">mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; mio::extend_index&lt;mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long)</a></td>
@@ -125,11 +125,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#305">mio::Index&lt;mio::AgeGroup&gt; mio::reduce_index&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">3199692</td>
+              <td class="coverFnHi">3200556</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#305">mio::Index&lt;mio::AgeGroup&gt; mio::reduce_index&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">12613761</td>
+              <td class="coverFnHi">13266621</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#305">mio::Index&lt;mio::AgeGroup&gt; mio::reduce_index&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -337,7 +337,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::abm::VirusVariant&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::abm::VirusVariant, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">68127</td>
+              <td class="coverFnHi">67839</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::abm::ProtectionType&gt;, mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::abm::VirusVariant&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant, (void*)0&gt;(mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;)</a></td>
@@ -381,11 +381,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#218">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">160775849</td>
+              <td class="coverFnHi">166740617</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#201">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type&amp; mio::get&lt;0ul, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::AgeGroup&gt;&amp;)</a></td>
-              <td class="coverFnHi">8025501</td>
+              <td class="coverFnHi">8132421</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::SimulationDay&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::SimulationDay, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt; const&amp;)</a></td>
@@ -397,11 +397,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::oseir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::oseir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">23948291</td>
+              <td class="coverFnHi">23954771</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">90100912</td>
+              <td class="coverFnHi">94713088</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;0ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;0ul, mio::AgeGroup, mio::osecirvvs::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -481,7 +481,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::abm::VirusVariant&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::abm::VirusVariant, mio::AgeGroup, (void*)0&gt;(mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">68127</td>
+              <td class="coverFnHi">67839</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::abm::ProtectionType&gt;, mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::abm::VirusVariant&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant, (void*)0&gt;(mio::Index&lt;mio::abm::ProtectionType, mio::AgeGroup, mio::abm::VirusVariant&gt; const&amp;)</a></td>
@@ -509,11 +509,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::oseir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::AgeGroup, mio::oseir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">20748599</td>
+              <td class="coverFnHi">20754215</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecir::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">77487151</td>
+              <td class="coverFnHi">81446467</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#210">std::tuple_element&lt;1ul, std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt; &gt;::type const&amp; mio::get&lt;1ul, mio::AgeGroup, mio::osecirvvs::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -629,11 +629,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#242">mio::Index&lt;mio::AgeGroup&gt; const&amp; mio::get&lt;mio::AgeGroup, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5019</td>
+              <td class="coverFnHi">5037</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#226">mio::Index&lt;mio::AgeGroup&gt;&amp; mio::get&lt;mio::AgeGroup, mio::AgeGroup, mio::osecir::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;&amp;)</a></td>
-              <td class="coverFnHi">2390</td>
+              <td class="coverFnHi">2408</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#242">mio::Index&lt;mio::AgeGroup&gt; const&amp; mio::get&lt;mio::AgeGroup, mio::AgeGroup, mio::osecirvvs::InfectionState, (void*)0&gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;)</a></td>
@@ -857,7 +857,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#74">mio::Index&lt;mio::abm::VirusVariant&gt;::Index&lt;mio::abm::VirusVariant, (void*)0&gt;(mio::abm::VirusVariant)</a></td>
-              <td class="coverFnHi">51214</td>
+              <td class="coverFnHi">51142</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#167">boost::outcome_v2::basic_result&lt;mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;, mio::IOStatus, boost::outcome_v2::policy::all_narrow&gt; mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)</a></td>
@@ -865,7 +865,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#128">mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::Index(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;, mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">25713</td>
+              <td class="coverFnHi">25641</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#134">mio::Index&lt;mio::abm::VirusVariant, mio::AgeGroup&gt;::Index(std::tuple&lt;mio::Index&lt;mio::abm::VirusVariant&gt;, mio::Index&lt;mio::AgeGroup&gt; &gt; const&amp;)</a></td>
@@ -965,11 +965,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::oseir::InfectionState&gt;::Index(unsigned long)</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#74">mio::Index&lt;mio::oseir::InfectionState&gt;::Index&lt;mio::oseir::InfectionState, (void*)0&gt;(mio::oseir::InfectionState)</a></td>
-              <td class="coverFnHi">2706111</td>
+              <td class="coverFnHi">2706867</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::ssirs::InfectionState&gt;::Index(unsigned long)</a></td>
@@ -993,11 +993,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::osecir::InfectionState&gt;::Index(unsigned long)</a></td>
-              <td class="coverFnHi">12184824</td>
+              <td class="coverFnHi">12816624</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#74">mio::Index&lt;mio::osecir::InfectionState&gt;::Index&lt;mio::osecir::InfectionState, (void*)0&gt;(mio::osecir::InfectionState)</a></td>
-              <td class="coverFnHi">7189134</td>
+              <td class="coverFnHi">7547154</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::sseirvv::InfectionState&gt;::Index(unsigned long)</a></td>
@@ -1017,11 +1017,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#65">mio::Index&lt;mio::AgeGroup&gt;::Zero()</a></td>
-              <td class="coverFnHi">3175161</td>
+              <td class="coverFnHi">3217929</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#83">mio::Index&lt;mio::AgeGroup&gt;::Index(unsigned long)</a></td>
-              <td class="coverFnHi">11178423</td>
+              <td class="coverFnHi">11368989</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#167">boost::outcome_v2::basic_result&lt;mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt;, mio::IOStatus, boost::outcome_v2::policy::all_narrow&gt; mio::Index&lt;mio::AgeGroup, mio::SimulationDay&gt;::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)</a></td>
@@ -1041,7 +1041,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#128">mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt;::Index(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::oseir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">5187098</td>
+              <td class="coverFnHi">5188502</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#167">boost::outcome_v2::basic_result&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;, mio::IOStatus, boost::outcome_v2::policy::all_narrow&gt; mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)</a></td>
@@ -1053,7 +1053,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#128">mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::Index(mio::Index&lt;mio::AgeGroup&gt; const&amp;, mio::Index&lt;mio::osecir::InfectionState&gt; const&amp;)</a></td>
-              <td class="coverFnHi">19370862</td>
+              <td class="coverFnHi">20360682</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#134">mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt;::Index(std::tuple&lt;mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::osecir::InfectionState&gt; &gt; const&amp;)</a></td>
@@ -1145,11 +1145,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#272">mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; mio::details::extend_index_impl&lt;mio::AgeGroup, mio::oseir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;)</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#272">mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;)</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#272">mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecirvvs::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;)</a></td>
@@ -1177,11 +1177,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#260">mio::Index&lt;mio::AgeGroup&gt; mio::details::reduce_index_impl&lt;mio::AgeGroup, mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; const&amp;, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;)</a></td>
-              <td class="coverFnHi">3199692</td>
+              <td class="coverFnHi">3200556</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#260">mio::Index&lt;mio::AgeGroup&gt; mio::details::reduce_index_impl&lt;mio::AgeGroup, mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; const&amp;, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;)</a></td>
-              <td class="coverFnHi">12613761</td>
+              <td class="coverFnHi">13266621</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#260">mio::Index&lt;mio::AgeGroup&gt; mio::details::reduce_index_impl&lt;mio::AgeGroup, mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;(mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; const&amp;, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;)</a></td>
@@ -1405,19 +1405,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::oseir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;)::{lambda()#2}::operator()() const</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::oseir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::oseir::InfectionState&gt; &gt;)::{lambda()#1}::operator()() const</a></td>
-              <td class="coverFnHi">2480994</td>
+              <td class="coverFnHi">2481642</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;)::{lambda()#2}::operator()() const</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecir::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecir::InfectionState&gt; &gt;)::{lambda()#1}::operator()() const</a></td>
-              <td class="coverFnHi">12183660</td>
+              <td class="coverFnHi">12815460</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index.h.gcov.html#280">mio::details::extend_index_impl&lt;mio::AgeGroup, mio::osecirvvs::InfectionState, mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;, unsigned long, std::in_place_type_t&lt;mio::Index&lt;mio::AgeGroup, mio::osecirvvs::InfectionState&gt; &gt;)::{lambda()#2}::operator()() const</a></td>
diff --git a/coverage/cpp/memilio/utils/index.h.gcov.html b/coverage/cpp/memilio/utils/index.h.gcov.html
index 0fac60e6e3..83cf4ec5d9 100644
--- a/coverage/cpp/memilio/utils/index.h.gcov.html
+++ b/coverage/cpp/memilio/utils/index.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">325</td>
@@ -126,28 +126,28 @@
 <a name="64"><span class="lineNum">      64 </span>            : </a>
 <a name="65"><span class="lineNum">      65 </span>            :     static size_t constexpr size = 1;</a>
 <a name="66"><span class="lineNum">      66 </span>            : </a>
-<a name="67"><span class="lineNum">      67 </span><span class="lineCov">    3176807 :     static Index constexpr Zero()</span></a>
+<a name="67"><span class="lineNum">      67 </span><span class="lineCov">    3219575 :     static Index constexpr Zero()</span></a>
 <a name="68"><span class="lineNum">      68 </span>            :     {</a>
-<a name="69"><span class="lineNum">      69 </span><span class="lineCov">    3176807 :         return Index((size_t)0);</span></a>
+<a name="69"><span class="lineNum">      69 </span><span class="lineCov">    3219575 :         return Index((size_t)0);</span></a>
 <a name="70"><span class="lineNum">      70 </span>            :     }</a>
 <a name="71"><span class="lineNum">      71 </span>            : </a>
 <a name="72"><span class="lineNum">      72 </span>            :     /**</a>
 <a name="73"><span class="lineNum">      73 </span>            :      * @brief Constructor from enum, if CategoryTag is an enum</a>
 <a name="74"><span class="lineNum">      74 </span>            :      */</a>
 <a name="75"><span class="lineNum">      75 </span>            :     template &lt;typename Dummy = CategoryTag, std::enable_if_t&lt;std::is_enum&lt;Dummy&gt;::value, void&gt;* = nullptr&gt;</a>
-<a name="76"><span class="lineNum">      76 </span><span class="lineCov">   11746060 :     Index(Dummy val)</span></a>
-<a name="77"><span class="lineNum">      77 </span><span class="lineCov">   11746060 :         : TypeSafe&lt;size_t, Index&lt;CategoryTag&gt;&gt;((size_t)val)</span></a>
+<a name="76"><span class="lineNum">      76 </span><span class="lineCov">   12104764 :     Index(Dummy val)</span></a>
+<a name="77"><span class="lineNum">      77 </span><span class="lineCov">   12104764 :         : TypeSafe&lt;size_t, Index&lt;CategoryTag&gt;&gt;((size_t)val)</span></a>
 <a name="78"><span class="lineNum">      78 </span>            :     {</a>
-<a name="79"><span class="lineNum">      79 </span><span class="lineCov">   11746060 :     }</span></a>
+<a name="79"><span class="lineNum">      79 </span><span class="lineCov">   12104764 :     }</span></a>
 <a name="80"><span class="lineNum">      80 </span>            : </a>
 <a name="81"><span class="lineNum">      81 </span>            :     /**</a>
 <a name="82"><span class="lineNum">      82 </span>            :      * @brief Constructor from size_t</a>
 <a name="83"><span class="lineNum">      83 </span>            :      * @param val</a>
 <a name="84"><span class="lineNum">      84 </span>            :      */</a>
-<a name="85"><span class="lineNum">      85 </span><span class="lineCov">   27487696 :     explicit Index(size_t val)</span></a>
-<a name="86"><span class="lineNum">      86 </span><span class="lineCov">   27487696 :         : TypeSafe&lt;size_t, Index&lt;CategoryTag&gt;&gt;(val)</span></a>
+<a name="85"><span class="lineNum">      85 </span><span class="lineCov">   28310710 :     explicit Index(size_t val)</span></a>
+<a name="86"><span class="lineNum">      86 </span><span class="lineCov">   28310710 :         : TypeSafe&lt;size_t, Index&lt;CategoryTag&gt;&gt;(val)</span></a>
 <a name="87"><span class="lineNum">      87 </span>            :     {</a>
-<a name="88"><span class="lineNum">      88 </span><span class="lineCov">   27487696 :     }</span></a>
+<a name="88"><span class="lineNum">      88 </span><span class="lineCov">   28310710 :     }</span></a>
 <a name="89"><span class="lineNum">      89 </span>            : </a>
 <a name="90"><span class="lineNum">      90 </span>            :     /**</a>
 <a name="91"><span class="lineNum">      91 </span>            :      * serialize this. </a>
@@ -189,10 +189,10 @@
 <a name="127"><span class="lineNum">     127 </span>            :     }</a>
 <a name="128"><span class="lineNum">     128 </span>            : </a>
 <a name="129"><span class="lineNum">     129 </span>            :     // constructor from Indices</a>
-<a name="130"><span class="lineNum">     130 </span><span class="lineCov">   28886153 :     Index(Index&lt;CategoryTag&gt; const&amp;... _indices)</span></a>
-<a name="131"><span class="lineNum">     131 </span><span class="lineCov">   28885991 :         : indices{_indices...}</span></a>
+<a name="130"><span class="lineNum">     130 </span><span class="lineCov">   29877305 :     Index(Index&lt;CategoryTag&gt; const&amp;... _indices)</span></a>
+<a name="131"><span class="lineNum">     131 </span><span class="lineCov">   29877143 :         : indices{_indices...}</span></a>
 <a name="132"><span class="lineNum">     132 </span>            :     {</a>
-<a name="133"><span class="lineNum">     133 </span><span class="lineCov">   28886153 :     }</span></a>
+<a name="133"><span class="lineNum">     133 </span><span class="lineCov">   29877305 :     }</span></a>
 <a name="134"><span class="lineNum">     134 </span>            : </a>
 <a name="135"><span class="lineNum">     135 </span>            : private:</a>
 <a name="136"><span class="lineNum">     136 </span><span class="lineCov">        165 :     Index(const std::tuple&lt;Index&lt;CategoryTag&gt;...&gt;&amp; _indices)</span></a>
@@ -262,34 +262,34 @@
 <a name="200"><span class="lineNum">     200 </span>            : // retrieves the Index at the Ith position for a Index with one Tag, equals identity function</a>
 <a name="201"><span class="lineNum">     201 </span>            : template &lt;size_t I, typename... CategoryTags, std::enable_if_t&lt;(sizeof...(CategoryTags) == 1), void&gt;* = nullptr&gt;</a>
 <a name="202"><span class="lineNum">     202 </span>            : constexpr typename std::tuple_element&lt;I, std::tuple&lt;Index&lt;CategoryTags&gt;...&gt;&gt;::type&amp;</a>
-<a name="203"><span class="lineNum">     203 </span><span class="lineCov">    8025501 : get(Index&lt;CategoryTags...&gt;&amp; i) noexcept</span></a>
+<a name="203"><span class="lineNum">     203 </span><span class="lineCov">    8132421 : get(Index&lt;CategoryTags...&gt;&amp; i) noexcept</span></a>
 <a name="204"><span class="lineNum">     204 </span>            : {</a>
 <a name="205"><span class="lineNum">     205 </span>            :     static_assert(I == 0, &quot;I must be equal to zero for an Index with just one template parameter&quot;);</a>
-<a name="206"><span class="lineNum">     206 </span><span class="lineCov">    8025501 :     return i;</span></a>
+<a name="206"><span class="lineNum">     206 </span><span class="lineCov">    8132421 :     return i;</span></a>
 <a name="207"><span class="lineNum">     207 </span>            : }</a>
 <a name="208"><span class="lineNum">     208 </span>            : </a>
 <a name="209"><span class="lineNum">     209 </span>            : // retrieves the Index at the Ith position for a Index with more than one Tag const version</a>
 <a name="210"><span class="lineNum">     210 </span>            : template &lt;size_t I, typename... CategoryTags, std::enable_if_t&lt;(sizeof...(CategoryTags) &gt; 1), void&gt;* = nullptr&gt;</a>
 <a name="211"><span class="lineNum">     211 </span>            : constexpr typename std::tuple_element&lt;I, std::tuple&lt;Index&lt;CategoryTags&gt;...&gt;&gt;::type const&amp;</a>
-<a name="212"><span class="lineNum">     212 </span><span class="lineCov">  248522832 : get(Index&lt;CategoryTags...&gt; const&amp; i) noexcept</span></a>
+<a name="212"><span class="lineNum">     212 </span><span class="lineCov">  257105844 : get(Index&lt;CategoryTags...&gt; const&amp; i) noexcept</span></a>
 <a name="213"><span class="lineNum">     213 </span>            : {</a>
-<a name="214"><span class="lineNum">     214 </span><span class="lineCov">  248522832 :     return std::get&lt;I&gt;(i.indices);</span></a>
+<a name="214"><span class="lineNum">     214 </span><span class="lineCov">  257105844 :     return std::get&lt;I&gt;(i.indices);</span></a>
 <a name="215"><span class="lineNum">     215 </span>            : }</a>
 <a name="216"><span class="lineNum">     216 </span>            : </a>
 <a name="217"><span class="lineNum">     217 </span>            : // retrieves the Index at the Ith position for a Index with one Tag, equals identity function const version</a>
 <a name="218"><span class="lineNum">     218 </span>            : template &lt;size_t I, typename... CategoryTags, std::enable_if_t&lt;(sizeof...(CategoryTags) == 1), void&gt;* = nullptr&gt;</a>
 <a name="219"><span class="lineNum">     219 </span>            : constexpr typename std::tuple_element&lt;I, std::tuple&lt;Index&lt;CategoryTags&gt;...&gt;&gt;::type const&amp;</a>
-<a name="220"><span class="lineNum">     220 </span><span class="lineCov">  160832327 : get(Index&lt;CategoryTags...&gt; const&amp; i) noexcept</span></a>
+<a name="220"><span class="lineNum">     220 </span><span class="lineCov">  166797095 : get(Index&lt;CategoryTags...&gt; const&amp; i) noexcept</span></a>
 <a name="221"><span class="lineNum">     221 </span>            : {</a>
 <a name="222"><span class="lineNum">     222 </span>            :     static_assert(I == 0, &quot;I must be equal to zero for an Index with just one template parameter&quot;);</a>
-<a name="223"><span class="lineNum">     223 </span><span class="lineCov">  160832327 :     return i;</span></a>
+<a name="223"><span class="lineNum">     223 </span><span class="lineCov">  166797095 :     return i;</span></a>
 <a name="224"><span class="lineNum">     224 </span>            : }</a>
 <a name="225"><span class="lineNum">     225 </span>            : </a>
 <a name="226"><span class="lineNum">     226 </span>            : // retrieves the Index for the tag Tag of a Index with more than one Tag</a>
 <a name="227"><span class="lineNum">     227 </span>            : template &lt;typename Tag, typename... CategoryTags, std::enable_if_t&lt;(sizeof...(CategoryTags) &gt; 1), void&gt;* = nullptr&gt;</a>
-<a name="228"><span class="lineNum">     228 </span><span class="lineCov">       6011 : constexpr Index&lt;Tag&gt;&amp; get(Index&lt;CategoryTags...&gt;&amp; i) noexcept</span></a>
+<a name="228"><span class="lineNum">     228 </span><span class="lineCov">       6029 : constexpr Index&lt;Tag&gt;&amp; get(Index&lt;CategoryTags...&gt;&amp; i) noexcept</span></a>
 <a name="229"><span class="lineNum">     229 </span>            : {</a>
-<a name="230"><span class="lineNum">     230 </span><span class="lineCov">       6011 :     return std::get&lt;Index&lt;Tag&gt;&gt;(i.indices);</span></a>
+<a name="230"><span class="lineNum">     230 </span><span class="lineCov">       6029 :     return std::get&lt;Index&lt;Tag&gt;&gt;(i.indices);</span></a>
 <a name="231"><span class="lineNum">     231 </span>            : }</a>
 <a name="232"><span class="lineNum">     232 </span>            : </a>
 <a name="233"><span class="lineNum">     233 </span>            : // retrieves the Index for the tag Tag of a Index with one Tag, equals identity function</a>
@@ -303,9 +303,9 @@
 <a name="241"><span class="lineNum">     241 </span>            : </a>
 <a name="242"><span class="lineNum">     242 </span>            : // retrieves the Index for the tag Tag for a Index with more than one Tag const version</a>
 <a name="243"><span class="lineNum">     243 </span>            : template &lt;typename Tag, typename... CategoryTags, std::enable_if_t&lt;(sizeof...(CategoryTags) &gt; 1), void&gt;* = nullptr&gt;</a>
-<a name="244"><span class="lineNum">     244 </span><span class="lineCov">      66355 : constexpr Index&lt;Tag&gt; const&amp; get(Index&lt;CategoryTags...&gt; const&amp; i) noexcept</span></a>
+<a name="244"><span class="lineNum">     244 </span><span class="lineCov">      66373 : constexpr Index&lt;Tag&gt; const&amp; get(Index&lt;CategoryTags...&gt; const&amp; i) noexcept</span></a>
 <a name="245"><span class="lineNum">     245 </span>            : {</a>
-<a name="246"><span class="lineNum">     246 </span><span class="lineCov">      66355 :     return std::get&lt;Index&lt;Tag&gt;&gt;(i.indices);</span></a>
+<a name="246"><span class="lineNum">     246 </span><span class="lineCov">      66373 :     return std::get&lt;Index&lt;Tag&gt;&gt;(i.indices);</span></a>
 <a name="247"><span class="lineNum">     247 </span>            : }</a>
 <a name="248"><span class="lineNum">     248 </span>            : </a>
 <a name="249"><span class="lineNum">     249 </span>            : // retrieves the Index for the tag Tag for a Index with one Tag, equals identity function const version</a>
@@ -321,19 +321,19 @@
 <a name="259"><span class="lineNum">     259 </span>            : {</a>
 <a name="260"><span class="lineNum">     260 </span>            : /// @brief Extracts CategoryTags from the tagged Index and returns a subindex of SuperIndex with the given categories.</a>
 <a name="261"><span class="lineNum">     261 </span>            : template &lt;class... CategoryTags, class SuperIndex&gt;</a>
-<a name="262"><span class="lineNum">     262 </span><span class="lineCov">   17406141 : inline Index&lt;CategoryTags...&gt; reduce_index_impl(const SuperIndex&amp; i, mio::Tag&lt;Index&lt;CategoryTags...&gt;&gt;)</span></a>
+<a name="262"><span class="lineNum">     262 </span><span class="lineCov">   18059865 : inline Index&lt;CategoryTags...&gt; reduce_index_impl(const SuperIndex&amp; i, mio::Tag&lt;Index&lt;CategoryTags...&gt;&gt;)</span></a>
 <a name="263"><span class="lineNum">     263 </span>            : {</a>
 <a name="264"><span class="lineNum">     264 </span>            :     // the subindex may not be trivially constructible, so we pass its type using mio::Tag</a>
 <a name="265"><span class="lineNum">     265 </span>            :     // the type has to be passed as an argument to determine its CategoryTags</a>
 <a name="266"><span class="lineNum">     266 </span>            : </a>
 <a name="267"><span class="lineNum">     267 </span>            :     // below, we use get&lt;index_of_type&lt;&gt;&gt; instead of get&lt;&gt; directly to handle categories that are not unique</a>
 <a name="268"><span class="lineNum">     268 </span>            :     // (that is, `get&lt;CategoryTags&gt;(i)...` fails to compile for SuperIndex=Index&lt;T, T&gt;)</a>
-<a name="269"><span class="lineNum">     269 </span><span class="lineCov">   17406141 :     return Index&lt;CategoryTags...&gt;{get&lt;index_of_type_v&lt;CategoryTags, SuperIndex&gt;&gt;(i)...};</span></a>
+<a name="269"><span class="lineNum">     269 </span><span class="lineCov">   18059865 :     return Index&lt;CategoryTags...&gt;{get&lt;index_of_type_v&lt;CategoryTags, SuperIndex&gt;&gt;(i)...};</span></a>
 <a name="270"><span class="lineNum">     270 </span>            : }</a>
 <a name="271"><span class="lineNum">     271 </span>            : </a>
 <a name="272"><span class="lineNum">     272 </span>            : /// @brief Creates and returns a SuperIndex from SubIndex, using entries from the given SubIndex or fill_value.</a>
 <a name="273"><span class="lineNum">     273 </span>            : template &lt;class... CategoryTags, class... Subset&gt;</a>
-<a name="274"><span class="lineNum">     274 </span><span class="lineCov">   16172770 : inline Index&lt;CategoryTags...&gt; extend_index_impl(const Index&lt;Subset...&gt;&amp; i, const size_t fill_value,</span></a>
+<a name="274"><span class="lineNum">     274 </span><span class="lineCov">   16805218 : inline Index&lt;CategoryTags...&gt; extend_index_impl(const Index&lt;Subset...&gt;&amp; i, const size_t fill_value,</span></a>
 <a name="275"><span class="lineNum">     275 </span>            :                                                 mio::Tag&lt;Index&lt;CategoryTags...&gt;&gt;)</a>
 <a name="276"><span class="lineNum">     276 </span>            : {</a>
 <a name="277"><span class="lineNum">     277 </span>            :     using SuperIndex = Index&lt;CategoryTags...&gt;;</a>
@@ -341,18 +341,18 @@
 <a name="279"><span class="lineNum">     279 </span>            :     // The superindex may not be trivially constructible, so we pass its type using mio::Tag.</a>
 <a name="280"><span class="lineNum">     280 </span>            :     // The type has to be passed as an argument to determine its CategoryTags.</a>
 <a name="281"><span class="lineNum">     281 </span>            : </a>
-<a name="282"><span class="lineNum">     282 </span><span class="lineCov">   32344033 :     return SuperIndex{[&amp;]() {</span></a>
+<a name="282"><span class="lineNum">     282 </span><span class="lineCov">   33608929 :     return SuperIndex{[&amp;]() {</span></a>
 <a name="283"><span class="lineNum">     283 </span>            :         // This is an IIFE, which is invoked for each category (note the '...' after the function call).</a>
 <a name="284"><span class="lineNum">     284 </span>            :         // So CategoryTags without a '...' is seen by each IIFE as exactly one category from this variadic template.</a>
 <a name="285"><span class="lineNum">     285 </span>            :         if constexpr (is_type_in_list_v&lt;CategoryTags, Subset...&gt;) {</a>
 <a name="286"><span class="lineNum">     286 </span>            :             // We use get&lt;index_of_type&lt;&gt;&gt; instead of get&lt;&gt; directly to handle categories that are not unique</a>
 <a name="287"><span class="lineNum">     287 </span>            :             // (that is, `get&lt;CategoryTags&gt;(i)...` fails to compile for SuperIndex=Index&lt;T, T&gt;)</a>
-<a name="288"><span class="lineNum">     288 </span><span class="lineCov">   32342528 :             return get&lt;index_of_type_v&lt;CategoryTags, SubIndex&gt;&gt;(i);</span></a>
+<a name="288"><span class="lineNum">     288 </span><span class="lineCov">   33607424 :             return get&lt;index_of_type_v&lt;CategoryTags, SubIndex&gt;&gt;(i);</span></a>
 <a name="289"><span class="lineNum">     289 </span>            :         }</a>
 <a name="290"><span class="lineNum">     290 </span>            :         else {</a>
-<a name="291"><span class="lineNum">     291 </span><span class="lineCov">   32345538 :             return Index&lt;CategoryTags&gt;(fill_value);</span></a>
+<a name="291"><span class="lineNum">     291 </span><span class="lineCov">   33610434 :             return Index&lt;CategoryTags&gt;(fill_value);</span></a>
 <a name="292"><span class="lineNum">     292 </span>            :         }</a>
-<a name="293"><span class="lineNum">     293 </span><span class="lineCov">   32344028 :     }()...};</span></a>
+<a name="293"><span class="lineNum">     293 </span><span class="lineCov">   33608924 :     }()...};</span></a>
 <a name="294"><span class="lineNum">     294 </span>            : }</a>
 <a name="295"><span class="lineNum">     295 </span>            : } // namespace details</a>
 <a name="296"><span class="lineNum">     296 </span>            : </a>
@@ -366,9 +366,9 @@
 <a name="304"><span class="lineNum">     304 </span>            :  * @return A (sub)index with the given categories and values from index.</a>
 <a name="305"><span class="lineNum">     305 </span>            :  */</a>
 <a name="306"><span class="lineNum">     306 </span>            : template &lt;class SubIndex, class SuperIndex&gt;</a>
-<a name="307"><span class="lineNum">     307 </span><span class="lineCov">   17406141 : SubIndex reduce_index(const SuperIndex&amp; index)</span></a>
+<a name="307"><span class="lineNum">     307 </span><span class="lineCov">   18059865 : SubIndex reduce_index(const SuperIndex&amp; index)</span></a>
 <a name="308"><span class="lineNum">     308 </span>            : {</a>
-<a name="309"><span class="lineNum">     309 </span><span class="lineCov">   17406141 :     return details::reduce_index_impl(index, mio::Tag&lt;SubIndex&gt;{});</span></a>
+<a name="309"><span class="lineNum">     309 </span><span class="lineCov">   18059865 :     return details::reduce_index_impl(index, mio::Tag&lt;SubIndex&gt;{});</span></a>
 <a name="310"><span class="lineNum">     310 </span>            : }</a>
 <a name="311"><span class="lineNum">     311 </span>            : </a>
 <a name="312"><span class="lineNum">     312 </span>            : /**</a>
@@ -382,9 +382,9 @@
 <a name="320"><span class="lineNum">     320 </span>            :  * @return A (super)index with the given categories and values from index.</a>
 <a name="321"><span class="lineNum">     321 </span>            :  */</a>
 <a name="322"><span class="lineNum">     322 </span>            : template &lt;class SuperIndex, class SubIndex&gt;</a>
-<a name="323"><span class="lineNum">     323 </span><span class="lineCov">   16172770 : SuperIndex extend_index(const SubIndex&amp; index, size_t fill_value = 0)</span></a>
+<a name="323"><span class="lineNum">     323 </span><span class="lineCov">   16805218 : SuperIndex extend_index(const SubIndex&amp; index, size_t fill_value = 0)</span></a>
 <a name="324"><span class="lineNum">     324 </span>            : {</a>
-<a name="325"><span class="lineNum">     325 </span><span class="lineCov">   16172770 :     return details::extend_index_impl(index, fill_value, mio::Tag&lt;SuperIndex&gt;{});</span></a>
+<a name="325"><span class="lineNum">     325 </span><span class="lineCov">   16805218 :     return details::extend_index_impl(index, fill_value, mio::Tag&lt;SuperIndex&gt;{});</span></a>
 <a name="326"><span class="lineNum">     326 </span>            : }</a>
 <a name="327"><span class="lineNum">     327 </span>            : </a>
 <a name="328"><span class="lineNum">     328 </span>            : } // namespace mio</a>
diff --git a/coverage/cpp/memilio/utils/index.html b/coverage/cpp/memilio/utils/index.html
index 8f2450f163..a602f6e952 100644
--- a/coverage/cpp/memilio/utils/index.html
+++ b/coverage/cpp/memilio/utils/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4194</td>
diff --git a/coverage/cpp/memilio/utils/index_range.h.func-sort-c.html b/coverage/cpp/memilio/utils/index_range.h.func-sort-c.html
index f27bfb9e9a..161a9a178f 100644
--- a/coverage/cpp/memilio/utils/index_range.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/index_range.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
@@ -149,43 +149,43 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#39">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::IndexRange(mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#177">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt; mio::make_index_range&lt;mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#153">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#144">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#118">void mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::increment_index&lt;0ul&gt;()</a></td>
-              <td class="coverFnHi">1609533</td>
+              <td class="coverFnHi">1630917</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#84">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator++()</a></td>
-              <td class="coverFnHi">1609533</td>
+              <td class="coverFnHi">1630917</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#78">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator*() const</a></td>
-              <td class="coverFnHi">1609668</td>
+              <td class="coverFnHi">1631052</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#71">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::MultiIndexIterator(mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup&gt;)</a></td>
-              <td class="coverFnHi">3174738</td>
+              <td class="coverFnHi">3217506</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#101">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator==(mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator&amp;) const</a></td>
-              <td class="coverFnHi">3196902</td>
+              <td class="coverFnHi">3239670</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#107">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator!=(mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator&amp;) const</a></td>
-              <td class="coverFnHi">3196902</td>
+              <td class="coverFnHi">3239670</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/index_range.h.func.html b/coverage/cpp/memilio/utils/index_range.h.func.html
index 6a94c76400..a40b8c61d1 100644
--- a/coverage/cpp/memilio/utils/index_range.h.func.html
+++ b/coverage/cpp/memilio/utils/index_range.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
@@ -113,19 +113,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#118">void mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::increment_index&lt;0ul&gt;()</a></td>
-              <td class="coverFnHi">1609533</td>
+              <td class="coverFnHi">1630917</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#71">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::MultiIndexIterator(mio::Index&lt;mio::AgeGroup&gt;, mio::Index&lt;mio::AgeGroup&gt;)</a></td>
-              <td class="coverFnHi">3174738</td>
+              <td class="coverFnHi">3217506</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#84">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator++()</a></td>
-              <td class="coverFnHi">1609533</td>
+              <td class="coverFnHi">1630917</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#39">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::IndexRange(mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#177">mio::IndexRange&lt;mio::Index&lt;CatA, CatB, CatC&gt; &gt; mio::make_index_range&lt;CatA, CatB, CatC&gt;(mio::Index&lt;CatA, CatB, CatC&gt; const&amp;)</a></td>
@@ -133,7 +133,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#177">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt; mio::make_index_range&lt;mio::AgeGroup&gt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;)</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#78">mio::IndexRange&lt;mio::Index&lt;CategoryTag&lt;1ul&gt;, CategoryTag&lt;2ul&gt;, CategoryTag&lt;3ul&gt; &gt; &gt;::MultiIndexIterator::operator*() const</a></td>
@@ -169,23 +169,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#78">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator*() const</a></td>
-              <td class="coverFnHi">1609668</td>
+              <td class="coverFnHi">1631052</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#101">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator==(mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator&amp;) const</a></td>
-              <td class="coverFnHi">3196902</td>
+              <td class="coverFnHi">3239670</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#107">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator::operator!=(mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::MultiIndexIterator&amp;) const</a></td>
-              <td class="coverFnHi">3196902</td>
+              <td class="coverFnHi">3239670</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#153">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="index_range.h.gcov.html#144">mio::IndexRange&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">1587369</td>
+              <td class="coverFnHi">1608753</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/index_range.h.gcov.html b/coverage/cpp/memilio/utils/index_range.h.gcov.html
index 8932a59669..9cce80732f 100644
--- a/coverage/cpp/memilio/utils/index_range.h.gcov.html
+++ b/coverage/cpp/memilio/utils/index_range.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
@@ -100,10 +100,10 @@
 <a name="38"><span class="lineNum">      38 </span>            :      * The range for each Index i in the MultiIndex is determined by [0, d_i), where d_i is the dimension of i.</a>
 <a name="39"><span class="lineNum">      39 </span>            :      * @param[in] dimensions A MultiIndex that contains the dimension for each Category.</a>
 <a name="40"><span class="lineNum">      40 </span>            :      */</a>
-<a name="41"><span class="lineNum">      41 </span><span class="lineCov">    1587370 :     IndexRange(const MultiIndex&amp; dimensions)</span></a>
-<a name="42"><span class="lineNum">      42 </span><span class="lineCov">    1587370 :         : m_dimensions(dimensions)</span></a>
+<a name="41"><span class="lineNum">      41 </span><span class="lineCov">    1608754 :     IndexRange(const MultiIndex&amp; dimensions)</span></a>
+<a name="42"><span class="lineNum">      42 </span><span class="lineCov">    1608754 :         : m_dimensions(dimensions)</span></a>
 <a name="43"><span class="lineNum">      43 </span>            :     {</a>
-<a name="44"><span class="lineNum">      44 </span><span class="lineCov">    1587370 :     }</span></a>
+<a name="44"><span class="lineNum">      44 </span><span class="lineCov">    1608754 :     }</span></a>
 <a name="45"><span class="lineNum">      45 </span>            : </a>
 <a name="46"><span class="lineNum">      46 </span>            :     /**</a>
 <a name="47"><span class="lineNum">      47 </span>            :      * @brief Iterator for MultiIndices.</a>
@@ -132,25 +132,25 @@
 <a name="70"><span class="lineNum">      70 </span>            :          * @param index Initial value for the iterator position.</a>
 <a name="71"><span class="lineNum">      71 </span>            :          * @param dimensions A reference to the dimensions of the MultiIndex.</a>
 <a name="72"><span class="lineNum">      72 </span>            :          */</a>
-<a name="73"><span class="lineNum">      73 </span><span class="lineCov">    3174741 :         MultiIndexIterator(value_type index, reference dimensions)</span></a>
-<a name="74"><span class="lineNum">      74 </span><span class="lineCov">    3174741 :             : m_index(index)</span></a>
-<a name="75"><span class="lineNum">      75 </span><span class="lineCov">    3174741 :             , m_dims(dimensions)</span></a>
+<a name="73"><span class="lineNum">      73 </span><span class="lineCov">    3217509 :         MultiIndexIterator(value_type index, reference dimensions)</span></a>
+<a name="74"><span class="lineNum">      74 </span><span class="lineCov">    3217509 :             : m_index(index)</span></a>
+<a name="75"><span class="lineNum">      75 </span><span class="lineCov">    3217509 :             , m_dims(dimensions)</span></a>
 <a name="76"><span class="lineNum">      76 </span>            :         {</a>
-<a name="77"><span class="lineNum">      77 </span><span class="lineCov">    3174741 :         }</span></a>
+<a name="77"><span class="lineNum">      77 </span><span class="lineCov">    3217509 :         }</span></a>
 <a name="78"><span class="lineNum">      78 </span>            : </a>
 <a name="79"><span class="lineNum">      79 </span>            :         /// Dereference operator.</a>
-<a name="80"><span class="lineNum">      80 </span><span class="lineCov">    1609760 :         reference operator*() const</span></a>
+<a name="80"><span class="lineNum">      80 </span><span class="lineCov">    1631144 :         reference operator*() const</span></a>
 <a name="81"><span class="lineNum">      81 </span>            :         {</a>
-<a name="82"><span class="lineNum">      82 </span><span class="lineCov">    1609760 :             return m_index;</span></a>
+<a name="82"><span class="lineNum">      82 </span><span class="lineCov">    1631144 :             return m_index;</span></a>
 <a name="83"><span class="lineNum">      83 </span>            :         }</a>
 <a name="84"><span class="lineNum">      84 </span>            : </a>
 <a name="85"><span class="lineNum">      85 </span>            :         /// Pre-increment operator.</a>
-<a name="86"><span class="lineNum">      86 </span><span class="lineCov">    1609563 :         MultiIndexIterator&amp; operator++()</span></a>
+<a name="86"><span class="lineNum">      86 </span><span class="lineCov">    1630947 :         MultiIndexIterator&amp; operator++()</span></a>
 <a name="87"><span class="lineNum">      87 </span>            :         {</a>
 <a name="88"><span class="lineNum">      88 </span>            :             if constexpr (MultiIndex::size &gt; 0) {</a>
-<a name="89"><span class="lineNum">      89 </span><span class="lineCov">    1609563 :                 increment_index();</span></a>
+<a name="89"><span class="lineNum">      89 </span><span class="lineCov">    1630947 :                 increment_index();</span></a>
 <a name="90"><span class="lineNum">      90 </span>            :             }</a>
-<a name="91"><span class="lineNum">      91 </span><span class="lineCov">    1609563 :             return *this;</span></a>
+<a name="91"><span class="lineNum">      91 </span><span class="lineCov">    1630947 :             return *this;</span></a>
 <a name="92"><span class="lineNum">      92 </span>            :         }</a>
 <a name="93"><span class="lineNum">      93 </span>            : </a>
 <a name="94"><span class="lineNum">      94 </span>            :         /// Post-increment operator.</a>
@@ -162,15 +162,15 @@
 <a name="100"><span class="lineNum">     100 </span>            :         }</a>
 <a name="101"><span class="lineNum">     101 </span>            : </a>
 <a name="102"><span class="lineNum">     102 </span>            :         /// Equality operator.</a>
-<a name="103"><span class="lineNum">     103 </span><span class="lineCov">    3196902 :         bool operator==(MultiIndexIterator&amp; other) const</span></a>
+<a name="103"><span class="lineNum">     103 </span><span class="lineCov">    3239670 :         bool operator==(MultiIndexIterator&amp; other) const</span></a>
 <a name="104"><span class="lineNum">     104 </span>            :         {</a>
-<a name="105"><span class="lineNum">     105 </span><span class="lineCov">    3196902 :             return m_index == other.m_index;</span></a>
+<a name="105"><span class="lineNum">     105 </span><span class="lineCov">    3239670 :             return m_index == other.m_index;</span></a>
 <a name="106"><span class="lineNum">     106 </span>            :         }</a>
 <a name="107"><span class="lineNum">     107 </span>            : </a>
 <a name="108"><span class="lineNum">     108 </span>            :         /// Inequality operator.</a>
-<a name="109"><span class="lineNum">     109 </span><span class="lineCov">    3196902 :         bool operator!=(MultiIndexIterator&amp; other) const</span></a>
+<a name="109"><span class="lineNum">     109 </span><span class="lineCov">    3239670 :         bool operator!=(MultiIndexIterator&amp; other) const</span></a>
 <a name="110"><span class="lineNum">     110 </span>            :         {</a>
-<a name="111"><span class="lineNum">     111 </span><span class="lineCov">    3196902 :             return !(*this == other);</span></a>
+<a name="111"><span class="lineNum">     111 </span><span class="lineCov">    3239670 :             return !(*this == other);</span></a>
 <a name="112"><span class="lineNum">     112 </span>            :         }</a>
 <a name="113"><span class="lineNum">     113 </span>            : </a>
 <a name="114"><span class="lineNum">     114 </span>            :     private:</a>
@@ -179,10 +179,10 @@
 <a name="117"><span class="lineNum">     117 </span>            :          * @tparam I position in the MultiIndex.</a>
 <a name="118"><span class="lineNum">     118 </span>            :          */</a>
 <a name="119"><span class="lineNum">     119 </span>            :         template &lt;size_t I = MultiIndex::size - 1&gt;</a>
-<a name="120"><span class="lineNum">     120 </span><span class="lineCov">    1609571 :         inline void increment_index()</span></a>
+<a name="120"><span class="lineNum">     120 </span><span class="lineCov">    1630955 :         inline void increment_index()</span></a>
 <a name="121"><span class="lineNum">     121 </span>            :         {</a>
-<a name="122"><span class="lineNum">     122 </span><span class="lineCov">    1609571 :             assert(mio::get&lt;I&gt;(m_dims).get() &gt; 0 &amp;&amp; &quot;All dimensions must be positive.&quot;);</span></a>
-<a name="123"><span class="lineNum">     123 </span><span class="lineCov">    1609571 :             assert(mio::get&lt;I&gt;(m_index) &lt; mio::get&lt;I&gt;(m_dims) &amp;&amp; &quot;Index out of bounds.&quot;);</span></a>
+<a name="122"><span class="lineNum">     122 </span><span class="lineCov">    1630955 :             assert(mio::get&lt;I&gt;(m_dims).get() &gt; 0 &amp;&amp; &quot;All dimensions must be positive.&quot;);</span></a>
+<a name="123"><span class="lineNum">     123 </span><span class="lineCov">    1630955 :             assert(mio::get&lt;I&gt;(m_index) &lt; mio::get&lt;I&gt;(m_dims) &amp;&amp; &quot;Index out of bounds.&quot;);</span></a>
 <a name="124"><span class="lineNum">     124 </span>            : </a>
 <a name="125"><span class="lineNum">     125 </span>            :             if constexpr (I &gt; 0) {</a>
 <a name="126"><span class="lineNum">     126 </span>            :                 // increment first, then do a carry-over if necessary</a>
@@ -193,10 +193,10 @@
 <a name="131"><span class="lineNum">     131 </span>            :                 }</a>
 <a name="132"><span class="lineNum">     132 </span>            :             }</a>
 <a name="133"><span class="lineNum">     133 </span>            :             else {</a>
-<a name="134"><span class="lineNum">     134 </span><span class="lineCov">    1609535 :                 ++mio::get&lt;0&gt;(m_index);</span></a>
+<a name="134"><span class="lineNum">     134 </span><span class="lineCov">    1630919 :                 ++mio::get&lt;0&gt;(m_index);</span></a>
 <a name="135"><span class="lineNum">     135 </span>            :                 // no carry check for the most significant index</a>
 <a name="136"><span class="lineNum">     136 </span>            :             }</a>
-<a name="137"><span class="lineNum">     137 </span><span class="lineCov">    1609571 :         }</span></a>
+<a name="137"><span class="lineNum">     137 </span><span class="lineCov">    1630955 :         }</span></a>
 <a name="138"><span class="lineNum">     138 </span>            :         value_type m_index; ///&lt; Index used for iteration.</a>
 <a name="139"><span class="lineNum">     139 </span>            :         value_type m_dims; ///&lt; Copy of range dimensions.</a>
 <a name="140"><span class="lineNum">     140 </span>            :     };</a>
@@ -205,25 +205,25 @@
 <a name="143"><span class="lineNum">     143 </span>            :      * @brief STL iterator for a IndexRange.</a>
 <a name="144"><span class="lineNum">     144 </span>            :      * @return Returns the first index for the given dimensions, i.e. 0.</a>
 <a name="145"><span class="lineNum">     145 </span>            :      */</a>
-<a name="146"><span class="lineNum">     146 </span><span class="lineCov">    1587371 :     MultiIndexIterator begin() const</span></a>
+<a name="146"><span class="lineNum">     146 </span><span class="lineCov">    1608755 :     MultiIndexIterator begin() const</span></a>
 <a name="147"><span class="lineNum">     147 </span>            :     {</a>
-<a name="148"><span class="lineNum">     148 </span><span class="lineCov">    1587371 :         return MultiIndexIterator(MultiIndex::Zero(), m_dimensions);</span></a>
+<a name="148"><span class="lineNum">     148 </span><span class="lineCov">    1608755 :         return MultiIndexIterator(MultiIndex::Zero(), m_dimensions);</span></a>
 <a name="149"><span class="lineNum">     149 </span>            :     }</a>
 <a name="150"><span class="lineNum">     150 </span>            : </a>
 <a name="151"><span class="lineNum">     151 </span>            :     /**</a>
 <a name="152"><span class="lineNum">     152 </span>            :      * @brief STL iterator for a IndexRange.</a>
 <a name="153"><span class="lineNum">     153 </span>            :      * @return Returns the first index outside of the given dimensions.</a>
 <a name="154"><span class="lineNum">     154 </span>            :      */</a>
-<a name="155"><span class="lineNum">     155 </span><span class="lineCov">    1587370 :     MultiIndexIterator end() const</span></a>
+<a name="155"><span class="lineNum">     155 </span><span class="lineCov">    1608754 :     MultiIndexIterator end() const</span></a>
 <a name="156"><span class="lineNum">     156 </span>            :     {</a>
 <a name="157"><span class="lineNum">     157 </span>            :         // set end to the first invalid index that is reached by increments of 1,</a>
 <a name="158"><span class="lineNum">     158 </span>            :         // i.e. 0 everywhere except for the most significant index (position 0),</a>
 <a name="159"><span class="lineNum">     159 </span>            :         // which is set to its dimension</a>
-<a name="160"><span class="lineNum">     160 </span><span class="lineCov">    1587370 :         MultiIndex end = MultiIndex::Zero();</span></a>
+<a name="160"><span class="lineNum">     160 </span><span class="lineCov">    1608754 :         MultiIndex end = MultiIndex::Zero();</span></a>
 <a name="161"><span class="lineNum">     161 </span>            :         if constexpr (MultiIndex::size &gt; 0) {</a>
-<a name="162"><span class="lineNum">     162 </span><span class="lineCov">    1587370 :             mio::get&lt;0&gt;(end) = mio::get&lt;0&gt;(m_dimensions);</span></a>
+<a name="162"><span class="lineNum">     162 </span><span class="lineCov">    1608754 :             mio::get&lt;0&gt;(end) = mio::get&lt;0&gt;(m_dimensions);</span></a>
 <a name="163"><span class="lineNum">     163 </span>            :         }</a>
-<a name="164"><span class="lineNum">     164 </span><span class="lineCov">    3174740 :         return MultiIndexIterator(end, m_dimensions);</span></a>
+<a name="164"><span class="lineNum">     164 </span><span class="lineCov">    3217508 :         return MultiIndexIterator(end, m_dimensions);</span></a>
 <a name="165"><span class="lineNum">     165 </span>            :     }</a>
 <a name="166"><span class="lineNum">     166 </span>            : </a>
 <a name="167"><span class="lineNum">     167 </span>            : private:</a>
@@ -238,9 +238,9 @@
 <a name="176"><span class="lineNum">     176 </span>            :  * @return An iterable range over the given dimensions.</a>
 <a name="177"><span class="lineNum">     177 </span>            :  */</a>
 <a name="178"><span class="lineNum">     178 </span>            : template &lt;class... Categories&gt;</a>
-<a name="179"><span class="lineNum">     179 </span><span class="lineCov">    1587369 : IndexRange&lt;Index&lt;Categories...&gt;&gt; make_index_range(const Index&lt;Categories...&gt;&amp; dimensions)</span></a>
+<a name="179"><span class="lineNum">     179 </span><span class="lineCov">    1608753 : IndexRange&lt;Index&lt;Categories...&gt;&gt; make_index_range(const Index&lt;Categories...&gt;&amp; dimensions)</span></a>
 <a name="180"><span class="lineNum">     180 </span>            : {</a>
-<a name="181"><span class="lineNum">     181 </span><span class="lineCov">    1587369 :     return IndexRange&lt;Index&lt;Categories...&gt;&gt;(dimensions);</span></a>
+<a name="181"><span class="lineNum">     181 </span><span class="lineCov">    1608753 :     return IndexRange&lt;Index&lt;Categories...&gt;&gt;(dimensions);</span></a>
 <a name="182"><span class="lineNum">     182 </span>            : }</a>
 <a name="183"><span class="lineNum">     183 </span>            : </a>
 <a name="184"><span class="lineNum">     184 </span>            : } // namespace mio</a>
diff --git a/coverage/cpp/memilio/utils/logging.h.func-sort-c.html b/coverage/cpp/memilio/utils/logging.h.func-sort-c.html
index 7addf9f60c..140461826f 100644
--- a/coverage/cpp/memilio/utils/logging.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/logging.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">32</td>
@@ -237,7 +237,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="logging.h.gcov.html#93">void mio::log_info&lt;&gt;(fmt::v9::basic_string_view&lt;char&gt;)</a></td>
-              <td class="coverFnHi">57045</td>
+              <td class="coverFnHi">57063</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/logging.h.func.html b/coverage/cpp/memilio/utils/logging.h.func.html
index b1dde9bbeb..fb2e0103b6 100644
--- a/coverage/cpp/memilio/utils/logging.h.func.html
+++ b/coverage/cpp/memilio/utils/logging.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">32</td>
@@ -141,7 +141,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="logging.h.gcov.html#93">void mio::log_info&lt;&gt;(fmt::v9::basic_string_view&lt;char&gt;)</a></td>
-              <td class="coverFnHi">57045</td>
+              <td class="coverFnHi">57063</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="logging.h.gcov.html#93">void mio::log_info&lt;std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;(fmt::v9::basic_string_view&lt;char&gt;, std::__cxx11::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; const&amp;)</a></td>
diff --git a/coverage/cpp/memilio/utils/logging.h.gcov.html b/coverage/cpp/memilio/utils/logging.h.gcov.html
index bf090a2361..27ae5ebba9 100644
--- a/coverage/cpp/memilio/utils/logging.h.gcov.html
+++ b/coverage/cpp/memilio/utils/logging.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">32</td>
@@ -154,10 +154,10 @@
 <a name="92"><span class="lineNum">      92 </span><span class="lineCov">        686 : }</span></a>
 <a name="93"><span class="lineNum">      93 </span>            : </a>
 <a name="94"><span class="lineNum">      94 </span>            : template &lt;typename... Args&gt;</a>
-<a name="95"><span class="lineNum">      95 </span><span class="lineCov">      57131 : inline void log_info(spdlog::string_view_t fmt, const Args&amp;... args)</span></a>
+<a name="95"><span class="lineNum">      95 </span><span class="lineCov">      57149 : inline void log_info(spdlog::string_view_t fmt, const Args&amp;... args)</span></a>
 <a name="96"><span class="lineNum">      96 </span>            : {</a>
-<a name="97"><span class="lineNum">      97 </span><span class="lineCov">      57217 :     spdlog::default_logger_raw()-&gt;info(fmt, args...);</span></a>
-<a name="98"><span class="lineNum">      98 </span><span class="lineCov">      57131 : }</span></a>
+<a name="97"><span class="lineNum">      97 </span><span class="lineCov">      57235 :     spdlog::default_logger_raw()-&gt;info(fmt, args...);</span></a>
+<a name="98"><span class="lineNum">      98 </span><span class="lineCov">      57149 : }</span></a>
 <a name="99"><span class="lineNum">      99 </span>            : </a>
 <a name="100"><span class="lineNum">     100 </span>            : template &lt;typename... Args&gt;</a>
 <a name="101"><span class="lineNum">     101 </span><span class="lineCov">        888 : inline void log_error(spdlog::string_view_t fmt, const Args&amp;... args)</span></a>
diff --git a/coverage/cpp/memilio/utils/memory.h.func-sort-c.html b/coverage/cpp/memilio/utils/memory.h.func-sort-c.html
index a6e10fbc39..5f19bc612d 100644
--- a/coverage/cpp/memilio/utils/memory.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/memory.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/memilio/utils/memory.h.func.html b/coverage/cpp/memilio/utils/memory.h.func.html
index a23776ec41..d71c5a308e 100644
--- a/coverage/cpp/memilio/utils/memory.h.func.html
+++ b/coverage/cpp/memilio/utils/memory.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/memilio/utils/memory.h.gcov.html b/coverage/cpp/memilio/utils/memory.h.gcov.html
index f88eef176d..5166692f55 100644
--- a/coverage/cpp/memilio/utils/memory.h.gcov.html
+++ b/coverage/cpp/memilio/utils/memory.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/memilio/utils/metaprogramming.h.func-sort-c.html b/coverage/cpp/memilio/utils/metaprogramming.h.func-sort-c.html
index 7f0556618b..fa72c7e0d8 100644
--- a/coverage/cpp/memilio/utils/metaprogramming.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/metaprogramming.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/utils/metaprogramming.h.func.html b/coverage/cpp/memilio/utils/metaprogramming.h.func.html
index ee6e79cc3d..dbede9dfd0 100644
--- a/coverage/cpp/memilio/utils/metaprogramming.h.func.html
+++ b/coverage/cpp/memilio/utils/metaprogramming.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/utils/metaprogramming.h.gcov.html b/coverage/cpp/memilio/utils/metaprogramming.h.gcov.html
index 9b632448eb..20a2a15326 100644
--- a/coverage/cpp/memilio/utils/metaprogramming.h.gcov.html
+++ b/coverage/cpp/memilio/utils/metaprogramming.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/utils/miompi.cpp.func-sort-c.html b/coverage/cpp/memilio/utils/miompi.cpp.func-sort-c.html
index 2a0371fb16..d18a03b54d 100644
--- a/coverage/cpp/memilio/utils/miompi.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/miompi.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/utils/miompi.cpp.func.html b/coverage/cpp/memilio/utils/miompi.cpp.func.html
index 472314906e..79a6dc24a9 100644
--- a/coverage/cpp/memilio/utils/miompi.cpp.func.html
+++ b/coverage/cpp/memilio/utils/miompi.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/utils/miompi.cpp.gcov.html b/coverage/cpp/memilio/utils/miompi.cpp.gcov.html
index e20dcd616a..9df4fad5fd 100644
--- a/coverage/cpp/memilio/utils/miompi.cpp.gcov.html
+++ b/coverage/cpp/memilio/utils/miompi.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/memilio/utils/parameter_distributions.h.func-sort-c.html b/coverage/cpp/memilio/utils/parameter_distributions.h.func-sort-c.html
index d5c896d5ac..f1e0b7258a 100644
--- a/coverage/cpp/memilio/utils/parameter_distributions.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/parameter_distributions.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">44</td>
diff --git a/coverage/cpp/memilio/utils/parameter_distributions.h.func.html b/coverage/cpp/memilio/utils/parameter_distributions.h.func.html
index 5b7d4f6e3d..3857570d8c 100644
--- a/coverage/cpp/memilio/utils/parameter_distributions.h.func.html
+++ b/coverage/cpp/memilio/utils/parameter_distributions.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">44</td>
diff --git a/coverage/cpp/memilio/utils/parameter_distributions.h.gcov.html b/coverage/cpp/memilio/utils/parameter_distributions.h.gcov.html
index dab030ef8b..bde5471e81 100644
--- a/coverage/cpp/memilio/utils/parameter_distributions.h.gcov.html
+++ b/coverage/cpp/memilio/utils/parameter_distributions.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">44</td>
@@ -362,10 +362,10 @@
 <a name="300"><span class="lineNum">     300 </span><span class="lineCov">      12525 :         int i        = 0;</span></a>
 <a name="301"><span class="lineNum">     301 </span><span class="lineCov">      12525 :         int retries  = 10;</span></a>
 <a name="302"><span class="lineNum">     302 </span><span class="lineCov">      12525 :         double rnumb = m_distribution(thread_local_rng());</span></a>
-<a name="303"><span class="lineNum">     303 </span><span class="lineCov">      12562 :         while ((rnumb &gt; m_upper_bound || rnumb &lt; m_lower_bound) &amp;&amp; i &lt; retries) {</span></a>
-<a name="304"><span class="lineNum">     304 </span><span class="lineCov">         37 :             rnumb = m_distribution(thread_local_rng());</span></a>
-<a name="305"><span class="lineNum">     305 </span><span class="lineCov">         37 :             i++;</span></a>
-<a name="306"><span class="lineNum">     306 </span><span class="lineCov">         37 :             if (i == retries) {</span></a>
+<a name="303"><span class="lineNum">     303 </span><span class="lineCov">      12572 :         while ((rnumb &gt; m_upper_bound || rnumb &lt; m_lower_bound) &amp;&amp; i &lt; retries) {</span></a>
+<a name="304"><span class="lineNum">     304 </span><span class="lineCov">         47 :             rnumb = m_distribution(thread_local_rng());</span></a>
+<a name="305"><span class="lineNum">     305 </span><span class="lineCov">         47 :             i++;</span></a>
+<a name="306"><span class="lineNum">     306 </span><span class="lineCov">         47 :             if (i == retries) {</span></a>
 <a name="307"><span class="lineNum">     307 </span><span class="lineNoCov">          0 :                 log_warning(&quot;Not successfully sampled within [min,max].&quot;);</span></a>
 <a name="308"><span class="lineNum">     308 </span><span class="lineNoCov">          0 :                 if (rnumb &gt; m_upper_bound) {</span></a>
 <a name="309"><span class="lineNum">     309 </span><span class="lineNoCov">          0 :                     rnumb = m_upper_bound;</span></a>
diff --git a/coverage/cpp/memilio/utils/parameter_set.h.func-sort-c.html b/coverage/cpp/memilio/utils/parameter_set.h.func-sort-c.html
index 90eef775ca..688736bb29 100644
--- a/coverage/cpp/memilio/utils/parameter_set.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/parameter_set.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1739</td>
@@ -4555,18 +4555,10 @@
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::WorkRatio&gt;::get() const</a></td>
               <td class="coverFnHi">117</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SocialEventRate&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SocialEventRate&gt;() const</a></td>
-              <td class="coverFnHi">126</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::sseirvv::TransmissionProbabilityOnContactV1&gt;::Type const&amp; mio::ParameterSet&lt;mio::sseirvv::TransmissionProbabilityOnContactV1, mio::sseirvv::TransmissionProbabilityOnContactV2, mio::sseirvv::TimeExposedV1, mio::sseirvv::TimeExposedV2, mio::sseirvv::TimeInfectedV1, mio::sseirvv::TimeInfectedV2, mio::sseirvv::ContactPatterns&gt;::get&lt;mio::sseirvv::TransmissionProbabilityOnContactV1&gt;() const</a></td>
               <td class="coverFnHi">126</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SocialEventRate&gt;::get() const</a></td>
-              <td class="coverFnHi">126</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::sseirvv::TransmissionProbabilityOnContactV1&gt;::get() const</a></td>
               <td class="coverFnHi">126</td>
@@ -4587,6 +4579,14 @@
               <td class="coverFn"><a href="parameter_set.h.gcov.html#108">mio::details::TaggedParameter&lt;mio::ssir::TimeInfected&gt;::get()</a></td>
               <td class="coverFnHi">135</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SocialEventRate&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SocialEventRate&gt;() const</a></td>
+              <td class="coverFnHi">135</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SocialEventRate&gt;::get() const</a></td>
+              <td class="coverFnHi">135</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::isecir::TransitionDistributions&gt;::Type const&amp; mio::ParameterSet&lt;mio::isecir::TransitionDistributions, mio::isecir::TransitionProbabilities, mio::isecir::ContactPatterns, mio::isecir::TransmissionProbabilityOnContact, mio::isecir::RelativeTransmissionNoSymptoms, mio::isecir::RiskOfInfectionFromSymptomatic, mio::isecir::StartDay, mio::isecir::Seasonality&gt;::get&lt;mio::isecir::TransitionDistributions&gt;() const</a></td>
               <td class="coverFnHi">136</td>
@@ -5840,12 +5840,12 @@
               <td class="coverFnHi">750</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::CriticalToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::CriticalToRecovered&gt;() const</a></td>
-              <td class="coverFnHi">804</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::CriticalToDead&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::CriticalToDead&gt;() const</a></td>
+              <td class="coverFnHi">786</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::CriticalToRecovered&gt;::get() const</a></td>
-              <td class="coverFnHi">804</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::CriticalToDead&gt;::get() const</a></td>
+              <td class="coverFnHi">786</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#270">mio::ParameterTagTraits&lt;mio::lsecir::TimeInfectedCritical&gt;::Type&amp; mio::ParameterSet&lt;mio::lsecir::TimeExposed, mio::lsecir::TimeInfectedNoSymptoms, mio::lsecir::TimeInfectedSymptoms, mio::lsecir::TimeInfectedSevere, mio::lsecir::TimeInfectedCritical, mio::lsecir::TransmissionProbabilityOnContact, mio::lsecir::ContactPatterns, mio::lsecir::RelativeTransmissionNoSymptoms, mio::lsecir::RiskOfInfectionFromSymptomatic, mio::lsecir::RecoveredPerInfectedNoSymptoms, mio::lsecir::SeverePerInfectedSymptoms, mio::lsecir::CriticalPerSevere, mio::lsecir::DeathsPerCritical, mio::lsecir::StartDay, mio::lsecir::Seasonality&gt;::get&lt;mio::lsecir::TimeInfectedCritical&gt;()</a></td>
@@ -5856,11 +5856,19 @@
               <td class="coverFnHi">812</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::CriticalToDead&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::CriticalToDead&gt;() const</a></td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::CriticalToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::CriticalToRecovered&gt;() const</a></td>
+              <td class="coverFnHi">813</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::CriticalToRecovered&gt;::get() const</a></td>
+              <td class="coverFnHi">813</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SevereToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SevereToRecovered&gt;() const</a></td>
               <td class="coverFnHi">831</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::CriticalToDead&gt;::get() const</a></td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SevereToRecovered&gt;::get() const</a></td>
               <td class="coverFnHi">831</td>
             </tr>
     <tr>
@@ -5872,12 +5880,12 @@
               <td class="coverFnHi">846</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SevereToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SevereToRecovered&gt;() const</a></td>
-              <td class="coverFnHi">849</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SevereToCritical&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SevereToCritical&gt;() const</a></td>
+              <td class="coverFnHi">876</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SevereToRecovered&gt;::get() const</a></td>
-              <td class="coverFnHi">849</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SevereToCritical&gt;::get() const</a></td>
+              <td class="coverFnHi">876</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#248">mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::ParameterSet&lt;mio::AgeGroup, , void&gt;(mio::AgeGroup&amp;&amp;)</a></td>
@@ -6132,36 +6140,28 @@
               <td class="coverFnHi">892</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedSymptomsToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedSymptomsToRecovered&gt;() const</a></td>
-              <td class="coverFnHi">894</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedSymptomsToRecovered&gt;::get() const</a></td>
-              <td class="coverFnHi">894</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SevereToCritical&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SevereToCritical&gt;() const</a></td>
-              <td class="coverFnHi">912</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;() const</a></td>
+              <td class="coverFnHi">939</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SevereToCritical&gt;::get() const</a></td>
-              <td class="coverFnHi">912</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;::get() const</a></td>
+              <td class="coverFnHi">939</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;() const</a></td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedSymptomsToSevere&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedSymptomsToSevere&gt;() const</a></td>
               <td class="coverFnHi">957</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;::get() const</a></td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedSymptomsToSevere&gt;::get() const</a></td>
               <td class="coverFnHi">957</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedSymptomsToSevere&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedSymptomsToSevere&gt;() const</a></td>
-              <td class="coverFnHi">1011</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedSymptomsToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedSymptomsToRecovered&gt;() const</a></td>
+              <td class="coverFnHi">966</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedSymptomsToSevere&gt;::get() const</a></td>
-              <td class="coverFnHi">1011</td>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedSymptomsToRecovered&gt;::get() const</a></td>
+              <td class="coverFnHi">966</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#270">mio::ParameterTagTraits&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;::Type&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;()</a></td>
@@ -6195,14 +6195,6 @@
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::DetectInfection&gt;::get() const</a></td>
               <td class="coverFnHi">1092</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;() const</a></td>
-              <td class="coverFnHi">1146</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;::get() const</a></td>
-              <td class="coverFnHi">1146</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#270">_ZN3mio12ParameterSetIJNS_9osecirvvs8StartDayENS1_11SeasonalityIdEENS1_11ICUCapacityIdEENS1_20TestAndTraceCapacityIdEENS1_37TestAndTraceCapacityMaxRiskNoSymptomsIdEENS1_35TestAndTraceCapacityMaxRiskSymptomsIdEENS1_15ContactPatternsIdEENS1_30DynamicNPIsImplementationDelayIdEENS1_27DynamicNPIsInfectedSymptomsIdEENS1_11TimeExposedIdEENS1_22TimeInfectedNoSymptomsIdEENS1_20TimeInfectedSymptomsIdEENS1_18TimeInfectedSevereIdEENS1_20TimeInfectedCriticalIdEENS1_32TransmissionProbabilityOnContactIdEENS1_30RelativeTransmissionNoSymptomsIdEENS1_30RecoveredPerInfectedNoSymptomsIdEENS1_30RiskOfInfectionFromSymptomaticIdEENS1_33MaxRiskOfInfectionFromSymptomaticIdEENS1_25SeverePerInfectedSymptomsIdEENS1_17CriticalPerSevereIdEENS1_17DeathsPerCriticalIdEENS1_14VaccinationGapIdEENS1_33DaysUntilEffectivePartialImmunityIdEENS1_34DaysUntilEffectiveImprovedImmunityIdEENS1_20DailyFullVaccinationIdEENS1_21DailyFirstVaccinationIdEENS1_27ReducExposedPartialImmunityIdEENS1_28ReducExposedImprovedImmunityIdEENS1_36ReducInfectedSymptomsPartialImmunityIdEENS1_37ReducInfectedSymptomsImprovedImmunityIdEENS1_46ReducInfectedSevereCriticalDeadPartialImmunityIdEENS1_47ReducInfectedSevereCriticalDeadImprovedImmunityIdEENS1_21ReducTimeInfectedMildIdEENS1_24InfectiousnessNewVariantIdEENS1_18StartDayNewVariantEEE3getIS6_EERNS_18ParameterTagTraitsIT_E4TypeEv</a></td>
               <td class="coverFnHi">1152</td>
@@ -6219,6 +6211,14 @@
               <td class="coverFn"><a href="parameter_set.h.gcov.html#108">mio::details::TaggedParameter&lt;mio::osecirvvs::TestAndTraceCapacity&lt;double&gt; &gt;::get()</a></td>
               <td class="coverFnHi">1152</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;() const</a></td>
+              <td class="coverFnHi">1164</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;::get() const</a></td>
+              <td class="coverFnHi">1164</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#270">mio::ParameterTagTraits&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::Type&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;()</a></td>
               <td class="coverFnHi">1194</td>
@@ -6367,6 +6367,14 @@
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::LockdownDate&gt;::get() const</a></td>
               <td class="coverFnHi">1780</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::GotoSchoolTimeMaximum&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::GotoSchoolTimeMaximum&gt;() const</a></td>
+              <td class="coverFnHi">1879</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::GotoSchoolTimeMaximum&gt;::get() const</a></td>
+              <td class="coverFnHi">1879</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#270">_ZN3mio12ParameterSetIJNS_9osecirvvs8StartDayENS1_11SeasonalityIdEENS1_11ICUCapacityIdEENS1_20TestAndTraceCapacityIdEENS1_37TestAndTraceCapacityMaxRiskNoSymptomsIdEENS1_35TestAndTraceCapacityMaxRiskSymptomsIdEENS1_15ContactPatternsIdEENS1_30DynamicNPIsImplementationDelayIdEENS1_27DynamicNPIsInfectedSymptomsIdEENS1_11TimeExposedIdEENS1_22TimeInfectedNoSymptomsIdEENS1_20TimeInfectedSymptomsIdEENS1_18TimeInfectedSevereIdEENS1_20TimeInfectedCriticalIdEENS1_32TransmissionProbabilityOnContactIdEENS1_30RelativeTransmissionNoSymptomsIdEENS1_30RecoveredPerInfectedNoSymptomsIdEENS1_30RiskOfInfectionFromSymptomaticIdEENS1_33MaxRiskOfInfectionFromSymptomaticIdEENS1_25SeverePerInfectedSymptomsIdEENS1_17CriticalPerSevereIdEENS1_17DeathsPerCriticalIdEENS1_14VaccinationGapIdEENS1_33DaysUntilEffectivePartialImmunityIdEENS1_34DaysUntilEffectiveImprovedImmunityIdEENS1_20DailyFullVaccinationIdEENS1_21DailyFirstVaccinationIdEENS1_27ReducExposedPartialImmunityIdEENS1_28ReducExposedImprovedImmunityIdEENS1_36ReducInfectedSymptomsPartialImmunityIdEENS1_37ReducInfectedSymptomsImprovedImmunityIdEENS1_46ReducInfectedSevereCriticalDeadPartialImmunityIdEENS1_47ReducInfectedSevereCriticalDeadImprovedImmunityIdEENS1_21ReducTimeInfectedMildIdEENS1_24InfectiousnessNewVariantIdEENS1_18StartDayNewVariantEEE3getIS1A_EERNS_18ParameterTagTraitsIT_E4TypeEv</a></td>
               <td class="coverFnHi">1883</td>
@@ -6391,21 +6399,13 @@
               <td class="coverFn"><a href="parameter_set.h.gcov.html#108">mio::details::TaggedParameter&lt;mio::osecirvvs::DaysUntilEffectiveImprovedImmunity&lt;double&gt; &gt;::get()</a></td>
               <td class="coverFnHi">1883</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::GotoSchoolTimeMaximum&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::GotoSchoolTimeMaximum&gt;() const</a></td>
-              <td class="coverFnHi">1888</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::GotoSchoolTimeMaximum&gt;::get() const</a></td>
-              <td class="coverFnHi">1888</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::GotoSchoolTimeMinimum&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::GotoSchoolTimeMinimum&gt;() const</a></td>
-              <td class="coverFnHi">1906</td>
+              <td class="coverFnHi">1897</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::GotoSchoolTimeMinimum&gt;::get() const</a></td>
-              <td class="coverFnHi">1906</td>
+              <td class="coverFnHi">1897</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::MaximumContacts&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::MaximumContacts, mio::abm::ContactRates, mio::abm::UseLocationCapacityForTransmissions&gt;::get&lt;mio::abm::MaximumContacts&gt;() const</a></td>
@@ -7033,203 +7033,203 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::ContactPatterns&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::ContactPatterns&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">386748</td>
+              <td class="coverFnHi">386856</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::ContactPatterns&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">386748</td>
+              <td class="coverFnHi">386856</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::TimeInfected&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::TimeInfected&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">386891</td>
+              <td class="coverFnHi">386999</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::TimeInfected&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">386891</td>
+              <td class="coverFnHi">386999</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::TimeExposed&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::TimeExposed&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">386900</td>
+              <td class="coverFnHi">387008</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::TimeExposed&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">386900</td>
+              <td class="coverFnHi">387008</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">387007</td>
+              <td class="coverFnHi">387115</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">387007</td>
+              <td class="coverFnHi">387115</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::ContactPatterns&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::ContactPatterns&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">394061</td>
+              <td class="coverFnHi">415121</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::ContactPatterns&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">394061</td>
+              <td class="coverFnHi">415121</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeExposed&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeExposed&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">407447</td>
+              <td class="coverFnHi">428507</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeExposed&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">407447</td>
+              <td class="coverFnHi">428507</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">_ZNK3mio12ParameterSetIJNS_9osecirvvs8StartDayENS1_11SeasonalityIdEENS1_11ICUCapacityIdEENS1_20TestAndTraceCapacityIdEENS1_37TestAndTraceCapacityMaxRiskNoSymptomsIdEENS1_35TestAndTraceCapacityMaxRiskSymptomsIdEENS1_15ContactPatternsIdEENS1_30DynamicNPIsImplementationDelayIdEENS1_27DynamicNPIsInfectedSymptomsIdEENS1_11TimeExposedIdEENS1_22TimeInfectedNoSymptomsIdEENS1_20TimeInfectedSymptomsIdEENS1_18TimeInfectedSevereIdEENS1_20TimeInfectedCriticalIdEENS1_32TransmissionProbabilityOnContactIdEENS1_30RelativeTransmissionNoSymptomsIdEENS1_30RecoveredPerInfectedNoSymptomsIdEENS1_30RiskOfInfectionFromSymptomaticIdEENS1_33MaxRiskOfInfectionFromSymptomaticIdEENS1_25SeverePerInfectedSymptomsIdEENS1_17CriticalPerSevereIdEENS1_17DeathsPerCriticalIdEENS1_14VaccinationGapIdEENS1_33DaysUntilEffectivePartialImmunityIdEENS1_34DaysUntilEffectiveImprovedImmunityIdEENS1_20DailyFullVaccinationIdEENS1_21DailyFirstVaccinationIdEENS1_27ReducExposedPartialImmunityIdEENS1_28ReducExposedImprovedImmunityIdEENS1_36ReducInfectedSymptomsPartialImmunityIdEENS1_37ReducInfectedSymptomsImprovedImmunityIdEENS1_46ReducInfectedSevereCriticalDeadPartialImmunityIdEENS1_47ReducInfectedSevereCriticalDeadImprovedImmunityIdEENS1_21ReducTimeInfectedMildIdEENS1_24InfectiousnessNewVariantIdEENS1_18StartDayNewVariantEEE3getIS1G_EERKNS_18ParameterTagTraitsIT_E4TypeEv</a></td>
+              <td class="coverFnHi">450001</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecirvvs::DailyFullVaccination&lt;double&gt; &gt;::get() const</a></td>
+              <td class="coverFnHi">450001</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">_ZNK3mio12ParameterSetIJNS_9osecirvvs8StartDayENS1_11SeasonalityIdEENS1_11ICUCapacityIdEENS1_20TestAndTraceCapacityIdEENS1_37TestAndTraceCapacityMaxRiskNoSymptomsIdEENS1_35TestAndTraceCapacityMaxRiskSymptomsIdEENS1_15ContactPatternsIdEENS1_30DynamicNPIsImplementationDelayIdEENS1_27DynamicNPIsInfectedSymptomsIdEENS1_11TimeExposedIdEENS1_22TimeInfectedNoSymptomsIdEENS1_20TimeInfectedSymptomsIdEENS1_18TimeInfectedSevereIdEENS1_20TimeInfectedCriticalIdEENS1_32TransmissionProbabilityOnContactIdEENS1_30RelativeTransmissionNoSymptomsIdEENS1_30RecoveredPerInfectedNoSymptomsIdEENS1_30RiskOfInfectionFromSymptomaticIdEENS1_33MaxRiskOfInfectionFromSymptomaticIdEENS1_25SeverePerInfectedSymptomsIdEENS1_17CriticalPerSevereIdEENS1_17DeathsPerCriticalIdEENS1_14VaccinationGapIdEENS1_33DaysUntilEffectivePartialImmunityIdEENS1_34DaysUntilEffectiveImprovedImmunityIdEENS1_20DailyFullVaccinationIdEENS1_21DailyFirstVaccinationIdEENS1_27ReducExposedPartialImmunityIdEENS1_28ReducExposedImprovedImmunityIdEENS1_36ReducInfectedSymptomsPartialImmunityIdEENS1_37ReducInfectedSymptomsImprovedImmunityIdEENS1_46ReducInfectedSevereCriticalDeadPartialImmunityIdEENS1_47ReducInfectedSevereCriticalDeadImprovedImmunityIdEENS1_21ReducTimeInfectedMildIdEENS1_24InfectiousnessNewVariantIdEENS1_18StartDayNewVariantEEE3getIS1I_EERKNS_18ParameterTagTraitsIT_E4TypeEv</a></td>
+              <td class="coverFnHi">450010</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecirvvs::DailyFirstVaccination&lt;double&gt; &gt;::get() const</a></td>
+              <td class="coverFnHi">450010</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::StartDay&gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::StartDay&gt;() const</a></td>
-              <td class="coverFnHi">442829</td>
+              <td class="coverFnHi">463889</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::StartDay&gt;::get() const</a></td>
-              <td class="coverFnHi">442829</td>
+              <td class="coverFnHi">463889</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">443457</td>
+              <td class="coverFnHi">464517</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">443457</td>
+              <td class="coverFnHi">464517</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::Seasonality&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::Seasonality&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">443648</td>
+              <td class="coverFnHi">464708</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::Seasonality&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">443648</td>
+              <td class="coverFnHi">464708</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">443680</td>
+              <td class="coverFnHi">464740</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">443680</td>
+              <td class="coverFnHi">464740</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">444028</td>
+              <td class="coverFnHi">465088</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">444028</td>
+              <td class="coverFnHi">465088</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">444338</td>
+              <td class="coverFnHi">465398</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">444338</td>
+              <td class="coverFnHi">465398</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TransmissionProbabilityOnContact&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">445798</td>
+              <td class="coverFnHi">466858</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">445798</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">_ZNK3mio12ParameterSetIJNS_9osecirvvs8StartDayENS1_11SeasonalityIdEENS1_11ICUCapacityIdEENS1_20TestAndTraceCapacityIdEENS1_37TestAndTraceCapacityMaxRiskNoSymptomsIdEENS1_35TestAndTraceCapacityMaxRiskSymptomsIdEENS1_15ContactPatternsIdEENS1_30DynamicNPIsImplementationDelayIdEENS1_27DynamicNPIsInfectedSymptomsIdEENS1_11TimeExposedIdEENS1_22TimeInfectedNoSymptomsIdEENS1_20TimeInfectedSymptomsIdEENS1_18TimeInfectedSevereIdEENS1_20TimeInfectedCriticalIdEENS1_32TransmissionProbabilityOnContactIdEENS1_30RelativeTransmissionNoSymptomsIdEENS1_30RecoveredPerInfectedNoSymptomsIdEENS1_30RiskOfInfectionFromSymptomaticIdEENS1_33MaxRiskOfInfectionFromSymptomaticIdEENS1_25SeverePerInfectedSymptomsIdEENS1_17CriticalPerSevereIdEENS1_17DeathsPerCriticalIdEENS1_14VaccinationGapIdEENS1_33DaysUntilEffectivePartialImmunityIdEENS1_34DaysUntilEffectiveImprovedImmunityIdEENS1_20DailyFullVaccinationIdEENS1_21DailyFirstVaccinationIdEENS1_27ReducExposedPartialImmunityIdEENS1_28ReducExposedImprovedImmunityIdEENS1_36ReducInfectedSymptomsPartialImmunityIdEENS1_37ReducInfectedSymptomsImprovedImmunityIdEENS1_46ReducInfectedSevereCriticalDeadPartialImmunityIdEENS1_47ReducInfectedSevereCriticalDeadImprovedImmunityIdEENS1_21ReducTimeInfectedMildIdEENS1_24InfectiousnessNewVariantIdEENS1_18StartDayNewVariantEEE3getIS1G_EERKNS_18ParameterTagTraitsIT_E4TypeEv</a></td>
-              <td class="coverFnHi">450001</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecirvvs::DailyFullVaccination&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">450001</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#259">_ZNK3mio12ParameterSetIJNS_9osecirvvs8StartDayENS1_11SeasonalityIdEENS1_11ICUCapacityIdEENS1_20TestAndTraceCapacityIdEENS1_37TestAndTraceCapacityMaxRiskNoSymptomsIdEENS1_35TestAndTraceCapacityMaxRiskSymptomsIdEENS1_15ContactPatternsIdEENS1_30DynamicNPIsImplementationDelayIdEENS1_27DynamicNPIsInfectedSymptomsIdEENS1_11TimeExposedIdEENS1_22TimeInfectedNoSymptomsIdEENS1_20TimeInfectedSymptomsIdEENS1_18TimeInfectedSevereIdEENS1_20TimeInfectedCriticalIdEENS1_32TransmissionProbabilityOnContactIdEENS1_30RelativeTransmissionNoSymptomsIdEENS1_30RecoveredPerInfectedNoSymptomsIdEENS1_30RiskOfInfectionFromSymptomaticIdEENS1_33MaxRiskOfInfectionFromSymptomaticIdEENS1_25SeverePerInfectedSymptomsIdEENS1_17CriticalPerSevereIdEENS1_17DeathsPerCriticalIdEENS1_14VaccinationGapIdEENS1_33DaysUntilEffectivePartialImmunityIdEENS1_34DaysUntilEffectiveImprovedImmunityIdEENS1_20DailyFullVaccinationIdEENS1_21DailyFirstVaccinationIdEENS1_27ReducExposedPartialImmunityIdEENS1_28ReducExposedImprovedImmunityIdEENS1_36ReducInfectedSymptomsPartialImmunityIdEENS1_37ReducInfectedSymptomsImprovedImmunityIdEENS1_46ReducInfectedSevereCriticalDeadPartialImmunityIdEENS1_47ReducInfectedSevereCriticalDeadImprovedImmunityIdEENS1_21ReducTimeInfectedMildIdEENS1_24InfectiousnessNewVariantIdEENS1_18StartDayNewVariantEEE3getIS1I_EERKNS_18ParameterTagTraitsIT_E4TypeEv</a></td>
-              <td class="coverFnHi">450010</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecirvvs::DailyFirstVaccination&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">450010</td>
+              <td class="coverFnHi">466858</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::DeathsPerCritical&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">812941</td>
+              <td class="coverFnHi">855061</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">812941</td>
+              <td class="coverFnHi">855061</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedCritical&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedCritical&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">813155</td>
+              <td class="coverFnHi">855275</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedCritical&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">813155</td>
+              <td class="coverFnHi">855275</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::ICUCapacity&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::ICUCapacity&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">814092</td>
+              <td class="coverFnHi">856212</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::ICUCapacity&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">814092</td>
+              <td class="coverFnHi">856212</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">888309</td>
+              <td class="coverFnHi">930429</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">888309</td>
+              <td class="coverFnHi">930429</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::CriticalPerSevere&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::CriticalPerSevere&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1219504</td>
+              <td class="coverFnHi">1282684</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::CriticalPerSevere&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1219504</td>
+              <td class="coverFnHi">1282684</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedSevere&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedSevere&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1219691</td>
+              <td class="coverFnHi">1282871</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedSevere&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1219691</td>
+              <td class="coverFnHi">1282871</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::SeverePerInfectedSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::SeverePerInfectedSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1625536</td>
+              <td class="coverFnHi">1709776</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::SeverePerInfectedSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1625536</td>
+              <td class="coverFnHi">1709776</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1625714</td>
+              <td class="coverFnHi">1709954</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1625714</td>
+              <td class="coverFnHi">1709954</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">2032237</td>
+              <td class="coverFnHi">2137537</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">2032237</td>
+              <td class="coverFnHi">2137537</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedNoSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedNoSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">2032379</td>
+              <td class="coverFnHi">2137679</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedNoSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">2032379</td>
+              <td class="coverFnHi">2137679</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/parameter_set.h.func.html b/coverage/cpp/memilio/utils/parameter_set.h.func.html
index 3514b4c801..61e6f9806b 100644
--- a/coverage/cpp/memilio/utils/parameter_set.h.func.html
+++ b/coverage/cpp/memilio/utils/parameter_set.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1739</td>
@@ -5341,35 +5341,35 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;() const</a></td>
-              <td class="coverFnHi">1146</td>
+              <td class="coverFnHi">1164</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;() const</a></td>
-              <td class="coverFnHi">957</td>
+              <td class="coverFnHi">939</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedSymptomsToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedSymptomsToRecovered&gt;() const</a></td>
-              <td class="coverFnHi">894</td>
+              <td class="coverFnHi">966</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::InfectedSymptomsToSevere&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::InfectedSymptomsToSevere&gt;() const</a></td>
-              <td class="coverFnHi">1011</td>
+              <td class="coverFnHi">957</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SevereToCritical&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SevereToCritical&gt;() const</a></td>
-              <td class="coverFnHi">912</td>
+              <td class="coverFnHi">876</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SevereToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SevereToRecovered&gt;() const</a></td>
-              <td class="coverFnHi">849</td>
+              <td class="coverFnHi">831</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::CriticalToDead&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::CriticalToDead&gt;() const</a></td>
-              <td class="coverFnHi">831</td>
+              <td class="coverFnHi">786</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::CriticalToRecovered&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::CriticalToRecovered&gt;() const</a></td>
-              <td class="coverFnHi">804</td>
+              <td class="coverFnHi">813</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::RecoveredToSusceptible&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::RecoveredToSusceptible&gt;() const</a></td>
@@ -5405,7 +5405,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::SocialEventRate&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::SocialEventRate&gt;() const</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::BasicShoppingRate&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::BasicShoppingRate&gt;() const</a></td>
@@ -5429,11 +5429,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::GotoSchoolTimeMinimum&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::GotoSchoolTimeMinimum&gt;() const</a></td>
-              <td class="coverFnHi">1906</td>
+              <td class="coverFnHi">1897</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::GotoSchoolTimeMaximum&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::GotoSchoolTimeMaximum&gt;() const</a></td>
-              <td class="coverFnHi">1888</td>
+              <td class="coverFnHi">1879</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::abm::AgeGroupGotoSchool&gt;::Type const&amp; mio::ParameterSet&lt;mio::abm::IncubationPeriod, mio::abm::InfectedNoSymptomsToSymptoms, mio::abm::InfectedNoSymptomsToRecovered, mio::abm::InfectedSymptomsToRecovered, mio::abm::InfectedSymptomsToSevere, mio::abm::SevereToCritical, mio::abm::SevereToRecovered, mio::abm::CriticalToDead, mio::abm::CriticalToRecovered, mio::abm::RecoveredToSusceptible, mio::abm::ViralLoadDistributions, mio::abm::InfectivityDistributions, mio::abm::DetectInfection, mio::abm::MaskProtection, mio::abm::AerosolTransmissionRates, mio::abm::LockdownDate, mio::abm::QuarantineDuration, mio::abm::SocialEventRate, mio::abm::BasicShoppingRate, mio::abm::WorkRatio, mio::abm::SchoolRatio, mio::abm::GotoWorkTimeMinimum, mio::abm::GotoWorkTimeMaximum, mio::abm::GotoSchoolTimeMinimum, mio::abm::GotoSchoolTimeMaximum, mio::abm::AgeGroupGotoSchool, mio::abm::AgeGroupGotoWork, mio::abm::InfectionProtectionFactor, mio::abm::SeverityProtectionFactor, mio::abm::HighViralLoadProtectionFactor, mio::abm::TestData&gt;::get&lt;mio::abm::AgeGroupGotoSchool&gt;() const</a></td>
@@ -5493,19 +5493,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">387007</td>
+              <td class="coverFnHi">387115</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::TimeExposed&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::TimeExposed&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">386900</td>
+              <td class="coverFnHi">387008</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::TimeInfected&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::TimeInfected&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">386891</td>
+              <td class="coverFnHi">386999</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::oseir::ContactPatterns&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt;, mio::oseir::TimeExposed&lt;double&gt;, mio::oseir::TimeInfected&lt;double&gt;, mio::oseir::ContactPatterns&lt;double&gt; &gt;::get&lt;mio::oseir::ContactPatterns&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">386748</td>
+              <td class="coverFnHi">386856</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::ssirs::TransmissionProbabilityOnContact&gt;::Type const&amp; mio::ParameterSet&lt;mio::ssirs::TransmissionProbabilityOnContact, mio::ssirs::TimeInfected, mio::ssirs::ContactPatterns, mio::ssirs::TimeImmune&gt;::get&lt;mio::ssirs::TransmissionProbabilityOnContact&gt;() const</a></td>
@@ -5665,43 +5665,43 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">443457</td>
+              <td class="coverFnHi">464517</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::SeverePerInfectedSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::SeverePerInfectedSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1625536</td>
+              <td class="coverFnHi">1709776</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::CriticalPerSevere&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::CriticalPerSevere&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1219504</td>
+              <td class="coverFnHi">1282684</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::DeathsPerCritical&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">812941</td>
+              <td class="coverFnHi">855061</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::StartDay&gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::StartDay&gt;() const</a></td>
-              <td class="coverFnHi">442829</td>
+              <td class="coverFnHi">463889</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::Seasonality&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::Seasonality&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">443648</td>
+              <td class="coverFnHi">464708</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::ICUCapacity&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::ICUCapacity&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">814092</td>
+              <td class="coverFnHi">856212</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">888309</td>
+              <td class="coverFnHi">930429</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">443680</td>
+              <td class="coverFnHi">464740</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::ContactPatterns&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::ContactPatterns&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">394061</td>
+              <td class="coverFnHi">415121</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt; &gt;() const</a></td>
@@ -5713,39 +5713,39 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeExposed&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeExposed&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">407447</td>
+              <td class="coverFnHi">428507</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedNoSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedNoSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">2032379</td>
+              <td class="coverFnHi">2137679</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1625714</td>
+              <td class="coverFnHi">1709954</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedSevere&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedSevere&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">1219691</td>
+              <td class="coverFnHi">1282871</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TimeInfectedCritical&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TimeInfectedCritical&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">813155</td>
+              <td class="coverFnHi">855275</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::TransmissionProbabilityOnContact&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">445798</td>
+              <td class="coverFnHi">466858</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">444338</td>
+              <td class="coverFnHi">465398</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">2032237</td>
+              <td class="coverFnHi">2137537</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#259">mio::ParameterTagTraits&lt;mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::Type const&amp; mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get&lt;mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt; &gt;() const</a></td>
-              <td class="coverFnHi">444028</td>
+              <td class="coverFnHi">465088</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#332">void mio::ParameterSet&lt;mio::osecir::StartDay, mio::osecir::Seasonality&lt;double&gt;, mio::osecir::ICUCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacity&lt;double&gt;, mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt;, mio::osecir::ContactPatterns&lt;double&gt;, mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt;, mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt;, mio::osecir::TimeExposed&lt;double&gt;, mio::osecir::TimeInfectedNoSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSymptoms&lt;double&gt;, mio::osecir::TimeInfectedSevere&lt;double&gt;, mio::osecir::TimeInfectedCritical&lt;double&gt;, mio::osecir::TransmissionProbabilityOnContact&lt;double&gt;, mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt;, mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt;, mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt;, mio::osecir::SeverePerInfectedSymptoms&lt;double&gt;, mio::osecir::CriticalPerSevere&lt;double&gt;, mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -6069,7 +6069,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::CriticalToDead&gt;::get() const</a></td>
-              <td class="coverFnHi">831</td>
+              <td class="coverFnHi">786</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::MaskProtection&gt;::get() const</a></td>
@@ -6085,7 +6085,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SocialEventRate&gt;::get() const</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::AgeGroupGotoWork&gt;::get() const</a></td>
@@ -6097,7 +6097,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SevereToCritical&gt;::get() const</a></td>
-              <td class="coverFnHi">912</td>
+              <td class="coverFnHi">876</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::BasicShoppingRate&gt;::get() const</a></td>
@@ -6105,7 +6105,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::SevereToRecovered&gt;::get() const</a></td>
-              <td class="coverFnHi">849</td>
+              <td class="coverFnHi">831</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::AgeGroupGotoSchool&gt;::get() const</a></td>
@@ -6117,7 +6117,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::CriticalToRecovered&gt;::get() const</a></td>
-              <td class="coverFnHi">804</td>
+              <td class="coverFnHi">813</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::GotoWorkTimeMaximum&gt;::get() const</a></td>
@@ -6129,11 +6129,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::GotoSchoolTimeMaximum&gt;::get() const</a></td>
-              <td class="coverFnHi">1888</td>
+              <td class="coverFnHi">1879</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::GotoSchoolTimeMinimum&gt;::get() const</a></td>
-              <td class="coverFnHi">1906</td>
+              <td class="coverFnHi">1897</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::RecoveredToSusceptible&gt;::get() const</a></td>
@@ -6149,7 +6149,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedSymptomsToSevere&gt;::get() const</a></td>
-              <td class="coverFnHi">1011</td>
+              <td class="coverFnHi">957</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectivityDistributions&gt;::get() const</a></td>
@@ -6165,11 +6165,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedSymptomsToRecovered&gt;::get() const</a></td>
-              <td class="coverFnHi">894</td>
+              <td class="coverFnHi">966</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedNoSymptomsToSymptoms&gt;::get() const</a></td>
-              <td class="coverFnHi">1146</td>
+              <td class="coverFnHi">1164</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::HighViralLoadProtectionFactor&gt;::get() const</a></td>
@@ -6177,7 +6177,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::InfectedNoSymptomsToRecovered&gt;::get() const</a></td>
-              <td class="coverFnHi">957</td>
+              <td class="coverFnHi">939</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::abm::UseLocationCapacityForTransmissions&gt;::get() const</a></td>
@@ -6221,19 +6221,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::TimeExposed&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">386900</td>
+              <td class="coverFnHi">387008</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::TimeInfected&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">386891</td>
+              <td class="coverFnHi">386999</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::ContactPatterns&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">386748</td>
+              <td class="coverFnHi">386856</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::oseir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">387007</td>
+              <td class="coverFnHi">387115</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::ssirs::TimeImmune&gt;::get() const</a></td>
@@ -6393,51 +6393,51 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::ICUCapacity&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">814092</td>
+              <td class="coverFnHi">856212</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::Seasonality&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">443648</td>
+              <td class="coverFnHi">464708</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeExposed&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">407447</td>
+              <td class="coverFnHi">428507</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::ContactPatterns&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">394061</td>
+              <td class="coverFnHi">415121</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::CriticalPerSevere&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1219504</td>
+              <td class="coverFnHi">1282684</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::DeathsPerCritical&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">812941</td>
+              <td class="coverFnHi">855061</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedSevere&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1219691</td>
+              <td class="coverFnHi">1282871</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TestAndTraceCapacity&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">888309</td>
+              <td class="coverFnHi">930429</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedCritical&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">813155</td>
+              <td class="coverFnHi">855275</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1625714</td>
+              <td class="coverFnHi">1709954</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TimeInfectedNoSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">2032379</td>
+              <td class="coverFnHi">2137679</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::SeverePerInfectedSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">1625536</td>
+              <td class="coverFnHi">1709776</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::DynamicNPIsInfectedSymptoms&lt;double&gt; &gt;::get() const</a></td>
@@ -6445,7 +6445,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TestAndTraceCapacityMaxRisk&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">443680</td>
+              <td class="coverFnHi">464740</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::DynamicNPIsImplementationDelay&lt;double&gt; &gt;::get() const</a></td>
@@ -6453,27 +6453,27 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::RecoveredPerInfectedNoSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">2032237</td>
+              <td class="coverFnHi">2137537</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::RelativeTransmissionNoSymptoms&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">444338</td>
+              <td class="coverFnHi">465398</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::RiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">444028</td>
+              <td class="coverFnHi">465088</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::TransmissionProbabilityOnContact&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">445798</td>
+              <td class="coverFnHi">466858</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::MaxRiskOfInfectionFromSymptomatic&lt;double&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">443457</td>
+              <td class="coverFnHi">464517</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::osecir::StartDay&gt;::get() const</a></td>
-              <td class="coverFnHi">442829</td>
+              <td class="coverFnHi">463889</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameter_set.h.gcov.html#103">mio::details::TaggedParameter&lt;mio::glsecir::Seasonality&gt;::get() const</a></td>
diff --git a/coverage/cpp/memilio/utils/parameter_set.h.gcov.html b/coverage/cpp/memilio/utils/parameter_set.h.gcov.html
index 54711818a8..c822c1af56 100644
--- a/coverage/cpp/memilio/utils/parameter_set.h.gcov.html
+++ b/coverage/cpp/memilio/utils/parameter_set.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1739</td>
@@ -164,9 +164,9 @@
 <a name="102"><span class="lineNum">     102 </span>            :         return get();</a>
 <a name="103"><span class="lineNum">     103 </span>            :     }</a>
 <a name="104"><span class="lineNum">     104 </span>            : </a>
-<a name="105"><span class="lineNum">     105 </span><span class="lineCov">   21518930 :     const Type&amp; get() const</span></a>
+<a name="105"><span class="lineNum">     105 </span><span class="lineCov">   22382741 :     const Type&amp; get() const</span></a>
 <a name="106"><span class="lineNum">     106 </span>            :     {</a>
-<a name="107"><span class="lineNum">     107 </span><span class="lineCov">   21518930 :         return m_value;</span></a>
+<a name="107"><span class="lineNum">     107 </span><span class="lineCov">   22382741 :         return m_value;</span></a>
 <a name="108"><span class="lineNum">     108 </span>            :     }</a>
 <a name="109"><span class="lineNum">     109 </span>            : </a>
 <a name="110"><span class="lineNum">     110 </span><span class="lineCov">     322472 :     Type&amp; get()</span></a>
@@ -320,9 +320,9 @@
 <a name="258"><span class="lineNum">     258 </span>            :      * @return The value of the parameter</a>
 <a name="259"><span class="lineNum">     259 </span>            :      */</a>
 <a name="260"><span class="lineNum">     260 </span>            :     template &lt;class Tag&gt;</a>
-<a name="261"><span class="lineNum">     261 </span><span class="lineCov">   21518930 :     const typename ParameterTagTraits&lt;Tag&gt;::Type&amp; get() const</span></a>
+<a name="261"><span class="lineNum">     261 </span><span class="lineCov">   22382741 :     const typename ParameterTagTraits&lt;Tag&gt;::Type&amp; get() const</span></a>
 <a name="262"><span class="lineNum">     262 </span>            :     {</a>
-<a name="263"><span class="lineNum">     263 </span><span class="lineCov">   21518930 :         return std::get&lt;details::TaggedParameter&lt;Tag&gt;&gt;(m_tup).get();</span></a>
+<a name="263"><span class="lineNum">     263 </span><span class="lineCov">   22382741 :         return std::get&lt;details::TaggedParameter&lt;Tag&gt;&gt;(m_tup).get();</span></a>
 <a name="264"><span class="lineNum">     264 </span>            :     }</a>
 <a name="265"><span class="lineNum">     265 </span>            : </a>
 <a name="266"><span class="lineNum">     266 </span>            :     /**</a>
diff --git a/coverage/cpp/memilio/utils/random_number_generator.cpp.func-sort-c.html b/coverage/cpp/memilio/utils/random_number_generator.cpp.func-sort-c.html
index c8eb59ac33..2f0f601cd0 100644
--- a/coverage/cpp/memilio/utils/random_number_generator.cpp.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/random_number_generator.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.cpp.gcov.html#23">mio::thread_local_rng()</a></td>
-              <td class="coverFnHi">40188</td>
+              <td class="coverFnHi">40198</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/random_number_generator.cpp.func.html b/coverage/cpp/memilio/utils/random_number_generator.cpp.func.html
index 88a831760e..d9540db657 100644
--- a/coverage/cpp/memilio/utils/random_number_generator.cpp.func.html
+++ b/coverage/cpp/memilio/utils/random_number_generator.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.cpp.gcov.html#23">mio::thread_local_rng()</a></td>
-              <td class="coverFnHi">40188</td>
+              <td class="coverFnHi">40198</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/random_number_generator.cpp.gcov.html b/coverage/cpp/memilio/utils/random_number_generator.cpp.gcov.html
index c3e17f314a..dbcc05ad4f 100644
--- a/coverage/cpp/memilio/utils/random_number_generator.cpp.gcov.html
+++ b/coverage/cpp/memilio/utils/random_number_generator.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
@@ -84,10 +84,10 @@
 <a name="22"><span class="lineNum">      22 </span>            : namespace mio</a>
 <a name="23"><span class="lineNum">      23 </span>            : {</a>
 <a name="24"><span class="lineNum">      24 </span>            : </a>
-<a name="25"><span class="lineNum">      25 </span><span class="lineCov">      40188 : RandomNumberGenerator&amp; thread_local_rng()</span></a>
+<a name="25"><span class="lineNum">      25 </span><span class="lineCov">      40198 : RandomNumberGenerator&amp; thread_local_rng()</span></a>
 <a name="26"><span class="lineNum">      26 </span>            : {</a>
-<a name="27"><span class="lineNum">      27 </span><span class="lineCov">      40188 :     static thread_local auto rng = RandomNumberGenerator();</span></a>
-<a name="28"><span class="lineNum">      28 </span><span class="lineCov">      40188 :     return rng;</span></a>
+<a name="27"><span class="lineNum">      27 </span><span class="lineCov">      40198 :     static thread_local auto rng = RandomNumberGenerator();</span></a>
+<a name="28"><span class="lineNum">      28 </span><span class="lineCov">      40198 :     return rng;</span></a>
 <a name="29"><span class="lineNum">      29 </span>            : }</a>
 <a name="30"><span class="lineNum">      30 </span>            : </a>
 <a name="31"><span class="lineNum">      31 </span>            : } // namespace mio</a>
diff --git a/coverage/cpp/memilio/utils/random_number_generator.h.func-sort-c.html b/coverage/cpp/memilio/utils/random_number_generator.h.func-sort-c.html
index 0ea77d2742..7835ef0e40 100644
--- a/coverage/cpp/memilio/utils/random_number_generator.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/random_number_generator.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">67</td>
@@ -128,20 +128,20 @@
               <td class="coverFnHi">54</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="random_number_generator.h.gcov.html#614">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;)</a></td>
-              <td class="coverFnHi">63</td>
+              <td class="coverFn"><a href="random_number_generator.h.gcov.html#399">mio::log_thread_local_rng_seeds(mio::LogLevel)</a></td>
+              <td class="coverFnHi">72</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="random_number_generator.h.gcov.html#625">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type)</a></td>
-              <td class="coverFnHi">63</td>
+              <td class="coverFn"><a href="random_number_generator.h.gcov.html#614">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;)</a></td>
+              <td class="coverFnHi">72</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">unsigned long mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator, std::array&lt;double, 1ul&gt;&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, std::array&lt;double, 1ul&gt;&amp;)</a></td>
+              <td class="coverFn"><a href="random_number_generator.h.gcov.html#625">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type)</a></td>
               <td class="coverFnHi">72</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="random_number_generator.h.gcov.html#399">mio::log_thread_local_rng_seeds(mio::LogLevel)</a></td>
-              <td class="coverFnHi">72</td>
+              <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">unsigned long mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator, std::array&lt;double, 1ul&gt;&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, std::array&lt;double, 1ul&gt;&amp;)</a></td>
+              <td class="coverFnHi">81</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#486">mio::DistributionAdapter&lt;std::normal_distribution&lt;double&gt; &gt;::get_generator() const</a></td>
@@ -161,11 +161,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">unsigned long mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::operator()&lt;mio::RandomNumberGenerator, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;&gt;(mio::RandomNumberGenerator&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">double mio::DistributionAdapter&lt;std::exponential_distribution&lt;double&gt; &gt;::operator()&lt;mio::RandomNumberGenerator, double&gt;(mio::RandomNumberGenerator&amp;, double&amp;&amp;)</a></td>
-              <td class="coverFnHi">144</td>
+              <td class="coverFnHi">153</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#494">mio::DistributionAdapter&lt;std::normal_distribution&lt;double&gt; &gt;::set_generator(std::function&lt;double (std::normal_distribution&lt;double&gt;::param_type const&amp;)&gt;)</a></td>
@@ -189,7 +189,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">double mio::DistributionAdapter&lt;std::exponential_distribution&lt;double&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator, double&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, double&amp;)</a></td>
-              <td class="coverFnHi">486</td>
+              <td class="coverFnHi">495</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#381">mio::log_rng_seeds(mio::RandomNumberGenerator const&amp;, mio::LogLevel)</a></td>
@@ -213,11 +213,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#505">mio::DistributionAdapter&lt;std::exponential_distribution&lt;double&gt; &gt;::get_instance()</a></td>
-              <td class="coverFnHi">954</td>
-            </tr>
-    <tr>
-              <td class="coverFn"><a href="random_number_generator.h.gcov.html#614">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::RandomNumberGenerator&gt;(mio::RandomNumberGenerator&amp;)</a></td>
-              <td class="coverFnHi">981</td>
+              <td class="coverFnHi">972</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#212">mio::Key&lt;unsigned long&gt; mio::seed_rng_key&lt;std::seed_seq&gt;(std::seed_seq&amp;)</a></td>
@@ -235,9 +231,13 @@
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#296">mio::RandomNumberGenerator::RandomNumberGenerator()</a></td>
               <td class="coverFnHi">984</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="random_number_generator.h.gcov.html#614">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::RandomNumberGenerator&gt;(mio::RandomNumberGenerator&amp;)</a></td>
+              <td class="coverFnHi">990</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#564">mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::DiscreteDistributionInPlace(mio::Span&lt;double&gt;)</a></td>
-              <td class="coverFnHi">1044</td>
+              <td class="coverFnHi">1062</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#505">mio::DistributionAdapter&lt;std::normal_distribution&lt;double&gt; &gt;::get_instance()</a></td>
@@ -245,23 +245,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#505">mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::get_instance()</a></td>
-              <td class="coverFnHi">1224</td>
+              <td class="coverFnHi">1242</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">double mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;)</a></td>
-              <td class="coverFnHi">1575</td>
+              <td class="coverFnHi">1521</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#625">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::RandomNumberGenerator&gt;(mio::RandomNumberGenerator&amp;, mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type)</a></td>
-              <td class="coverFnHi">2331</td>
+              <td class="coverFnHi">2340</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#546">mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type::weights() const</a></td>
-              <td class="coverFnHi">2394</td>
+              <td class="coverFnHi">2412</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#541">mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type::param_type(mio::Span&lt;double&gt;)</a></td>
-              <td class="coverFnHi">2493</td>
+              <td class="coverFnHi">2511</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#439">mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::ParamType::get_distribution_instance()</a></td>
@@ -273,15 +273,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#123">mio::RandomNumberGeneratorBase&lt;mio::abm::PersonalRandomNumberGenerator&gt;::min()</a></td>
-              <td class="coverFnHi">2772</td>
+              <td class="coverFnHi">2727</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#193">mio::RandomNumberGeneratorBase&lt;mio::abm::PersonalRandomNumberGenerator&gt;::operator()()</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#235">mio::Counter&lt;unsigned long&gt; mio::rng_totalsequence_counter&lt;unsigned long, unsigned int, mio::Counter&lt;unsigned int&gt; &gt;(unsigned int, mio::Counter&lt;unsigned int&gt;)</a></td>
-              <td class="coverFnHi">2832</td>
+              <td class="coverFnHi">2787</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#430">mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::ParamType::ParamType&lt;std::uniform_real_distribution&lt;double&gt;::param_type const&amp;, (void*)0&gt;(std::uniform_real_distribution&lt;double&gt;::param_type const&amp;)</a></td>
@@ -297,7 +297,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#505">mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::get_instance()</a></td>
-              <td class="coverFnHi">12834</td>
+              <td class="coverFnHi">12843</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#430">mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::ParamType::ParamType&lt;, (void*)0&gt;()</a></td>
@@ -305,31 +305,31 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#123">mio::RandomNumberGeneratorBase&lt;mio::RandomNumberGenerator&gt;::min()</a></td>
-              <td class="coverFnHi">63174</td>
+              <td class="coverFnHi">62306</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#314">mio::RandomNumberGenerator::increment_counter()</a></td>
-              <td class="coverFnHi">65190</td>
+              <td class="coverFnHi">64322</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#193">mio::RandomNumberGeneratorBase&lt;mio::RandomNumberGenerator&gt;::operator()()</a></td>
-              <td class="coverFnHi">65190</td>
+              <td class="coverFnHi">64322</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#306">mio::RandomNumberGenerator::get_counter() const</a></td>
-              <td class="coverFnHi">65285</td>
+              <td class="coverFnHi">64417</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#150">mio::details::to_uint64(r123array2x32)</a></td>
-              <td class="coverFnHi">68955</td>
+              <td class="coverFnHi">68042</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#302">mio::RandomNumberGenerator::get_key() const</a></td>
-              <td class="coverFnHi">71841</td>
+              <td class="coverFnHi">70973</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#160">mio::details::to_r123_array(unsigned long)</a></td>
-              <td class="coverFnHi">135942</td>
+              <td class="coverFnHi">134116</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/random_number_generator.h.func.html b/coverage/cpp/memilio/utils/random_number_generator.h.func.html
index 710ccf1b48..b561f720c7 100644
--- a/coverage/cpp/memilio/utils/random_number_generator.h.func.html
+++ b/coverage/cpp/memilio/utils/random_number_generator.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">67</td>
@@ -73,7 +73,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#505">mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::get_instance()</a></td>
-              <td class="coverFnHi">1224</td>
+              <td class="coverFnHi">1242</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#494">mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::set_generator(std::function&lt;unsigned long (mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type const&amp;)&gt;)</a></td>
@@ -93,11 +93,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">unsigned long mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::operator()&lt;mio::RandomNumberGenerator, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;&gt;(mio::RandomNumberGenerator&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;)</a></td>
-              <td class="coverFnHi">126</td>
+              <td class="coverFnHi">135</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">unsigned long mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator, std::array&lt;double, 1ul&gt;&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, std::array&lt;double, 1ul&gt;&amp;)</a></td>
-              <td class="coverFnHi">72</td>
+              <td class="coverFnHi">81</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">unsigned long mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator, std::array&lt;double, 5ul&gt;&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, std::array&lt;double, 5ul&gt;&amp;)</a></td>
@@ -129,7 +129,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#505">mio::DistributionAdapter&lt;std::exponential_distribution&lt;double&gt; &gt;::get_instance()</a></td>
-              <td class="coverFnHi">954</td>
+              <td class="coverFnHi">972</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#494">mio::DistributionAdapter&lt;std::exponential_distribution&lt;double&gt; &gt;::set_generator(std::function&lt;double (std::exponential_distribution&lt;double&gt;::param_type const&amp;)&gt;)</a></td>
@@ -145,15 +145,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">double mio::DistributionAdapter&lt;std::exponential_distribution&lt;double&gt; &gt;::operator()&lt;mio::RandomNumberGenerator, double&gt;(mio::RandomNumberGenerator&amp;, double&amp;&amp;)</a></td>
-              <td class="coverFnHi">144</td>
+              <td class="coverFnHi">153</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">double mio::DistributionAdapter&lt;std::exponential_distribution&lt;double&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator, double&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, double&amp;)</a></td>
-              <td class="coverFnHi">486</td>
+              <td class="coverFnHi">495</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#505">mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::get_instance()</a></td>
-              <td class="coverFnHi">12834</td>
+              <td class="coverFnHi">12843</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#494">mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::set_generator(std::function&lt;double (std::uniform_real_distribution&lt;double&gt;::param_type const&amp;)&gt;)</a></td>
@@ -189,7 +189,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">double mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;)</a></td>
-              <td class="coverFnHi">1575</td>
+              <td class="coverFnHi">1521</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#472">double mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator, std::uniform_real_distribution&lt;double&gt;::param_type&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, std::uniform_real_distribution&lt;double&gt;::param_type&amp;)</a></td>
@@ -217,7 +217,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#314">mio::RandomNumberGenerator::increment_counter()</a></td>
-              <td class="coverFnHi">65190</td>
+              <td class="coverFnHi">64322</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#324">mio::RandomNumberGenerator::seed(std::vector&lt;unsigned int, std::allocator&lt;unsigned int&gt; &gt; const&amp;)</a></td>
@@ -233,19 +233,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#123">mio::RandomNumberGeneratorBase&lt;mio::RandomNumberGenerator&gt;::min()</a></td>
-              <td class="coverFnHi">63174</td>
+              <td class="coverFnHi">62306</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#193">mio::RandomNumberGeneratorBase&lt;mio::RandomNumberGenerator&gt;::operator()()</a></td>
-              <td class="coverFnHi">65190</td>
+              <td class="coverFnHi">64322</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#123">mio::RandomNumberGeneratorBase&lt;mio::abm::PersonalRandomNumberGenerator&gt;::min()</a></td>
-              <td class="coverFnHi">2772</td>
+              <td class="coverFnHi">2727</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#193">mio::RandomNumberGeneratorBase&lt;mio::abm::PersonalRandomNumberGenerator&gt;::operator()()</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#235">mio::Counter&lt;unsigned long&gt; mio::rng_totalsequence_counter&lt;unsigned long, int, mio::Counter&lt;unsigned int&gt; &gt;(int, mio::Counter&lt;unsigned int&gt;)</a></td>
@@ -253,7 +253,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#235">mio::Counter&lt;unsigned long&gt; mio::rng_totalsequence_counter&lt;unsigned long, unsigned int, mio::Counter&lt;unsigned int&gt; &gt;(unsigned int, mio::Counter&lt;unsigned int&gt;)</a></td>
-              <td class="coverFnHi">2832</td>
+              <td class="coverFnHi">2787</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#235">mio::Counter&lt;unsigned long&gt; mio::rng_totalsequence_counter&lt;unsigned long, unsigned long, mio::Counter&lt;unsigned int&gt; &gt;(unsigned long, mio::Counter&lt;unsigned int&gt;)</a></td>
@@ -265,35 +265,35 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#541">mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type::param_type(mio::Span&lt;double&gt;)</a></td>
-              <td class="coverFnHi">2493</td>
+              <td class="coverFnHi">2511</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#564">mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::DiscreteDistributionInPlace(mio::Span&lt;double&gt;)</a></td>
-              <td class="coverFnHi">1044</td>
+              <td class="coverFnHi">1062</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#614">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::RandomNumberGenerator&gt;(mio::RandomNumberGenerator&amp;)</a></td>
-              <td class="coverFnHi">981</td>
+              <td class="coverFnHi">990</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#625">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::RandomNumberGenerator&gt;(mio::RandomNumberGenerator&amp;, mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type)</a></td>
-              <td class="coverFnHi">2331</td>
+              <td class="coverFnHi">2340</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#614">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;)</a></td>
-              <td class="coverFnHi">63</td>
+              <td class="coverFnHi">72</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#625">unsigned long mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::operator()&lt;mio::abm::PersonalRandomNumberGenerator&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type)</a></td>
-              <td class="coverFnHi">63</td>
+              <td class="coverFnHi">72</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#160">mio::details::to_r123_array(unsigned long)</a></td>
-              <td class="coverFnHi">135942</td>
+              <td class="coverFnHi">134116</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#150">mio::details::to_uint64(r123array2x32)</a></td>
-              <td class="coverFnHi">68955</td>
+              <td class="coverFnHi">68042</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#486">mio::DistributionAdapter&lt;mio::DiscreteDistributionInPlace&lt;unsigned long&gt; &gt;::get_generator() const</a></td>
@@ -313,11 +313,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#306">mio::RandomNumberGenerator::get_counter() const</a></td>
-              <td class="coverFnHi">65285</td>
+              <td class="coverFnHi">64417</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#302">mio::RandomNumberGenerator::get_key() const</a></td>
-              <td class="coverFnHi">71841</td>
+              <td class="coverFnHi">70973</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#331">mio::RandomNumberGenerator::get_seeds() const</a></td>
@@ -325,7 +325,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#546">mio::DiscreteDistributionInPlace&lt;unsigned long&gt;::param_type::weights() const</a></td>
-              <td class="coverFnHi">2394</td>
+              <td class="coverFnHi">2412</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_number_generator.h.gcov.html#699">auto mio::deserialize_internal&lt;mio::JsonContext, mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::ParamType, double, (void*)0&gt;(mio::JsonContext&amp;, std::in_place_type_t&lt;mio::DistributionAdapter&lt;std::uniform_real_distribution&lt;double&gt; &gt;::ParamType&gt;)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#1}::operator()&lt;double const&amp;, double const&amp;&gt;(mio::JsonContext&amp;&amp;, double const&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/utils/random_number_generator.h.gcov.html b/coverage/cpp/memilio/utils/random_number_generator.h.gcov.html
index 16333a45ef..be8ad8125f 100644
--- a/coverage/cpp/memilio/utils/random_number_generator.h.gcov.html
+++ b/coverage/cpp/memilio/utils/random_number_generator.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">67</td>
@@ -184,9 +184,9 @@
 <a name="122"><span class="lineNum">     122 </span>            :     * Minimum value generated by this generator.</a>
 <a name="123"><span class="lineNum">     123 </span>            :     * Counterbased generators allow the whole range supported by the result_type.</a>
 <a name="124"><span class="lineNum">     124 </span>            :     */</a>
-<a name="125"><span class="lineNum">     125 </span><span class="lineCov">      65946 :     static constexpr result_type min()</span></a>
+<a name="125"><span class="lineNum">     125 </span><span class="lineCov">      65033 :     static constexpr result_type min()</span></a>
 <a name="126"><span class="lineNum">     126 </span>            :     {</a>
-<a name="127"><span class="lineNum">     127 </span><span class="lineCov">      65946 :         return std::numeric_limits&lt;result_type&gt;::min();</span></a>
+<a name="127"><span class="lineNum">     127 </span><span class="lineCov">      65033 :         return std::numeric_limits&lt;result_type&gt;::min();</span></a>
 <a name="128"><span class="lineNum">     128 </span>            :     }</a>
 <a name="129"><span class="lineNum">     129 </span>            : </a>
 <a name="130"><span class="lineNum">     130 </span>            :     /**</a>
@@ -211,21 +211,21 @@
 <a name="149"><span class="lineNum">     149 </span>            : /**</a>
 <a name="150"><span class="lineNum">     150 </span>            : * Convert a Random123 array type (rng counters and keys) to uint64_t.</a>
 <a name="151"><span class="lineNum">     151 </span>            : */</a>
-<a name="152"><span class="lineNum">     152 </span><span class="lineCov">      68955 : inline uint64_t to_uint64(r123array2x32 tf_array)</span></a>
+<a name="152"><span class="lineNum">     152 </span><span class="lineCov">      68042 : inline uint64_t to_uint64(r123array2x32 tf_array)</span></a>
 <a name="153"><span class="lineNum">     153 </span>            : {</a>
-<a name="154"><span class="lineNum">     154 </span><span class="lineCov">      68955 :     uint64_t i;</span></a>
-<a name="155"><span class="lineNum">     155 </span><span class="lineCov">      68955 :     std::memcpy(&amp;i, tf_array.data(), sizeof(uint64_t));</span></a>
-<a name="156"><span class="lineNum">     156 </span><span class="lineCov">      68955 :     return i;</span></a>
+<a name="154"><span class="lineNum">     154 </span><span class="lineCov">      68042 :     uint64_t i;</span></a>
+<a name="155"><span class="lineNum">     155 </span><span class="lineCov">      68042 :     std::memcpy(&amp;i, tf_array.data(), sizeof(uint64_t));</span></a>
+<a name="156"><span class="lineNum">     156 </span><span class="lineCov">      68042 :     return i;</span></a>
 <a name="157"><span class="lineNum">     157 </span>            : }</a>
 <a name="158"><span class="lineNum">     158 </span>            : </a>
 <a name="159"><span class="lineNum">     159 </span>            : /**</a>
 <a name="160"><span class="lineNum">     160 </span>            : * Convert a uint64_t to a Random123 array type (rng counters and keys).</a>
 <a name="161"><span class="lineNum">     161 </span>            : */</a>
-<a name="162"><span class="lineNum">     162 </span><span class="lineCov">     135942 : inline r123array2x32 to_r123_array(uint64_t i)</span></a>
+<a name="162"><span class="lineNum">     162 </span><span class="lineCov">     134116 : inline r123array2x32 to_r123_array(uint64_t i)</span></a>
 <a name="163"><span class="lineNum">     163 </span>            : {</a>
-<a name="164"><span class="lineNum">     164 </span><span class="lineCov">     135942 :     threefry2x32_ctr_t c;</span></a>
-<a name="165"><span class="lineNum">     165 </span><span class="lineCov">     135942 :     std::memcpy(c.data(), &amp;i, sizeof(uint64_t));</span></a>
-<a name="166"><span class="lineNum">     166 </span><span class="lineCov">     135942 :     return c;</span></a>
+<a name="164"><span class="lineNum">     164 </span><span class="lineCov">     134116 :     threefry2x32_ctr_t c;</span></a>
+<a name="165"><span class="lineNum">     165 </span><span class="lineCov">     134116 :     std::memcpy(c.data(), &amp;i, sizeof(uint64_t));</span></a>
+<a name="166"><span class="lineNum">     166 </span><span class="lineCov">     134116 :     return c;</span></a>
 <a name="167"><span class="lineNum">     167 </span>            : }</a>
 <a name="168"><span class="lineNum">     168 </span>            : } // namespace details</a>
 <a name="169"><span class="lineNum">     169 </span>            : </a>
@@ -254,16 +254,16 @@
 <a name="192"><span class="lineNum">     192 </span>            : static_assert(sizeof(Counter&lt;uint32_t&gt;) == sizeof(uint32_t), &quot;Empty Base Optimization isn't working.&quot;);</a>
 <a name="193"><span class="lineNum">     193 </span>            : </a>
 <a name="194"><span class="lineNum">     194 </span>            : template &lt;class Derived&gt;</a>
-<a name="195"><span class="lineNum">     195 </span><span class="lineCov">      67971 : auto RandomNumberGeneratorBase&lt;Derived&gt;::operator()() -&gt; result_type</span></a>
+<a name="195"><span class="lineNum">     195 </span><span class="lineCov">      67058 : auto RandomNumberGeneratorBase&lt;Derived&gt;::operator()() -&gt; result_type</span></a>
 <a name="196"><span class="lineNum">     196 </span>            : {</a>
 <a name="197"><span class="lineNum">     197 </span>            :     //generate a random sample using the Random123 library.</a>
 <a name="198"><span class="lineNum">     198 </span>            :     //Use another threefryNxR algorithm if larger or more random samples are needed than 64 bit.</a>
-<a name="199"><span class="lineNum">     199 </span><span class="lineCov">      67971 :     auto self = static_cast&lt;Derived*&gt;(this);</span></a>
-<a name="200"><span class="lineNum">     200 </span><span class="lineCov">      67971 :     auto c    = static_cast&lt;uint64_t&gt;(self-&gt;get_counter().get());</span></a>
-<a name="201"><span class="lineNum">     201 </span><span class="lineCov">      67971 :     auto k    = static_cast&lt;uint64_t&gt;(self-&gt;get_key().get());</span></a>
-<a name="202"><span class="lineNum">     202 </span><span class="lineCov">     135942 :     auto r    = details::to_uint64(threefry2x32(details::to_r123_array(k), details::to_r123_array(c)));</span></a>
-<a name="203"><span class="lineNum">     203 </span><span class="lineCov">      67971 :     self-&gt;increment_counter();</span></a>
-<a name="204"><span class="lineNum">     204 </span><span class="lineCov">      67971 :     return r;</span></a>
+<a name="199"><span class="lineNum">     199 </span><span class="lineCov">      67058 :     auto self = static_cast&lt;Derived*&gt;(this);</span></a>
+<a name="200"><span class="lineNum">     200 </span><span class="lineCov">      67058 :     auto c    = static_cast&lt;uint64_t&gt;(self-&gt;get_counter().get());</span></a>
+<a name="201"><span class="lineNum">     201 </span><span class="lineCov">      67058 :     auto k    = static_cast&lt;uint64_t&gt;(self-&gt;get_key().get());</span></a>
+<a name="202"><span class="lineNum">     202 </span><span class="lineCov">     134116 :     auto r    = details::to_uint64(threefry2x32(details::to_r123_array(k), details::to_r123_array(c)));</span></a>
+<a name="203"><span class="lineNum">     203 </span><span class="lineCov">      67058 :     self-&gt;increment_counter();</span></a>
+<a name="204"><span class="lineNum">     204 </span><span class="lineCov">      67058 :     return r;</span></a>
 <a name="205"><span class="lineNum">     205 </span>            : }</a>
 <a name="206"><span class="lineNum">     206 </span>            : </a>
 <a name="207"><span class="lineNum">     207 </span>            : /**</a>
@@ -296,7 +296,7 @@
 <a name="234"><span class="lineNum">     234 </span>            : * @param return The counter in the total sequence.</a>
 <a name="235"><span class="lineNum">     235 </span>            : */</a>
 <a name="236"><span class="lineNum">     236 </span>            : template &lt;class UIntC, class UIntN, class CounterS&gt;</a>
-<a name="237"><span class="lineNum">     237 </span><span class="lineCov">       2870 : Counter&lt;UIntC&gt; rng_totalsequence_counter(UIntN subsequence_idx, CounterS counter)</span></a>
+<a name="237"><span class="lineNum">     237 </span><span class="lineCov">       2825 : Counter&lt;UIntC&gt; rng_totalsequence_counter(UIntN subsequence_idx, CounterS counter)</span></a>
 <a name="238"><span class="lineNum">     238 </span>            : {</a>
 <a name="239"><span class="lineNum">     239 </span>            :     //use UIntC for variables because it's the biggest integer type in this function</a>
 <a name="240"><span class="lineNum">     240 </span>            :     static const UIntC BITS_PER_BYTE = 8;</a>
@@ -318,10 +318,10 @@
 <a name="256"><span class="lineNum">     256 </span>            :     //subsequence index uint32_t(181) = 0x000000B5</a>
 <a name="257"><span class="lineNum">     257 </span>            :     //subsequence counter uint32_t(41309) = 0x0000A15D</a>
 <a name="258"><span class="lineNum">     258 </span>            :     //total sequence counter = 0x000000B50000A15D</a>
-<a name="259"><span class="lineNum">     259 </span><span class="lineCov">       2870 :     const auto i = static_cast&lt;UIntC&gt;(subsequence_idx);</span></a>
-<a name="260"><span class="lineNum">     260 </span><span class="lineCov">       2870 :     const auto s = static_cast&lt;UIntC&gt;(counter.get());</span></a>
-<a name="261"><span class="lineNum">     261 </span><span class="lineCov">       2870 :     const auto c = (i &lt;&lt; S_BITS) + s; //shift subsequence index to the high bits, add subsequence counter into low bits</span></a>
-<a name="262"><span class="lineNum">     262 </span><span class="lineCov">       2870 :     return Counter&lt;UIntC&gt;{c};</span></a>
+<a name="259"><span class="lineNum">     259 </span><span class="lineCov">       2825 :     const auto i = static_cast&lt;UIntC&gt;(subsequence_idx);</span></a>
+<a name="260"><span class="lineNum">     260 </span><span class="lineCov">       2825 :     const auto s = static_cast&lt;UIntC&gt;(counter.get());</span></a>
+<a name="261"><span class="lineNum">     261 </span><span class="lineCov">       2825 :     const auto c = (i &lt;&lt; S_BITS) + s; //shift subsequence index to the high bits, add subsequence counter into low bits</span></a>
+<a name="262"><span class="lineNum">     262 </span><span class="lineCov">       2825 :     return Counter&lt;UIntC&gt;{c};</span></a>
 <a name="263"><span class="lineNum">     263 </span>            : }</a>
 <a name="264"><span class="lineNum">     264 </span>            : </a>
 <a name="265"><span class="lineNum">     265 </span>            : /**</a>
@@ -363,22 +363,22 @@
 <a name="301"><span class="lineNum">     301 </span><span class="lineCov">        984 :         seed(generate_seeds());</span></a>
 <a name="302"><span class="lineNum">     302 </span><span class="lineCov">        984 :     }</span></a>
 <a name="303"><span class="lineNum">     303 </span>            : </a>
-<a name="304"><span class="lineNum">     304 </span><span class="lineCov">      71841 :     Key&lt;uint64_t&gt; get_key() const</span></a>
+<a name="304"><span class="lineNum">     304 </span><span class="lineCov">      70973 :     Key&lt;uint64_t&gt; get_key() const</span></a>
 <a name="305"><span class="lineNum">     305 </span>            :     {</a>
-<a name="306"><span class="lineNum">     306 </span><span class="lineCov">      71841 :         return m_key;</span></a>
+<a name="306"><span class="lineNum">     306 </span><span class="lineCov">      70973 :         return m_key;</span></a>
 <a name="307"><span class="lineNum">     307 </span>            :     }</a>
-<a name="308"><span class="lineNum">     308 </span><span class="lineCov">      65285 :     Counter&lt;uint64_t&gt; get_counter() const</span></a>
+<a name="308"><span class="lineNum">     308 </span><span class="lineCov">      64417 :     Counter&lt;uint64_t&gt; get_counter() const</span></a>
 <a name="309"><span class="lineNum">     309 </span>            :     {</a>
-<a name="310"><span class="lineNum">     310 </span><span class="lineCov">      65285 :         return m_counter;</span></a>
+<a name="310"><span class="lineNum">     310 </span><span class="lineCov">      64417 :         return m_counter;</span></a>
 <a name="311"><span class="lineNum">     311 </span>            :     }</a>
 <a name="312"><span class="lineNum">     312 </span><span class="lineCov">         53 :     void set_counter(Counter&lt;uint64_t&gt; counter)</span></a>
 <a name="313"><span class="lineNum">     313 </span>            :     {</a>
 <a name="314"><span class="lineNum">     314 </span><span class="lineCov">         53 :         m_counter = counter;</span></a>
 <a name="315"><span class="lineNum">     315 </span><span class="lineCov">         53 :     }</span></a>
-<a name="316"><span class="lineNum">     316 </span><span class="lineCov">      65190 :     void increment_counter()</span></a>
+<a name="316"><span class="lineNum">     316 </span><span class="lineCov">      64322 :     void increment_counter()</span></a>
 <a name="317"><span class="lineNum">     317 </span>            :     {</a>
-<a name="318"><span class="lineNum">     318 </span><span class="lineCov">      65190 :         ++m_counter;</span></a>
-<a name="319"><span class="lineNum">     319 </span><span class="lineCov">      65190 :     }</span></a>
+<a name="318"><span class="lineNum">     318 </span><span class="lineCov">      64322 :         ++m_counter;</span></a>
+<a name="319"><span class="lineNum">     319 </span><span class="lineCov">      64322 :     }</span></a>
 <a name="320"><span class="lineNum">     320 </span><span class="lineCov">        984 :     static std::vector&lt;uint32_t&gt; generate_seeds()</span></a>
 <a name="321"><span class="lineNum">     321 </span>            :     {</a>
 <a name="322"><span class="lineNum">     322 </span><span class="lineCov">        984 :         std::random_device rd;</span></a>
@@ -533,14 +533,14 @@
 <a name="471"><span class="lineNum">     471 </span>            :      * DistributionAdapter&lt;std::uniform_int_distribution&gt;::operator() accepts two integers as well.</a>
 <a name="472"><span class="lineNum">     472 </span>            :      */</a>
 <a name="473"><span class="lineNum">     473 </span>            :     template &lt;class RNG, class... T&gt;</a>
-<a name="474"><span class="lineNum">     474 </span><span class="lineCov">      14445 :     ResultType operator()(RNG&amp; rng, T&amp;&amp;... params)</span></a>
+<a name="474"><span class="lineNum">     474 </span><span class="lineCov">      14427 :     ResultType operator()(RNG&amp; rng, T&amp;&amp;... params)</span></a>
 <a name="475"><span class="lineNum">     475 </span>            :     {</a>
-<a name="476"><span class="lineNum">     476 </span><span class="lineCov">      14445 :         if (m_generator) {</span></a>
+<a name="476"><span class="lineNum">     476 </span><span class="lineCov">      14427 :         if (m_generator) {</span></a>
 <a name="477"><span class="lineNum">     477 </span>            :             //unlikely outside of tests</a>
 <a name="478"><span class="lineNum">     478 </span><span class="lineCov">       4203 :             return m_generator(typename DistT::param_type{std::forward&lt;T&gt;(params)...});</span></a>
 <a name="479"><span class="lineNum">     479 </span>            :         }</a>
 <a name="480"><span class="lineNum">     480 </span>            :         else {</a>
-<a name="481"><span class="lineNum">     481 </span><span class="lineCov">      10242 :             return DistT(std::forward&lt;T&gt;(params)...)(rng);</span></a>
+<a name="481"><span class="lineNum">     481 </span><span class="lineCov">      10224 :             return DistT(std::forward&lt;T&gt;(params)...)(rng);</span></a>
 <a name="482"><span class="lineNum">     482 </span>            :         }</a>
 <a name="483"><span class="lineNum">     483 </span>            :     }</a>
 <a name="484"><span class="lineNum">     484 </span>            : </a>
@@ -566,10 +566,10 @@
 <a name="504"><span class="lineNum">     504 </span>            :      * The generator function of this instance can be replaced</a>
 <a name="505"><span class="lineNum">     505 </span>            :      * for mocking during tests.</a>
 <a name="506"><span class="lineNum">     506 </span>            :      */</a>
-<a name="507"><span class="lineNum">     507 </span><span class="lineCov">      16092 :     static DistributionAdapter&amp; get_instance()</span></a>
+<a name="507"><span class="lineNum">     507 </span><span class="lineCov">      16137 :     static DistributionAdapter&amp; get_instance()</span></a>
 <a name="508"><span class="lineNum">     508 </span>            :     {</a>
-<a name="509"><span class="lineNum">     509 </span><span class="lineCov">      16092 :         static DistributionAdapter instance;</span></a>
-<a name="510"><span class="lineNum">     510 </span><span class="lineCov">      16092 :         return instance;</span></a>
+<a name="509"><span class="lineNum">     509 </span><span class="lineCov">      16137 :         static DistributionAdapter instance;</span></a>
+<a name="510"><span class="lineNum">     510 </span><span class="lineCov">      16137 :         return instance;</span></a>
 <a name="511"><span class="lineNum">     511 </span>            :     }</a>
 <a name="512"><span class="lineNum">     512 </span>            : </a>
 <a name="513"><span class="lineNum">     513 </span>            : private:</a>
@@ -602,14 +602,14 @@
 <a name="540"><span class="lineNum">     540 </span>            : </a>
 <a name="541"><span class="lineNum">     541 </span>            :         param_type() = default;</a>
 <a name="542"><span class="lineNum">     542 </span>            : </a>
-<a name="543"><span class="lineNum">     543 </span><span class="lineCov">       2493 :         param_type(Span&lt;double&gt; weights)</span></a>
-<a name="544"><span class="lineNum">     544 </span><span class="lineCov">       2493 :             : m_weights(weights)</span></a>
+<a name="543"><span class="lineNum">     543 </span><span class="lineCov">       2511 :         param_type(Span&lt;double&gt; weights)</span></a>
+<a name="544"><span class="lineNum">     544 </span><span class="lineCov">       2511 :             : m_weights(weights)</span></a>
 <a name="545"><span class="lineNum">     545 </span>            :         {</a>
-<a name="546"><span class="lineNum">     546 </span><span class="lineCov">       2493 :         }</span></a>
+<a name="546"><span class="lineNum">     546 </span><span class="lineCov">       2511 :         }</span></a>
 <a name="547"><span class="lineNum">     547 </span>            : </a>
-<a name="548"><span class="lineNum">     548 </span><span class="lineCov">       2394 :         Span&lt;double&gt; weights() const</span></a>
+<a name="548"><span class="lineNum">     548 </span><span class="lineCov">       2412 :         Span&lt;double&gt; weights() const</span></a>
 <a name="549"><span class="lineNum">     549 </span>            :         {</a>
-<a name="550"><span class="lineNum">     550 </span><span class="lineCov">       2394 :             return m_weights;</span></a>
+<a name="550"><span class="lineNum">     550 </span><span class="lineCov">       2412 :             return m_weights;</span></a>
 <a name="551"><span class="lineNum">     551 </span>            :         }</a>
 <a name="552"><span class="lineNum">     552 </span>            : </a>
 <a name="553"><span class="lineNum">     553 </span>            :     private:</a>
@@ -625,10 +625,10 @@
 <a name="563"><span class="lineNum">     563 </span>            :     /**</a>
 <a name="564"><span class="lineNum">     564 </span>            :      * distribution with specified weights.</a>
 <a name="565"><span class="lineNum">     565 </span>            :      */</a>
-<a name="566"><span class="lineNum">     566 </span><span class="lineCov">       1044 :     DiscreteDistributionInPlace(Span&lt;double&gt; weights)</span></a>
-<a name="567"><span class="lineNum">     567 </span><span class="lineCov">       1044 :         : m_params(weights)</span></a>
+<a name="566"><span class="lineNum">     566 </span><span class="lineCov">       1062 :     DiscreteDistributionInPlace(Span&lt;double&gt; weights)</span></a>
+<a name="567"><span class="lineNum">     567 </span><span class="lineCov">       1062 :         : m_params(weights)</span></a>
 <a name="568"><span class="lineNum">     568 </span>            :     {</a>
-<a name="569"><span class="lineNum">     569 </span><span class="lineCov">       1044 :     }</span></a>
+<a name="569"><span class="lineNum">     569 </span><span class="lineCov">       1062 :     }</span></a>
 <a name="570"><span class="lineNum">     570 </span>            : </a>
 <a name="571"><span class="lineNum">     571 </span>            :     /**</a>
 <a name="572"><span class="lineNum">     572 </span>            :      * distribution with specified params.</a>
@@ -675,9 +675,9 @@
 <a name="613"><span class="lineNum">     613 </span>            :      * @param rng object of a type that that models UniformRandomBitGenerator concept.</a>
 <a name="614"><span class="lineNum">     614 </span>            :      */</a>
 <a name="615"><span class="lineNum">     615 </span>            :     template &lt;class RNG&gt;</a>
-<a name="616"><span class="lineNum">     616 </span><span class="lineCov">       1044 :     result_type operator()(RNG&amp; rng)</span></a>
+<a name="616"><span class="lineNum">     616 </span><span class="lineCov">       1062 :     result_type operator()(RNG&amp; rng)</span></a>
 <a name="617"><span class="lineNum">     617 </span>            :     {</a>
-<a name="618"><span class="lineNum">     618 </span><span class="lineCov">       1044 :         return (*this)(rng, m_params);</span></a>
+<a name="618"><span class="lineNum">     618 </span><span class="lineCov">       1062 :         return (*this)(rng, m_params);</span></a>
 <a name="619"><span class="lineNum">     619 </span>            :     }</a>
 <a name="620"><span class="lineNum">     620 </span>            : </a>
 <a name="621"><span class="lineNum">     621 </span>            :     /**</a>
@@ -686,20 +686,20 @@
 <a name="624"><span class="lineNum">     624 </span>            :      * @param p parameters of the dstribution.</a>
 <a name="625"><span class="lineNum">     625 </span>            :      */</a>
 <a name="626"><span class="lineNum">     626 </span>            :     template &lt;class RNG&gt;</a>
-<a name="627"><span class="lineNum">     627 </span><span class="lineCov">       2394 :     result_type operator()(RNG&amp; rng, param_type p)</span></a>
+<a name="627"><span class="lineNum">     627 </span><span class="lineCov">       2412 :     result_type operator()(RNG&amp; rng, param_type p)</span></a>
 <a name="628"><span class="lineNum">     628 </span>            :     {</a>
-<a name="629"><span class="lineNum">     629 </span><span class="lineCov">       2394 :         auto weights = p.weights();</span></a>
-<a name="630"><span class="lineNum">     630 </span><span class="lineCov">       2394 :         if (weights.size() &lt;= 1) {</span></a>
-<a name="631"><span class="lineNum">     631 </span><span class="lineCov">        963 :             return 0;</span></a>
+<a name="629"><span class="lineNum">     629 </span><span class="lineCov">       2412 :         auto weights = p.weights();</span></a>
+<a name="630"><span class="lineNum">     630 </span><span class="lineCov">       2412 :         if (weights.size() &lt;= 1) {</span></a>
+<a name="631"><span class="lineNum">     631 </span><span class="lineCov">        972 :             return 0;</span></a>
 <a name="632"><span class="lineNum">     632 </span>            :         }</a>
-<a name="633"><span class="lineNum">     633 </span><span class="lineCov">       1431 :         auto sum = std::accumulate(weights.begin(), weights.end(), 0.0);</span></a>
+<a name="633"><span class="lineNum">     633 </span><span class="lineCov">       1440 :         auto sum = std::accumulate(weights.begin(), weights.end(), 0.0);</span></a>
 <a name="634"><span class="lineNum">     634 </span>            :         auto u =</a>
-<a name="635"><span class="lineNum">     635 </span><span class="lineCov">       1431 :             std::uniform_real_distribution&lt;double&gt;()(rng, std::uniform_real_distribution&lt;double&gt;::param_type{0.0, sum});</span></a>
-<a name="636"><span class="lineNum">     636 </span><span class="lineCov">       1431 :         auto intermediate_sum = 0.0;</span></a>
-<a name="637"><span class="lineNum">     637 </span><span class="lineCov">       4302 :         for (size_t i = 0; i &lt; weights.size(); ++i) {</span></a>
-<a name="638"><span class="lineNum">     638 </span><span class="lineCov">       4302 :             intermediate_sum += weights.get_ptr()[i];</span></a>
-<a name="639"><span class="lineNum">     639 </span><span class="lineCov">       4302 :             if (u &lt; intermediate_sum) {</span></a>
-<a name="640"><span class="lineNum">     640 </span><span class="lineCov">       1431 :                 return i;</span></a>
+<a name="635"><span class="lineNum">     635 </span><span class="lineCov">       1440 :             std::uniform_real_distribution&lt;double&gt;()(rng, std::uniform_real_distribution&lt;double&gt;::param_type{0.0, sum});</span></a>
+<a name="636"><span class="lineNum">     636 </span><span class="lineCov">       1440 :         auto intermediate_sum = 0.0;</span></a>
+<a name="637"><span class="lineNum">     637 </span><span class="lineCov">       4410 :         for (size_t i = 0; i &lt; weights.size(); ++i) {</span></a>
+<a name="638"><span class="lineNum">     638 </span><span class="lineCov">       4410 :             intermediate_sum += weights.get_ptr()[i];</span></a>
+<a name="639"><span class="lineNum">     639 </span><span class="lineCov">       4410 :             if (u &lt; intermediate_sum) {</span></a>
+<a name="640"><span class="lineNum">     640 </span><span class="lineCov">       1440 :                 return i;</span></a>
 <a name="641"><span class="lineNum">     641 </span>            :             }</a>
 <a name="642"><span class="lineNum">     642 </span>            :         }</a>
 <a name="643"><span class="lineNum">     643 </span><span class="lineNoCov">          0 :         assert(false &amp;&amp; &quot;this should never happen.&quot;);</span></a>
diff --git a/coverage/cpp/memilio/utils/span.h.func-sort-c.html b/coverage/cpp/memilio/utils/span.h.func-sort-c.html
index 0bbd9c8cca..bb71c5da48 100644
--- a/coverage/cpp/memilio/utils/span.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/span.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#44">mio::Span&lt;double&gt;::Span&lt;std::array&lt;double, 1ul&gt; &gt;(std::array&lt;double, 1ul&gt; const&amp;)</a></td>
-              <td class="coverFnHi">72</td>
+              <td class="coverFnHi">81</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#44">mio::Span&lt;double&gt;::Span&lt;Eigen::Array&lt;double, -1, 1, 0, -1, 1&gt; &gt;(Eigen::Array&lt;double, -1, 1, 0, -1, 1&gt; const&amp;)</a></td>
@@ -73,23 +73,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#88">mio::Span&lt;double&gt;::end() const</a></td>
-              <td class="coverFnHi">1431</td>
+              <td class="coverFnHi">1440</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#80">mio::Span&lt;double&gt;::begin() const</a></td>
-              <td class="coverFnHi">1431</td>
+              <td class="coverFnHi">1440</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#44">mio::Span&lt;double&gt;::Span&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt; &gt;(std::vector&lt;double, std::allocator&lt;double&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">1476</td>
+              <td class="coverFnHi">1485</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#72">mio::Span&lt;double&gt;::get_ptr() const</a></td>
-              <td class="coverFnHi">4302</td>
+              <td class="coverFnHi">4410</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#96">mio::Span&lt;double&gt;::size() const</a></td>
-              <td class="coverFnHi">6696</td>
+              <td class="coverFnHi">6822</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/span.h.func.html b/coverage/cpp/memilio/utils/span.h.func.html
index ed271e3d15..347e520509 100644
--- a/coverage/cpp/memilio/utils/span.h.func.html
+++ b/coverage/cpp/memilio/utils/span.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#44">mio::Span&lt;double&gt;::Span&lt;std::array&lt;double, 1ul&gt; &gt;(std::array&lt;double, 1ul&gt; const&amp;)</a></td>
-              <td class="coverFnHi">72</td>
+              <td class="coverFnHi">81</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#44">mio::Span&lt;double&gt;::Span&lt;std::array&lt;double, 5ul&gt; &gt;(std::array&lt;double, 5ul&gt; const&amp;)</a></td>
@@ -73,23 +73,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#44">mio::Span&lt;double&gt;::Span&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt; &gt;(std::vector&lt;double, std::allocator&lt;double&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">1476</td>
+              <td class="coverFnHi">1485</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#88">mio::Span&lt;double&gt;::end() const</a></td>
-              <td class="coverFnHi">1431</td>
+              <td class="coverFnHi">1440</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#96">mio::Span&lt;double&gt;::size() const</a></td>
-              <td class="coverFnHi">6696</td>
+              <td class="coverFnHi">6822</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#80">mio::Span&lt;double&gt;::begin() const</a></td>
-              <td class="coverFnHi">1431</td>
+              <td class="coverFnHi">1440</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="span.h.gcov.html#72">mio::Span&lt;double&gt;::get_ptr() const</a></td>
-              <td class="coverFnHi">4302</td>
+              <td class="coverFnHi">4410</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/span.h.gcov.html b/coverage/cpp/memilio/utils/span.h.gcov.html
index 2c6f9f0fd2..17509c875b 100644
--- a/coverage/cpp/memilio/utils/span.h.gcov.html
+++ b/coverage/cpp/memilio/utils/span.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
@@ -105,11 +105,11 @@
 <a name="43"><span class="lineNum">      43 </span>            :      * e.g. std::vector or std::array</a>
 <a name="44"><span class="lineNum">      44 </span>            :      */</a>
 <a name="45"><span class="lineNum">      45 </span>            :     template &lt;class Cont&gt;</a>
-<a name="46"><span class="lineNum">      46 </span><span class="lineCov">       2493 :     Span(const Cont&amp; c)</span></a>
-<a name="47"><span class="lineNum">      47 </span><span class="lineCov">       2493 :         : m_ptr(c.size() == 0 ? nullptr : c.data())</span></a>
-<a name="48"><span class="lineNum">      48 </span><span class="lineCov">       2493 :         , m_size(c.size())</span></a>
+<a name="46"><span class="lineNum">      46 </span><span class="lineCov">       2511 :     Span(const Cont&amp; c)</span></a>
+<a name="47"><span class="lineNum">      47 </span><span class="lineCov">       2511 :         : m_ptr(c.size() == 0 ? nullptr : c.data())</span></a>
+<a name="48"><span class="lineNum">      48 </span><span class="lineCov">       2511 :         , m_size(c.size())</span></a>
 <a name="49"><span class="lineNum">      49 </span>            :     {</a>
-<a name="50"><span class="lineNum">      50 </span><span class="lineCov">       2493 :     }</span></a>
+<a name="50"><span class="lineNum">      50 </span><span class="lineCov">       2511 :     }</span></a>
 <a name="51"><span class="lineNum">      51 </span>            : </a>
 <a name="52"><span class="lineNum">      52 </span>            :     /**</a>
 <a name="53"><span class="lineNum">      53 </span>            :      * construct from a c array.</a>
@@ -133,33 +133,33 @@
 <a name="71"><span class="lineNum">      71 </span>            :     /**</a>
 <a name="72"><span class="lineNum">      72 </span>            :      * get the adress of the beginning of array.</a>
 <a name="73"><span class="lineNum">      73 </span>            :      */</a>
-<a name="74"><span class="lineNum">      74 </span><span class="lineCov">       4302 :     const T* get_ptr() const</span></a>
+<a name="74"><span class="lineNum">      74 </span><span class="lineCov">       4410 :     const T* get_ptr() const</span></a>
 <a name="75"><span class="lineNum">      75 </span>            :     {</a>
-<a name="76"><span class="lineNum">      76 </span><span class="lineCov">       4302 :         return m_ptr;</span></a>
+<a name="76"><span class="lineNum">      76 </span><span class="lineCov">       4410 :         return m_ptr;</span></a>
 <a name="77"><span class="lineNum">      77 </span>            :     }</a>
 <a name="78"><span class="lineNum">      78 </span>            : </a>
 <a name="79"><span class="lineNum">      79 </span>            :     /**</a>
 <a name="80"><span class="lineNum">      80 </span>            :      * get an iterator to the first element.</a>
 <a name="81"><span class="lineNum">      81 </span>            :      */</a>
-<a name="82"><span class="lineNum">      82 </span><span class="lineCov">       1431 :     const T* begin() const</span></a>
+<a name="82"><span class="lineNum">      82 </span><span class="lineCov">       1440 :     const T* begin() const</span></a>
 <a name="83"><span class="lineNum">      83 </span>            :     {</a>
-<a name="84"><span class="lineNum">      84 </span><span class="lineCov">       1431 :         return m_ptr;</span></a>
+<a name="84"><span class="lineNum">      84 </span><span class="lineCov">       1440 :         return m_ptr;</span></a>
 <a name="85"><span class="lineNum">      85 </span>            :     }</a>
 <a name="86"><span class="lineNum">      86 </span>            : </a>
 <a name="87"><span class="lineNum">      87 </span>            :     /**</a>
 <a name="88"><span class="lineNum">      88 </span>            :      * get an iterator to one past the last element.</a>
 <a name="89"><span class="lineNum">      89 </span>            :      */</a>
-<a name="90"><span class="lineNum">      90 </span><span class="lineCov">       1431 :     const T* end() const</span></a>
+<a name="90"><span class="lineNum">      90 </span><span class="lineCov">       1440 :     const T* end() const</span></a>
 <a name="91"><span class="lineNum">      91 </span>            :     {</a>
-<a name="92"><span class="lineNum">      92 </span><span class="lineCov">       1431 :         return m_ptr + m_size;</span></a>
+<a name="92"><span class="lineNum">      92 </span><span class="lineCov">       1440 :         return m_ptr + m_size;</span></a>
 <a name="93"><span class="lineNum">      93 </span>            :     }</a>
 <a name="94"><span class="lineNum">      94 </span>            : </a>
 <a name="95"><span class="lineNum">      95 </span>            :     /**</a>
 <a name="96"><span class="lineNum">      96 </span>            :      * get the number of elements in the array</a>
 <a name="97"><span class="lineNum">      97 </span>            :      */</a>
-<a name="98"><span class="lineNum">      98 </span><span class="lineCov">       6696 :     size_t size() const</span></a>
+<a name="98"><span class="lineNum">      98 </span><span class="lineCov">       6822 :     size_t size() const</span></a>
 <a name="99"><span class="lineNum">      99 </span>            :     {</a>
-<a name="100"><span class="lineNum">     100 </span><span class="lineCov">       6696 :         return m_size;</span></a>
+<a name="100"><span class="lineNum">     100 </span><span class="lineCov">       6822 :         return m_size;</span></a>
 <a name="101"><span class="lineNum">     101 </span>            :     }</a>
 <a name="102"><span class="lineNum">     102 </span>            : </a>
 <a name="103"><span class="lineNum">     103 </span>            : private:</a>
diff --git a/coverage/cpp/memilio/utils/stl_util.h.func-sort-c.html b/coverage/cpp/memilio/utils/stl_util.h.func-sort-c.html
index 14c4204b8c..339330890a 100644
--- a/coverage/cpp/memilio/utils/stl_util.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/stl_util.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">443</td>
@@ -1455,10 +1455,6 @@
               <td class="coverFn"><a href="stl_util.h.gcov.html#66">std::vector&lt;mio::abm::Trip, std::allocator&lt;mio::abm::Trip&gt; &gt;::iterator mio::insert_sorted_replace&lt;mio::abm::Trip, mio::abm::TripList::add_trip(mio::abm::Trip, bool)::{lambda(auto:1&amp;, auto:2&amp;)#1}&gt;(std::vector&lt;mio::abm::Trip, std::allocator&lt;mio::abm::Trip&gt; &gt;&amp;, mio::abm::Trip const&amp;, mio::abm::TripList::add_trip(mio::abm::Trip, bool)::{lambda(auto:1&amp;, auto:2&amp;)#1})</a></td>
               <td class="coverFnHi">162</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="stl_util.h.gcov.html#112">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::operator[](unsigned long) const</a></td>
-              <td class="coverFnHi">162</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#66">std::vector&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;, std::allocator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;::iterator mio::insert_sorted_replace&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;, mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt;::add_(mio::Damping&lt;mio::ColumnVectorShape&gt; const&amp;)::{lambda(auto:1&amp;, auto:2&amp;)#1}&gt;(std::vector&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;, std::allocator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt;&amp;, mio::Damping&lt;mio::ColumnVectorShape&gt; const&amp;, mio::Dampings&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt;::add_(mio::Damping&lt;mio::ColumnVectorShape&gt; const&amp;)::{lambda(auto:1&amp;, auto:2&amp;)#1})</a></td>
               <td class="coverFnHi">165</td>
@@ -1479,6 +1475,10 @@
               <td class="coverFn"><a href="stl_util.h.gcov.html#66">std::vector&lt;mio::Edge&lt;int&gt;, std::allocator&lt;mio::Edge&lt;int&gt; &gt; &gt;::iterator mio::insert_sorted_replace&lt;mio::Edge&lt;int&gt;, mio::Graph&lt;int, int&gt;::add_edge&lt;int&gt;(unsigned long, unsigned long, int&amp;&amp;)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#1}&gt;(std::vector&lt;mio::Edge&lt;int&gt;, std::allocator&lt;mio::Edge&lt;int&gt; &gt; &gt;&amp;, mio::Edge&lt;int&gt; const&amp;, mio::Graph&lt;int, int&gt;::add_edge&lt;int&gt;(unsigned long, unsigned long, int&amp;&amp;)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#1})</a></td>
               <td class="coverFnHi">171</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="stl_util.h.gcov.html#112">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::operator[](unsigned long) const</a></td>
+              <td class="coverFnHi">171</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;*, std::vector&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;, std::allocator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;*, std::vector&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;, std::allocator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;*, std::vector&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;, std::allocator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;*, std::vector&lt;mio::Damping&lt;mio::ColumnVectorShape&gt;, std::allocator&lt;mio::Damping&lt;mio::ColumnVectorShape&gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
               <td class="coverFnHi">175</td>
@@ -1655,10 +1655,6 @@
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;int&gt;*, std::vector&lt;mio::Edge&lt;int&gt;, std::allocator&lt;mio::Edge&lt;int&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;int&gt;*, std::vector&lt;mio::Edge&lt;int&gt;, std::allocator&lt;mio::Edge&lt;int&gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
               <td class="coverFnHi">441</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">450</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::RectMatrixShape&gt;*, std::vector&lt;mio::Damping&lt;mio::RectMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::RectMatrixShape&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::RectMatrixShape&gt;*, std::vector&lt;mio::Damping&lt;mio::RectMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::RectMatrixShape&gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
               <td class="coverFnHi">455</td>
@@ -1695,6 +1691,10 @@
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::RectMatrixShape&gt; const*, std::vector&lt;mio::Damping&lt;mio::RectMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::RectMatrixShape&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::RectMatrixShape&gt; const*, std::vector&lt;mio::Damping&lt;mio::RectMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::RectMatrixShape&gt; &gt; &gt; &gt; &gt; &gt;::begin() const</a></td>
               <td class="coverFnHi">462</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
+              <td class="coverFnHi">468</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::abm::Person const*, std::vector&lt;mio::abm::Person, std::allocator&lt;mio::abm::Person&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::abm::Person const*, std::vector&lt;mio::abm::Person, std::allocator&lt;mio::abm::Person&gt; &gt; &gt; &gt; &gt;::end() const</a></td>
               <td class="coverFnHi">477</td>
@@ -1761,19 +1761,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#161">auto mio::make_range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#104">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::Range(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt;)</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;*, std::vector&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;*, std::vector&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;*, std::vector&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;*, std::vector&lt;mio::Damping&lt;mio::SquareMatrixShape&gt;, std::allocator&lt;mio::Damping&lt;mio::SquareMatrixShape&gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
@@ -1840,12 +1840,12 @@
               <td class="coverFnHi">1062</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="stl_util.h.gcov.html#124">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::size() const</a></td>
+              <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;int&gt;*, std::vector&lt;mio::Node&lt;int&gt;, std::allocator&lt;mio::Node&lt;int&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;int&gt;*, std::vector&lt;mio::Node&lt;int&gt;, std::allocator&lt;mio::Node&lt;int&gt; &gt; &gt; &gt; &gt; &gt;::begin() const</a></td>
               <td class="coverFnHi">1062</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;int&gt;*, std::vector&lt;mio::Node&lt;int&gt;, std::allocator&lt;mio::Node&lt;int&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;int&gt;*, std::vector&lt;mio::Node&lt;int&gt;, std::allocator&lt;mio::Node&lt;int&gt; &gt; &gt; &gt; &gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">1062</td>
+              <td class="coverFn"><a href="stl_util.h.gcov.html#124">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::size() const</a></td>
+              <td class="coverFnHi">1089</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#201">mio::details::string_length(char const*)</a></td>
@@ -1857,7 +1857,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">10152</td>
+              <td class="coverFnHi">10179</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdge&lt;double&gt; &gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdge&lt;double&gt; &gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdge&lt;double&gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdge&lt;double&gt; &gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdge&lt;double&gt; &gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdge&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
@@ -1893,7 +1893,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, mio::TimeSeriesTimeIterator&lt;double, true&gt; &gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">96806</td>
+              <td class="coverFnHi">96815</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;std::reverse_iterator&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt; &gt;, std::reverse_iterator&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt; &gt; &gt; &gt;::begin() const</a></td>
@@ -1933,7 +1933,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#112">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::operator[](unsigned long) const</a></td>
-              <td class="coverFnHi">110205</td>
+              <td class="coverFnHi">110295</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::FlowSimulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
@@ -1953,23 +1953,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#161">auto mio::make_range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#104">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::Range(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;)</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, mio::TimeSeriesTimeIterator&lt;double, true&gt; &gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">183262</td>
+              <td class="coverFnHi">183388</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;std::reverse_iterator&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt; &gt;, std::reverse_iterator&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt; &gt; &gt;(std::reverse_iterator&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt; &gt;&amp;&amp;, std::reverse_iterator&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt; &gt;&amp;&amp;)</a></td>
diff --git a/coverage/cpp/memilio/utils/stl_util.h.func.html b/coverage/cpp/memilio/utils/stl_util.h.func.html
index b227614fef..6eee6fc473 100644
--- a/coverage/cpp/memilio/utils/stl_util.h.func.html
+++ b/coverage/cpp/memilio/utils/stl_util.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">443</td>
@@ -117,7 +117,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
@@ -129,7 +129,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#167">auto mio::make_range&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;(__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
@@ -313,7 +313,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#161">auto mio::make_range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#161">auto mio::make_range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt; &gt; &gt;(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
@@ -325,7 +325,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#161">auto mio::make_range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#161">auto mio::make_range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;&amp;&amp;)</a></td>
@@ -653,7 +653,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#104">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::Range(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt;)</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#104">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt; &gt; &gt;::Range(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt; &gt;)</a></td>
@@ -665,7 +665,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#104">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::Range(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;)</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#104">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::Range(std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;)</a></td>
@@ -1573,7 +1573,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">450</td>
+              <td class="coverFnHi">468</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#124">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::size() const</a></td>
@@ -1581,11 +1581,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">612</td>
+              <td class="coverFnHi">639</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#112">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;*, std::vector&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt;, std::allocator&lt;mio::Edge&lt;mio::MobilityEdgeStochastic&gt; &gt; &gt; &gt; &gt; &gt;::operator[](unsigned long) const</a></td>
-              <td class="coverFnHi">162</td>
+              <td class="coverFnHi">171</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;*, std::vector&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt;, std::allocator&lt;mio::Edge&lt;TestGraph_graph_without_edges_Test::TestBody()::MockMobility&gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
@@ -1613,19 +1613,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">10152</td>
+              <td class="coverFnHi">10179</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#124">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::size() const</a></td>
-              <td class="coverFnHi">1062</td>
+              <td class="coverFnHi">1089</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">120357</td>
+              <td class="coverFnHi">120474</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#112">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::oseir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::operator[](unsigned long) const</a></td>
-              <td class="coverFnHi">110205</td>
+              <td class="coverFnHi">110295</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;__gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;*, std::vector&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt;, std::allocator&lt;mio::Node&lt;mio::SimulationNode&lt;mio::Simulation&lt;double, mio::osecir::Model&lt;double&gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt;::end() const</a></td>
@@ -1909,11 +1909,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, mio::TimeSeriesTimeIterator&lt;double, true&gt; &gt; &gt;::end() const</a></td>
-              <td class="coverFnHi">96806</td>
+              <td class="coverFnHi">96815</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#129">mio::Range&lt;std::pair&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, mio::TimeSeriesTimeIterator&lt;double, true&gt; &gt; &gt;::begin() const</a></td>
-              <td class="coverFnHi">183262</td>
+              <td class="coverFnHi">183388</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="stl_util.h.gcov.html#134">mio::Range&lt;std::pair&lt;mio::TimeSeriesTimeIterator&lt;float, false&gt;, mio::TimeSeriesTimeIterator&lt;float, false&gt; &gt; &gt;::end() const</a></td>
diff --git a/coverage/cpp/memilio/utils/stl_util.h.gcov.html b/coverage/cpp/memilio/utils/stl_util.h.gcov.html
index ca45df14b3..9adf6620e9 100644
--- a/coverage/cpp/memilio/utils/stl_util.h.gcov.html
+++ b/coverage/cpp/memilio/utils/stl_util.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">443</td>
@@ -165,19 +165,19 @@
 <a name="103"><span class="lineNum">     103 </span>            :     using value_type             = typename std::iterator_traits&lt;iterator&gt;::value_type;</a>
 <a name="104"><span class="lineNum">     104 </span>            :     using reference              = typename std::iterator_traits&lt;iterator&gt;::reference;</a>
 <a name="105"><span class="lineNum">     105 </span>            : </a>
-<a name="106"><span class="lineNum">     106 </span><span class="lineCov">     894789 :     Range(IterPair iter_pair)</span></a>
-<a name="107"><span class="lineNum">     107 </span><span class="lineCov">     894789 :         : m_iter_pair(iter_pair)</span></a>
+<a name="106"><span class="lineNum">     106 </span><span class="lineCov">     894933 :     Range(IterPair iter_pair)</span></a>
+<a name="107"><span class="lineNum">     107 </span><span class="lineCov">     894933 :         : m_iter_pair(iter_pair)</span></a>
 <a name="108"><span class="lineNum">     108 </span>            :     {</a>
-<a name="109"><span class="lineNum">     109 </span><span class="lineCov">     894789 :     }</span></a>
+<a name="109"><span class="lineNum">     109 </span><span class="lineCov">     894933 :     }</span></a>
 <a name="110"><span class="lineNum">     110 </span>            : </a>
 <a name="111"><span class="lineNum">     111 </span>            :     /** @brief index operator.</a>
 <a name="112"><span class="lineNum">     112 </span>            :      * constant complexity if random access iterator, linear otherwise</a>
 <a name="113"><span class="lineNum">     113 </span>            :      */</a>
-<a name="114"><span class="lineNum">     114 </span><span class="lineCov">     220925 :     reference operator[](size_t idx) const</span></a>
+<a name="114"><span class="lineNum">     114 </span><span class="lineCov">     221024 :     reference operator[](size_t idx) const</span></a>
 <a name="115"><span class="lineNum">     115 </span>            :     {</a>
-<a name="116"><span class="lineNum">     116 </span><span class="lineCov">     220925 :         auto it = begin();</span></a>
-<a name="117"><span class="lineNum">     117 </span><span class="lineCov">     220925 :         std::advance(it, idx);</span></a>
-<a name="118"><span class="lineNum">     118 </span><span class="lineCov">     220925 :         return *it;</span></a>
+<a name="116"><span class="lineNum">     116 </span><span class="lineCov">     221024 :         auto it = begin();</span></a>
+<a name="117"><span class="lineNum">     117 </span><span class="lineCov">     221024 :         std::advance(it, idx);</span></a>
+<a name="118"><span class="lineNum">     118 </span><span class="lineCov">     221024 :         return *it;</span></a>
 <a name="119"><span class="lineNum">     119 </span>            :     }</a>
 <a name="120"><span class="lineNum">     120 </span>            : </a>
 <a name="121"><span class="lineNum">     121 </span>            :     reference back() const</a>
@@ -185,19 +185,19 @@
 <a name="123"><span class="lineNum">     123 </span>            :         return *(--end());</a>
 <a name="124"><span class="lineNum">     124 </span>            :     }</a>
 <a name="125"><span class="lineNum">     125 </span>            : </a>
-<a name="126"><span class="lineNum">     126 </span><span class="lineCov">     112388 :     size_t size() const</span></a>
+<a name="126"><span class="lineNum">     126 </span><span class="lineCov">     112415 :     size_t size() const</span></a>
 <a name="127"><span class="lineNum">     127 </span>            :     {</a>
-<a name="128"><span class="lineNum">     128 </span><span class="lineCov">     112388 :         return static_cast&lt;size_t&gt;(std::distance(begin(), end()));</span></a>
+<a name="128"><span class="lineNum">     128 </span><span class="lineCov">     112415 :         return static_cast&lt;size_t&gt;(std::distance(begin(), end()));</span></a>
 <a name="129"><span class="lineNum">     129 </span>            :     }</a>
 <a name="130"><span class="lineNum">     130 </span>            : </a>
-<a name="131"><span class="lineNum">     131 </span><span class="lineCov">     880936 :     auto begin() const</span></a>
+<a name="131"><span class="lineNum">     131 </span><span class="lineCov">     881206 :     auto begin() const</span></a>
 <a name="132"><span class="lineNum">     132 </span>            :     {</a>
-<a name="133"><span class="lineNum">     133 </span><span class="lineCov">     880936 :         return m_iter_pair.first;</span></a>
+<a name="133"><span class="lineNum">     133 </span><span class="lineCov">     881206 :         return m_iter_pair.first;</span></a>
 <a name="134"><span class="lineNum">     134 </span>            :     }</a>
 <a name="135"><span class="lineNum">     135 </span>            : </a>
-<a name="136"><span class="lineNum">     136 </span><span class="lineCov">     575688 :     auto end() const</span></a>
+<a name="136"><span class="lineNum">     136 </span><span class="lineCov">     575742 :     auto end() const</span></a>
 <a name="137"><span class="lineNum">     137 </span>            :     {</a>
-<a name="138"><span class="lineNum">     138 </span><span class="lineCov">     575688 :         return m_iter_pair.second;</span></a>
+<a name="138"><span class="lineNum">     138 </span><span class="lineCov">     575742 :         return m_iter_pair.second;</span></a>
 <a name="139"><span class="lineNum">     139 </span>            :     }</a>
 <a name="140"><span class="lineNum">     140 </span>            : </a>
 <a name="141"><span class="lineNum">     141 </span>            :     template &lt;class T = typename std::iterator_traits&lt;iterator&gt;::iterator_category,</a>
@@ -222,15 +222,15 @@
 <a name="160"><span class="lineNum">     160 </span>            :  * @brief factories for template argument deduction</a>
 <a name="161"><span class="lineNum">     161 </span>            :  */</a>
 <a name="162"><span class="lineNum">     162 </span>            : template &lt;class IterPair&gt;</a>
-<a name="163"><span class="lineNum">     163 </span><span class="lineCov">     893291 : auto make_range(IterPair&amp;&amp; p)</span></a>
+<a name="163"><span class="lineNum">     163 </span><span class="lineCov">     893435 : auto make_range(IterPair&amp;&amp; p)</span></a>
 <a name="164"><span class="lineNum">     164 </span>            : {</a>
-<a name="165"><span class="lineNum">     165 </span><span class="lineCov">     893291 :     return Range&lt;std::remove_reference_t&lt;std::remove_cv_t&lt;IterPair&gt;&gt;&gt;{p};</span></a>
+<a name="165"><span class="lineNum">     165 </span><span class="lineCov">     893435 :     return Range&lt;std::remove_reference_t&lt;std::remove_cv_t&lt;IterPair&gt;&gt;&gt;{p};</span></a>
 <a name="166"><span class="lineNum">     166 </span>            : }</a>
 <a name="167"><span class="lineNum">     167 </span>            : </a>
 <a name="168"><span class="lineNum">     168 </span>            : template &lt;class Iter1, class Iter2&gt;</a>
-<a name="169"><span class="lineNum">     169 </span><span class="lineCov">     893163 : auto make_range(Iter1&amp;&amp; iter1, Iter2&amp;&amp; iter2)</span></a>
+<a name="169"><span class="lineNum">     169 </span><span class="lineCov">     893307 : auto make_range(Iter1&amp;&amp; iter1, Iter2&amp;&amp; iter2)</span></a>
 <a name="170"><span class="lineNum">     170 </span>            : {</a>
-<a name="171"><span class="lineNum">     171 </span><span class="lineCov">     893163 :     return make_range(std::make_pair(iter1, iter2));</span></a>
+<a name="171"><span class="lineNum">     171 </span><span class="lineCov">     893307 :     return make_range(std::make_pair(iter1, iter2));</span></a>
 <a name="172"><span class="lineNum">     172 </span>            : }</a>
 <a name="173"><span class="lineNum">     173 </span>            : </a>
 <a name="174"><span class="lineNum">     174 </span>            : /**</a>
diff --git a/coverage/cpp/memilio/utils/time_series.h.func-sort-c.html b/coverage/cpp/memilio/utils/time_series.h.func-sort-c.html
index 3345fa720f..bcf8e84c3b 100644
--- a/coverage/cpp/memilio/utils/time_series.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/time_series.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">205</td>
@@ -579,6 +579,10 @@
               <td class="coverFn"><a href="time_series.h.gcov.html#749">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesValueIterator&lt;double, false&gt;, double, false, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, Eigen::VectorBlock&lt;Eigen::Block&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, -1, 1, true&gt;, -1&gt; &gt;::operator!=(mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesValueIterator&lt;double, false&gt;, double, false, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, Eigen::VectorBlock&lt;Eigen::Block&lt;Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;, -1, 1, true&gt;, -1&gt; &gt; const&amp;) const</a></td>
               <td class="coverFnHi">513</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="time_series.h.gcov.html#124">auto mio::TimeSeries&lt;double&gt;::TimeSeries(std::vector&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt;, std::allocator&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt; &gt; &gt;)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#2}::operator()&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;&gt;(std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;) const</a></td>
+              <td class="coverFnHi">558</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#241">Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; mio::TimeSeries&lt;double&gt;::add_time_point&lt;Eigen::Transpose&lt;Eigen::Map&lt;Eigen::Matrix&lt;double, -1, -1, 1, -1, -1&gt;, 0, Eigen::Stride&lt;-1, -1&gt; &gt; &gt; &gt;(double, Eigen::Transpose&lt;Eigen::Map&lt;Eigen::Matrix&lt;double, -1, -1, 1, -1, -1&gt;, 0, Eigen::Stride&lt;-1, -1&gt; &gt; &gt;&amp;&amp;)</a></td>
               <td class="coverFnHi">576</td>
@@ -587,10 +591,6 @@
               <td class="coverFn"><a href="time_series.h.gcov.html#241">Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; mio::TimeSeries&lt;double&gt;::add_time_point&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;&gt;(double, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&amp;)</a></td>
               <td class="coverFnHi">684</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="time_series.h.gcov.html#124">auto mio::TimeSeries&lt;double&gt;::TimeSeries(std::vector&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt;, std::allocator&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt; &gt; &gt;)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#2}::operator()&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;&gt;(std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;) const</a></td>
-              <td class="coverFnHi">693</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#241">Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; mio::TimeSeries&lt;double&gt;::add_time_point&lt;Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&gt;(double, Eigen::CwiseNullaryOp&lt;Eigen::internal::scalar_constant_op&lt;double&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; &gt; const&amp;&amp;)</a></td>
               <td class="coverFnHi">887</td>
@@ -629,15 +629,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#679">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator+=(long)</a></td>
-              <td class="coverFnHi">35397</td>
+              <td class="coverFnHi">35100</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#839">mio::TimeSeriesTimeIterator&lt;double, true&gt;::get_reference() const</a></td>
-              <td class="coverFnHi">36571</td>
+              <td class="coverFnHi">36274</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#663">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator*() const</a></td>
-              <td class="coverFnHi">36571</td>
+              <td class="coverFnHi">36274</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#854">decltype ((((declval&lt;mio::TimeSeries&lt;double&gt;&amp;&gt;)()).rend)()) mio::find_value_reverse&lt;mio::TimeSeries&lt;double&gt;&amp;, double&gt;(mio::TimeSeries&lt;double&gt;&amp;, double, double, double)</a></td>
@@ -721,11 +721,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#717">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator++()</a></td>
-              <td class="coverFnHi">94776</td>
+              <td class="coverFnHi">95415</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#743">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator==(mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">96644</td>
+              <td class="coverFnHi">96653</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#252">mio::TimeSeries&lt;double&gt;::remove_time_point(long)</a></td>
@@ -753,7 +753,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#218">mio::TimeSeries&lt;double&gt;::add_time_point()</a></td>
-              <td class="coverFnHi">112167</td>
+              <td class="coverFnHi">114858</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#136">mio::TimeSeries&lt;double&gt;::TimeSeries(mio::TimeSeries&lt;double&gt; const&amp;)</a></td>
@@ -761,7 +761,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#274">mio::TimeSeries&lt;double&gt;::get_time(long) const</a></td>
-              <td class="coverFnHi">136268</td>
+              <td class="coverFnHi">136520</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#730">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt;, double, false, double, double&amp;&gt;::operator--()</a></td>
@@ -769,11 +769,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#317">mio::TimeSeries&lt;double&gt;::get_last_value() const</a></td>
-              <td class="coverFnHi">164732</td>
+              <td class="coverFnHi">164615</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#712">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator-(mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">173272</td>
+              <td class="coverFnHi">173398</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#644">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::TimeSeriesIteratorBase(Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt; const*, long)</a></td>
@@ -801,7 +801,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#295">mio::TimeSeries&lt;double&gt;::get_value(long) const</a></td>
-              <td class="coverFnHi">325620</td>
+              <td class="coverFnHi">325746</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#644">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, false&gt;, double, false, double, double&amp;&gt;::TimeSeriesIteratorBase(Eigen::Matrix&lt;double, -1, -1, 0, -1, -1&gt;*, long)</a></td>
@@ -809,7 +809,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#309">mio::TimeSeries&lt;double&gt;::operator[](long)</a></td>
-              <td class="coverFnHi">500003</td>
+              <td class="coverFnHi">505943</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#283">mio::TimeSeries&lt;float&gt;::get_last_time()</a></td>
@@ -861,43 +861,43 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#567">mio::TimeSeries&lt;double&gt;::add_time_point_noinit()</a></td>
-              <td class="coverFnHi">1366491</td>
+              <td class="coverFnHi">1369182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#283">mio::TimeSeries&lt;double&gt;::get_last_time()</a></td>
-              <td class="coverFnHi">1426538</td>
+              <td class="coverFnHi">1429247</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#329">mio::TimeSeries&lt;double&gt;::reserve(long)</a></td>
-              <td class="coverFnHi">1577139</td>
+              <td class="coverFnHi">1579848</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#340">mio::TimeSeries&lt;double&gt;::get_capacity() const</a></td>
-              <td class="coverFnHi">1577256</td>
+              <td class="coverFnHi">1579965</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#269">mio::TimeSeries&lt;double&gt;::get_time(long)</a></td>
-              <td class="coverFnHi">1645598</td>
+              <td class="coverFnHi">1648307</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#321">mio::TimeSeries&lt;double&gt;::get_last_value()</a></td>
-              <td class="coverFnHi">2187653</td>
+              <td class="coverFnHi">2190434</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#194">mio::TimeSeries&lt;double&gt;::get_num_time_points() const</a></td>
-              <td class="coverFnHi">2584416</td>
+              <td class="coverFnHi">2589834</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#300">mio::TimeSeries&lt;double&gt;::get_value(long)</a></td>
-              <td class="coverFnHi">3064279</td>
+              <td class="coverFnHi">3075655</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#202">mio::TimeSeries&lt;double&gt;::get_num_elements() const</a></td>
-              <td class="coverFnHi">3759265</td>
+              <td class="coverFnHi">3770767</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#210">mio::TimeSeries&lt;double&gt;::get_num_rows() const</a></td>
-              <td class="coverFnHi">3759310</td>
+              <td class="coverFnHi">3770812</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/time_series.h.func.html b/coverage/cpp/memilio/utils/time_series.h.func.html
index f91a3481fe..a9bf313db6 100644
--- a/coverage/cpp/memilio/utils/time_series.h.func.html
+++ b/coverage/cpp/memilio/utils/time_series.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">205</td>
@@ -113,7 +113,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#283">mio::TimeSeries&lt;double&gt;::get_last_time()</a></td>
-              <td class="coverFnHi">1426538</td>
+              <td class="coverFnHi">1429247</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#228">mio::TimeSeries&lt;double&gt;::add_time_point(double)</a></td>
@@ -121,7 +121,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#218">mio::TimeSeries&lt;double&gt;::add_time_point()</a></td>
-              <td class="coverFnHi">112167</td>
+              <td class="coverFnHi">114858</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#241">Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt; mio::TimeSeries&lt;double&gt;::add_time_point&lt;Eigen::CwiseBinaryOp&lt;Eigen::internal::scalar_sum_op&lt;double, double&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&gt; const&gt;(double, Eigen::CwiseBinaryOp&lt;Eigen::internal::scalar_sum_op&lt;double, double&gt;, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const&gt; const&amp;&amp;)</a></td>
@@ -181,7 +181,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#321">mio::TimeSeries&lt;double&gt;::get_last_value()</a></td>
-              <td class="coverFnHi">2187653</td>
+              <td class="coverFnHi">2190434</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#573">mio::TimeSeries&lt;double&gt;::get_valid_block()</a></td>
@@ -197,7 +197,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#567">mio::TimeSeries&lt;double&gt;::add_time_point_noinit()</a></td>
-              <td class="coverFnHi">1366491</td>
+              <td class="coverFnHi">1369182</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#261">mio::TimeSeries&lt;double&gt;::remove_last_time_point()</a></td>
@@ -233,11 +233,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#329">mio::TimeSeries&lt;double&gt;::reserve(long)</a></td>
-              <td class="coverFnHi">1577139</td>
+              <td class="coverFnHi">1579848</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#269">mio::TimeSeries&lt;double&gt;::get_time(long)</a></td>
-              <td class="coverFnHi">1645598</td>
+              <td class="coverFnHi">1648307</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#450">mio::TimeSeries&lt;double&gt;::get_times()</a></td>
@@ -245,7 +245,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#300">mio::TimeSeries&lt;double&gt;::get_value(long)</a></td>
-              <td class="coverFnHi">3064279</td>
+              <td class="coverFnHi">3075655</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#178">mio::TimeSeries&lt;double&gt;::TimeSeries(mio::TimeSeries&lt;double&gt;&amp;&amp;)</a></td>
@@ -289,7 +289,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#309">mio::TimeSeries&lt;double&gt;::operator[](long)</a></td>
-              <td class="coverFnHi">500003</td>
+              <td class="coverFnHi">505943</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#283">mio::TimeSeries&lt;float&gt;::get_last_time()</a></td>
@@ -425,7 +425,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#679">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator+=(long)</a></td>
-              <td class="coverFnHi">35397</td>
+              <td class="coverFnHi">35100</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#723">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator++(int)</a></td>
@@ -433,7 +433,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#717">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator++()</a></td>
-              <td class="coverFnHi">94776</td>
+              <td class="coverFnHi">95415</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#644">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;float, false&gt;, float, false, float, float&amp;&gt;::TimeSeriesIteratorBase(Eigen::Matrix&lt;float, -1, -1, 0, -1, -1&gt;*, long)</a></td>
@@ -569,11 +569,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#340">mio::TimeSeries&lt;double&gt;::get_capacity() const</a></td>
-              <td class="coverFnHi">1577256</td>
+              <td class="coverFnHi">1579965</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#210">mio::TimeSeries&lt;double&gt;::get_num_rows() const</a></td>
-              <td class="coverFnHi">3759310</td>
+              <td class="coverFnHi">3770812</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#287">mio::TimeSeries&lt;double&gt;::get_last_time() const</a></td>
@@ -581,7 +581,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#317">mio::TimeSeries&lt;double&gt;::get_last_value() const</a></td>
-              <td class="coverFnHi">164732</td>
+              <td class="coverFnHi">164615</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#460">mio::TimeSeries&lt;double&gt;::get_const_times() const</a></td>
@@ -593,11 +593,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#202">mio::TimeSeries&lt;double&gt;::get_num_elements() const</a></td>
-              <td class="coverFnHi">3759265</td>
+              <td class="coverFnHi">3770767</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#194">mio::TimeSeries&lt;double&gt;::get_num_time_points() const</a></td>
-              <td class="coverFnHi">2584416</td>
+              <td class="coverFnHi">2589834</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#182">mio::TimeSeries&lt;double&gt;::is_strictly_monotonic() const</a></td>
@@ -617,7 +617,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#274">mio::TimeSeries&lt;double&gt;::get_time(long) const</a></td>
-              <td class="coverFnHi">136268</td>
+              <td class="coverFnHi">136520</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#455">mio::TimeSeries&lt;double&gt;::get_times() const</a></td>
@@ -625,7 +625,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#295">mio::TimeSeries&lt;double&gt;::get_value(long) const</a></td>
-              <td class="coverFnHi">325620</td>
+              <td class="coverFnHi">325746</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#541">void mio::TimeSeries&lt;double&gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -689,7 +689,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#839">mio::TimeSeriesTimeIterator&lt;double, true&gt;::get_reference() const</a></td>
-              <td class="coverFnHi">36571</td>
+              <td class="coverFnHi">36274</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#839">mio::TimeSeriesTimeIterator&lt;float, false&gt;::get_reference() const</a></td>
@@ -733,15 +733,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#663">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator*() const</a></td>
-              <td class="coverFnHi">36571</td>
+              <td class="coverFnHi">36274</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#743">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator==(mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">96644</td>
+              <td class="coverFnHi">96653</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#712">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator-(mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">173272</td>
+              <td class="coverFnHi">173398</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#749">mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt;::operator!=(mio::details::TimeSeriesIteratorBase&lt;mio::TimeSeriesTimeIterator&lt;double, true&gt;, double, true, double, double const&amp;&gt; const&amp;) const</a></td>
@@ -889,7 +889,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#124">auto mio::TimeSeries&lt;double&gt;::TimeSeries(std::vector&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt;, std::allocator&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt; &gt; &gt;)::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#2}::operator()&lt;std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;&gt;(std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;, std::vector&lt;double, std::allocator&lt;double&gt; &gt;&amp;) const</a></td>
-              <td class="coverFnHi">693</td>
+              <td class="coverFnHi">558</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time_series.h.gcov.html#856">auto mio::find_value_reverse&lt;mio::TimeSeries&lt;double&gt;&amp;, double&gt;(mio::TimeSeries&lt;double&gt;&amp;, double, double, double)::{lambda(auto:1)#1}::operator()&lt;double&gt;(double) const</a></td>
diff --git a/coverage/cpp/memilio/utils/time_series.h.gcov.html b/coverage/cpp/memilio/utils/time_series.h.gcov.html
index ae6cba5420..08a5cc310f 100644
--- a/coverage/cpp/memilio/utils/time_series.h.gcov.html
+++ b/coverage/cpp/memilio/utils/time_series.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">205</td>
@@ -186,7 +186,7 @@
 <a name="124"><span class="lineNum">     124 </span><span class="lineCov">      78446 :         m_data.resize(Eigen::NoChange, table.size()); // finalize resize by setting the rows</span></a>
 <a name="125"><span class="lineNum">     125 </span>            :         // sort table by time</a>
 <a name="126"><span class="lineNum">     126 </span><span class="lineCov">      78446 :         std::sort(table.begin(), table.end(), [](auto&amp;&amp; a, auto&amp;&amp; b) {</span></a>
-<a name="127"><span class="lineNum">     127 </span><span class="lineCov">        693 :             return a[0] &lt; b[0];</span></a>
+<a name="127"><span class="lineNum">     127 </span><span class="lineCov">        558 :             return a[0] &lt; b[0];</span></a>
 <a name="128"><span class="lineNum">     128 </span>            :         });</a>
 <a name="129"><span class="lineNum">     129 </span>            :         // assign table to data</a>
 <a name="130"><span class="lineNum">     130 </span><span class="lineCov">     157054 :         for (Eigen::Index tp = 0; tp &lt; m_data.cols(); tp++) {</span></a>
@@ -255,34 +255,34 @@
 <a name="193"><span class="lineNum">     193 </span>            :     /**</a>
 <a name="194"><span class="lineNum">     194 </span>            :      * number of time points in the series</a>
 <a name="195"><span class="lineNum">     195 </span>            :      */</a>
-<a name="196"><span class="lineNum">     196 </span><span class="lineCov">    3695834 :     Eigen::Index get_num_time_points() const</span></a>
+<a name="196"><span class="lineNum">     196 </span><span class="lineCov">    3701252 :     Eigen::Index get_num_time_points() const</span></a>
 <a name="197"><span class="lineNum">     197 </span>            :     {</a>
-<a name="198"><span class="lineNum">     198 </span><span class="lineCov">    3695834 :         return m_num_time_points;</span></a>
+<a name="198"><span class="lineNum">     198 </span><span class="lineCov">    3701252 :         return m_num_time_points;</span></a>
 <a name="199"><span class="lineNum">     199 </span>            :     }</a>
 <a name="200"><span class="lineNum">     200 </span>            : </a>
 <a name="201"><span class="lineNum">     201 </span>            :     /**</a>
 <a name="202"><span class="lineNum">     202 </span>            :      * number of elements of vector at each time point</a>
 <a name="203"><span class="lineNum">     203 </span>            :      */</a>
-<a name="204"><span class="lineNum">     204 </span><span class="lineCov">    4871934 :     Eigen::Index get_num_elements() const</span></a>
+<a name="204"><span class="lineNum">     204 </span><span class="lineCov">    4883436 :     Eigen::Index get_num_elements() const</span></a>
 <a name="205"><span class="lineNum">     205 </span>            :     {</a>
-<a name="206"><span class="lineNum">     206 </span><span class="lineCov">    4871934 :         return get_num_rows() - 1;</span></a>
+<a name="206"><span class="lineNum">     206 </span><span class="lineCov">    4883436 :         return get_num_rows() - 1;</span></a>
 <a name="207"><span class="lineNum">     207 </span>            :     }</a>
 <a name="208"><span class="lineNum">     208 </span>            : </a>
 <a name="209"><span class="lineNum">     209 </span>            :     /**</a>
 <a name="210"><span class="lineNum">     210 </span>            :      * number of rows in data storage (includes time)</a>
 <a name="211"><span class="lineNum">     211 </span>            :      */</a>
-<a name="212"><span class="lineNum">     212 </span><span class="lineCov">    4872024 :     Eigen::Index get_num_rows() const</span></a>
+<a name="212"><span class="lineNum">     212 </span><span class="lineCov">    4883526 :     Eigen::Index get_num_rows() const</span></a>
 <a name="213"><span class="lineNum">     213 </span>            :     {</a>
-<a name="214"><span class="lineNum">     214 </span><span class="lineCov">    4872024 :         return m_data.rows();</span></a>
+<a name="214"><span class="lineNum">     214 </span><span class="lineCov">    4883526 :         return m_data.rows();</span></a>
 <a name="215"><span class="lineNum">     215 </span>            :     }</a>
 <a name="216"><span class="lineNum">     216 </span>            : </a>
 <a name="217"><span class="lineNum">     217 </span>            :     /**</a>
 <a name="218"><span class="lineNum">     218 </span>            :      * add one uninitialized time point</a>
 <a name="219"><span class="lineNum">     219 </span>            :      */</a>
-<a name="220"><span class="lineNum">     220 </span><span class="lineCov">     113275 :     Eigen::Ref&lt;Vector&gt; add_time_point()</span></a>
+<a name="220"><span class="lineNum">     220 </span><span class="lineCov">     115966 :     Eigen::Ref&lt;Vector&gt; add_time_point()</span></a>
 <a name="221"><span class="lineNum">     221 </span>            :     {</a>
-<a name="222"><span class="lineNum">     222 </span><span class="lineCov">     113275 :         add_time_point_noinit();</span></a>
-<a name="223"><span class="lineNum">     223 </span><span class="lineCov">     113275 :         return get_last_value();</span></a>
+<a name="222"><span class="lineNum">     222 </span><span class="lineCov">     115966 :         add_time_point_noinit();</span></a>
+<a name="223"><span class="lineNum">     223 </span><span class="lineCov">     115966 :         return get_last_value();</span></a>
 <a name="224"><span class="lineNum">     224 </span>            :     }</a>
 <a name="225"><span class="lineNum">     225 </span>            : </a>
 <a name="226"><span class="lineNum">     226 </span>            :     /**</a>
@@ -330,23 +330,23 @@
 <a name="268"><span class="lineNum">     268 </span>            :     /**</a>
 <a name="269"><span class="lineNum">     269 </span>            :      * time of time point at index i</a>
 <a name="270"><span class="lineNum">     270 </span>            :      */</a>
-<a name="271"><span class="lineNum">     271 </span><span class="lineCov">    2757012 :     FP&amp; get_time(Eigen::Index i)</span></a>
+<a name="271"><span class="lineNum">     271 </span><span class="lineCov">    2759721 :     FP&amp; get_time(Eigen::Index i)</span></a>
 <a name="272"><span class="lineNum">     272 </span>            :     {</a>
-<a name="273"><span class="lineNum">     273 </span><span class="lineCov">    2757012 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
-<a name="274"><span class="lineNum">     274 </span><span class="lineCov">    2757012 :         return m_data(0, i);</span></a>
+<a name="273"><span class="lineNum">     273 </span><span class="lineCov">    2759721 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
+<a name="274"><span class="lineNum">     274 </span><span class="lineCov">    2759721 :         return m_data(0, i);</span></a>
 <a name="275"><span class="lineNum">     275 </span>            :     }</a>
-<a name="276"><span class="lineNum">     276 </span><span class="lineCov">     136268 :     const FP&amp; get_time(Eigen::Index i) const</span></a>
+<a name="276"><span class="lineNum">     276 </span><span class="lineCov">     136520 :     const FP&amp; get_time(Eigen::Index i) const</span></a>
 <a name="277"><span class="lineNum">     277 </span>            :     {</a>
-<a name="278"><span class="lineNum">     278 </span><span class="lineCov">     136268 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
-<a name="279"><span class="lineNum">     279 </span><span class="lineCov">     136268 :         return m_data(0, i);</span></a>
+<a name="278"><span class="lineNum">     278 </span><span class="lineCov">     136520 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
+<a name="279"><span class="lineNum">     279 </span><span class="lineCov">     136520 :         return m_data(0, i);</span></a>
 <a name="280"><span class="lineNum">     280 </span>            :     }</a>
 <a name="281"><span class="lineNum">     281 </span>            : </a>
 <a name="282"><span class="lineNum">     282 </span>            :     /**</a>
 <a name="283"><span class="lineNum">     283 </span>            :      * time of time point at index num_time_points - 1</a>
 <a name="284"><span class="lineNum">     284 </span>            :      */</a>
-<a name="285"><span class="lineNum">     285 </span><span class="lineCov">    2537835 :     FP&amp; get_last_time()</span></a>
+<a name="285"><span class="lineNum">     285 </span><span class="lineCov">    2540544 :     FP&amp; get_last_time()</span></a>
 <a name="286"><span class="lineNum">     286 </span>            :     {</a>
-<a name="287"><span class="lineNum">     287 </span><span class="lineCov">    2537835 :         return get_time(get_num_time_points() - 1);</span></a>
+<a name="287"><span class="lineNum">     287 </span><span class="lineCov">    2540544 :         return get_time(get_num_time_points() - 1);</span></a>
 <a name="288"><span class="lineNum">     288 </span>            :     }</a>
 <a name="289"><span class="lineNum">     289 </span><span class="lineCov">        422 :     const FP&amp; get_last_time() const</span></a>
 <a name="290"><span class="lineNum">     290 </span>            :     {</a>
@@ -356,54 +356,54 @@
 <a name="294"><span class="lineNum">     294 </span>            :     /**</a>
 <a name="295"><span class="lineNum">     295 </span>            :      * reference to value vector at time point i</a>
 <a name="296"><span class="lineNum">     296 </span>            :      */</a>
-<a name="297"><span class="lineNum">     297 </span><span class="lineCov">     325629 :     Eigen::Ref&lt;const Vector&gt; get_value(Eigen::Index i) const</span></a>
+<a name="297"><span class="lineNum">     297 </span><span class="lineCov">     325755 :     Eigen::Ref&lt;const Vector&gt; get_value(Eigen::Index i) const</span></a>
 <a name="298"><span class="lineNum">     298 </span>            :     {</a>
-<a name="299"><span class="lineNum">     299 </span><span class="lineCov">     325629 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
-<a name="300"><span class="lineNum">     300 </span><span class="lineCov">     325629 :         return m_data.col(i).segment(1, get_num_elements());</span></a>
+<a name="299"><span class="lineNum">     299 </span><span class="lineCov">     325755 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
+<a name="300"><span class="lineNum">     300 </span><span class="lineCov">     325755 :         return m_data.col(i).segment(1, get_num_elements());</span></a>
 <a name="301"><span class="lineNum">     301 </span>            :     }</a>
-<a name="302"><span class="lineNum">     302 </span><span class="lineCov">    4176857 :     Eigen::Ref&lt;Vector&gt; get_value(Eigen::Index i)</span></a>
+<a name="302"><span class="lineNum">     302 </span><span class="lineCov">    4188233 :     Eigen::Ref&lt;Vector&gt; get_value(Eigen::Index i)</span></a>
 <a name="303"><span class="lineNum">     303 </span>            :     {</a>
-<a name="304"><span class="lineNum">     304 </span><span class="lineCov">    4176857 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
-<a name="305"><span class="lineNum">     305 </span><span class="lineCov">    4176857 :         return m_data.col(i).segment(1, get_num_elements());</span></a>
+<a name="304"><span class="lineNum">     304 </span><span class="lineCov">    4188233 :         assert(i &gt;= 0 &amp;&amp; i &lt; m_num_time_points);</span></a>
+<a name="305"><span class="lineNum">     305 </span><span class="lineCov">    4188233 :         return m_data.col(i).segment(1, get_num_elements());</span></a>
 <a name="306"><span class="lineNum">     306 </span>            :     }</a>
 <a name="307"><span class="lineNum">     307 </span><span class="lineCov">      73741 :     Eigen::Ref&lt;const Vector&gt; operator[](Eigen::Index i) const</span></a>
 <a name="308"><span class="lineNum">     308 </span>            :     {</a>
 <a name="309"><span class="lineNum">     309 </span><span class="lineCov">      73741 :         return get_value(i);</span></a>
 <a name="310"><span class="lineNum">     310 </span>            :     }</a>
-<a name="311"><span class="lineNum">     311 </span><span class="lineCov">     500158 :     Eigen::Ref&lt;Vector&gt; operator[](Eigen::Index i)</span></a>
+<a name="311"><span class="lineNum">     311 </span><span class="lineCov">     506098 :     Eigen::Ref&lt;Vector&gt; operator[](Eigen::Index i)</span></a>
 <a name="312"><span class="lineNum">     312 </span>            :     {</a>
-<a name="313"><span class="lineNum">     313 </span><span class="lineCov">     500158 :         return get_value(i);</span></a>
+<a name="313"><span class="lineNum">     313 </span><span class="lineCov">     506098 :         return get_value(i);</span></a>
 <a name="314"><span class="lineNum">     314 </span>            :     }</a>
 <a name="315"><span class="lineNum">     315 </span>            : </a>
 <a name="316"><span class="lineNum">     316 </span>            :     /**</a>
 <a name="317"><span class="lineNum">     317 </span>            :      * reference to value vector at time point (num_timepoints - 1)</a>
 <a name="318"><span class="lineNum">     318 </span>            :      */</a>
-<a name="319"><span class="lineNum">     319 </span><span class="lineCov">     164732 :     Eigen::Ref&lt;const Vector&gt; get_last_value() const</span></a>
+<a name="319"><span class="lineNum">     319 </span><span class="lineCov">     164615 :     Eigen::Ref&lt;const Vector&gt; get_last_value() const</span></a>
 <a name="320"><span class="lineNum">     320 </span>            :     {</a>
-<a name="321"><span class="lineNum">     321 </span><span class="lineCov">     164732 :         return get_value(m_num_time_points - 1);</span></a>
+<a name="321"><span class="lineNum">     321 </span><span class="lineCov">     164615 :         return get_value(m_num_time_points - 1);</span></a>
 <a name="322"><span class="lineNum">     322 </span>            :     }</a>
-<a name="323"><span class="lineNum">     323 </span><span class="lineCov">    3300067 :     Eigen::Ref&lt;Vector&gt; get_last_value()</span></a>
+<a name="323"><span class="lineNum">     323 </span><span class="lineCov">    3302848 :     Eigen::Ref&lt;Vector&gt; get_last_value()</span></a>
 <a name="324"><span class="lineNum">     324 </span>            :     {</a>
-<a name="325"><span class="lineNum">     325 </span><span class="lineCov">    3300067 :         return get_value(m_num_time_points - 1);</span></a>
+<a name="325"><span class="lineNum">     325 </span><span class="lineCov">    3302848 :         return get_value(m_num_time_points - 1);</span></a>
 <a name="326"><span class="lineNum">     326 </span>            :     }</a>
 <a name="327"><span class="lineNum">     327 </span>            : </a>
 <a name="328"><span class="lineNum">     328 </span>            :     /**</a>
 <a name="329"><span class="lineNum">     329 </span>            :      * reserve capacity for n time points</a>
 <a name="330"><span class="lineNum">     330 </span>            :      */</a>
-<a name="331"><span class="lineNum">     331 </span><span class="lineCov">    2689568 :     void reserve(Eigen::Index n)</span></a>
+<a name="331"><span class="lineNum">     331 </span><span class="lineCov">    2692277 :     void reserve(Eigen::Index n)</span></a>
 <a name="332"><span class="lineNum">     332 </span>            :     {</a>
-<a name="333"><span class="lineNum">     333 </span><span class="lineCov">    2689568 :         assert(n &gt;= 0);</span></a>
-<a name="334"><span class="lineNum">     334 </span><span class="lineCov">    2689568 :         if (n &gt; get_capacity()) {</span></a>
+<a name="333"><span class="lineNum">     333 </span><span class="lineCov">    2692277 :         assert(n &gt;= 0);</span></a>
+<a name="334"><span class="lineNum">     334 </span><span class="lineCov">    2692277 :         if (n &gt; get_capacity()) {</span></a>
 <a name="335"><span class="lineNum">     335 </span><span class="lineCov">      83642 :             m_data.conservativeResize(Eigen::NoChange, details::next_pow2(n));</span></a>
 <a name="336"><span class="lineNum">     336 </span>            :         }</a>
-<a name="337"><span class="lineNum">     337 </span><span class="lineCov">    2689568 :     }</span></a>
+<a name="337"><span class="lineNum">     337 </span><span class="lineCov">    2692277 :     }</span></a>
 <a name="338"><span class="lineNum">     338 </span>            : </a>
 <a name="339"><span class="lineNum">     339 </span>            :     /**</a>
 <a name="340"><span class="lineNum">     340 </span>            :      * current capacity</a>
 <a name="341"><span class="lineNum">     341 </span>            :      */</a>
-<a name="342"><span class="lineNum">     342 </span><span class="lineCov">    2689802 :     Eigen::Index get_capacity() const</span></a>
+<a name="342"><span class="lineNum">     342 </span><span class="lineCov">    2692511 :     Eigen::Index get_capacity() const</span></a>
 <a name="343"><span class="lineNum">     343 </span>            :     {</a>
-<a name="344"><span class="lineNum">     344 </span><span class="lineCov">    2689802 :         return m_data.cols();</span></a>
+<a name="344"><span class="lineNum">     344 </span><span class="lineCov">    2692511 :         return m_data.cols();</span></a>
 <a name="345"><span class="lineNum">     345 </span>            :     }</a>
 <a name="346"><span class="lineNum">     346 </span>            : </a>
 <a name="347"><span class="lineNum">     347 </span>            :     /**</a>
@@ -628,11 +628,11 @@
 <a name="566"><span class="lineNum">     566 </span><span class="lineCov">         82 :     }</span></a>
 <a name="567"><span class="lineNum">     567 </span>            : </a>
 <a name="568"><span class="lineNum">     568 </span>            : private:</a>
-<a name="569"><span class="lineNum">     569 </span><span class="lineCov">    2478892 :     void add_time_point_noinit()</span></a>
+<a name="569"><span class="lineNum">     569 </span><span class="lineCov">    2481583 :     void add_time_point_noinit()</span></a>
 <a name="570"><span class="lineNum">     570 </span>            :     {</a>
-<a name="571"><span class="lineNum">     571 </span><span class="lineCov">    2478892 :         reserve(m_num_time_points + 1);</span></a>
-<a name="572"><span class="lineNum">     572 </span><span class="lineCov">    2478892 :         ++m_num_time_points;</span></a>
-<a name="573"><span class="lineNum">     573 </span><span class="lineCov">    2478892 :     }</span></a>
+<a name="571"><span class="lineNum">     571 </span><span class="lineCov">    2481583 :         reserve(m_num_time_points + 1);</span></a>
+<a name="572"><span class="lineNum">     572 </span><span class="lineCov">    2481583 :         ++m_num_time_points;</span></a>
+<a name="573"><span class="lineNum">     573 </span><span class="lineCov">    2481583 :     }</span></a>
 <a name="574"><span class="lineNum">     574 </span>            :     /** currently occupied block of storage */</a>
 <a name="575"><span class="lineNum">     575 </span><span class="lineCov">     212100 :     auto get_valid_block()</span></a>
 <a name="576"><span class="lineNum">     576 </span>            :     {</a>
@@ -724,10 +724,10 @@
 <a name="662"><span class="lineNum">     662 </span>            :         }</a>
 <a name="663"><span class="lineNum">     663 </span>            :     };</a>
 <a name="664"><span class="lineNum">     664 </span>            : </a>
-<a name="665"><span class="lineNum">     665 </span><span class="lineCov">     201082 :     reference operator*() const</span></a>
+<a name="665"><span class="lineNum">     665 </span><span class="lineCov">     200785 :     reference operator*() const</span></a>
 <a name="666"><span class="lineNum">     666 </span>            :     {</a>
-<a name="667"><span class="lineNum">     667 </span><span class="lineCov">     201082 :         assert(m_col_idx &gt;= 0 &amp;&amp; m_col_idx &lt; m_matrix-&gt;cols());</span></a>
-<a name="668"><span class="lineNum">     668 </span><span class="lineCov">     201082 :         return static_cast&lt;const Derived&amp;&gt;(*this).get_reference();</span></a>
+<a name="667"><span class="lineNum">     667 </span><span class="lineCov">     200785 :         assert(m_col_idx &gt;= 0 &amp;&amp; m_col_idx &lt; m_matrix-&gt;cols());</span></a>
+<a name="668"><span class="lineNum">     668 </span><span class="lineCov">     200785 :         return static_cast&lt;const Derived&amp;&gt;(*this).get_reference();</span></a>
 <a name="669"><span class="lineNum">     669 </span>            :     }</a>
 <a name="670"><span class="lineNum">     670 </span>            : </a>
 <a name="671"><span class="lineNum">     671 </span>            :     pointer operator-&gt;() const</a>
@@ -740,10 +740,10 @@
 <a name="678"><span class="lineNum">     678 </span><span class="lineCov">         36 :         return *((*this) + i);</span></a>
 <a name="679"><span class="lineNum">     679 </span>            :     }</a>
 <a name="680"><span class="lineNum">     680 </span>            : </a>
-<a name="681"><span class="lineNum">     681 </span><span class="lineCov">      35784 :     Derived&amp; operator+=(difference_type i)</span></a>
+<a name="681"><span class="lineNum">     681 </span><span class="lineCov">      35487 :     Derived&amp; operator+=(difference_type i)</span></a>
 <a name="682"><span class="lineNum">     682 </span>            :     {</a>
-<a name="683"><span class="lineNum">     683 </span><span class="lineCov">      35784 :         m_col_idx += i;</span></a>
-<a name="684"><span class="lineNum">     684 </span><span class="lineCov">      35784 :         return static_cast&lt;Derived&amp;&gt;(*this);</span></a>
+<a name="683"><span class="lineNum">     683 </span><span class="lineCov">      35487 :         m_col_idx += i;</span></a>
+<a name="684"><span class="lineNum">     684 </span><span class="lineCov">      35487 :         return static_cast&lt;Derived&amp;&gt;(*this);</span></a>
 <a name="685"><span class="lineNum">     685 </span>            :     }</a>
 <a name="686"><span class="lineNum">     686 </span>            : </a>
 <a name="687"><span class="lineNum">     687 </span><span class="lineCov">         90 :     Derived operator+(difference_type i) const</span></a>
@@ -773,15 +773,15 @@
 <a name="711"><span class="lineNum">     711 </span><span class="lineCov">      53931 :         return tmp;</span></a>
 <a name="712"><span class="lineNum">     712 </span>            :     }</a>
 <a name="713"><span class="lineNum">     713 </span>            : </a>
-<a name="714"><span class="lineNum">     714 </span><span class="lineCov">     281215 :     difference_type operator-(const TimeSeriesIteratorBase&amp; other) const</span></a>
+<a name="714"><span class="lineNum">     714 </span><span class="lineCov">     281341 :     difference_type operator-(const TimeSeriesIteratorBase&amp; other) const</span></a>
 <a name="715"><span class="lineNum">     715 </span>            :     {</a>
-<a name="716"><span class="lineNum">     716 </span><span class="lineCov">     281215 :         return m_col_idx - other.m_col_idx;</span></a>
+<a name="716"><span class="lineNum">     716 </span><span class="lineCov">     281341 :         return m_col_idx - other.m_col_idx;</span></a>
 <a name="717"><span class="lineNum">     717 </span>            :     }</a>
 <a name="718"><span class="lineNum">     718 </span>            : </a>
-<a name="719"><span class="lineNum">     719 </span><span class="lineCov">      96864 :     Derived&amp; operator++()</span></a>
+<a name="719"><span class="lineNum">     719 </span><span class="lineCov">      97503 :     Derived&amp; operator++()</span></a>
 <a name="720"><span class="lineNum">     720 </span>            :     {</a>
-<a name="721"><span class="lineNum">     721 </span><span class="lineCov">      96864 :         ++m_col_idx;</span></a>
-<a name="722"><span class="lineNum">     722 </span><span class="lineCov">      96864 :         return static_cast&lt;Derived&amp;&gt;(*this);</span></a>
+<a name="721"><span class="lineNum">     721 </span><span class="lineCov">      97503 :         ++m_col_idx;</span></a>
+<a name="722"><span class="lineNum">     722 </span><span class="lineCov">      97503 :         return static_cast&lt;Derived&amp;&gt;(*this);</span></a>
 <a name="723"><span class="lineNum">     723 </span>            :     }</a>
 <a name="724"><span class="lineNum">     724 </span>            : </a>
 <a name="725"><span class="lineNum">     725 </span><span class="lineCov">        180 :     Derived operator++(int)</span></a>
@@ -804,10 +804,10 @@
 <a name="742"><span class="lineNum">     742 </span><span class="lineCov">         18 :         return tmp;</span></a>
 <a name="743"><span class="lineNum">     743 </span>            :     }</a>
 <a name="744"><span class="lineNum">     744 </span>            : </a>
-<a name="745"><span class="lineNum">     745 </span><span class="lineCov">     207642 :     bool operator==(const TimeSeriesIteratorBase&amp; other) const</span></a>
+<a name="745"><span class="lineNum">     745 </span><span class="lineCov">     207651 :     bool operator==(const TimeSeriesIteratorBase&amp; other) const</span></a>
 <a name="746"><span class="lineNum">     746 </span>            :     {</a>
-<a name="747"><span class="lineNum">     747 </span><span class="lineCov">     207642 :         assert(m_matrix == other.m_matrix);</span></a>
-<a name="748"><span class="lineNum">     748 </span><span class="lineCov">     207642 :         return m_col_idx == other.m_col_idx;</span></a>
+<a name="747"><span class="lineNum">     747 </span><span class="lineCov">     207651 :         assert(m_matrix == other.m_matrix);</span></a>
+<a name="748"><span class="lineNum">     748 </span><span class="lineCov">     207651 :         return m_col_idx == other.m_col_idx;</span></a>
 <a name="749"><span class="lineNum">     749 </span>            :     }</a>
 <a name="750"><span class="lineNum">     750 </span>            : </a>
 <a name="751"><span class="lineNum">     751 </span><span class="lineCov">       2731 :     bool operator!=(const TimeSeriesIteratorBase&amp; other) const</span></a>
@@ -900,9 +900,9 @@
 <a name="838"><span class="lineNum">     838 </span>            :     using value_type        = typename Base::value_type;</a>
 <a name="839"><span class="lineNum">     839 </span>            :     using pointer           = typename Base::pointer;</a>
 <a name="840"><span class="lineNum">     840 </span>            : </a>
-<a name="841"><span class="lineNum">     841 </span><span class="lineCov">     146041 :     reference get_reference() const</span></a>
+<a name="841"><span class="lineNum">     841 </span><span class="lineCov">     145744 :     reference get_reference() const</span></a>
 <a name="842"><span class="lineNum">     842 </span>            :     {</a>
-<a name="843"><span class="lineNum">     843 </span><span class="lineCov">     146041 :         return m_matrix-&gt;coeffRef(0, m_col_idx);</span></a>
+<a name="843"><span class="lineNum">     843 </span><span class="lineCov">     145744 :         return m_matrix-&gt;coeffRef(0, m_col_idx);</span></a>
 <a name="844"><span class="lineNum">     844 </span>            :     }</a>
 <a name="845"><span class="lineNum">     845 </span>            : };</a>
 <a name="846"><span class="lineNum">     846 </span>            : </a>
diff --git a/coverage/cpp/memilio/utils/transform_iterator.h.func-sort-c.html b/coverage/cpp/memilio/utils/transform_iterator.h.func-sort-c.html
index 76b83ca6bb..94cb700cd9 100644
--- a/coverage/cpp/memilio/utils/transform_iterator.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/transform_iterator.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">11</td>
diff --git a/coverage/cpp/memilio/utils/transform_iterator.h.func.html b/coverage/cpp/memilio/utils/transform_iterator.h.func.html
index 4ba535a5b2..e8aee29a2e 100644
--- a/coverage/cpp/memilio/utils/transform_iterator.h.func.html
+++ b/coverage/cpp/memilio/utils/transform_iterator.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">11</td>
diff --git a/coverage/cpp/memilio/utils/transform_iterator.h.gcov.html b/coverage/cpp/memilio/utils/transform_iterator.h.gcov.html
index d2e17618aa..01a962320a 100644
--- a/coverage/cpp/memilio/utils/transform_iterator.h.gcov.html
+++ b/coverage/cpp/memilio/utils/transform_iterator.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">11</td>
diff --git a/coverage/cpp/memilio/utils/type_list.h.func-sort-c.html b/coverage/cpp/memilio/utils/type_list.h.func-sort-c.html
index 801bfe6cb1..78f507fa7a 100644
--- a/coverage/cpp/memilio/utils/type_list.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/type_list.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
@@ -77,11 +77,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_list.h.gcov.html#46">mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt;::size()</a></td>
-              <td class="coverFnHi">2400029</td>
+              <td class="coverFnHi">2400677</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_list.h.gcov.html#46">mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt;::size()</a></td>
-              <td class="coverFnHi">12220238</td>
+              <td class="coverFnHi">12852038</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/type_list.h.func.html b/coverage/cpp/memilio/utils/type_list.h.func.html
index c06bba0214..665aa3103a 100644
--- a/coverage/cpp/memilio/utils/type_list.h.func.html
+++ b/coverage/cpp/memilio/utils/type_list.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_list.h.gcov.html#46">mio::TypeList&lt;mio::Flow&lt;(mio::oseir::InfectionState)0, (mio::oseir::InfectionState)1&gt;, mio::Flow&lt;(mio::oseir::InfectionState)1, (mio::oseir::InfectionState)2&gt;, mio::Flow&lt;(mio::oseir::InfectionState)2, (mio::oseir::InfectionState)3&gt; &gt;::size()</a></td>
-              <td class="coverFnHi">2400029</td>
+              <td class="coverFnHi">2400677</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_list.h.gcov.html#46">mio::TypeList&lt;mio::Flow&lt;(mio::ssirs::InfectionState)0, (mio::ssirs::InfectionState)1&gt;, mio::Flow&lt;(mio::ssirs::InfectionState)1, (mio::ssirs::InfectionState)2&gt;, mio::Flow&lt;(mio::ssirs::InfectionState)2, (mio::ssirs::InfectionState)0&gt; &gt;::size()</a></td>
@@ -73,7 +73,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_list.h.gcov.html#46">mio::TypeList&lt;mio::Flow&lt;(mio::osecir::InfectionState)0, (mio::osecir::InfectionState)1&gt;, mio::Flow&lt;(mio::osecir::InfectionState)1, (mio::osecir::InfectionState)2&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)4&gt;, mio::Flow&lt;(mio::osecir::InfectionState)2, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)5&gt;, mio::Flow&lt;(mio::osecir::InfectionState)3, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)4, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)6&gt;, mio::Flow&lt;(mio::osecir::InfectionState)5, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)7&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)8&gt;, mio::Flow&lt;(mio::osecir::InfectionState)6, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)9&gt;, mio::Flow&lt;(mio::osecir::InfectionState)7, (mio::osecir::InfectionState)8&gt; &gt;::size()</a></td>
-              <td class="coverFnHi">12220238</td>
+              <td class="coverFnHi">12852038</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_list.h.gcov.html#46">mio::TypeList&lt;mio::Flow&lt;(mio::sseirvv::InfectionState)0, (mio::sseirvv::InfectionState)1&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)0, (mio::sseirvv::InfectionState)4&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)1, (mio::sseirvv::InfectionState)2&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)4, (mio::sseirvv::InfectionState)5&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)2, (mio::sseirvv::InfectionState)3&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)5, (mio::sseirvv::InfectionState)6&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)3, (mio::sseirvv::InfectionState)7&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)7, (mio::sseirvv::InfectionState)8&gt;, mio::Flow&lt;(mio::sseirvv::InfectionState)8, (mio::sseirvv::InfectionState)9&gt; &gt;::size()</a></td>
diff --git a/coverage/cpp/memilio/utils/type_list.h.gcov.html b/coverage/cpp/memilio/utils/type_list.h.gcov.html
index 5d7e5c80ac..561d6454f3 100644
--- a/coverage/cpp/memilio/utils/type_list.h.gcov.html
+++ b/coverage/cpp/memilio/utils/type_list.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
@@ -107,9 +107,9 @@
 <a name="45"><span class="lineNum">      45 </span>            :     }</a>
 <a name="46"><span class="lineNum">      46 </span>            : </a>
 <a name="47"><span class="lineNum">      47 </span>            :     /// @brief returns the number of Types in TypeList</a>
-<a name="48"><span class="lineNum">      48 </span><span class="lineCov">   16206325 :     static constexpr size_t size()</span></a>
+<a name="48"><span class="lineNum">      48 </span><span class="lineCov">   16838773 :     static constexpr size_t size()</span></a>
 <a name="49"><span class="lineNum">      49 </span>            :     {</a>
-<a name="50"><span class="lineNum">      50 </span><span class="lineCov">   16206325 :         return sizeof...(Types);</span></a>
+<a name="50"><span class="lineNum">      50 </span><span class="lineCov">   16838773 :         return sizeof...(Types);</span></a>
 <a name="51"><span class="lineNum">      51 </span>            :     }</a>
 <a name="52"><span class="lineNum">      52 </span>            : };</a>
 <a name="53"><span class="lineNum">      53 </span>            : </a>
diff --git a/coverage/cpp/memilio/utils/type_safe.h.func-sort-c.html b/coverage/cpp/memilio/utils/type_safe.h.func-sort-c.html
index c95f30bc5b..2362428713 100644
--- a/coverage/cpp/memilio/utils/type_safe.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/type_safe.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">280</td>
@@ -929,7 +929,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Counter&lt;unsigned int&gt; &gt;::operator++()</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#162">mio::OperatorAdditionSubtraction&lt;mio::Index&lt;mio::SimulationDay&gt; &gt;::operator-(mio::Index&lt;mio::SimulationDay&gt; const&amp;) const</a></td>
@@ -953,19 +953,19 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned int, mio::Counter&lt;unsigned int&gt; &gt;::TypeSafe(unsigned int)</a></td>
-              <td class="coverFnHi">4859</td>
+              <td class="coverFnHi">4814</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::abm::MaskType&gt; &gt;::operator&lt;(mio::Index&lt;mio::abm::MaskType&gt; const&amp;) const</a></td>
               <td class="coverFnHi">5313</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::operator==(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">5634</td>
+              <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned int, mio::Counter&lt;unsigned int&gt; &gt;::get() const</a></td>
+              <td class="coverFnHi">5561</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned int, mio::Counter&lt;unsigned int&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">5651</td>
+              <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::operator==(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;) const</a></td>
+              <td class="coverFnHi">5634</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;TestAgeGroup&gt; &gt;::operator==(mio::Index&lt;TestAgeGroup&gt; const&amp;) const</a></td>
@@ -1045,7 +1045,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::abm::LocationId&gt;::operator&lt;(mio::abm::LocationId const&amp;) const</a></td>
-              <td class="coverFnHi">24714</td>
+              <td class="coverFnHi">24723</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;TestAgeGroup&gt; &gt;::operator unsigned long() const</a></td>
@@ -1077,7 +1077,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::operator&lt;(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">32405</td>
+              <td class="coverFnHi">32333</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::operator++()</a></td>
@@ -1093,7 +1093,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#78">mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::operator!=(mio::abm::LocationId const&amp;) const</a></td>
-              <td class="coverFnHi">37566</td>
+              <td class="coverFnHi">37575</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;int, mio::regions::DistrictId&gt;::TypeSafe(int)</a></td>
@@ -1121,7 +1121,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">52177</td>
+              <td class="coverFnHi">52105</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::operator==(mio::Index&lt;mio::osecirvvs::InfectionState&gt; const&amp;) const</a></td>
@@ -1137,27 +1137,27 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned int, mio::abm::PersonId&gt;::get() const</a></td>
-              <td class="coverFnHi">58527</td>
+              <td class="coverFnHi">58500</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::TypeSafe(unsigned int)</a></td>
-              <td class="coverFnHi">64081</td>
+              <td class="coverFnHi">64099</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">64810</td>
+              <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Counter&lt;unsigned long&gt; &gt;::operator++()</a></td>
+              <td class="coverFnHi">64322</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Counter&lt;unsigned long&gt; &gt;::operator++()</a></td>
-              <td class="coverFnHi">65190</td>
+              <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::get() const</a></td>
+              <td class="coverFnHi">64666</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Key&lt;unsigned long&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">67971</td>
+              <td class="coverFnHi">67058</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Counter&lt;unsigned long&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">69166</td>
+              <td class="coverFnHi">68253</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::SimulationDay&gt; &gt;::TypeSafe(unsigned long)</a></td>
@@ -1169,11 +1169,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">81261</td>
+              <td class="coverFnHi">81117</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::get() const</a></td>
-              <td class="coverFnHi">82377</td>
+              <td class="coverFnHi">82431</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;int, mio::regions::StateId&gt;::TypeSafe(int)</a></td>
@@ -1185,7 +1185,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Counter&lt;unsigned long&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">133330</td>
+              <td class="coverFnHi">131549</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::operator==(mio::abm::LocationId const&amp;) const</a></td>
@@ -1203,21 +1203,21 @@
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;int, mio::regions::CountyId&gt;::TypeSafe(int)</a></td>
               <td class="coverFnHi">298934</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="type_safe.h.gcov.html#128">mio::OperatorIncrementDecrement&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::operator++(int)</a></td>
-              <td class="coverFnHi">926149</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;int, mio::regions::CountyId&gt;::get() const</a></td>
               <td class="coverFnHi">927199</td>
             </tr>
+    <tr>
+              <td class="coverFn"><a href="type_safe.h.gcov.html#128">mio::OperatorIncrementDecrement&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::operator++(int)</a></td>
+              <td class="coverFnHi">968287</td>
+            </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::SimulationDay&gt; &gt;::operator&lt;(mio::Index&lt;mio::SimulationDay&gt; const&amp;) const</a></td>
               <td class="coverFnHi">1058945</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;double, mio::SimulationTime&gt;::TypeSafe(double)</a></td>
-              <td class="coverFnHi">1167948</td>
+              <td class="coverFnHi">1189125</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::SimulationDay&gt; &gt;::operator unsigned long() const</a></td>
@@ -1225,7 +1225,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::operator++()</a></td>
-              <td class="coverFnHi">2067265</td>
+              <td class="coverFnHi">2109709</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::SimulationDay&gt; &gt;::get() const</a></td>
@@ -1233,7 +1233,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::operator==(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">3198767</td>
+              <td class="coverFnHi">3241535</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::osecirvvs::InfectionState&gt; const&amp;) const</a></td>
@@ -1245,11 +1245,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::oseir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">5187105</td>
+              <td class="coverFnHi">5188509</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::operator unsigned long() const</a></td>
@@ -1261,47 +1261,47 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;double, mio::SimulationTime&gt;::operator double() const</a></td>
-              <td class="coverFnHi">8125451</td>
+              <td class="coverFnHi">8273690</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">10373902</td>
+              <td class="coverFnHi">10376710</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">10374704</td>
+              <td class="coverFnHi">10377512</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">11178423</td>
+              <td class="coverFnHi">11368989</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::osecir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">19371655</td>
+              <td class="coverFnHi">20361475</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">19373958</td>
+              <td class="coverFnHi">20363778</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">38744360</td>
+              <td class="coverFnHi">40724000</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">38746174</td>
+              <td class="coverFnHi">40725850</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::operator&lt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">68806375</td>
+              <td class="coverFnHi">71273041</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">130635294</td>
+              <td class="coverFnHi">135315285</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">143240924</td>
+              <td class="coverFnHi">148280438</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/type_safe.h.func.html b/coverage/cpp/memilio/utils/type_safe.h.func.html
index 64a968dc69..0858cb7993 100644
--- a/coverage/cpp/memilio/utils/type_safe.h.func.html
+++ b/coverage/cpp/memilio/utils/type_safe.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">280</td>
@@ -117,11 +117,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#128">mio::OperatorIncrementDecrement&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::operator++(int)</a></td>
-              <td class="coverFnHi">926149</td>
+              <td class="coverFnHi">968287</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::operator++()</a></td>
-              <td class="coverFnHi">2067265</td>
+              <td class="coverFnHi">2109709</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::operator++()</a></td>
@@ -129,11 +129,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Counter&lt;unsigned int&gt; &gt;::operator++()</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#124">mio::OperatorIncrementDecrement&lt;mio::Counter&lt;unsigned long&gt; &gt;::operator++()</a></td>
-              <td class="coverFnHi">65190</td>
+              <td class="coverFnHi">64322</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#138">mio::OperatorIncrementDecrement&lt;TypeSafe_numericOps_Test::TestBody()::TS&gt;::operator--(int)</a></td>
@@ -177,7 +177,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;double, mio::SimulationTime&gt;::TypeSafe(double)</a></td>
-              <td class="coverFnHi">1167948</td>
+              <td class="coverFnHi">1189125</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#47">mio::TypeSafe&lt;double, mio::SimulationTime&gt;::TypeSafe()</a></td>
@@ -257,7 +257,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::TypeSafe(unsigned int)</a></td>
-              <td class="coverFnHi">64081</td>
+              <td class="coverFnHi">64099</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#106">boost::outcome_v2::basic_result&lt;mio::abm::PersonId, mio::IOStatus, boost::outcome_v2::policy::all_narrow&gt; mio::TypeSafe&lt;unsigned int, mio::abm::PersonId&gt;::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)</a></td>
@@ -273,7 +273,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned int, mio::Counter&lt;unsigned int&gt; &gt;::TypeSafe(unsigned int)</a></td>
-              <td class="coverFnHi">4859</td>
+              <td class="coverFnHi">4814</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#106">boost::outcome_v2::basic_result&lt;mio::Key&lt;unsigned long&gt;, mio::IOStatus, boost::outcome_v2::policy::all_narrow&gt; mio::TypeSafe&lt;unsigned long, mio::Key&lt;unsigned long&gt; &gt;::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)</a></td>
@@ -369,7 +369,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">52177</td>
+              <td class="coverFnHi">52105</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::ProtectionType&gt; &gt;::TypeSafe(unsigned long)</a></td>
@@ -397,7 +397,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">5187105</td>
+              <td class="coverFnHi">5188509</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::ssirs::InfectionState&gt; &gt;::TypeSafe(unsigned long)</a></td>
@@ -409,7 +409,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">19373958</td>
+              <td class="coverFnHi">20363778</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::sseirvv::InfectionState&gt; &gt;::TypeSafe(unsigned long)</a></td>
@@ -417,7 +417,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">11178423</td>
+              <td class="coverFnHi">11368989</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::TypeSafe(unsigned long)</a></td>
@@ -437,7 +437,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#54">mio::TypeSafe&lt;unsigned long, mio::Counter&lt;unsigned long&gt; &gt;::TypeSafe(unsigned long)</a></td>
-              <td class="coverFnHi">69166</td>
+              <td class="coverFnHi">68253</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#86">mio::operator&lt;&lt;(std::basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;&amp;, jsontest::TypeSafeInt const&amp;)</a></td>
@@ -541,7 +541,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::abm::LocationId&gt;::operator&lt;(mio::abm::LocationId const&amp;) const</a></td>
-              <td class="coverFnHi">24714</td>
+              <td class="coverFnHi">24723</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::abm::PersonId&gt;::operator&lt;(mio::abm::PersonId const&amp;) const</a></td>
@@ -625,7 +625,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::operator&lt;(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">32405</td>
+              <td class="coverFnHi">32333</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::abm::ProtectionType&gt; &gt;::operator&lt;(mio::Index&lt;mio::abm::ProtectionType&gt; const&amp;) const</a></td>
@@ -653,7 +653,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::oseir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">5186951</td>
+              <td class="coverFnHi">5188355</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::ssirs::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::ssirs::InfectionState&gt; const&amp;) const</a></td>
@@ -665,7 +665,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::osecir::InfectionState&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">19371655</td>
+              <td class="coverFnHi">20361475</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::sseirvv::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::sseirvv::InfectionState&gt; const&amp;) const</a></td>
@@ -677,7 +677,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::AgeGroup&gt; &gt;::operator&lt;(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">68806375</td>
+              <td class="coverFnHi">71273041</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#207">mio::OperatorComparison&lt;mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::operator&lt;(mio::Index&lt;mio::osecirvvs::InfectionState&gt; const&amp;) const</a></td>
@@ -753,7 +753,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;double, mio::SimulationTime&gt;::operator double() const</a></td>
-              <td class="coverFnHi">8125451</td>
+              <td class="coverFnHi">8273690</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;double, mio::SimulationTime&gt;::operator==(mio::SimulationTime const&amp;) const</a></td>
@@ -861,7 +861,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::get() const</a></td>
-              <td class="coverFnHi">82377</td>
+              <td class="coverFnHi">82431</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#96">void mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -877,11 +877,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#78">mio::TypeSafe&lt;unsigned int, mio::abm::LocationId&gt;::operator!=(mio::abm::LocationId const&amp;) const</a></td>
-              <td class="coverFnHi">37566</td>
+              <td class="coverFnHi">37575</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned int, mio::abm::PersonId&gt;::get() const</a></td>
-              <td class="coverFnHi">58527</td>
+              <td class="coverFnHi">58500</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#96">void mio::TypeSafe&lt;unsigned int, mio::abm::PersonId&gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -897,7 +897,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned int, mio::Counter&lt;unsigned int&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">5651</td>
+              <td class="coverFnHi">5561</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#96">void mio::TypeSafe&lt;unsigned int, mio::Counter&lt;unsigned int&gt; &gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -913,7 +913,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Key&lt;unsigned long&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">67971</td>
+              <td class="coverFnHi">67058</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#96">void mio::TypeSafe&lt;unsigned long, mio::Key&lt;unsigned long&gt; &gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -1141,11 +1141,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">64810</td>
+              <td class="coverFnHi">64666</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">81261</td>
+              <td class="coverFnHi">81117</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::abm::VirusVariant&gt; &gt;::operator==(mio::Index&lt;mio::abm::VirusVariant&gt; const&amp;) const</a></td>
@@ -1201,11 +1201,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">10373902</td>
+              <td class="coverFnHi">10376710</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::oseir::InfectionState&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">10374704</td>
+              <td class="coverFnHi">10377512</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::ssirs::InfectionState&gt; &gt;::get() const</a></td>
@@ -1225,11 +1225,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">38744360</td>
+              <td class="coverFnHi">40724000</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">38746174</td>
+              <td class="coverFnHi">40725850</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecir::InfectionState&gt; &gt;::operator==(mio::Index&lt;mio::osecir::InfectionState&gt; const&amp;) const</a></td>
@@ -1245,15 +1245,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">143240924</td>
+              <td class="coverFnHi">148280438</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#62">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::operator unsigned long() const</a></td>
-              <td class="coverFnHi">130635294</td>
+              <td class="coverFnHi">135315285</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#74">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::AgeGroup&gt; &gt;::operator==(mio::Index&lt;mio::AgeGroup&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">3198767</td>
+              <td class="coverFnHi">3241535</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Index&lt;mio::osecirvvs::InfectionState&gt; &gt;::get() const</a></td>
@@ -1289,7 +1289,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#66">mio::TypeSafe&lt;unsigned long, mio::Counter&lt;unsigned long&gt; &gt;::get() const</a></td>
-              <td class="coverFnHi">133330</td>
+              <td class="coverFnHi">131549</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="type_safe.h.gcov.html#96">void mio::TypeSafe&lt;unsigned long, mio::Counter&lt;unsigned long&gt; &gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/utils/type_safe.h.gcov.html b/coverage/cpp/memilio/utils/type_safe.h.gcov.html
index 0a240a44ae..005700a4d6 100644
--- a/coverage/cpp/memilio/utils/type_safe.h.gcov.html
+++ b/coverage/cpp/memilio/utils/type_safe.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">280</td>
@@ -115,33 +115,33 @@
 <a name="53"><span class="lineNum">      53 </span>            :     /**</a>
 <a name="54"><span class="lineNum">      54 </span>            :      * value constructor.</a>
 <a name="55"><span class="lineNum">      55 </span>            :      */</a>
-<a name="56"><span class="lineNum">      56 </span><span class="lineCov">   40999839 :     explicit TypeSafe(T t)</span></a>
-<a name="57"><span class="lineNum">      57 </span><span class="lineCov">   40999839 :         : m_t(t)</span></a>
+<a name="56"><span class="lineNum">      56 </span><span class="lineCov">   42201794 :     explicit TypeSafe(T t)</span></a>
+<a name="57"><span class="lineNum">      57 </span><span class="lineCov">   42201794 :         : m_t(t)</span></a>
 <a name="58"><span class="lineNum">      58 </span>            :     {</a>
-<a name="59"><span class="lineNum">      59 </span><span class="lineCov">   40999839 :     }</span></a>
+<a name="59"><span class="lineNum">      59 </span><span class="lineCov">   42201794 :     }</span></a>
 <a name="60"><span class="lineNum">      60 </span>            : </a>
 <a name="61"><span class="lineNum">      61 </span>            :     /**</a>
 <a name="62"><span class="lineNum">      62 </span>            :      * conversion to underlying type.</a>
 <a name="63"><span class="lineNum">      63 </span>            :      */</a>
-<a name="64"><span class="lineNum">      64 </span><span class="lineCov">  196683361 :     explicit operator T() const</span></a>
+<a name="64"><span class="lineNum">      64 </span><span class="lineCov">  203493931 :     explicit operator T() const</span></a>
 <a name="65"><span class="lineNum">      65 </span>            :     {</a>
-<a name="66"><span class="lineNum">      66 </span><span class="lineCov">  196683361 :         return m_t;</span></a>
+<a name="66"><span class="lineNum">      66 </span><span class="lineCov">  203493931 :         return m_t;</span></a>
 <a name="67"><span class="lineNum">      67 </span>            :     }</a>
-<a name="68"><span class="lineNum">      68 </span><span class="lineCov">  202818111 :     T get() const</span></a>
+<a name="68"><span class="lineNum">      68 </span><span class="lineCov">  209837172 :     T get() const</span></a>
 <a name="69"><span class="lineNum">      69 </span>            :     {</a>
-<a name="70"><span class="lineNum">      70 </span><span class="lineCov">  202818111 :         return m_t;</span></a>
+<a name="70"><span class="lineNum">      70 </span><span class="lineCov">  209837172 :         return m_t;</span></a>
 <a name="71"><span class="lineNum">      71 </span>            :     }</a>
 <a name="72"><span class="lineNum">      72 </span>            : </a>
 <a name="73"><span class="lineNum">      73 </span>            :     /**</a>
 <a name="74"><span class="lineNum">      74 </span>            :      * equality operators.</a>
 <a name="75"><span class="lineNum">      75 </span>            :      */</a>
-<a name="76"><span class="lineNum">      76 </span><span class="lineCov">    3554210 :     bool operator==(const Derived&amp; other) const</span></a>
+<a name="76"><span class="lineNum">      76 </span><span class="lineCov">    3596978 :     bool operator==(const Derived&amp; other) const</span></a>
 <a name="77"><span class="lineNum">      77 </span>            :     {</a>
-<a name="78"><span class="lineNum">      78 </span><span class="lineCov">    3554210 :         return m_t == other.m_t;</span></a>
+<a name="78"><span class="lineNum">      78 </span><span class="lineCov">    3596978 :         return m_t == other.m_t;</span></a>
 <a name="79"><span class="lineNum">      79 </span>            :     }</a>
-<a name="80"><span class="lineNum">      80 </span><span class="lineCov">      94489 :     bool operator!=(const Derived&amp; other) const</span></a>
+<a name="80"><span class="lineNum">      80 </span><span class="lineCov">      94498 :     bool operator!=(const Derived&amp; other) const</span></a>
 <a name="81"><span class="lineNum">      81 </span>            :     {</a>
-<a name="82"><span class="lineNum">      82 </span><span class="lineCov">      94489 :         return !(*this == other);</span></a>
+<a name="82"><span class="lineNum">      82 </span><span class="lineCov">      94498 :         return !(*this == other);</span></a>
 <a name="83"><span class="lineNum">      83 </span>            :     }</a>
 <a name="84"><span class="lineNum">      84 </span>            : </a>
 <a name="85"><span class="lineNum">      85 </span>            :     /**</a>
@@ -185,15 +185,15 @@
 <a name="123"><span class="lineNum">     123 </span>            : class OperatorIncrementDecrement</a>
 <a name="124"><span class="lineNum">     124 </span>            : {</a>
 <a name="125"><span class="lineNum">     125 </span>            : public:</a>
-<a name="126"><span class="lineNum">     126 </span><span class="lineCov">    2232327 :     TS&amp; operator++()</span></a>
+<a name="126"><span class="lineNum">     126 </span><span class="lineCov">    2273858 :     TS&amp; operator++()</span></a>
 <a name="127"><span class="lineNum">     127 </span>            :     {</a>
-<a name="128"><span class="lineNum">     128 </span><span class="lineCov">    2232327 :         return static_cast&lt;TS&amp;&gt;(*this) = TS{static_cast&lt;const TS&amp;&gt;(*this).get() + 1};</span></a>
+<a name="128"><span class="lineNum">     128 </span><span class="lineCov">    2273858 :         return static_cast&lt;TS&amp;&gt;(*this) = TS{static_cast&lt;const TS&amp;&gt;(*this).get() + 1};</span></a>
 <a name="129"><span class="lineNum">     129 </span>            :     }</a>
-<a name="130"><span class="lineNum">     130 </span><span class="lineCov">     927110 :     TS operator++(int)</span></a>
+<a name="130"><span class="lineNum">     130 </span><span class="lineCov">     969248 :     TS operator++(int)</span></a>
 <a name="131"><span class="lineNum">     131 </span>            :     {</a>
-<a name="132"><span class="lineNum">     132 </span><span class="lineCov">     927110 :         auto tmp                = static_cast&lt;TS&amp;&gt;(*this);</span></a>
-<a name="133"><span class="lineNum">     133 </span><span class="lineCov">     927110 :         static_cast&lt;TS&amp;&gt;(*this) = TS{static_cast&lt;const TS&amp;&gt;(*this).get() + 1};</span></a>
-<a name="134"><span class="lineNum">     134 </span><span class="lineCov">    1853350 :         return tmp;</span></a>
+<a name="132"><span class="lineNum">     132 </span><span class="lineCov">     969248 :         auto tmp                = static_cast&lt;TS&amp;&gt;(*this);</span></a>
+<a name="133"><span class="lineNum">     133 </span><span class="lineCov">     969248 :         static_cast&lt;TS&amp;&gt;(*this) = TS{static_cast&lt;const TS&amp;&gt;(*this).get() + 1};</span></a>
+<a name="134"><span class="lineNum">     134 </span><span class="lineCov">    1937626 :         return tmp;</span></a>
 <a name="135"><span class="lineNum">     135 </span>            :     }</a>
 <a name="136"><span class="lineNum">     136 </span><span class="lineCov">          7 :     TS&amp; operator--()</span></a>
 <a name="137"><span class="lineNum">     137 </span>            :     {</a>
@@ -268,9 +268,9 @@
 <a name="206"><span class="lineNum">     206 </span>            : class OperatorComparison</a>
 <a name="207"><span class="lineNum">     207 </span>            : {</a>
 <a name="208"><span class="lineNum">     208 </span>            : public:</a>
-<a name="209"><span class="lineNum">     209 </span><span class="lineCov">   97848862 :     bool operator&lt;(const TS&amp; other) const</span></a>
+<a name="209"><span class="lineNum">     209 </span><span class="lineCov">  101306689 :     bool operator&lt;(const TS&amp; other) const</span></a>
 <a name="210"><span class="lineNum">     210 </span>            :     {</a>
-<a name="211"><span class="lineNum">     211 </span><span class="lineCov">   97848862 :         return static_cast&lt;const TS&amp;&gt;(*this).get() &lt; static_cast&lt;const TS&amp;&gt;(other).get();</span></a>
+<a name="211"><span class="lineNum">     211 </span><span class="lineCov">  101306689 :         return static_cast&lt;const TS&amp;&gt;(*this).get() &lt; static_cast&lt;const TS&amp;&gt;(other).get();</span></a>
 <a name="212"><span class="lineNum">     212 </span>            :     }</a>
 <a name="213"><span class="lineNum">     213 </span><span class="lineCov">         14 :     bool operator&lt;=(const TS&amp; other) const</span></a>
 <a name="214"><span class="lineNum">     214 </span>            :     {</a>
diff --git a/coverage/cpp/memilio/utils/uncertain_value.h.func-sort-c.html b/coverage/cpp/memilio/utils/uncertain_value.h.func-sort-c.html
index 6e38d53834..030063a2fc 100644
--- a/coverage/cpp/memilio/utils/uncertain_value.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/uncertain_value.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">26</td>
@@ -181,7 +181,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_value.h.gcov.html#97">mio::UncertainValue&lt;double&gt;::operator double const&amp;() const</a></td>
-              <td class="coverFnHi">19327780</td>
+              <td class="coverFnHi">20149552</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/memilio/utils/uncertain_value.h.func.html b/coverage/cpp/memilio/utils/uncertain_value.h.func.html
index 1e9eb8c762..b48147e539 100644
--- a/coverage/cpp/memilio/utils/uncertain_value.h.func.html
+++ b/coverage/cpp/memilio/utils/uncertain_value.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">26</td>
@@ -157,7 +157,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_value.h.gcov.html#97">mio::UncertainValue&lt;double&gt;::operator double const&amp;() const</a></td>
-              <td class="coverFnHi">19327780</td>
+              <td class="coverFnHi">20149552</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="uncertain_value.h.gcov.html#199">auto mio::UncertainValue&lt;double&gt;::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)::{lambda(auto:1&amp;&amp;)#2}::operator()&lt;double const&amp;&gt;(mio::JsonContext&amp;&amp;) const</a></td>
diff --git a/coverage/cpp/memilio/utils/uncertain_value.h.gcov.html b/coverage/cpp/memilio/utils/uncertain_value.h.gcov.html
index c4240910ee..c477cc82c9 100644
--- a/coverage/cpp/memilio/utils/uncertain_value.h.gcov.html
+++ b/coverage/cpp/memilio/utils/uncertain_value.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">26</td>
@@ -158,9 +158,9 @@
 <a name="96"><span class="lineNum">      96 </span>            :     {</a>
 <a name="97"><span class="lineNum">      97 </span><span class="lineCov">     238862 :         return m_value;</span></a>
 <a name="98"><span class="lineNum">      98 </span>            :     }</a>
-<a name="99"><span class="lineNum">      99 </span><span class="lineCov">   19327792 :     operator const FP&amp;() const</span></a>
+<a name="99"><span class="lineNum">      99 </span><span class="lineCov">   20149564 :     operator const FP&amp;() const</span></a>
 <a name="100"><span class="lineNum">     100 </span>            :     {</a>
-<a name="101"><span class="lineNum">     101 </span><span class="lineCov">   19327792 :         return m_value;</span></a>
+<a name="101"><span class="lineNum">     101 </span><span class="lineCov">   20149564 :         return m_value;</span></a>
 <a name="102"><span class="lineNum">     102 </span>            :     }</a>
 <a name="103"><span class="lineNum">     103 </span>            : </a>
 <a name="104"><span class="lineNum">     104 </span>            :     /**</a>
diff --git a/coverage/cpp/memilio/utils/visitor.h.func-sort-c.html b/coverage/cpp/memilio/utils/visitor.h.func-sort-c.html
index c0a39eae23..b13cd526c3 100644
--- a/coverage/cpp/memilio/utils/visitor.h.func-sort-c.html
+++ b/coverage/cpp/memilio/utils/visitor.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/utils/visitor.h.func.html b/coverage/cpp/memilio/utils/visitor.h.func.html
index 2532408be7..5fa259e7a9 100644
--- a/coverage/cpp/memilio/utils/visitor.h.func.html
+++ b/coverage/cpp/memilio/utils/visitor.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/memilio/utils/visitor.h.gcov.html b/coverage/cpp/memilio/utils/visitor.h.gcov.html
index a878282e3f..94d4871c3b 100644
--- a/coverage/cpp/memilio/utils/visitor.h.gcov.html
+++ b/coverage/cpp/memilio/utils/visitor.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/abm/analyze_result.h.func-sort-c.html b/coverage/cpp/models/abm/analyze_result.h.func-sort-c.html
index 44bf6cf3e4..c1db9f8c9e 100644
--- a/coverage/cpp/models/abm/analyze_result.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/analyze_result.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">94</td>
diff --git a/coverage/cpp/models/abm/analyze_result.h.func.html b/coverage/cpp/models/abm/analyze_result.h.func.html
index cd8cb8d64e..0b888ad80f 100644
--- a/coverage/cpp/models/abm/analyze_result.h.func.html
+++ b/coverage/cpp/models/abm/analyze_result.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">94</td>
diff --git a/coverage/cpp/models/abm/analyze_result.h.gcov.html b/coverage/cpp/models/abm/analyze_result.h.gcov.html
index 413d3e0746..024342016c 100644
--- a/coverage/cpp/models/abm/analyze_result.h.gcov.html
+++ b/coverage/cpp/models/abm/analyze_result.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">94</td>
diff --git a/coverage/cpp/models/abm/common_abm_loggers.h.func-sort-c.html b/coverage/cpp/models/abm/common_abm_loggers.h.func-sort-c.html
index 85e9149f2a..e79a81a065 100644
--- a/coverage/cpp/models/abm/common_abm_loggers.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/common_abm_loggers.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/abm/common_abm_loggers.h.func.html b/coverage/cpp/models/abm/common_abm_loggers.h.func.html
index 1031b9cd7c..d7f277f15e 100644
--- a/coverage/cpp/models/abm/common_abm_loggers.h.func.html
+++ b/coverage/cpp/models/abm/common_abm_loggers.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/abm/common_abm_loggers.h.gcov.html b/coverage/cpp/models/abm/common_abm_loggers.h.gcov.html
index e1ee075f75..ae5fe3ab2e 100644
--- a/coverage/cpp/models/abm/common_abm_loggers.h.gcov.html
+++ b/coverage/cpp/models/abm/common_abm_loggers.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
@@ -116,14 +116,14 @@
 <a name="54"><span class="lineNum">      54 </span><span class="lineCov">       1350 : constexpr mio::abm::ActivityType guess_activity_type(mio::abm::LocationType current_location)</span></a>
 <a name="55"><span class="lineNum">      55 </span>            : {</a>
 <a name="56"><span class="lineNum">      56 </span><span class="lineCov">       1350 :     switch (current_location) {</span></a>
-<a name="57"><span class="lineNum">      57 </span><span class="lineCov">        792 :     case mio::abm::LocationType::Home:</span></a>
-<a name="58"><span class="lineNum">      58 </span><span class="lineCov">        792 :         return mio::abm::ActivityType::Home;</span></a>
+<a name="57"><span class="lineNum">      57 </span><span class="lineCov">        774 :     case mio::abm::LocationType::Home:</span></a>
+<a name="58"><span class="lineNum">      58 </span><span class="lineCov">        774 :         return mio::abm::ActivityType::Home;</span></a>
 <a name="59"><span class="lineNum">      59 </span><span class="lineCov">         18 :     case mio::abm::LocationType::Work:</span></a>
 <a name="60"><span class="lineNum">      60 </span><span class="lineCov">         18 :         return mio::abm::ActivityType::Workplace;</span></a>
 <a name="61"><span class="lineNum">      61 </span><span class="lineNoCov">          0 :     case mio::abm::LocationType::School:</span></a>
 <a name="62"><span class="lineNum">      62 </span><span class="lineNoCov">          0 :         return mio::abm::ActivityType::Education;</span></a>
-<a name="63"><span class="lineNum">      63 </span><span class="lineCov">         18 :     case mio::abm::LocationType::SocialEvent:</span></a>
-<a name="64"><span class="lineNum">      64 </span><span class="lineCov">         18 :         return mio::abm::ActivityType::Leisure;</span></a>
+<a name="63"><span class="lineNum">      63 </span><span class="lineCov">         36 :     case mio::abm::LocationType::SocialEvent:</span></a>
+<a name="64"><span class="lineNum">      64 </span><span class="lineCov">         36 :         return mio::abm::ActivityType::Leisure;</span></a>
 <a name="65"><span class="lineNum">      65 </span><span class="lineCov">         36 :     case mio::abm::LocationType::BasicsShop:</span></a>
 <a name="66"><span class="lineNum">      66 </span><span class="lineCov">         36 :         return mio::abm::ActivityType::Shopping;</span></a>
 <a name="67"><span class="lineNum">      67 </span><span class="lineCov">         18 :     case mio::abm::LocationType::ICU:</span></a>
@@ -292,8 +292,8 @@
 <a name="230"><span class="lineNum">     230 </span><span class="lineCov">        216 :             auto&amp; current_state_vec = std::get&lt;index_of_type_v&lt;Logger, Loggers...&gt;&gt;(data).front();</span></a>
 <a name="231"><span class="lineNum">     231 </span><span class="lineCov">        864 :             for (auto i = 0; i &lt; (int)current_state_vec.size(); i++) {</span></a>
 <a name="232"><span class="lineNum">     232 </span><span class="lineCov">        648 :                 if (std::get&lt;1&gt;(t[i]) != std::get&lt;1&gt;(current_state_vec[i])) {</span></a>
-<a name="233"><span class="lineNum">     233 </span><span class="lineCov">         90 :                     std::get&lt;1&gt;(current_state_vec[i]) = std::get&lt;1&gt;(t[i]);</span></a>
-<a name="234"><span class="lineNum">     234 </span><span class="lineCov">         90 :                     diff_vector.push_back(t[i]);</span></a>
+<a name="233"><span class="lineNum">     233 </span><span class="lineCov">         99 :                     std::get&lt;1&gt;(current_state_vec[i]) = std::get&lt;1&gt;(t[i]);</span></a>
+<a name="234"><span class="lineNum">     234 </span><span class="lineCov">         99 :                     diff_vector.push_back(t[i]);</span></a>
 <a name="235"><span class="lineNum">     235 </span>            :                 }</a>
 <a name="236"><span class="lineNum">     236 </span>            :             }</a>
 <a name="237"><span class="lineNum">     237 </span><span class="lineCov">        216 :             std::get&lt;index_of_type_v&lt;Logger, Loggers...&gt;&gt;(data).push_back(diff_vector);</span></a>
diff --git a/coverage/cpp/models/abm/household.cpp.func-sort-c.html b/coverage/cpp/models/abm/household.cpp.func-sort-c.html
index fd2e8f6494..dbbb7683fc 100644
--- a/coverage/cpp/models/abm/household.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/household.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/models/abm/household.cpp.func.html b/coverage/cpp/models/abm/household.cpp.func.html
index 1b07b79e6f..93f2406d98 100644
--- a/coverage/cpp/models/abm/household.cpp.func.html
+++ b/coverage/cpp/models/abm/household.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/models/abm/household.cpp.gcov.html b/coverage/cpp/models/abm/household.cpp.gcov.html
index f8eae85eae..0bdbab34ff 100644
--- a/coverage/cpp/models/abm/household.cpp.gcov.html
+++ b/coverage/cpp/models/abm/household.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/models/abm/household.h.func-sort-c.html b/coverage/cpp/models/abm/household.h.func-sort-c.html
index 0b8ba43141..aa7478958f 100644
--- a/coverage/cpp/models/abm/household.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/household.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/abm/household.h.func.html b/coverage/cpp/models/abm/household.h.func.html
index 89e00553ee..94645fc295 100644
--- a/coverage/cpp/models/abm/household.h.func.html
+++ b/coverage/cpp/models/abm/household.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/abm/household.h.gcov.html b/coverage/cpp/models/abm/household.h.gcov.html
index 01001c50c8..818671ea41 100644
--- a/coverage/cpp/models/abm/household.h.gcov.html
+++ b/coverage/cpp/models/abm/household.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/abm/index-sort-f.html b/coverage/cpp/models/abm/index-sort-f.html
index 1b22b33ac6..54a162c7eb 100644
--- a/coverage/cpp/models/abm/index-sort-f.html
+++ b/coverage/cpp/models/abm/index-sort-f.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">1720</td>
+            <td class="headerCovTableEntry">1718</td>
             <td class="headerCovTableEntry">1749</td>
-            <td class="headerCovTableEntryHi">98.3 %</td>
+            <td class="headerCovTableEntryHi">98.2 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">460</td>
@@ -140,92 +140,92 @@
       <td class="coverNumHi">1 / 1</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="simulation.cpp.gcov.html">simulation.cpp</a></td>
+      <td class="coverFile"><a href="personal_rng.cpp.gcov.html">personal_rng.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">10 / 10</td>
+      <td class="coverNumHi">9 / 9</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">2 / 2</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="personal_rng.cpp.gcov.html">personal_rng.cpp</a></td>
+      <td class="coverFile"><a href="location.cpp.gcov.html">location.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">9 / 9</td>
+      <td class="coverNumHi">12 / 12</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">2 / 2</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="location.cpp.gcov.html">location.cpp</a></td>
+      <td class="coverFile"><a href="simulation.cpp.gcov.html">simulation.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">12 / 12</td>
+      <td class="coverNumHi">10 / 10</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">2 / 2</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="mask.cpp.gcov.html">mask.cpp</a></td>
+      <td class="coverFile"><a href="personal_rng.h.gcov.html">personal_rng.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">10 / 10</td>
+      <td class="coverNumHi">7 / 7</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="protection_event.h.gcov.html">protection_event.h</a></td>
+      <td class="coverFile"><a href="lockdown_rules.cpp.gcov.html">lockdown_rules.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">8 / 8</td>
+      <td class="coverNumHi">12 / 12</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="personal_rng.h.gcov.html">personal_rng.h</a></td>
+      <td class="coverFile"><a href="protection_event.h.gcov.html">protection_event.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">7 / 7</td>
+      <td class="coverNumHi">8 / 8</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="mask.h.gcov.html">mask.h</a></td>
+      <td class="coverFile"><a href="location_id.h.gcov.html">location_id.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">6 / 6</td>
+      <td class="coverNumHi">8 / 8</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="lockdown_rules.cpp.gcov.html">lockdown_rules.cpp</a></td>
+      <td class="coverFile"><a href="person_id.h.gcov.html">person_id.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">12 / 12</td>
+      <td class="coverNumHi">8 / 8</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="location_id.h.gcov.html">location_id.h</a></td>
+      <td class="coverFile"><a href="mask.h.gcov.html">mask.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">8 / 8</td>
+      <td class="coverNumHi">6 / 6</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">3 / 3</td>
     </tr>
@@ -240,12 +240,12 @@
       <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="person_id.h.gcov.html">person_id.h</a></td>
+      <td class="coverFile"><a href="mask.cpp.gcov.html">mask.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">8 / 8</td>
+      <td class="coverNumHi">10 / 10</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">3 / 3</td>
     </tr>
@@ -312,10 +312,10 @@
     <tr>
       <td class="coverFile"><a href="infection.cpp.gcov.html">infection.cpp</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=98 height=10 alt="97.5%"><img src="../../snow.png" width=2 height=10 alt="97.5%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=96 height=10 alt="96.3%"><img src="../../snow.png" width=4 height=10 alt="96.3%"></td></tr></table>
       </td>
-      <td class="coverPerHi">97.5&nbsp;%</td>
-      <td class="coverNumHi">158 / 162</td>
+      <td class="coverPerHi">96.3&nbsp;%</td>
+      <td class="coverNumHi">156 / 162</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">12 / 12</td>
     </tr>
diff --git a/coverage/cpp/models/abm/index-sort-l.html b/coverage/cpp/models/abm/index-sort-l.html
index d161a2bdb7..7e51107e7b 100644
--- a/coverage/cpp/models/abm/index-sort-l.html
+++ b/coverage/cpp/models/abm/index-sort-l.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">1720</td>
+            <td class="headerCovTableEntry">1718</td>
             <td class="headerCovTableEntry">1749</td>
-            <td class="headerCovTableEntryHi">98.3 %</td>
+            <td class="headerCovTableEntryHi">98.2 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">460</td>
@@ -99,6 +99,16 @@
       <td class="coverPerMed">89.3&nbsp;%</td>
       <td class="coverNumMed">25 / 28</td>
     </tr>
+    <tr>
+      <td class="coverFile"><a href="infection.cpp.gcov.html">infection.cpp</a></td>
+      <td class="coverBar" align="center">
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=96 height=10 alt="96.3%"><img src="../../snow.png" width=4 height=10 alt="96.3%"></td></tr></table>
+      </td>
+      <td class="coverPerHi">96.3&nbsp;%</td>
+      <td class="coverNumHi">156 / 162</td>
+      <td class="coverPerHi">100.0&nbsp;%</td>
+      <td class="coverNumHi">12 / 12</td>
+    </tr>
     <tr>
       <td class="coverFile"><a href="location.h.gcov.html">location.h</a></td>
       <td class="coverBar" align="center">
@@ -129,16 +139,6 @@
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">21 / 21</td>
     </tr>
-    <tr>
-      <td class="coverFile"><a href="infection.cpp.gcov.html">infection.cpp</a></td>
-      <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=98 height=10 alt="97.5%"><img src="../../snow.png" width=2 height=10 alt="97.5%"></td></tr></table>
-      </td>
-      <td class="coverPerHi">97.5&nbsp;%</td>
-      <td class="coverNumHi">158 / 162</td>
-      <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">12 / 12</td>
-    </tr>
     <tr>
       <td class="coverFile"><a href="person.cpp.gcov.html">person.cpp</a></td>
       <td class="coverBar" align="center">
@@ -220,44 +220,44 @@
       <td class="coverNumHi">2 / 2</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="mask.cpp.gcov.html">mask.cpp</a></td>
+      <td class="coverFile"><a href="simulation.cpp.gcov.html">simulation.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">10 / 10</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">3 / 3</td>
+      <td class="coverNumHi">2 / 2</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="simulation.cpp.gcov.html">simulation.cpp</a></td>
+      <td class="coverFile"><a href="mask.cpp.gcov.html">mask.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">10 / 10</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">2 / 2</td>
+      <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="lockdown_rules.cpp.gcov.html">lockdown_rules.cpp</a></td>
+      <td class="coverFile"><a href="simulation.h.gcov.html">simulation.h</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">12 / 12</td>
-      <td class="coverPerHi">100.0&nbsp;%</td>
-      <td class="coverNumHi">3 / 3</td>
+      <td class="coverPerMed">83.3&nbsp;%</td>
+      <td class="coverNumMed">5 / 6</td>
     </tr>
     <tr>
-      <td class="coverFile"><a href="simulation.h.gcov.html">simulation.h</a></td>
+      <td class="coverFile"><a href="lockdown_rules.cpp.gcov.html">lockdown_rules.cpp</a></td>
       <td class="coverBar" align="center">
         <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table>
       </td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">12 / 12</td>
-      <td class="coverPerMed">83.3&nbsp;%</td>
-      <td class="coverNumMed">5 / 6</td>
+      <td class="coverPerHi">100.0&nbsp;%</td>
+      <td class="coverNumHi">3 / 3</td>
     </tr>
     <tr>
       <td class="coverFile"><a href="location.cpp.gcov.html">location.cpp</a></td>
diff --git a/coverage/cpp/models/abm/index.html b/coverage/cpp/models/abm/index.html
index 2a367628f3..17fe517bf5 100644
--- a/coverage/cpp/models/abm/index.html
+++ b/coverage/cpp/models/abm/index.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">1720</td>
+            <td class="headerCovTableEntry">1718</td>
             <td class="headerCovTableEntry">1749</td>
-            <td class="headerCovTableEntryHi">98.3 %</td>
+            <td class="headerCovTableEntryHi">98.2 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">460</td>
@@ -112,10 +112,10 @@
     <tr>
       <td class="coverFile"><a href="infection.cpp.gcov.html">infection.cpp</a></td>
       <td class="coverBar" align="center">
-        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=98 height=10 alt="97.5%"><img src="../../snow.png" width=2 height=10 alt="97.5%"></td></tr></table>
+        <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../../emerald.png" width=96 height=10 alt="96.3%"><img src="../../snow.png" width=4 height=10 alt="96.3%"></td></tr></table>
       </td>
-      <td class="coverPerHi">97.5&nbsp;%</td>
-      <td class="coverNumHi">158 / 162</td>
+      <td class="coverPerHi">96.3&nbsp;%</td>
+      <td class="coverNumHi">156 / 162</td>
       <td class="coverPerHi">100.0&nbsp;%</td>
       <td class="coverNumHi">12 / 12</td>
     </tr>
diff --git a/coverage/cpp/models/abm/infection.cpp.func-sort-c.html b/coverage/cpp/models/abm/infection.cpp.func-sort-c.html
index c4a950515d..affe94b332 100644
--- a/coverage/cpp/models/abm/infection.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/infection.cpp.func-sort-c.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">158</td>
+            <td class="headerCovTableEntry">156</td>
             <td class="headerCovTableEntry">162</td>
-            <td class="headerCovTableEntryHi">97.5 %</td>
+            <td class="headerCovTableEntryHi">96.3 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
@@ -105,7 +105,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="infection.cpp.gcov.html#92">mio::abm::Infection::get_infection_state(mio::abm::TimePoint) const::{lambda(mio::abm::TimePoint const&amp;, std::pair&lt;mio::abm::TimePoint, mio::abm::InfectionState&gt;)#1}::operator()(mio::abm::TimePoint const&amp;, std::pair&lt;mio::abm::TimePoint, mio::abm::InfectionState&gt;) const</a></td>
-              <td class="coverFnHi">28602</td>
+              <td class="coverFnHi">36387</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/infection.cpp.func.html b/coverage/cpp/models/abm/infection.cpp.func.html
index c123cacf25..6519a57631 100644
--- a/coverage/cpp/models/abm/infection.cpp.func.html
+++ b/coverage/cpp/models/abm/infection.cpp.func.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">158</td>
+            <td class="headerCovTableEntry">156</td>
             <td class="headerCovTableEntry">162</td>
-            <td class="headerCovTableEntryHi">97.5 %</td>
+            <td class="headerCovTableEntryHi">96.3 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
@@ -105,7 +105,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="infection.cpp.gcov.html#92">mio::abm::Infection::get_infection_state(mio::abm::TimePoint) const::{lambda(mio::abm::TimePoint const&amp;, std::pair&lt;mio::abm::TimePoint, mio::abm::InfectionState&gt;)#1}::operator()(mio::abm::TimePoint const&amp;, std::pair&lt;mio::abm::TimePoint, mio::abm::InfectionState&gt;) const</a></td>
-              <td class="coverFnHi">28602</td>
+              <td class="coverFnHi">36387</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/infection.cpp.gcov.html b/coverage/cpp/models/abm/infection.cpp.gcov.html
index 7a5066d30a..e665836436 100644
--- a/coverage/cpp/models/abm/infection.cpp.gcov.html
+++ b/coverage/cpp/models/abm/infection.cpp.gcov.html
@@ -31,13 +31,13 @@
             <td class="headerValue">coverage.info</td>
             <td></td>
             <td class="headerItem">Lines:</td>
-            <td class="headerCovTableEntry">158</td>
+            <td class="headerCovTableEntry">156</td>
             <td class="headerCovTableEntry">162</td>
-            <td class="headerCovTableEntryHi">97.5 %</td>
+            <td class="headerCovTableEntryHi">96.3 %</td>
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
@@ -153,8 +153,8 @@
 <a name="91"><span class="lineNum">      91 </span><span class="lineCov">         18 :         return InfectionState::Susceptible;</span></a>
 <a name="92"><span class="lineNum">      92 </span>            : </a>
 <a name="93"><span class="lineNum">      93 </span><span class="lineCov">      14076 :     return (*std::prev(std::upper_bound(m_infection_course.begin(), m_infection_course.end(), t,</span></a>
-<a name="94"><span class="lineNum">      94 </span><span class="lineCov">      28602 :                                         [](const TimePoint&amp; s, std::pair&lt;TimePoint, InfectionState&gt; state) {</span></a>
-<a name="95"><span class="lineNum">      95 </span><span class="lineCov">      28602 :                                             return state.first &gt; s;</span></a>
+<a name="94"><span class="lineNum">      94 </span><span class="lineCov">      36387 :                                         [](const TimePoint&amp; s, std::pair&lt;TimePoint, InfectionState&gt; state) {</span></a>
+<a name="95"><span class="lineNum">      95 </span><span class="lineCov">      36387 :                                             return state.first &gt; s;</span></a>
 <a name="96"><span class="lineNum">      96 </span><span class="lineCov">      28152 :                                         })))</span></a>
 <a name="97"><span class="lineNum">      97 </span><span class="lineCov">      14076 :         .second;</span></a>
 <a name="98"><span class="lineNum">      98 </span>            : }</a>
@@ -195,8 +195,8 @@
 <a name="133"><span class="lineNum">     133 </span><span class="lineCov">        504 :     m_infection_course.push_back(std::pair&lt;TimePoint, InfectionState&gt;(t, next_state));</span></a>
 <a name="134"><span class="lineNum">     134 </span><span class="lineCov">        504 :     auto&amp; uniform_dist = UniformDistribution&lt;double&gt;::get_instance();</span></a>
 <a name="135"><span class="lineNum">     135 </span>            :     ScalarType v; // random draws</a>
-<a name="136"><span class="lineNum">     136 </span><span class="lineCov">       1179 :     while ((next_state != InfectionState::Recovered &amp;&amp; next_state != InfectionState::Dead)) {</span></a>
-<a name="137"><span class="lineNum">     137 </span><span class="lineCov">        675 :         switch (next_state) {</span></a>
+<a name="136"><span class="lineNum">     136 </span><span class="lineCov">       1116 :     while ((next_state != InfectionState::Recovered &amp;&amp; next_state != InfectionState::Dead)) {</span></a>
+<a name="137"><span class="lineNum">     137 </span><span class="lineCov">        612 :         switch (next_state) {</span></a>
 <a name="138"><span class="lineNum">     138 </span><span class="lineCov">         72 :         case InfectionState::Exposed:</span></a>
 <a name="139"><span class="lineNum">     139 </span>            :             // roll out how long until infected without symptoms</a>
 <a name="140"><span class="lineNum">     140 </span><span class="lineCov">         72 :             time_period = days(params.get&lt;IncubationPeriod&gt;()[{m_virus_variant, age}]); // subject to change</span></a>
@@ -207,68 +207,68 @@
 <a name="145"><span class="lineNum">     145 </span><span class="lineCov">        207 :             v = uniform_dist(rng);</span></a>
 <a name="146"><span class="lineNum">     146 </span><span class="lineCov">        207 :             if (v &lt; 0.5) { // TODO: subject to change</span></a>
 <a name="147"><span class="lineNum">     147 </span>            :                 time_period =</a>
-<a name="148"><span class="lineNum">     148 </span><span class="lineCov">         63 :                     days(params.get&lt;InfectedNoSymptomsToSymptoms&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="149"><span class="lineNum">     149 </span><span class="lineCov">         63 :                 next_state = InfectionState::InfectedSymptoms;</span></a>
+<a name="148"><span class="lineNum">     148 </span><span class="lineCov">         81 :                     days(params.get&lt;InfectedNoSymptomsToSymptoms&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="149"><span class="lineNum">     149 </span><span class="lineCov">         81 :                 next_state = InfectionState::InfectedSymptoms;</span></a>
 <a name="150"><span class="lineNum">     150 </span>            :             }</a>
 <a name="151"><span class="lineNum">     151 </span>            :             else {</a>
-<a name="152"><span class="lineNum">     152 </span><span class="lineCov">        432 :                 time_period = days(</span></a>
-<a name="153"><span class="lineNum">     153 </span><span class="lineCov">        432 :                     params.get&lt;InfectedNoSymptomsToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="154"><span class="lineNum">     154 </span><span class="lineCov">        144 :                 next_state = InfectionState::Recovered;</span></a>
+<a name="152"><span class="lineNum">     152 </span><span class="lineCov">        378 :                 time_period = days(</span></a>
+<a name="153"><span class="lineNum">     153 </span><span class="lineCov">        378 :                     params.get&lt;InfectedNoSymptomsToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="154"><span class="lineNum">     154 </span><span class="lineCov">        126 :                 next_state = InfectionState::Recovered;</span></a>
 <a name="155"><span class="lineNum">     155 </span>            :             }</a>
 <a name="156"><span class="lineNum">     156 </span>            : </a>
 <a name="157"><span class="lineNum">     157 </span><span class="lineCov">        207 :             break;</span></a>
-<a name="158"><span class="lineNum">     158 </span><span class="lineCov">        189 :         case InfectionState::InfectedSymptoms:</span></a>
+<a name="158"><span class="lineNum">     158 </span><span class="lineCov">        207 :         case InfectionState::InfectedSymptoms:</span></a>
 <a name="159"><span class="lineNum">     159 </span>            :             // roll out next infection step</a>
 <a name="160"><span class="lineNum">     160 </span>            :             {</a>
-<a name="161"><span class="lineNum">     161 </span><span class="lineCov">        189 :                 ScalarType severity_protection_factor = 0.5;</span></a>
-<a name="162"><span class="lineNum">     162 </span><span class="lineCov">        189 :                 v                                     = uniform_dist(rng);</span></a>
-<a name="163"><span class="lineNum">     163 </span><span class="lineCov">        189 :                 if (latest_protection.type != ProtectionType::NoProtection) {</span></a>
+<a name="161"><span class="lineNum">     161 </span><span class="lineCov">        207 :                 ScalarType severity_protection_factor = 0.5;</span></a>
+<a name="162"><span class="lineNum">     162 </span><span class="lineCov">        207 :                 v                                     = uniform_dist(rng);</span></a>
+<a name="163"><span class="lineNum">     163 </span><span class="lineCov">        207 :                 if (latest_protection.type != ProtectionType::NoProtection) {</span></a>
 <a name="164"><span class="lineNum">     164 </span>            :                     severity_protection_factor =</a>
 <a name="165"><span class="lineNum">     165 </span><span class="lineCov">         18 :                         params.get&lt;SeverityProtectionFactor&gt;()[{latest_protection.type, age, m_virus_variant}](</span></a>
 <a name="166"><span class="lineNum">     166 </span><span class="lineCov">          9 :                             t.days() - latest_protection.time.days());</span></a>
 <a name="167"><span class="lineNum">     167 </span>            :                 }</a>
-<a name="168"><span class="lineNum">     168 </span><span class="lineCov">        189 :                 if (v &lt; (1 - severity_protection_factor) * 0.5) {</span></a>
+<a name="168"><span class="lineNum">     168 </span><span class="lineCov">        207 :                 if (v &lt; (1 - severity_protection_factor) * 0.5) {</span></a>
 <a name="169"><span class="lineNum">     169 </span>            :                     time_period =</a>
-<a name="170"><span class="lineNum">     170 </span><span class="lineCov">         90 :                         days(params.get&lt;InfectedSymptomsToSevere&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="171"><span class="lineNum">     171 </span><span class="lineCov">         90 :                     next_state = InfectionState::InfectedSevere;</span></a>
+<a name="170"><span class="lineNum">     170 </span><span class="lineCov">         45 :                         days(params.get&lt;InfectedSymptomsToSevere&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="171"><span class="lineNum">     171 </span><span class="lineCov">         45 :                     next_state = InfectionState::InfectedSevere;</span></a>
 <a name="172"><span class="lineNum">     172 </span>            :                 }</a>
 <a name="173"><span class="lineNum">     173 </span>            :                 else {</a>
-<a name="174"><span class="lineNum">     174 </span><span class="lineCov">        297 :                     time_period = days(</span></a>
-<a name="175"><span class="lineNum">     175 </span><span class="lineCov">        297 :                         params.get&lt;InfectedSymptomsToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="176"><span class="lineNum">     176 </span><span class="lineCov">         99 :                     next_state = InfectionState::Recovered;</span></a>
+<a name="174"><span class="lineNum">     174 </span><span class="lineCov">        486 :                     time_period = days(</span></a>
+<a name="175"><span class="lineNum">     175 </span><span class="lineCov">        486 :                         params.get&lt;InfectedSymptomsToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="176"><span class="lineNum">     176 </span><span class="lineCov">        162 :                     next_state = InfectionState::Recovered;</span></a>
 <a name="177"><span class="lineNum">     177 </span>            :                 }</a>
-<a name="178"><span class="lineNum">     178 </span><span class="lineCov">        189 :                 break;</span></a>
+<a name="178"><span class="lineNum">     178 </span><span class="lineCov">        207 :                 break;</span></a>
 <a name="179"><span class="lineNum">     179 </span>            :             }</a>
-<a name="180"><span class="lineNum">     180 </span><span class="lineCov">        126 :         case InfectionState::InfectedSevere:</span></a>
+<a name="180"><span class="lineNum">     180 </span><span class="lineCov">         81 :         case InfectionState::InfectedSevere:</span></a>
 <a name="181"><span class="lineNum">     181 </span>            :             // roll out next infection step</a>
-<a name="182"><span class="lineNum">     182 </span><span class="lineCov">        126 :             v = uniform_dist(rng);</span></a>
-<a name="183"><span class="lineNum">     183 </span><span class="lineCov">        126 :             if (v &lt; 0.5) { // TODO: subject to change</span></a>
-<a name="184"><span class="lineNum">     184 </span><span class="lineCov">         63 :                 time_period = days(params.get&lt;SevereToCritical&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="185"><span class="lineNum">     185 </span><span class="lineCov">         63 :                 next_state  = InfectionState::InfectedCritical;</span></a>
+<a name="182"><span class="lineNum">     182 </span><span class="lineCov">         81 :             v = uniform_dist(rng);</span></a>
+<a name="183"><span class="lineNum">     183 </span><span class="lineCov">         81 :             if (v &lt; 0.5) { // TODO: subject to change</span></a>
+<a name="184"><span class="lineNum">     184 </span><span class="lineCov">         27 :                 time_period = days(params.get&lt;SevereToCritical&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="185"><span class="lineNum">     185 </span><span class="lineCov">         27 :                 next_state  = InfectionState::InfectedCritical;</span></a>
 <a name="186"><span class="lineNum">     186 </span>            :             }</a>
 <a name="187"><span class="lineNum">     187 </span>            :             else {</a>
-<a name="188"><span class="lineNum">     188 </span><span class="lineCov">         63 :                 time_period = days(params.get&lt;SevereToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="189"><span class="lineNum">     189 </span><span class="lineCov">         63 :                 next_state  = InfectionState::Recovered;</span></a>
+<a name="188"><span class="lineNum">     188 </span><span class="lineCov">         54 :                 time_period = days(params.get&lt;SevereToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="189"><span class="lineNum">     189 </span><span class="lineCov">         54 :                 next_state  = InfectionState::Recovered;</span></a>
 <a name="190"><span class="lineNum">     190 </span>            :             }</a>
-<a name="191"><span class="lineNum">     191 </span><span class="lineCov">        126 :             break;</span></a>
-<a name="192"><span class="lineNum">     192 </span><span class="lineCov">         81 :         case InfectionState::InfectedCritical:</span></a>
+<a name="191"><span class="lineNum">     191 </span><span class="lineCov">         81 :             break;</span></a>
+<a name="192"><span class="lineNum">     192 </span><span class="lineCov">         45 :         case InfectionState::InfectedCritical:</span></a>
 <a name="193"><span class="lineNum">     193 </span>            :             // roll out next infection step</a>
-<a name="194"><span class="lineNum">     194 </span><span class="lineCov">         81 :             v = uniform_dist(rng);</span></a>
-<a name="195"><span class="lineNum">     195 </span><span class="lineCov">         81 :             if (v &lt; 0.5) { // TODO: subject to change</span></a>
-<a name="196"><span class="lineNum">     196 </span><span class="lineCov">         45 :                 time_period = days(params.get&lt;CriticalToDead&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="197"><span class="lineNum">     197 </span><span class="lineCov">         45 :                 next_state  = InfectionState::Dead;</span></a>
+<a name="194"><span class="lineNum">     194 </span><span class="lineCov">         45 :             v = uniform_dist(rng);</span></a>
+<a name="195"><span class="lineNum">     195 </span><span class="lineCov">         45 :             if (v &lt; 0.5) { // TODO: subject to change</span></a>
+<a name="196"><span class="lineNum">     196 </span><span class="lineNoCov">          0 :                 time_period = days(params.get&lt;CriticalToDead&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="197"><span class="lineNum">     197 </span><span class="lineNoCov">          0 :                 next_state  = InfectionState::Dead;</span></a>
 <a name="198"><span class="lineNum">     198 </span>            :             }</a>
 <a name="199"><span class="lineNum">     199 </span>            :             else {</a>
 <a name="200"><span class="lineNum">     200 </span>            :                 time_period =</a>
-<a name="201"><span class="lineNum">     201 </span><span class="lineCov">         36 :                     days(params.get&lt;CriticalToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="202"><span class="lineNum">     202 </span><span class="lineCov">         36 :                 next_state = InfectionState::Recovered;</span></a>
+<a name="201"><span class="lineNum">     201 </span><span class="lineCov">         45 :                     days(params.get&lt;CriticalToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="202"><span class="lineNum">     202 </span><span class="lineCov">         45 :                 next_state = InfectionState::Recovered;</span></a>
 <a name="203"><span class="lineNum">     203 </span>            :             }</a>
-<a name="204"><span class="lineNum">     204 </span><span class="lineCov">         81 :             break;</span></a>
+<a name="204"><span class="lineNum">     204 </span><span class="lineCov">         45 :             break;</span></a>
 <a name="205"><span class="lineNum">     205 </span><span class="lineNoCov">          0 :         default:</span></a>
 <a name="206"><span class="lineNum">     206 </span><span class="lineNoCov">          0 :             break;</span></a>
 <a name="207"><span class="lineNum">     207 </span>            :         }</a>
-<a name="208"><span class="lineNum">     208 </span><span class="lineCov">        675 :         t = t + time_period;</span></a>
-<a name="209"><span class="lineNum">     209 </span><span class="lineCov">        675 :         m_infection_course.push_back({t, next_state});</span></a>
+<a name="208"><span class="lineNum">     208 </span><span class="lineCov">        612 :         t = t + time_period;</span></a>
+<a name="209"><span class="lineNum">     209 </span><span class="lineCov">        612 :         m_infection_course.push_back({t, next_state});</span></a>
 <a name="210"><span class="lineNum">     210 </span>            :     }</a>
 <a name="211"><span class="lineNum">     211 </span><span class="lineCov">        504 : }</span></a>
 <a name="212"><span class="lineNum">     212 </span>            : </a>
@@ -283,8 +283,8 @@
 <a name="221"><span class="lineNum">     221 </span><span class="lineCov">        504 :     auto&amp; uniform_dist = UniformDistribution&lt;double&gt;::get_instance();</span></a>
 <a name="222"><span class="lineNum">     222 </span>            :     ScalarType v; // random draws</a>
 <a name="223"><span class="lineNum">     223 </span>            : </a>
-<a name="224"><span class="lineNum">     224 </span><span class="lineCov">       1557 :     while ((previous_state != InfectionState::Exposed)) {</span></a>
-<a name="225"><span class="lineNum">     225 </span><span class="lineCov">       1053 :         switch (previous_state) {</span></a>
+<a name="224"><span class="lineNum">     224 </span><span class="lineCov">       1548 :     while ((previous_state != InfectionState::Exposed)) {</span></a>
+<a name="225"><span class="lineNum">     225 </span><span class="lineCov">       1044 :         switch (previous_state) {</span></a>
 <a name="226"><span class="lineNum">     226 </span>            : </a>
 <a name="227"><span class="lineNum">     227 </span><span class="lineCov">        432 :         case InfectionState::InfectedNoSymptoms:</span></a>
 <a name="228"><span class="lineNum">     228 </span><span class="lineCov">        432 :             time_period    = days(params.get&lt;IncubationPeriod&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
@@ -297,11 +297,11 @@
 <a name="235"><span class="lineNum">     235 </span><span class="lineCov">        279 :             previous_state = InfectionState::InfectedNoSymptoms;</span></a>
 <a name="236"><span class="lineNum">     236 </span><span class="lineCov">        279 :             break;</span></a>
 <a name="237"><span class="lineNum">     237 </span>            : </a>
-<a name="238"><span class="lineNum">     238 </span><span class="lineCov">        144 :         case InfectionState::InfectedSevere:</span></a>
+<a name="238"><span class="lineNum">     238 </span><span class="lineCov">        135 :         case InfectionState::InfectedSevere:</span></a>
 <a name="239"><span class="lineNum">     239 </span>            :             time_period =</a>
-<a name="240"><span class="lineNum">     240 </span><span class="lineCov">        144 :                 days(params.get&lt;InfectedSymptomsToSevere&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="241"><span class="lineNum">     241 </span><span class="lineCov">        144 :             previous_state = InfectionState::InfectedSymptoms;</span></a>
-<a name="242"><span class="lineNum">     242 </span><span class="lineCov">        144 :             break;</span></a>
+<a name="240"><span class="lineNum">     240 </span><span class="lineCov">        135 :                 days(params.get&lt;InfectedSymptomsToSevere&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="241"><span class="lineNum">     241 </span><span class="lineCov">        135 :             previous_state = InfectionState::InfectedSymptoms;</span></a>
+<a name="242"><span class="lineNum">     242 </span><span class="lineCov">        135 :             break;</span></a>
 <a name="243"><span class="lineNum">     243 </span>            : </a>
 <a name="244"><span class="lineNum">     244 </span><span class="lineCov">         81 :         case InfectionState::InfectedCritical:</span></a>
 <a name="245"><span class="lineNum">     245 </span><span class="lineCov">         81 :             time_period    = days(params.get&lt;SevereToCritical&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
@@ -318,12 +318,12 @@
 <a name="256"><span class="lineNum">     256 </span>            :             }</a>
 <a name="257"><span class="lineNum">     257 </span><span class="lineCov">         63 :             else if (v &lt; 0.5) { // TODO: subject to change</span></a>
 <a name="258"><span class="lineNum">     258 </span>            :                 time_period =</a>
-<a name="259"><span class="lineNum">     259 </span><span class="lineCov">          9 :                     days(params.get&lt;InfectedSymptomsToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="260"><span class="lineNum">     260 </span><span class="lineCov">          9 :                 previous_state = InfectionState::InfectedSymptoms;</span></a>
+<a name="259"><span class="lineNum">     259 </span><span class="lineCov">         18 :                     days(params.get&lt;InfectedSymptomsToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="260"><span class="lineNum">     260 </span><span class="lineCov">         18 :                 previous_state = InfectionState::InfectedSymptoms;</span></a>
 <a name="261"><span class="lineNum">     261 </span>            :             }</a>
-<a name="262"><span class="lineNum">     262 </span><span class="lineCov">         54 :             else if (v &lt; 0.75) {</span></a>
-<a name="263"><span class="lineNum">     263 </span><span class="lineCov">         27 :                 time_period = days(params.get&lt;SevereToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
-<a name="264"><span class="lineNum">     264 </span><span class="lineCov">         27 :                 previous_state = InfectionState::InfectedSevere;</span></a>
+<a name="262"><span class="lineNum">     262 </span><span class="lineCov">         45 :             else if (v &lt; 0.75) {</span></a>
+<a name="263"><span class="lineNum">     263 </span><span class="lineCov">         18 :                 time_period = days(params.get&lt;SevereToRecovered&gt;()[{m_virus_variant, age}]); // TODO: subject to change</span></a>
+<a name="264"><span class="lineNum">     264 </span><span class="lineCov">         18 :                 previous_state = InfectionState::InfectedSevere;</span></a>
 <a name="265"><span class="lineNum">     265 </span>            :             }</a>
 <a name="266"><span class="lineNum">     266 </span>            :             else {</a>
 <a name="267"><span class="lineNum">     267 </span>            :                 time_period =</a>
@@ -340,8 +340,8 @@
 <a name="278"><span class="lineNum">     278 </span><span class="lineNoCov">          0 :         default:</span></a>
 <a name="279"><span class="lineNum">     279 </span><span class="lineNoCov">          0 :             break;</span></a>
 <a name="280"><span class="lineNum">     280 </span>            :         }</a>
-<a name="281"><span class="lineNum">     281 </span><span class="lineCov">       1053 :         start_date = start_date - time_period;</span></a>
-<a name="282"><span class="lineNum">     282 </span><span class="lineCov">       1053 :         m_infection_course.insert(m_infection_course.begin(), {start_date, previous_state});</span></a>
+<a name="281"><span class="lineNum">     281 </span><span class="lineCov">       1044 :         start_date = start_date - time_period;</span></a>
+<a name="282"><span class="lineNum">     282 </span><span class="lineCov">       1044 :         m_infection_course.insert(m_infection_course.begin(), {start_date, previous_state});</span></a>
 <a name="283"><span class="lineNum">     283 </span>            :     }</a>
 <a name="284"><span class="lineNum">     284 </span><span class="lineCov">       1008 :     return start_date;</span></a>
 <a name="285"><span class="lineNum">     285 </span>            : }</a>
diff --git a/coverage/cpp/models/abm/infection.h.func-sort-c.html b/coverage/cpp/models/abm/infection.h.func-sort-c.html
index 3251f9fa0d..dc29b42021 100644
--- a/coverage/cpp/models/abm/infection.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/infection.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/infection.h.func.html b/coverage/cpp/models/abm/infection.h.func.html
index 01a68a7b7b..2cff36ea14 100644
--- a/coverage/cpp/models/abm/infection.h.func.html
+++ b/coverage/cpp/models/abm/infection.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/infection.h.gcov.html b/coverage/cpp/models/abm/infection.h.gcov.html
index 3e758c6bb2..16b22f6319 100644
--- a/coverage/cpp/models/abm/infection.h.gcov.html
+++ b/coverage/cpp/models/abm/infection.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/location.cpp.func-sort-c.html b/coverage/cpp/models/abm/location.cpp.func-sort-c.html
index 74a966ea67..58eb15c5a0 100644
--- a/coverage/cpp/models/abm/location.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/location.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/location.cpp.func.html b/coverage/cpp/models/abm/location.cpp.func.html
index 4861cc34b2..bdff5531a8 100644
--- a/coverage/cpp/models/abm/location.cpp.func.html
+++ b/coverage/cpp/models/abm/location.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/location.cpp.gcov.html b/coverage/cpp/models/abm/location.cpp.gcov.html
index 9c7b70d2a8..b8aa5055e1 100644
--- a/coverage/cpp/models/abm/location.cpp.gcov.html
+++ b/coverage/cpp/models/abm/location.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/location.h.func-sort-c.html b/coverage/cpp/models/abm/location.h.func-sort-c.html
index 25329f718e..deaa743bf6 100644
--- a/coverage/cpp/models/abm/location.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/location.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
@@ -113,7 +113,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#227">mio::abm::Location::get_capacity(unsigned int) const</a></td>
-              <td class="coverFnHi">252</td>
+              <td class="coverFnHi">261</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#74">mio::abm::CellCapacity::CellCapacity()</a></td>
@@ -125,7 +125,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#152">mio::abm::Location::get_type() const</a></td>
-              <td class="coverFnHi">4761</td>
+              <td class="coverFnHi">4797</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#59">mio::abm::CellIndex::CellIndex(unsigned long)</a></td>
@@ -137,11 +137,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#186">mio::abm::Location::get_cells() const</a></td>
-              <td class="coverFnHi">9747</td>
+              <td class="coverFnHi">9756</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#161">mio::abm::Location::get_id() const</a></td>
-              <td class="coverFnHi">47583</td>
+              <td class="coverFnHi">47628</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/location.h.func.html b/coverage/cpp/models/abm/location.h.func.html
index 75a1b97073..c4a74bf5c5 100644
--- a/coverage/cpp/models/abm/location.h.func.html
+++ b/coverage/cpp/models/abm/location.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
@@ -109,7 +109,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#227">mio::abm::Location::get_capacity(unsigned int) const</a></td>
-              <td class="coverFnHi">252</td>
+              <td class="coverFnHi">261</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#237">mio::abm::Location::is_mask_required() const</a></td>
@@ -129,15 +129,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#161">mio::abm::Location::get_id() const</a></td>
-              <td class="coverFnHi">47583</td>
+              <td class="coverFnHi">47628</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#152">mio::abm::Location::get_type() const</a></td>
-              <td class="coverFnHi">4761</td>
+              <td class="coverFnHi">4797</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#186">mio::abm::Location::get_cells() const</a></td>
-              <td class="coverFnHi">9747</td>
+              <td class="coverFnHi">9756</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location.h.gcov.html#138">mio::abm::Location::operator==(mio::abm::Location const&amp;) const</a></td>
diff --git a/coverage/cpp/models/abm/location.h.gcov.html b/coverage/cpp/models/abm/location.h.gcov.html
index 71d9d05eee..e29ef82119 100644
--- a/coverage/cpp/models/abm/location.h.gcov.html
+++ b/coverage/cpp/models/abm/location.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
@@ -213,18 +213,18 @@
 <a name="151"><span class="lineNum">     151 </span>            :      * @brief Get the type of this Location.</a>
 <a name="152"><span class="lineNum">     152 </span>            :      * @return The #LocationType of the Location.</a>
 <a name="153"><span class="lineNum">     153 </span>            :      */</a>
-<a name="154"><span class="lineNum">     154 </span><span class="lineCov">       4761 :     LocationType get_type() const</span></a>
+<a name="154"><span class="lineNum">     154 </span><span class="lineCov">       4797 :     LocationType get_type() const</span></a>
 <a name="155"><span class="lineNum">     155 </span>            :     {</a>
-<a name="156"><span class="lineNum">     156 </span><span class="lineCov">       4761 :         return m_type;</span></a>
+<a name="156"><span class="lineNum">     156 </span><span class="lineCov">       4797 :         return m_type;</span></a>
 <a name="157"><span class="lineNum">     157 </span>            :     }</a>
 <a name="158"><span class="lineNum">     158 </span>            : </a>
 <a name="159"><span class="lineNum">     159 </span>            :     /**</a>
 <a name="160"><span class="lineNum">     160 </span>            :      * @brief Get the location's identifier in a Model.</a>
 <a name="161"><span class="lineNum">     161 </span>            :      * @return The location's LocationId by value.</a>
 <a name="162"><span class="lineNum">     162 </span>            :      */</a>
-<a name="163"><span class="lineNum">     163 </span><span class="lineCov">      47583 :     LocationId get_id() const</span></a>
+<a name="163"><span class="lineNum">     163 </span><span class="lineCov">      47628 :     LocationId get_id() const</span></a>
 <a name="164"><span class="lineNum">     164 </span>            :     {</a>
-<a name="165"><span class="lineNum">     165 </span><span class="lineCov">      47583 :         return m_id;</span></a>
+<a name="165"><span class="lineNum">     165 </span><span class="lineCov">      47628 :         return m_id;</span></a>
 <a name="166"><span class="lineNum">     166 </span>            :     }</a>
 <a name="167"><span class="lineNum">     167 </span>            : </a>
 <a name="168"><span class="lineNum">     168 </span>            :     /**</a>
@@ -247,9 +247,9 @@
 <a name="185"><span class="lineNum">     185 </span>            :      * @brief Get the Cell%s of this Location.</a>
 <a name="186"><span class="lineNum">     186 </span>            :      * @return The vector of all Cell%s of the Location.</a>
 <a name="187"><span class="lineNum">     187 </span>            :      */</a>
-<a name="188"><span class="lineNum">     188 </span><span class="lineCov">       9747 :     const std::vector&lt;Cell&gt;&amp; get_cells() const</span></a>
+<a name="188"><span class="lineNum">     188 </span><span class="lineCov">       9756 :     const std::vector&lt;Cell&gt;&amp; get_cells() const</span></a>
 <a name="189"><span class="lineNum">     189 </span>            :     {</a>
-<a name="190"><span class="lineNum">     190 </span><span class="lineCov">       9747 :         return m_cells;</span></a>
+<a name="190"><span class="lineNum">     190 </span><span class="lineCov">       9756 :         return m_cells;</span></a>
 <a name="191"><span class="lineNum">     191 </span>            :     }</a>
 <a name="192"><span class="lineNum">     192 </span>            : </a>
 <a name="193"><span class="lineNum">     193 </span>            :     /**</a>
@@ -288,10 +288,10 @@
 <a name="226"><span class="lineNum">     226 </span>            :      * @param[in] cell_idx The index of the Cell.</a>
 <a name="227"><span class="lineNum">     227 </span>            :      * @return The CellCapacity of the Cell.</a>
 <a name="228"><span class="lineNum">     228 </span>            :      */</a>
-<a name="229"><span class="lineNum">     229 </span><span class="lineCov">        252 :     CellCapacity get_capacity(uint32_t cell_idx = 0) const</span></a>
+<a name="229"><span class="lineNum">     229 </span><span class="lineCov">        261 :     CellCapacity get_capacity(uint32_t cell_idx = 0) const</span></a>
 <a name="230"><span class="lineNum">     230 </span>            :     {</a>
-<a name="231"><span class="lineNum">     231 </span><span class="lineCov">        252 :         assert(cell_idx &lt; m_cells.size() &amp;&amp; &quot;Given cell index is too large.&quot;);</span></a>
-<a name="232"><span class="lineNum">     232 </span><span class="lineCov">        252 :         return m_cells[cell_idx].m_capacity;</span></a>
+<a name="231"><span class="lineNum">     231 </span><span class="lineCov">        261 :         assert(cell_idx &lt; m_cells.size() &amp;&amp; &quot;Given cell index is too large.&quot;);</span></a>
+<a name="232"><span class="lineNum">     232 </span><span class="lineCov">        261 :         return m_cells[cell_idx].m_capacity;</span></a>
 <a name="233"><span class="lineNum">     233 </span>            :     }</a>
 <a name="234"><span class="lineNum">     234 </span>            : </a>
 <a name="235"><span class="lineNum">     235 </span>            :     /**</a>
diff --git a/coverage/cpp/models/abm/location_id.h.func-sort-c.html b/coverage/cpp/models/abm/location_id.h.func-sort-c.html
index 12f64c33c9..9f3ce3f3e3 100644
--- a/coverage/cpp/models/abm/location_id.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/location_id.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -61,15 +61,15 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="location_id.h.gcov.html#34">mio::abm::LocationId::LocationId(unsigned int)</a></td>
-              <td class="coverFnHi">28117</td>
+              <td class="coverFnHi">28126</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location_id.h.gcov.html#46">mio::abm::LocationId::invalid_id()</a></td>
-              <td class="coverFnHi">35928</td>
+              <td class="coverFnHi">35937</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location_id.h.gcov.html#40">mio::abm::LocationId::LocationId()</a></td>
-              <td class="coverFnHi">35964</td>
+              <td class="coverFnHi">35973</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/location_id.h.func.html b/coverage/cpp/models/abm/location_id.h.func.html
index 5fb7f2ff23..bc4f5ff5a5 100644
--- a/coverage/cpp/models/abm/location_id.h.func.html
+++ b/coverage/cpp/models/abm/location_id.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -61,15 +61,15 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="location_id.h.gcov.html#46">mio::abm::LocationId::invalid_id()</a></td>
-              <td class="coverFnHi">35928</td>
+              <td class="coverFnHi">35937</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location_id.h.gcov.html#34">mio::abm::LocationId::LocationId(unsigned int)</a></td>
-              <td class="coverFnHi">28117</td>
+              <td class="coverFnHi">28126</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="location_id.h.gcov.html#40">mio::abm::LocationId::LocationId()</a></td>
-              <td class="coverFnHi">35964</td>
+              <td class="coverFnHi">35973</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/location_id.h.gcov.html b/coverage/cpp/models/abm/location_id.h.gcov.html
index e76150529f..50445a6451 100644
--- a/coverage/cpp/models/abm/location_id.h.gcov.html
+++ b/coverage/cpp/models/abm/location_id.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -95,21 +95,21 @@
 <a name="33"><span class="lineNum">      33 </span>            : struct MEMILIO_ENABLE_EBO LocationId : public mio::TypeSafe&lt;uint32_t, LocationId&gt;,</a>
 <a name="34"><span class="lineNum">      34 </span>            :                                        public OperatorComparison&lt;LocationId&gt; {</a>
 <a name="35"><span class="lineNum">      35 </span>            :     /// @brief Create an ID.</a>
-<a name="36"><span class="lineNum">      36 </span><span class="lineCov">      28117 :     LocationId(uint32_t id)</span></a>
-<a name="37"><span class="lineNum">      37 </span><span class="lineCov">      28117 :         : mio::TypeSafe&lt;uint32_t, LocationId&gt;(id)</span></a>
+<a name="36"><span class="lineNum">      36 </span><span class="lineCov">      28126 :     LocationId(uint32_t id)</span></a>
+<a name="37"><span class="lineNum">      37 </span><span class="lineCov">      28126 :         : mio::TypeSafe&lt;uint32_t, LocationId&gt;(id)</span></a>
 <a name="38"><span class="lineNum">      38 </span>            :     {</a>
-<a name="39"><span class="lineNum">      39 </span><span class="lineCov">      28117 :     }</span></a>
+<a name="39"><span class="lineNum">      39 </span><span class="lineCov">      28126 :     }</span></a>
 <a name="40"><span class="lineNum">      40 </span>            : </a>
 <a name="41"><span class="lineNum">      41 </span>            :     /// @brief Create an invalid ID.</a>
-<a name="42"><span class="lineNum">      42 </span><span class="lineCov">      35964 :     LocationId()</span></a>
-<a name="43"><span class="lineNum">      43 </span><span class="lineCov">      35964 :         : mio::TypeSafe&lt;uint32_t, LocationId&gt;(std::numeric_limits&lt;uint32_t&gt;::max())</span></a>
+<a name="42"><span class="lineNum">      42 </span><span class="lineCov">      35973 :     LocationId()</span></a>
+<a name="43"><span class="lineNum">      43 </span><span class="lineCov">      35973 :         : mio::TypeSafe&lt;uint32_t, LocationId&gt;(std::numeric_limits&lt;uint32_t&gt;::max())</span></a>
 <a name="44"><span class="lineNum">      44 </span>            :     {</a>
-<a name="45"><span class="lineNum">      45 </span><span class="lineCov">      35964 :     }</span></a>
+<a name="45"><span class="lineNum">      45 </span><span class="lineCov">      35973 :     }</span></a>
 <a name="46"><span class="lineNum">      46 </span>            : </a>
 <a name="47"><span class="lineNum">      47 </span>            :     /// @brief Value for invalid IDs.</a>
-<a name="48"><span class="lineNum">      48 </span><span class="lineCov">      35928 :     const static LocationId invalid_id()</span></a>
+<a name="48"><span class="lineNum">      48 </span><span class="lineCov">      35937 :     const static LocationId invalid_id()</span></a>
 <a name="49"><span class="lineNum">      49 </span>            :     {</a>
-<a name="50"><span class="lineNum">      50 </span><span class="lineCov">      35928 :         return LocationId();</span></a>
+<a name="50"><span class="lineNum">      50 </span><span class="lineCov">      35937 :         return LocationId();</span></a>
 <a name="51"><span class="lineNum">      51 </span>            :     }</a>
 <a name="52"><span class="lineNum">      52 </span>            : };</a>
 <a name="53"><span class="lineNum">      53 </span>            : </a>
diff --git a/coverage/cpp/models/abm/lockdown_rules.cpp.func-sort-c.html b/coverage/cpp/models/abm/lockdown_rules.cpp.func-sort-c.html
index 709a29b2fa..7e18759b67 100644
--- a/coverage/cpp/models/abm/lockdown_rules.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/lockdown_rules.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/lockdown_rules.cpp.func.html b/coverage/cpp/models/abm/lockdown_rules.cpp.func.html
index 51f78b36c8..65ca9d8ab4 100644
--- a/coverage/cpp/models/abm/lockdown_rules.cpp.func.html
+++ b/coverage/cpp/models/abm/lockdown_rules.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/lockdown_rules.cpp.gcov.html b/coverage/cpp/models/abm/lockdown_rules.cpp.gcov.html
index a0ca15579e..c8d6154bcc 100644
--- a/coverage/cpp/models/abm/lockdown_rules.cpp.gcov.html
+++ b/coverage/cpp/models/abm/lockdown_rules.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/mask.cpp.func-sort-c.html b/coverage/cpp/models/abm/mask.cpp.func-sort-c.html
index d79730e623..3591be8ed0 100644
--- a/coverage/cpp/models/abm/mask.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/mask.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="mask.cpp.gcov.html#34">mio::abm::Mask::change_mask(mio::abm::MaskType, mio::abm::TimePoint)</a></td>
-              <td class="coverFnHi">369</td>
+              <td class="coverFnHi">378</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="mask.cpp.gcov.html#28">mio::abm::Mask::Mask(mio::abm::MaskType, mio::abm::TimePoint)</a></td>
diff --git a/coverage/cpp/models/abm/mask.cpp.func.html b/coverage/cpp/models/abm/mask.cpp.func.html
index 871d3c166d..1d3b60330e 100644
--- a/coverage/cpp/models/abm/mask.cpp.func.html
+++ b/coverage/cpp/models/abm/mask.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="mask.cpp.gcov.html#34">mio::abm::Mask::change_mask(mio::abm::MaskType, mio::abm::TimePoint)</a></td>
-              <td class="coverFnHi">369</td>
+              <td class="coverFnHi">378</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="mask.cpp.gcov.html#28">mio::abm::Mask::Mask(mio::abm::MaskType, mio::abm::TimePoint)</a></td>
diff --git a/coverage/cpp/models/abm/mask.cpp.gcov.html b/coverage/cpp/models/abm/mask.cpp.gcov.html
index 22bb1030a5..d057eae9c3 100644
--- a/coverage/cpp/models/abm/mask.cpp.gcov.html
+++ b/coverage/cpp/models/abm/mask.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -95,11 +95,11 @@
 <a name="33"><span class="lineNum">      33 </span>            : {</a>
 <a name="34"><span class="lineNum">      34 </span><span class="lineCov">       1971 : }</span></a>
 <a name="35"><span class="lineNum">      35 </span>            : </a>
-<a name="36"><span class="lineNum">      36 </span><span class="lineCov">        369 : void Mask::change_mask(MaskType new_mask_type, TimePoint t)</span></a>
+<a name="36"><span class="lineNum">      36 </span><span class="lineCov">        378 : void Mask::change_mask(MaskType new_mask_type, TimePoint t)</span></a>
 <a name="37"><span class="lineNum">      37 </span>            : {</a>
-<a name="38"><span class="lineNum">      38 </span><span class="lineCov">        369 :     m_type             = new_mask_type;</span></a>
-<a name="39"><span class="lineNum">      39 </span><span class="lineCov">        369 :     m_time_first_usage = t;</span></a>
-<a name="40"><span class="lineNum">      40 </span><span class="lineCov">        369 : }</span></a>
+<a name="38"><span class="lineNum">      38 </span><span class="lineCov">        378 :     m_type             = new_mask_type;</span></a>
+<a name="39"><span class="lineNum">      39 </span><span class="lineCov">        378 :     m_time_first_usage = t;</span></a>
+<a name="40"><span class="lineNum">      40 </span><span class="lineCov">        378 : }</span></a>
 <a name="41"><span class="lineNum">      41 </span>            : </a>
 <a name="42"><span class="lineNum">      42 </span><span class="lineCov">         27 : const TimeSpan Mask::get_time_used(TimePoint curr_time) const</span></a>
 <a name="43"><span class="lineNum">      43 </span>            : {</a>
diff --git a/coverage/cpp/models/abm/mask.h.func-sort-c.html b/coverage/cpp/models/abm/mask.h.func-sort-c.html
index cbb1c4e95a..276c30f812 100644
--- a/coverage/cpp/models/abm/mask.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/mask.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/mask.h.func.html b/coverage/cpp/models/abm/mask.h.func.html
index 1a44b7d62a..7813526506 100644
--- a/coverage/cpp/models/abm/mask.h.func.html
+++ b/coverage/cpp/models/abm/mask.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/mask.h.gcov.html b/coverage/cpp/models/abm/mask.h.gcov.html
index e493913cbd..a761ad4086 100644
--- a/coverage/cpp/models/abm/mask.h.gcov.html
+++ b/coverage/cpp/models/abm/mask.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/mobility_rules.cpp.func-sort-c.html b/coverage/cpp/models/abm/mobility_rules.cpp.func-sort-c.html
index 9b9970d7c4..9a91ca57fe 100644
--- a/coverage/cpp/models/abm/mobility_rules.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/mobility_rules.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">11</td>
@@ -85,7 +85,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="mobility_rules.cpp.gcov.html#123">mio::abm::go_to_quarantine(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)</a></td>
-              <td class="coverFnHi">846</td>
+              <td class="coverFnHi">837</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="mobility_rules.cpp.gcov.html#44">mio::abm::go_to_school(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)</a></td>
diff --git a/coverage/cpp/models/abm/mobility_rules.cpp.func.html b/coverage/cpp/models/abm/mobility_rules.cpp.func.html
index 98c4c30ca4..e45e95e1a3 100644
--- a/coverage/cpp/models/abm/mobility_rules.cpp.func.html
+++ b/coverage/cpp/models/abm/mobility_rules.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">11</td>
@@ -89,7 +89,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="mobility_rules.cpp.gcov.html#123">mio::abm::go_to_quarantine(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)</a></td>
-              <td class="coverFnHi">846</td>
+              <td class="coverFnHi">837</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="mobility_rules.cpp.gcov.html#154">mio::abm::return_home_when_recovered(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)</a></td>
diff --git a/coverage/cpp/models/abm/mobility_rules.cpp.gcov.html b/coverage/cpp/models/abm/mobility_rules.cpp.gcov.html
index 804a3e9def..945cb667b2 100644
--- a/coverage/cpp/models/abm/mobility_rules.cpp.gcov.html
+++ b/coverage/cpp/models/abm/mobility_rules.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">11</td>
@@ -111,8 +111,8 @@
 <a name="49"><span class="lineNum">      49 </span><span class="lineCov">        855 :     auto current_loc = person.get_location_type();</span></a>
 <a name="50"><span class="lineNum">      50 </span>            : </a>
 <a name="51"><span class="lineNum">      51 </span><span class="lineCov">       2565 :     if (current_loc == LocationType::Home &amp;&amp; t &lt; params.get&lt;LockdownDate&gt;() &amp;&amp; t.day_of_week() &lt; 5 &amp;&amp;</span></a>
-<a name="52"><span class="lineNum">      52 </span><span class="lineCov">       2277 :         person.get_go_to_school_time(params) &gt;= t.time_since_midnight() &amp;&amp;</span></a>
-<a name="53"><span class="lineNum">      53 </span><span class="lineCov">       1296 :         person.get_go_to_school_time(params) &lt; t.time_since_midnight() + dt &amp;&amp;</span></a>
+<a name="52"><span class="lineNum">      52 </span><span class="lineCov">       2268 :         person.get_go_to_school_time(params) &gt;= t.time_since_midnight() &amp;&amp;</span></a>
+<a name="53"><span class="lineNum">      53 </span><span class="lineCov">       1287 :         person.get_go_to_school_time(params) &lt; t.time_since_midnight() + dt &amp;&amp;</span></a>
 <a name="54"><span class="lineNum">      54 </span><span class="lineCov">       2637 :         params.get&lt;mio::abm::AgeGroupGotoSchool&gt;()[person.get_age()] &amp;&amp; person.goes_to_school(t, params) &amp;&amp;</span></a>
 <a name="55"><span class="lineNum">      55 </span><span class="lineCov">       1053 :         !person.is_in_quarantine(t, params)) {</span></a>
 <a name="56"><span class="lineNum">      56 </span><span class="lineCov">         99 :         return LocationType::School;</span></a>
@@ -167,32 +167,32 @@
 <a name="105"><span class="lineNum">     105 </span>            : {</a>
 <a name="106"><span class="lineNum">     106 </span><span class="lineCov">        783 :     auto current_loc = person.get_location_type();</span></a>
 <a name="107"><span class="lineNum">     107 </span>            :     //leave</a>
-<a name="108"><span class="lineNum">     108 </span><span class="lineCov">       1863 :     if (current_loc == LocationType::Home &amp;&amp; t &lt; params.get&lt;LockdownDate&gt;() &amp;&amp;</span></a>
-<a name="109"><span class="lineNum">     109 </span><span class="lineCov">       1971 :         ((t.day_of_week() &lt;= 4 &amp;&amp; t.hour_of_day() &gt;= 19) || (t.day_of_week() &gt;= 5 &amp;&amp; t.hour_of_day() &gt;= 10)) &amp;&amp;</span></a>
-<a name="110"><span class="lineNum">     110 </span><span class="lineCov">       1107 :         !person.is_in_quarantine(t, params)) {</span></a>
-<a name="111"><span class="lineNum">     111 </span><span class="lineCov">        324 :         return random_transition(rng, current_loc, dt,</span></a>
-<a name="112"><span class="lineNum">     112 </span><span class="lineCov">        216 :                                  {{LocationType::SocialEvent,</span></a>
-<a name="113"><span class="lineNum">     113 </span><span class="lineCov">        324 :                                    params.get&lt;SocialEventRate&gt;().get_matrix_at(t.days())[(size_t)person.get_age()]}});</span></a>
+<a name="108"><span class="lineNum">     108 </span><span class="lineCov">       1872 :     if (current_loc == LocationType::Home &amp;&amp; t &lt; params.get&lt;LockdownDate&gt;() &amp;&amp;</span></a>
+<a name="109"><span class="lineNum">     109 </span><span class="lineCov">       1989 :         ((t.day_of_week() &lt;= 4 &amp;&amp; t.hour_of_day() &gt;= 19) || (t.day_of_week() &gt;= 5 &amp;&amp; t.hour_of_day() &gt;= 10)) &amp;&amp;</span></a>
+<a name="110"><span class="lineNum">     110 </span><span class="lineCov">       1134 :         !person.is_in_quarantine(t, params)) {</span></a>
+<a name="111"><span class="lineNum">     111 </span><span class="lineCov">        351 :         return random_transition(rng, current_loc, dt,</span></a>
+<a name="112"><span class="lineNum">     112 </span><span class="lineCov">        234 :                                  {{LocationType::SocialEvent,</span></a>
+<a name="113"><span class="lineNum">     113 </span><span class="lineCov">        351 :                                    params.get&lt;SocialEventRate&gt;().get_matrix_at(t.days())[(size_t)person.get_age()]}});</span></a>
 <a name="114"><span class="lineNum">     114 </span>            :     }</a>
 <a name="115"><span class="lineNum">     115 </span>            : </a>
 <a name="116"><span class="lineNum">     116 </span>            :     //return home</a>
-<a name="117"><span class="lineNum">     117 </span><span class="lineCov">       1368 :     if (current_loc == LocationType::SocialEvent &amp;&amp; t.hour_of_day() &gt;= 20 &amp;&amp;</span></a>
-<a name="118"><span class="lineNum">     118 </span><span class="lineCov">        693 :         person.get_time_at_location() &gt;= hours(2)) {</span></a>
+<a name="117"><span class="lineNum">     117 </span><span class="lineCov">       1350 :     if (current_loc == LocationType::SocialEvent &amp;&amp; t.hour_of_day() &gt;= 20 &amp;&amp;</span></a>
+<a name="118"><span class="lineNum">     118 </span><span class="lineCov">        684 :         person.get_time_at_location() &gt;= hours(2)) {</span></a>
 <a name="119"><span class="lineNum">     119 </span><span class="lineCov">          9 :         return LocationType::Home;</span></a>
 <a name="120"><span class="lineNum">     120 </span>            :     }</a>
 <a name="121"><span class="lineNum">     121 </span>            : </a>
-<a name="122"><span class="lineNum">     122 </span><span class="lineCov">        666 :     return current_loc;</span></a>
+<a name="122"><span class="lineNum">     122 </span><span class="lineCov">        657 :     return current_loc;</span></a>
 <a name="123"><span class="lineNum">     123 </span>            : }</a>
 <a name="124"><span class="lineNum">     124 </span>            : </a>
-<a name="125"><span class="lineNum">     125 </span><span class="lineCov">        846 : LocationType go_to_quarantine(PersonalRandomNumberGenerator&amp; /*rng*/, const Person&amp; person, TimePoint t,</span></a>
+<a name="125"><span class="lineNum">     125 </span><span class="lineCov">        837 : LocationType go_to_quarantine(PersonalRandomNumberGenerator&amp; /*rng*/, const Person&amp; person, TimePoint t,</span></a>
 <a name="126"><span class="lineNum">     126 </span>            :                               TimeSpan /*dt*/, const Parameters&amp; params)</a>
 <a name="127"><span class="lineNum">     127 </span>            : {</a>
-<a name="128"><span class="lineNum">     128 </span><span class="lineCov">        846 :     auto current_loc = person.get_location_type();</span></a>
-<a name="129"><span class="lineNum">     129 </span><span class="lineCov">        846 :     if (person.is_in_quarantine(t, params) &amp;&amp; current_loc != LocationType::Hospital &amp;&amp;</span></a>
+<a name="128"><span class="lineNum">     128 </span><span class="lineCov">        837 :     auto current_loc = person.get_location_type();</span></a>
+<a name="129"><span class="lineNum">     129 </span><span class="lineCov">        837 :     if (person.is_in_quarantine(t, params) &amp;&amp; current_loc != LocationType::Hospital &amp;&amp;</span></a>
 <a name="130"><span class="lineNum">     130 </span>            :         current_loc != LocationType::ICU) {</a>
 <a name="131"><span class="lineNum">     131 </span><span class="lineCov">          9 :         return LocationType::Home;</span></a>
 <a name="132"><span class="lineNum">     132 </span>            :     }</a>
-<a name="133"><span class="lineNum">     133 </span><span class="lineCov">        837 :     return current_loc;</span></a>
+<a name="133"><span class="lineNum">     133 </span><span class="lineCov">        828 :     return current_loc;</span></a>
 <a name="134"><span class="lineNum">     134 </span>            : }</a>
 <a name="135"><span class="lineNum">     135 </span>            : </a>
 <a name="136"><span class="lineNum">     136 </span><span class="lineCov">        792 : LocationType go_to_hospital(PersonalRandomNumberGenerator&amp; /*rng*/, const Person&amp; person, const TimePoint t,</span></a>
diff --git a/coverage/cpp/models/abm/model.cpp.func-sort-c.html b/coverage/cpp/models/abm/model.cpp.func-sort-c.html
index 4be236490f..b7ca7a5b72 100644
--- a/coverage/cpp/models/abm/model.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/model.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">25</td>
@@ -161,11 +161,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.cpp.gcov.html#99">bool mio::abm::Model::perform_mobility(mio::abm::TimePoint, mio::abm::TimeSpan)::{lambda(auto:1)#1}::operator()&lt;mio::abm::LocationType (*)(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)&gt;(mio::abm::LocationType (*)(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)) const</a></td>
-              <td class="coverFnHi">8829</td>
+              <td class="coverFnHi">8820</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.cpp.gcov.html#306">mio::abm::Model::find_location(mio::abm::LocationType, mio::abm::PersonId) const</a></td>
-              <td class="coverFnHi">8910</td>
+              <td class="coverFnHi">8901</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.cpp.gcov.html#257">auto mio::abm::Model::compute_exposure_caches(mio::abm::TimePoint, mio::abm::TimeSpan)::{lambda(auto:1&amp;)#2}::operator()&lt;boost::atomics::atomic&lt;double&gt; &gt;(boost::atomics::atomic&lt;double&gt;&amp;) const</a></td>
diff --git a/coverage/cpp/models/abm/model.cpp.func.html b/coverage/cpp/models/abm/model.cpp.func.html
index 8c6de7c698..35cbbef617 100644
--- a/coverage/cpp/models/abm/model.cpp.func.html
+++ b/coverage/cpp/models/abm/model.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">25</td>
@@ -121,7 +121,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.cpp.gcov.html#306">mio::abm::Model::find_location(mio::abm::LocationType, mio::abm::PersonId) const</a></td>
-              <td class="coverFnHi">8910</td>
+              <td class="coverFnHi">8901</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.cpp.gcov.html#287">mio::abm::Model::get_locations() const</a></td>
@@ -153,7 +153,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.cpp.gcov.html#99">bool mio::abm::Model::perform_mobility(mio::abm::TimePoint, mio::abm::TimeSpan)::{lambda(auto:1)#1}::operator()&lt;mio::abm::LocationType (*)(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)&gt;(mio::abm::LocationType (*)(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)) const</a></td>
-              <td class="coverFnHi">8829</td>
+              <td class="coverFnHi">8820</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.cpp.gcov.html#257">auto mio::abm::Model::compute_exposure_caches(mio::abm::TimePoint, mio::abm::TimeSpan)::{lambda(auto:1&amp;)#2}::operator()&lt;boost::atomics::atomic&lt;double&gt; &gt;(boost::atomics::atomic&lt;double&gt;&amp;) const</a></td>
diff --git a/coverage/cpp/models/abm/model.cpp.gcov.html b/coverage/cpp/models/abm/model.cpp.gcov.html
index 473ea708c1..a3638a4517 100644
--- a/coverage/cpp/models/abm/model.cpp.gcov.html
+++ b/coverage/cpp/models/abm/model.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">25</td>
@@ -162,25 +162,25 @@
 <a name="100"><span class="lineNum">     100 </span>            : </a>
 <a name="101"><span class="lineNum">     101 </span><span class="lineCov">       2772 :         auto try_mobility_rule = [&amp;](auto rule) -&gt; bool {</span></a>
 <a name="102"><span class="lineNum">     102 </span>            :             // run mobility rule and check if change of location can actually happen</a>
-<a name="103"><span class="lineNum">     103 </span><span class="lineCov">      45891 :             auto target_type                  = rule(personal_rng, person, t, dt, parameters);</span></a>
-<a name="104"><span class="lineNum">     104 </span><span class="lineCov">      26613 :             const Location&amp; target_location   = get_location(find_location(target_type, person_id));</span></a>
-<a name="105"><span class="lineNum">     105 </span><span class="lineCov">      26487 :             const LocationId current_location = person.get_location();</span></a>
+<a name="103"><span class="lineNum">     103 </span><span class="lineCov">      45954 :             auto target_type                  = rule(personal_rng, person, t, dt, parameters);</span></a>
+<a name="104"><span class="lineNum">     104 </span><span class="lineCov">      26595 :             const Location&amp; target_location   = get_location(find_location(target_type, person_id));</span></a>
+<a name="105"><span class="lineNum">     105 </span><span class="lineCov">      26460 :             const LocationId current_location = person.get_location();</span></a>
 <a name="106"><span class="lineNum">     106 </span>            : </a>
 <a name="107"><span class="lineNum">     107 </span>            :             // the Person cannot move if they do not wear mask as required at targeted location</a>
-<a name="108"><span class="lineNum">     108 </span><span class="lineCov">       8901 :             if (target_location.is_mask_required() &amp;&amp; !person.is_compliant(personal_rng, InterventionType::Mask)) {</span></a>
+<a name="108"><span class="lineNum">     108 </span><span class="lineCov">       8892 :             if (target_location.is_mask_required() &amp;&amp; !person.is_compliant(personal_rng, InterventionType::Mask)) {</span></a>
 <a name="109"><span class="lineNum">     109 </span><span class="lineCov">          9 :                 return false;</span></a>
 <a name="110"><span class="lineNum">     110 </span>            :             }</a>
 <a name="111"><span class="lineNum">     111 </span>            :             // the Person cannot move if the capacity of targeted Location is reached</a>
 <a name="112"><span class="lineNum">     112 </span><span class="lineCov">       8973 :             if (target_location.get_id() == current_location ||</span></a>
-<a name="113"><span class="lineNum">     113 </span><span class="lineCov">        306 :                 get_number_persons(target_location.get_id()) &gt;= target_location.get_capacity().persons) {</span></a>
-<a name="114"><span class="lineNum">     114 </span><span class="lineCov">       8676 :                 return false;</span></a>
+<a name="113"><span class="lineNum">     113 </span><span class="lineCov">        324 :                 get_number_persons(target_location.get_id()) &gt;= target_location.get_capacity().persons) {</span></a>
+<a name="114"><span class="lineNum">     114 </span><span class="lineCov">       8658 :                 return false;</span></a>
 <a name="115"><span class="lineNum">     115 </span>            :             }</a>
 <a name="116"><span class="lineNum">     116 </span>            :             // the Person cannot move if the performed TestingStrategy is positive</a>
-<a name="117"><span class="lineNum">     117 </span><span class="lineCov">        576 :             if (!m_testing_strategy.run_strategy(personal_rng, person, target_location, t)) {</span></a>
+<a name="117"><span class="lineNum">     117 </span><span class="lineCov">        612 :             if (!m_testing_strategy.run_strategy(personal_rng, person, target_location, t)) {</span></a>
 <a name="118"><span class="lineNum">     118 </span><span class="lineCov">         18 :                 return false;</span></a>
 <a name="119"><span class="lineNum">     119 </span>            :             }</a>
 <a name="120"><span class="lineNum">     120 </span>            :             // update worn mask to target location's requirements</a>
-<a name="121"><span class="lineNum">     121 </span><span class="lineCov">        126 :             if (target_location.is_mask_required()) {</span></a>
+<a name="121"><span class="lineNum">     121 </span><span class="lineCov">        135 :             if (target_location.is_mask_required()) {</span></a>
 <a name="122"><span class="lineNum">     122 </span>            :                 // if the current MaskProtection level is lower than required, the Person changes mask</a>
 <a name="123"><span class="lineNum">     123 </span><span class="lineCov">         45 :                 if (parameters.get&lt;MaskProtection&gt;()[person.get_mask().get_type()] &lt;</span></a>
 <a name="124"><span class="lineNum">     124 </span><span class="lineCov">         18 :                     parameters.get&lt;MaskProtection&gt;()[target_location.get_required_mask()]) {</span></a>
@@ -188,11 +188,11 @@
 <a name="126"><span class="lineNum">     126 </span>            :                 }</a>
 <a name="127"><span class="lineNum">     127 </span>            :             }</a>
 <a name="128"><span class="lineNum">     128 </span>            :             else {</a>
-<a name="129"><span class="lineNum">     129 </span><span class="lineCov">        468 :                 person.set_mask(MaskType::None, t);</span></a>
+<a name="129"><span class="lineNum">     129 </span><span class="lineCov">        504 :                 person.set_mask(MaskType::None, t);</span></a>
 <a name="130"><span class="lineNum">     130 </span>            :             }</a>
 <a name="131"><span class="lineNum">     131 </span>            :             // all requirements are met, move to target location</a>
-<a name="132"><span class="lineNum">     132 </span><span class="lineCov">        378 :             change_location(person_id, target_location.get_id());</span></a>
-<a name="133"><span class="lineNum">     133 </span><span class="lineCov">        126 :             return true;</span></a>
+<a name="132"><span class="lineNum">     132 </span><span class="lineCov">        405 :             change_location(person_id, target_location.get_id());</span></a>
+<a name="133"><span class="lineNum">     133 </span><span class="lineCov">        135 :             return true;</span></a>
 <a name="134"><span class="lineNum">     134 </span><span class="lineCov">       2772 :         };</span></a>
 <a name="135"><span class="lineNum">     135 </span>            : </a>
 <a name="136"><span class="lineNum">     136 </span>            :         // run mobility rules one after the other if the corresponding location type exists</a>
@@ -205,8 +205,8 @@
 <a name="143"><span class="lineNum">     143 </span><span class="lineCov">       5400 :                 (has_locations({LocationType::School, LocationType::Home}) &amp;&amp; try_mobility_rule(&amp;go_to_school)) ||</span></a>
 <a name="144"><span class="lineNum">     144 </span><span class="lineCov">       5373 :                 (has_locations({LocationType::Work, LocationType::Home}) &amp;&amp; try_mobility_rule(&amp;go_to_work)) ||</span></a>
 <a name="145"><span class="lineNum">     145 </span><span class="lineCov">       5355 :                 (has_locations({LocationType::BasicsShop, LocationType::Home}) &amp;&amp; try_mobility_rule(&amp;go_to_shop)) ||</span></a>
-<a name="146"><span class="lineNum">     146 </span><span class="lineCov">      13509 :                 (has_locations({LocationType::SocialEvent, LocationType::Home}) &amp;&amp; try_mobility_rule(&amp;go_to_event)) ||</span></a>
-<a name="147"><span class="lineNum">     147 </span><span class="lineCov">       5328 :                 (has_locations({LocationType::Home}) &amp;&amp; try_mobility_rule(&amp;go_to_quarantine));</span></a>
+<a name="146"><span class="lineNum">     146 </span><span class="lineCov">      13500 :                 (has_locations({LocationType::SocialEvent, LocationType::Home}) &amp;&amp; try_mobility_rule(&amp;go_to_event)) ||</span></a>
+<a name="147"><span class="lineNum">     147 </span><span class="lineCov">       5319 :                 (has_locations({LocationType::Home}) &amp;&amp; try_mobility_rule(&amp;go_to_quarantine));</span></a>
 <a name="148"><span class="lineNum">     148 </span>            :         }</a>
 <a name="149"><span class="lineNum">     149 </span>            :         else {</a>
 <a name="150"><span class="lineNum">     150 </span>            :             // no daily routine mobility, just infection related</a>
@@ -367,11 +367,11 @@
 <a name="305"><span class="lineNum">     305 </span><span class="lineCov">         81 :     return std::make_pair(m_persons.begin(), m_persons.end());</span></a>
 <a name="306"><span class="lineNum">     306 </span>            : }</a>
 <a name="307"><span class="lineNum">     307 </span>            : </a>
-<a name="308"><span class="lineNum">     308 </span><span class="lineCov">       8910 : LocationId Model::find_location(LocationType type, const PersonId person) const</span></a>
+<a name="308"><span class="lineNum">     308 </span><span class="lineCov">       8901 : LocationId Model::find_location(LocationType type, const PersonId person) const</span></a>
 <a name="309"><span class="lineNum">     309 </span>            : {</a>
-<a name="310"><span class="lineNum">     310 </span><span class="lineCov">       8910 :     auto location_id = get_person(person).get_assigned_location(type);</span></a>
-<a name="311"><span class="lineNum">     311 </span><span class="lineCov">       8910 :     assert(location_id != LocationId::invalid_id() &amp;&amp; &quot;The person has no assigned location of that type.&quot;);</span></a>
-<a name="312"><span class="lineNum">     312 </span><span class="lineCov">      17820 :     return location_id;</span></a>
+<a name="310"><span class="lineNum">     310 </span><span class="lineCov">       8901 :     auto location_id = get_person(person).get_assigned_location(type);</span></a>
+<a name="311"><span class="lineNum">     311 </span><span class="lineCov">       8901 :     assert(location_id != LocationId::invalid_id() &amp;&amp; &quot;The person has no assigned location of that type.&quot;);</span></a>
+<a name="312"><span class="lineNum">     312 </span><span class="lineCov">      17802 :     return location_id;</span></a>
 <a name="313"><span class="lineNum">     313 </span>            : }</a>
 <a name="314"><span class="lineNum">     314 </span>            : </a>
 <a name="315"><span class="lineNum">     315 </span><span class="lineCov">          9 : size_t Model::get_subpopulation_combined(TimePoint t, InfectionState s) const</span></a>
diff --git a/coverage/cpp/models/abm/model.h.func-sort-c.html b/coverage/cpp/models/abm/model.h.func-sort-c.html
index 6c98f40a4d..70602685a6 100644
--- a/coverage/cpp/models/abm/model.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -89,11 +89,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#365">mio::abm::Model::get_number_persons(mio::abm::LocationId) const</a></td>
-              <td class="coverFnHi">279</td>
+              <td class="coverFnHi">288</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#381">mio::abm::Model::change_location(mio::abm::PersonId, mio::abm::LocationId, mio::abm::TransportMode, std::vector&lt;unsigned int, std::allocator&lt;unsigned int&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">324</td>
+              <td class="coverFnHi">333</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#228">mio::abm::Model::assign_location(mio::abm::PersonId, mio::abm::LocationId)</a></td>
@@ -109,23 +109,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#339">mio::abm::Model::get_person(mio::abm::PersonId) const</a></td>
-              <td class="coverFnHi">8910</td>
+              <td class="coverFnHi">8901</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#444">mio::abm::Model::get_location(mio::abm::PersonId)</a></td>
-              <td class="coverFnHi">11448</td>
+              <td class="coverFnHi">11457</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#333">mio::abm::Model::get_person(mio::abm::PersonId)</a></td>
-              <td class="coverFnHi">18846</td>
+              <td class="coverFnHi">18864</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#430">mio::abm::Model::get_location(mio::abm::LocationId)</a></td>
-              <td class="coverFnHi">23409</td>
+              <td class="coverFnHi">23418</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#281">bool mio::abm::Model::has_locations&lt;std::initializer_list&lt;mio::abm::LocationType&gt; &gt;(std::initializer_list&lt;mio::abm::LocationType&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">24156</td>
+              <td class="coverFnHi">24147</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#353">mio::abm::Model::get_subpopulation(mio::abm::LocationId, mio::abm::TimePoint, mio::abm::InfectionState) const</a></td>
@@ -133,11 +133,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#269">mio::abm::Model::has_location(mio::abm::LocationType) const</a></td>
-              <td class="coverFnHi">28899</td>
+              <td class="coverFnHi">28890</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#283">auto mio::abm::Model::has_locations&lt;std::initializer_list&lt;mio::abm::LocationType&gt; &gt;(std::initializer_list&lt;mio::abm::LocationType&gt; const&amp;) const::{lambda(auto:1)#1}::operator()&lt;mio::abm::LocationType&gt;(mio::abm::LocationType) const</a></td>
-              <td class="coverFnHi">28899</td>
+              <td class="coverFnHi">28890</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#355">auto mio::abm::Model::get_subpopulation(mio::abm::LocationId, mio::abm::TimePoint, mio::abm::InfectionState) const::{lambda(auto:1&amp;&amp;)#1}::operator()&lt;mio::abm::Person const&amp;&gt;(mio::abm::Person const&amp;) const</a></td>
diff --git a/coverage/cpp/models/abm/model.h.func.html b/coverage/cpp/models/abm/model.h.func.html
index 0e6aa16e2d..7604922175 100644
--- a/coverage/cpp/models/abm/model.h.func.html
+++ b/coverage/cpp/models/abm/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#333">mio::abm::Model::get_person(mio::abm::PersonId)</a></td>
-              <td class="coverFnHi">18846</td>
+              <td class="coverFnHi">18864</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#130">boost::outcome_v2::basic_result&lt;mio::abm::Model, mio::IOStatus, boost::outcome_v2::policy::all_narrow&gt; mio::abm::Model::deserialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;)</a></td>
@@ -69,11 +69,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#430">mio::abm::Model::get_location(mio::abm::LocationId)</a></td>
-              <td class="coverFnHi">23409</td>
+              <td class="coverFnHi">23418</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#444">mio::abm::Model::get_location(mio::abm::PersonId)</a></td>
-              <td class="coverFnHi">11448</td>
+              <td class="coverFnHi">11457</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#228">mio::abm::Model::assign_location(mio::abm::PersonId, mio::abm::LocationId)</a></td>
@@ -81,7 +81,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#381">mio::abm::Model::change_location(mio::abm::PersonId, mio::abm::LocationId, mio::abm::TransportMode, std::vector&lt;unsigned int, std::allocator&lt;unsigned int&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">324</td>
+              <td class="coverFnHi">333</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#306">mio::abm::Model::get_rng()</a></td>
@@ -109,15 +109,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#339">mio::abm::Model::get_person(mio::abm::PersonId) const</a></td>
-              <td class="coverFnHi">8910</td>
+              <td class="coverFnHi">8901</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#269">mio::abm::Model::has_location(mio::abm::LocationType) const</a></td>
-              <td class="coverFnHi">28899</td>
+              <td class="coverFnHi">28890</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#281">bool mio::abm::Model::has_locations&lt;std::initializer_list&lt;mio::abm::LocationType&gt; &gt;(std::initializer_list&lt;mio::abm::LocationType&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">24156</td>
+              <td class="coverFnHi">24147</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#353">mio::abm::Model::get_subpopulation(mio::abm::LocationId, mio::abm::TimePoint, mio::abm::InfectionState) const</a></td>
@@ -125,7 +125,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#365">mio::abm::Model::get_number_persons(mio::abm::LocationId) const</a></td>
-              <td class="coverFnHi">279</td>
+              <td class="coverFnHi">288</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#110">void mio::abm::Model::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
@@ -137,7 +137,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#283">auto mio::abm::Model::has_locations&lt;std::initializer_list&lt;mio::abm::LocationType&gt; &gt;(std::initializer_list&lt;mio::abm::LocationType&gt; const&amp;) const::{lambda(auto:1)#1}::operator()&lt;mio::abm::LocationType&gt;(mio::abm::LocationType) const</a></td>
-              <td class="coverFnHi">28899</td>
+              <td class="coverFnHi">28890</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#355">auto mio::abm::Model::get_subpopulation(mio::abm::LocationId, mio::abm::TimePoint, mio::abm::InfectionState) const::{lambda(auto:1&amp;&amp;)#1}::operator()&lt;mio::abm::Person const&amp;&gt;(mio::abm::Person const&amp;) const</a></td>
diff --git a/coverage/cpp/models/abm/model.h.gcov.html b/coverage/cpp/models/abm/model.h.gcov.html
index 893e3a6ace..844a33b96d 100644
--- a/coverage/cpp/models/abm/model.h.gcov.html
+++ b/coverage/cpp/models/abm/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -330,9 +330,9 @@
 <a name="268"><span class="lineNum">     268 </span>            :     * @brief Check if at least one Location with a specified LocationType exists.</a>
 <a name="269"><span class="lineNum">     269 </span>            :     * @return True if there is at least one Location of LocationType `type`. False otherwise.</a>
 <a name="270"><span class="lineNum">     270 </span>            :     */</a>
-<a name="271"><span class="lineNum">     271 </span><span class="lineCov">      28899 :     bool has_location(LocationType type) const</span></a>
+<a name="271"><span class="lineNum">     271 </span><span class="lineCov">      28890 :     bool has_location(LocationType type) const</span></a>
 <a name="272"><span class="lineNum">     272 </span>            :     {</a>
-<a name="273"><span class="lineNum">     273 </span><span class="lineCov">      28899 :         return m_has_locations[size_t(type)];</span></a>
+<a name="273"><span class="lineNum">     273 </span><span class="lineCov">      28890 :         return m_has_locations[size_t(type)];</span></a>
 <a name="274"><span class="lineNum">     274 </span>            :     }</a>
 <a name="275"><span class="lineNum">     275 </span>            : </a>
 <a name="276"><span class="lineNum">     276 </span>            :     /**</a>
@@ -342,11 +342,11 @@
 <a name="280"><span class="lineNum">     280 </span>            :     * @return True if there is at least one Location of every LocationType in `location_types`. False otherwise.</a>
 <a name="281"><span class="lineNum">     281 </span>            :     */</a>
 <a name="282"><span class="lineNum">     282 </span>            :     template &lt;class C = std::initializer_list&lt;LocationType&gt;&gt;</a>
-<a name="283"><span class="lineNum">     283 </span><span class="lineCov">      24156 :     bool has_locations(const C&amp; location_types) const</span></a>
+<a name="283"><span class="lineNum">     283 </span><span class="lineCov">      24147 :     bool has_locations(const C&amp; location_types) const</span></a>
 <a name="284"><span class="lineNum">     284 </span>            :     {</a>
-<a name="285"><span class="lineNum">     285 </span><span class="lineCov">      81954 :         return std::all_of(location_types.begin(), location_types.end(), [&amp;](auto loc) {</span></a>
-<a name="286"><span class="lineNum">     286 </span><span class="lineCov">      57798 :             return has_location(loc);</span></a>
-<a name="287"><span class="lineNum">     287 </span><span class="lineCov">      24156 :         });</span></a>
+<a name="285"><span class="lineNum">     285 </span><span class="lineCov">      81927 :         return std::all_of(location_types.begin(), location_types.end(), [&amp;](auto loc) {</span></a>
+<a name="286"><span class="lineNum">     286 </span><span class="lineCov">      57780 :             return has_location(loc);</span></a>
+<a name="287"><span class="lineNum">     287 </span><span class="lineCov">      24147 :         });</span></a>
 <a name="288"><span class="lineNum">     288 </span>            :     }</a>
 <a name="289"><span class="lineNum">     289 </span>            : </a>
 <a name="290"><span class="lineNum">     290 </span>            :     /**</a>
@@ -394,16 +394,16 @@
 <a name="332"><span class="lineNum">     332 </span>            :      * @return A reference to the Person.</a>
 <a name="333"><span class="lineNum">     333 </span>            :      * @{</a>
 <a name="334"><span class="lineNum">     334 </span>            :      */</a>
-<a name="335"><span class="lineNum">     335 </span><span class="lineCov">      18846 :     Person&amp; get_person(PersonId id)</span></a>
+<a name="335"><span class="lineNum">     335 </span><span class="lineCov">      18864 :     Person&amp; get_person(PersonId id)</span></a>
 <a name="336"><span class="lineNum">     336 </span>            :     {</a>
-<a name="337"><span class="lineNum">     337 </span><span class="lineCov">      18846 :         assert(id.get() &lt; m_persons.size() &amp;&amp; &quot;Given PersonId is not in this Model.&quot;);</span></a>
-<a name="338"><span class="lineNum">     338 </span><span class="lineCov">      18846 :         return m_persons[id.get()];</span></a>
+<a name="337"><span class="lineNum">     337 </span><span class="lineCov">      18864 :         assert(id.get() &lt; m_persons.size() &amp;&amp; &quot;Given PersonId is not in this Model.&quot;);</span></a>
+<a name="338"><span class="lineNum">     338 </span><span class="lineCov">      18864 :         return m_persons[id.get()];</span></a>
 <a name="339"><span class="lineNum">     339 </span>            :     }</a>
 <a name="340"><span class="lineNum">     340 </span>            : </a>
-<a name="341"><span class="lineNum">     341 </span><span class="lineCov">       8910 :     const Person&amp; get_person(PersonId id) const</span></a>
+<a name="341"><span class="lineNum">     341 </span><span class="lineCov">       8901 :     const Person&amp; get_person(PersonId id) const</span></a>
 <a name="342"><span class="lineNum">     342 </span>            :     {</a>
-<a name="343"><span class="lineNum">     343 </span><span class="lineCov">       8910 :         assert(id.get() &lt; m_persons.size() &amp;&amp; &quot;Given PersonId is not in this Model.&quot;);</span></a>
-<a name="344"><span class="lineNum">     344 </span><span class="lineCov">       8910 :         return m_persons[id.get()];</span></a>
+<a name="343"><span class="lineNum">     343 </span><span class="lineCov">       8901 :         assert(id.get() &lt; m_persons.size() &amp;&amp; &quot;Given PersonId is not in this Model.&quot;);</span></a>
+<a name="344"><span class="lineNum">     344 </span><span class="lineCov">       8901 :         return m_persons[id.get()];</span></a>
 <a name="345"><span class="lineNum">     345 </span>            :     }</a>
 <a name="346"><span class="lineNum">     346 </span>            :     /** @} */</a>
 <a name="347"><span class="lineNum">     347 </span>            : </a>
@@ -426,12 +426,12 @@
 <a name="364"><span class="lineNum">     364 </span>            :      * @param[in] location A LocationId from the Model.</a>
 <a name="365"><span class="lineNum">     365 </span>            :      * @return Number of Person%s in the location.</a>
 <a name="366"><span class="lineNum">     366 </span>            :      */</a>
-<a name="367"><span class="lineNum">     367 </span><span class="lineCov">        279 :     size_t get_number_persons(LocationId location) const</span></a>
+<a name="367"><span class="lineNum">     367 </span><span class="lineCov">        288 :     size_t get_number_persons(LocationId location) const</span></a>
 <a name="368"><span class="lineNum">     368 </span>            :     {</a>
-<a name="369"><span class="lineNum">     369 </span><span class="lineCov">        279 :         if (!m_is_local_population_cache_valid) {</span></a>
+<a name="369"><span class="lineNum">     369 </span><span class="lineCov">        288 :         if (!m_is_local_population_cache_valid) {</span></a>
 <a name="370"><span class="lineNum">     370 </span><span class="lineNoCov">          0 :             build_compute_local_population_cache();</span></a>
 <a name="371"><span class="lineNum">     371 </span>            :         }</a>
-<a name="372"><span class="lineNum">     372 </span><span class="lineCov">        279 :         return m_local_population_cache[location.get()];</span></a>
+<a name="372"><span class="lineNum">     372 </span><span class="lineCov">        288 :         return m_local_population_cache[location.get()];</span></a>
 <a name="373"><span class="lineNum">     373 </span>            :     }</a>
 <a name="374"><span class="lineNum">     374 </span>            : </a>
 <a name="375"><span class="lineNum">     375 </span>            :     // Change the Location of a Person. this requires that Location is part of this Model.</a>
@@ -442,21 +442,21 @@
 <a name="380"><span class="lineNum">     380 </span>            :      * @param[in] mode The transport mode the person uses to change the Location.</a>
 <a name="381"><span class="lineNum">     381 </span>            :      * @param[in] cells The cells within the destination the person should be in.</a>
 <a name="382"><span class="lineNum">     382 </span>            :      */</a>
-<a name="383"><span class="lineNum">     383 </span><span class="lineCov">        324 :     inline void change_location(PersonId person, LocationId destination, TransportMode mode = TransportMode::Unknown,</span></a>
+<a name="383"><span class="lineNum">     383 </span><span class="lineCov">        333 :     inline void change_location(PersonId person, LocationId destination, TransportMode mode = TransportMode::Unknown,</span></a>
 <a name="384"><span class="lineNum">     384 </span>            :                                 const std::vector&lt;uint32_t&gt;&amp; cells = {0})</a>
 <a name="385"><span class="lineNum">     385 </span>            :     {</a>
-<a name="386"><span class="lineNum">     386 </span><span class="lineCov">        324 :         LocationId origin = get_location(person).get_id();</span></a>
+<a name="386"><span class="lineNum">     386 </span><span class="lineCov">        333 :         LocationId origin = get_location(person).get_id();</span></a>
 <a name="387"><span class="lineNum">     387 </span>            :         const bool has_changed_location =</a>
-<a name="388"><span class="lineNum">     388 </span><span class="lineCov">        324 :             mio::abm::change_location(get_person(person), get_location(destination), mode, cells);</span></a>
+<a name="388"><span class="lineNum">     388 </span><span class="lineCov">        333 :             mio::abm::change_location(get_person(person), get_location(destination), mode, cells);</span></a>
 <a name="389"><span class="lineNum">     389 </span>            :         // if the person has changed location, invalidate exposure caches but keep population caches valid</a>
-<a name="390"><span class="lineNum">     390 </span><span class="lineCov">        324 :         if (has_changed_location) {</span></a>
-<a name="391"><span class="lineNum">     391 </span><span class="lineCov">        315 :             m_are_exposure_caches_valid = false;</span></a>
-<a name="392"><span class="lineNum">     392 </span><span class="lineCov">        315 :             if (m_is_local_population_cache_valid) {</span></a>
-<a name="393"><span class="lineNum">     393 </span><span class="lineCov">        315 :                 --m_local_population_cache[origin.get()];</span></a>
-<a name="394"><span class="lineNum">     394 </span><span class="lineCov">        315 :                 ++m_local_population_cache[destination.get()];</span></a>
+<a name="390"><span class="lineNum">     390 </span><span class="lineCov">        333 :         if (has_changed_location) {</span></a>
+<a name="391"><span class="lineNum">     391 </span><span class="lineCov">        324 :             m_are_exposure_caches_valid = false;</span></a>
+<a name="392"><span class="lineNum">     392 </span><span class="lineCov">        324 :             if (m_is_local_population_cache_valid) {</span></a>
+<a name="393"><span class="lineNum">     393 </span><span class="lineCov">        324 :                 --m_local_population_cache[origin.get()];</span></a>
+<a name="394"><span class="lineNum">     394 </span><span class="lineCov">        324 :                 ++m_local_population_cache[destination.get()];</span></a>
 <a name="395"><span class="lineNum">     395 </span>            :             }</a>
 <a name="396"><span class="lineNum">     396 </span>            :         }</a>
-<a name="397"><span class="lineNum">     397 </span><span class="lineCov">        324 :     }</span></a>
+<a name="397"><span class="lineNum">     397 </span><span class="lineCov">        333 :     }</span></a>
 <a name="398"><span class="lineNum">     398 </span>            : </a>
 <a name="399"><span class="lineNum">     399 </span>            :     /**</a>
 <a name="400"><span class="lineNum">     400 </span>            :      * @brief Let a person interact with the population at its current location.</a>
@@ -491,11 +491,11 @@
 <a name="429"><span class="lineNum">     429 </span>            :         return m_locations[id.get()];</a>
 <a name="430"><span class="lineNum">     430 </span>            :     }</a>
 <a name="431"><span class="lineNum">     431 </span>            : </a>
-<a name="432"><span class="lineNum">     432 </span><span class="lineCov">      23409 :     Location&amp; get_location(LocationId id)</span></a>
+<a name="432"><span class="lineNum">     432 </span><span class="lineCov">      23418 :     Location&amp; get_location(LocationId id)</span></a>
 <a name="433"><span class="lineNum">     433 </span>            :     {</a>
-<a name="434"><span class="lineNum">     434 </span><span class="lineCov">      23409 :         assert(id != LocationId::invalid_id() &amp;&amp; &quot;Given LocationId must be valid.&quot;);</span></a>
-<a name="435"><span class="lineNum">     435 </span><span class="lineCov">      23409 :         assert(id &lt; LocationId((uint32_t)m_locations.size()) &amp;&amp; &quot;Given LocationId is not in this Model.&quot;);</span></a>
-<a name="436"><span class="lineNum">     436 </span><span class="lineCov">      23409 :         return m_locations[id.get()];</span></a>
+<a name="434"><span class="lineNum">     434 </span><span class="lineCov">      23418 :         assert(id != LocationId::invalid_id() &amp;&amp; &quot;Given LocationId must be valid.&quot;);</span></a>
+<a name="435"><span class="lineNum">     435 </span><span class="lineCov">      23418 :         assert(id &lt; LocationId((uint32_t)m_locations.size()) &amp;&amp; &quot;Given LocationId is not in this Model.&quot;);</span></a>
+<a name="436"><span class="lineNum">     436 </span><span class="lineCov">      23418 :         return m_locations[id.get()];</span></a>
 <a name="437"><span class="lineNum">     437 </span>            :     }</a>
 <a name="438"><span class="lineNum">     438 </span>            :     /** @} */</a>
 <a name="439"><span class="lineNum">     439 </span>            : </a>
@@ -505,9 +505,9 @@
 <a name="443"><span class="lineNum">     443 </span>            :      * @return Reference to the Location.</a>
 <a name="444"><span class="lineNum">     444 </span>            :      * @{</a>
 <a name="445"><span class="lineNum">     445 </span>            :      */</a>
-<a name="446"><span class="lineNum">     446 </span><span class="lineCov">      11448 :     inline Location&amp; get_location(PersonId id)</span></a>
+<a name="446"><span class="lineNum">     446 </span><span class="lineCov">      11457 :     inline Location&amp; get_location(PersonId id)</span></a>
 <a name="447"><span class="lineNum">     447 </span>            :     {</a>
-<a name="448"><span class="lineNum">     448 </span><span class="lineCov">      11448 :         return get_location(get_person(id).get_location());</span></a>
+<a name="448"><span class="lineNum">     448 </span><span class="lineCov">      11457 :         return get_location(get_person(id).get_location());</span></a>
 <a name="449"><span class="lineNum">     449 </span>            :     }</a>
 <a name="450"><span class="lineNum">     450 </span>            : </a>
 <a name="451"><span class="lineNum">     451 </span>            :     inline const Location&amp; get_location(PersonId id) const</a>
diff --git a/coverage/cpp/models/abm/model_functions.cpp.func-sort-c.html b/coverage/cpp/models/abm/model_functions.cpp.func-sort-c.html
index e8e7fd9ea9..38bef7b463 100644
--- a/coverage/cpp/models/abm/model_functions.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/model_functions.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
@@ -61,11 +61,11 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="model_functions.cpp.gcov.html#126">mio::abm::change_location(mio::abm::Person&amp;, mio::abm::Location const&amp;, mio::abm::TransportMode, std::vector&lt;unsigned int, std::allocator&lt;unsigned int&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">369</td>
+              <td class="coverFnHi">378</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model_functions.cpp.gcov.html#129">auto mio::abm::change_location(mio::abm::Person&amp;, mio::abm::Location const&amp;, mio::abm::TransportMode, std::vector&lt;unsigned int, std::allocator&lt;unsigned int&gt; &gt; const&amp;)::{lambda(auto:1 const&amp;)#1}::operator()&lt;unsigned int&gt;(unsigned int const&amp;) const</a></td>
-              <td class="coverFnHi">387</td>
+              <td class="coverFnHi">396</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model_functions.cpp.gcov.html#46">mio::abm::daily_transmissions_by_air(mio::CustomIndexArray&lt;boost::atomics::atomic&lt;double&gt;, mio::abm::CellIndex, mio::abm::VirusVariant&gt; const&amp;, mio::abm::CellIndex, mio::abm::VirusVariant, mio::abm::Parameters const&amp;)</a></td>
diff --git a/coverage/cpp/models/abm/model_functions.cpp.func.html b/coverage/cpp/models/abm/model_functions.cpp.func.html
index ef9a71409d..edc9f1d087 100644
--- a/coverage/cpp/models/abm/model_functions.cpp.func.html
+++ b/coverage/cpp/models/abm/model_functions.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="model_functions.cpp.gcov.html#126">mio::abm::change_location(mio::abm::Person&amp;, mio::abm::Location const&amp;, mio::abm::TransportMode, std::vector&lt;unsigned int, std::allocator&lt;unsigned int&gt; &gt; const&amp;)</a></td>
-              <td class="coverFnHi">369</td>
+              <td class="coverFnHi">378</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model_functions.cpp.gcov.html#99">mio::abm::add_exposure_contribution(mio::CustomIndexArray&lt;boost::atomics::atomic&lt;double&gt;, mio::abm::CellIndex, mio::abm::VirusVariant&gt;&amp;, mio::CustomIndexArray&lt;boost::atomics::atomic&lt;double&gt;, mio::abm::CellIndex, mio::abm::VirusVariant, mio::AgeGroup&gt;&amp;, mio::abm::Person const&amp;, mio::abm::Location const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan)</a></td>
@@ -81,7 +81,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model_functions.cpp.gcov.html#129">auto mio::abm::change_location(mio::abm::Person&amp;, mio::abm::Location const&amp;, mio::abm::TransportMode, std::vector&lt;unsigned int, std::allocator&lt;unsigned int&gt; &gt; const&amp;)::{lambda(auto:1 const&amp;)#1}::operator()&lt;unsigned int&gt;(unsigned int const&amp;) const</a></td>
-              <td class="coverFnHi">387</td>
+              <td class="coverFnHi">396</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model_functions.cpp.gcov.html#63">auto mio::abm::interact(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person&amp;, mio::abm::Location const&amp;, mio::CustomIndexArray&lt;boost::atomics::atomic&lt;double&gt;, mio::abm::CellIndex, mio::abm::VirusVariant&gt; const&amp;, mio::CustomIndexArray&lt;boost::atomics::atomic&lt;double&gt;, mio::abm::CellIndex, mio::abm::VirusVariant, mio::AgeGroup&gt; const&amp;, mio::abm::TimePoint, mio::abm::TimeSpan, mio::abm::Parameters const&amp;)::{lambda(auto:1 const&amp;)#1}::operator()&lt;unsigned int&gt;(unsigned int const&amp;) const</a></td>
diff --git a/coverage/cpp/models/abm/model_functions.cpp.gcov.html b/coverage/cpp/models/abm/model_functions.cpp.gcov.html
index 8b69d832c3..752288424d 100644
--- a/coverage/cpp/models/abm/model_functions.cpp.gcov.html
+++ b/coverage/cpp/models/abm/model_functions.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
@@ -187,19 +187,19 @@
 <a name="125"><span class="lineNum">     125 </span>            :     }</a>
 <a name="126"><span class="lineNum">     126 </span><span class="lineCov">       2889 : }</span></a>
 <a name="127"><span class="lineNum">     127 </span>            : </a>
-<a name="128"><span class="lineNum">     128 </span><span class="lineCov">        369 : bool change_location(Person&amp; person, const Location&amp; destination, const TransportMode mode,</span></a>
+<a name="128"><span class="lineNum">     128 </span><span class="lineCov">        378 : bool change_location(Person&amp; person, const Location&amp; destination, const TransportMode mode,</span></a>
 <a name="129"><span class="lineNum">     129 </span>            :                      const std::vector&lt;uint32_t&gt;&amp; cells)</a>
 <a name="130"><span class="lineNum">     130 </span>            : {</a>
-<a name="131"><span class="lineNum">     131 </span><span class="lineCov">        756 :     assert(std::all_of(cells.begin(), cells.end(), [&amp;](const auto&amp; cell) {</span></a>
+<a name="131"><span class="lineNum">     131 </span><span class="lineCov">        774 :     assert(std::all_of(cells.begin(), cells.end(), [&amp;](const auto&amp; cell) {</span></a>
 <a name="132"><span class="lineNum">     132 </span>            :         return cell &lt; destination.get_cells().size();</a>
 <a name="133"><span class="lineNum">     133 </span>            :     })); // make sure cell indices are valid</a>
 <a name="134"><span class="lineNum">     134 </span>            : </a>
-<a name="135"><span class="lineNum">     135 </span><span class="lineCov">        369 :     if (person.get_location() != destination.get_id()) {</span></a>
-<a name="136"><span class="lineNum">     136 </span><span class="lineCov">        351 :         person.set_location(destination.get_type(), destination.get_id());</span></a>
-<a name="137"><span class="lineNum">     137 </span><span class="lineCov">        351 :         person.get_cells() = cells;</span></a>
-<a name="138"><span class="lineNum">     138 </span><span class="lineCov">        351 :         person.set_last_transport_mode(mode);</span></a>
+<a name="135"><span class="lineNum">     135 </span><span class="lineCov">        378 :     if (person.get_location() != destination.get_id()) {</span></a>
+<a name="136"><span class="lineNum">     136 </span><span class="lineCov">        360 :         person.set_location(destination.get_type(), destination.get_id());</span></a>
+<a name="137"><span class="lineNum">     137 </span><span class="lineCov">        360 :         person.get_cells() = cells;</span></a>
+<a name="138"><span class="lineNum">     138 </span><span class="lineCov">        360 :         person.set_last_transport_mode(mode);</span></a>
 <a name="139"><span class="lineNum">     139 </span>            : </a>
-<a name="140"><span class="lineNum">     140 </span><span class="lineCov">        351 :         return true;</span></a>
+<a name="140"><span class="lineNum">     140 </span><span class="lineCov">        360 :         return true;</span></a>
 <a name="141"><span class="lineNum">     141 </span>            :     }</a>
 <a name="142"><span class="lineNum">     142 </span>            :     else {</a>
 <a name="143"><span class="lineNum">     143 </span><span class="lineCov">         36 :         mio::log_debug(&quot;In change_location: Person {} already is at Location {}&quot;, person.get_id().get(),</span></a>
diff --git a/coverage/cpp/models/abm/parameters.h.func-sort-c.html b/coverage/cpp/models/abm/parameters.h.func-sort-c.html
index d0942b31c6..c95a2ee509 100644
--- a/coverage/cpp/models/abm/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">76</td>
diff --git a/coverage/cpp/models/abm/parameters.h.func.html b/coverage/cpp/models/abm/parameters.h.func.html
index 939d3175ea..05210c19d4 100644
--- a/coverage/cpp/models/abm/parameters.h.func.html
+++ b/coverage/cpp/models/abm/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">76</td>
diff --git a/coverage/cpp/models/abm/parameters.h.gcov.html b/coverage/cpp/models/abm/parameters.h.gcov.html
index e9f8aee481..2b44fb2a27 100644
--- a/coverage/cpp/models/abm/parameters.h.gcov.html
+++ b/coverage/cpp/models/abm/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">76</td>
diff --git a/coverage/cpp/models/abm/person.cpp.func-sort-c.html b/coverage/cpp/models/abm/person.cpp.func-sort-c.html
index 990cd6fcf4..5665e1771f 100644
--- a/coverage/cpp/models/abm/person.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/person.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">26</td>
@@ -93,11 +93,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#92">mio::abm::Person::set_location(mio::abm::LocationType, mio::abm::LocationId)</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#238">mio::abm::Person::set_mask(mio::abm::MaskType, mio::abm::TimePoint)</a></td>
-              <td class="coverFnHi">360</td>
+              <td class="coverFnHi">369</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#82">mio::abm::Person::add_new_infection(mio::abm::Infection&amp;&amp;)</a></td>
@@ -105,7 +105,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#206">mio::abm::Person::is_compliant(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::InterventionType) const</a></td>
-              <td class="coverFnHi">666</td>
+              <td class="coverFnHi">675</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#99">mio::abm::Person::get_infection() const</a></td>
@@ -117,7 +117,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#133">mio::abm::Person::get_go_to_school_time(mio::abm::Parameters const&amp;) const</a></td>
-              <td class="coverFnHi">855</td>
+              <td class="coverFnHi">846</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#53">mio::abm::Person::Person(mio::abm::Person const&amp;, mio::abm::PersonId)</a></td>
@@ -149,11 +149,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#114">mio::abm::Person::get_assigned_location(mio::abm::LocationType) const</a></td>
-              <td class="coverFnHi">9846</td>
+              <td class="coverFnHi">9837</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#191">mio::abm::Person::get_cells()</a></td>
-              <td class="coverFnHi">10017</td>
+              <td class="coverFnHi">10026</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#186">mio::abm::Person::get_id() const</a></td>
@@ -165,7 +165,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#87">mio::abm::Person::get_location() const</a></td>
-              <td class="coverFnHi">124236</td>
+              <td class="coverFnHi">124245</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/person.cpp.func.html b/coverage/cpp/models/abm/person.cpp.func.html
index d4772c0c0f..c966c2b1c9 100644
--- a/coverage/cpp/models/abm/person.cpp.func.html
+++ b/coverage/cpp/models/abm/person.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">26</td>
@@ -65,7 +65,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#92">mio::abm::Person::set_location(mio::abm::LocationType, mio::abm::LocationId)</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#104">mio::abm::Person::get_infection()</a></td>
@@ -89,11 +89,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#238">mio::abm::Person::set_mask(mio::abm::MaskType, mio::abm::TimePoint)</a></td>
-              <td class="coverFnHi">360</td>
+              <td class="coverFnHi">369</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#191">mio::abm::Person::get_cells()</a></td>
-              <td class="coverFnHi">10017</td>
+              <td class="coverFnHi">10026</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#53">mio::abm::Person::Person(mio::abm::Person const&amp;, mio::abm::PersonId)</a></td>
@@ -109,7 +109,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#87">mio::abm::Person::get_location() const</a></td>
-              <td class="coverFnHi">124236</td>
+              <td class="coverFnHi">124245</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#119">mio::abm::Person::goes_to_work(mio::abm::TimePoint, mio::abm::Parameters const&amp;) const</a></td>
@@ -117,7 +117,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#206">mio::abm::Person::is_compliant(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::InterventionType) const</a></td>
-              <td class="coverFnHi">666</td>
+              <td class="coverFnHi">675</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#99">mio::abm::Person::get_infection() const</a></td>
@@ -141,11 +141,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#114">mio::abm::Person::get_assigned_location(mio::abm::LocationType) const</a></td>
-              <td class="coverFnHi">9846</td>
+              <td class="coverFnHi">9837</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#133">mio::abm::Person::get_go_to_school_time(mio::abm::Parameters const&amp;) const</a></td>
-              <td class="coverFnHi">855</td>
+              <td class="coverFnHi">846</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.cpp.gcov.html#212">mio::abm::Person::get_latest_protection() const</a></td>
diff --git a/coverage/cpp/models/abm/person.cpp.gcov.html b/coverage/cpp/models/abm/person.cpp.gcov.html
index a5636610cc..acafd406e5 100644
--- a/coverage/cpp/models/abm/person.cpp.gcov.html
+++ b/coverage/cpp/models/abm/person.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">26</td>
@@ -148,17 +148,17 @@
 <a name="86"><span class="lineNum">      86 </span><span class="lineCov">        432 :     m_infections.push_back(std::move(inf));</span></a>
 <a name="87"><span class="lineNum">      87 </span><span class="lineCov">        432 : }</span></a>
 <a name="88"><span class="lineNum">      88 </span>            : </a>
-<a name="89"><span class="lineNum">      89 </span><span class="lineCov">     124236 : LocationId Person::get_location() const</span></a>
+<a name="89"><span class="lineNum">      89 </span><span class="lineCov">     124245 : LocationId Person::get_location() const</span></a>
 <a name="90"><span class="lineNum">      90 </span>            : {</a>
-<a name="91"><span class="lineNum">      91 </span><span class="lineCov">     124236 :     return m_location;</span></a>
+<a name="91"><span class="lineNum">      91 </span><span class="lineCov">     124245 :     return m_location;</span></a>
 <a name="92"><span class="lineNum">      92 </span>            : }</a>
 <a name="93"><span class="lineNum">      93 </span>            : </a>
-<a name="94"><span class="lineNum">      94 </span><span class="lineCov">        351 : void Person::set_location(LocationType type, LocationId id)</span></a>
+<a name="94"><span class="lineNum">      94 </span><span class="lineCov">        360 : void Person::set_location(LocationType type, LocationId id)</span></a>
 <a name="95"><span class="lineNum">      95 </span>            : {</a>
-<a name="96"><span class="lineNum">      96 </span><span class="lineCov">        351 :     m_location         = id;</span></a>
-<a name="97"><span class="lineNum">      97 </span><span class="lineCov">        351 :     m_location_type    = type;</span></a>
-<a name="98"><span class="lineNum">      98 </span><span class="lineCov">        351 :     m_time_at_location = TimeSpan(0);</span></a>
-<a name="99"><span class="lineNum">      99 </span><span class="lineCov">        351 : }</span></a>
+<a name="96"><span class="lineNum">      96 </span><span class="lineCov">        360 :     m_location         = id;</span></a>
+<a name="97"><span class="lineNum">      97 </span><span class="lineCov">        360 :     m_location_type    = type;</span></a>
+<a name="98"><span class="lineNum">      98 </span><span class="lineCov">        360 :     m_time_at_location = TimeSpan(0);</span></a>
+<a name="99"><span class="lineNum">      99 </span><span class="lineCov">        360 : }</span></a>
 <a name="100"><span class="lineNum">     100 </span>            : </a>
 <a name="101"><span class="lineNum">     101 </span><span class="lineCov">        837 : const Infection&amp; Person::get_infection() const</span></a>
 <a name="102"><span class="lineNum">     102 </span>            : {</a>
@@ -175,9 +175,9 @@
 <a name="113"><span class="lineNum">     113 </span><span class="lineCov">       4014 :     m_assigned_locations[static_cast&lt;uint32_t&gt;(type)] = id;</span></a>
 <a name="114"><span class="lineNum">     114 </span><span class="lineCov">       4014 : }</span></a>
 <a name="115"><span class="lineNum">     115 </span>            : </a>
-<a name="116"><span class="lineNum">     116 </span><span class="lineCov">       9846 : LocationId Person::get_assigned_location(LocationType type) const</span></a>
+<a name="116"><span class="lineNum">     116 </span><span class="lineCov">       9837 : LocationId Person::get_assigned_location(LocationType type) const</span></a>
 <a name="117"><span class="lineNum">     117 </span>            : {</a>
-<a name="118"><span class="lineNum">     118 </span><span class="lineCov">       9846 :     return m_assigned_locations[static_cast&lt;uint32_t&gt;(type)];</span></a>
+<a name="118"><span class="lineNum">     118 </span><span class="lineCov">       9837 :     return m_assigned_locations[static_cast&lt;uint32_t&gt;(type)];</span></a>
 <a name="119"><span class="lineNum">     119 </span>            : }</a>
 <a name="120"><span class="lineNum">     120 </span>            : </a>
 <a name="121"><span class="lineNum">     121 </span><span class="lineCov">         99 : bool Person::goes_to_work(TimePoint t, const Parameters&amp; params) const</span></a>
@@ -194,13 +194,13 @@
 <a name="132"><span class="lineNum">     132 </span><span class="lineCov">        612 :     return minimum_goto_work_time + seconds(seconds_after_minimum);</span></a>
 <a name="133"><span class="lineNum">     133 </span>            : }</a>
 <a name="134"><span class="lineNum">     134 </span>            : </a>
-<a name="135"><span class="lineNum">     135 </span><span class="lineCov">        855 : TimeSpan Person::get_go_to_school_time(const Parameters&amp; params) const</span></a>
+<a name="135"><span class="lineNum">     135 </span><span class="lineCov">        846 : TimeSpan Person::get_go_to_school_time(const Parameters&amp; params) const</span></a>
 <a name="136"><span class="lineNum">     136 </span>            : {</a>
-<a name="137"><span class="lineNum">     137 </span><span class="lineCov">        855 :     TimeSpan minimum_goto_school_time = params.get&lt;GotoSchoolTimeMinimum&gt;()[m_age];</span></a>
-<a name="138"><span class="lineNum">     138 </span><span class="lineCov">        855 :     TimeSpan maximum_goto_school_time = params.get&lt;GotoSchoolTimeMaximum&gt;()[m_age];</span></a>
-<a name="139"><span class="lineNum">     139 </span><span class="lineCov">        855 :     int timeSlots                     = (maximum_goto_school_time.seconds() - minimum_goto_school_time.seconds());</span></a>
-<a name="140"><span class="lineNum">     140 </span><span class="lineCov">        855 :     int seconds_after_minimum         = int(timeSlots * m_random_goto_school_hour);</span></a>
-<a name="141"><span class="lineNum">     141 </span><span class="lineCov">       1710 :     return minimum_goto_school_time + seconds(seconds_after_minimum);</span></a>
+<a name="137"><span class="lineNum">     137 </span><span class="lineCov">        846 :     TimeSpan minimum_goto_school_time = params.get&lt;GotoSchoolTimeMinimum&gt;()[m_age];</span></a>
+<a name="138"><span class="lineNum">     138 </span><span class="lineCov">        846 :     TimeSpan maximum_goto_school_time = params.get&lt;GotoSchoolTimeMaximum&gt;()[m_age];</span></a>
+<a name="139"><span class="lineNum">     139 </span><span class="lineCov">        846 :     int timeSlots                     = (maximum_goto_school_time.seconds() - minimum_goto_school_time.seconds());</span></a>
+<a name="140"><span class="lineNum">     140 </span><span class="lineCov">        846 :     int seconds_after_minimum         = int(timeSlots * m_random_goto_school_hour);</span></a>
+<a name="141"><span class="lineNum">     141 </span><span class="lineCov">       1692 :     return minimum_goto_school_time + seconds(seconds_after_minimum);</span></a>
 <a name="142"><span class="lineNum">     142 </span>            : }</a>
 <a name="143"><span class="lineNum">     143 </span>            : </a>
 <a name="144"><span class="lineNum">     144 </span><span class="lineCov">         99 : bool Person::goes_to_school(TimePoint t, const Parameters&amp; params) const</span></a>
@@ -252,9 +252,9 @@
 <a name="190"><span class="lineNum">     190 </span><span class="lineCov">      11178 :     return m_person_id;</span></a>
 <a name="191"><span class="lineNum">     191 </span>            : }</a>
 <a name="192"><span class="lineNum">     192 </span>            : </a>
-<a name="193"><span class="lineNum">     193 </span><span class="lineCov">      10017 : std::vector&lt;uint32_t&gt;&amp; Person::get_cells()</span></a>
+<a name="193"><span class="lineNum">     193 </span><span class="lineCov">      10026 : std::vector&lt;uint32_t&gt;&amp; Person::get_cells()</span></a>
 <a name="194"><span class="lineNum">     194 </span>            : {</a>
-<a name="195"><span class="lineNum">     195 </span><span class="lineCov">      10017 :     return m_cells;</span></a>
+<a name="195"><span class="lineNum">     195 </span><span class="lineCov">      10026 :     return m_cells;</span></a>
 <a name="196"><span class="lineNum">     196 </span>            : }</a>
 <a name="197"><span class="lineNum">     197 </span>            : </a>
 <a name="198"><span class="lineNum">     198 </span><span class="lineCov">        837 : const std::vector&lt;uint32_t&gt;&amp; Person::get_cells() const</span></a>
@@ -267,10 +267,10 @@
 <a name="205"><span class="lineNum">     205 </span><span class="lineCov">       2025 :     return params.get&lt;MaskProtection&gt;()[m_mask.get_type()];</span></a>
 <a name="206"><span class="lineNum">     206 </span>            : }</a>
 <a name="207"><span class="lineNum">     207 </span>            : </a>
-<a name="208"><span class="lineNum">     208 </span><span class="lineCov">        666 : bool Person::is_compliant(PersonalRandomNumberGenerator&amp; rng, InterventionType intervention) const</span></a>
+<a name="208"><span class="lineNum">     208 </span><span class="lineCov">        675 : bool Person::is_compliant(PersonalRandomNumberGenerator&amp; rng, InterventionType intervention) const</span></a>
 <a name="209"><span class="lineNum">     209 </span>            : {</a>
-<a name="210"><span class="lineNum">     210 </span><span class="lineCov">        666 :     ScalarType compliance_check = UniformDistribution&lt;double&gt;::get_instance()(rng);</span></a>
-<a name="211"><span class="lineNum">     211 </span><span class="lineCov">        666 :     return compliance_check &lt;= get_compliance(intervention);</span></a>
+<a name="210"><span class="lineNum">     210 </span><span class="lineCov">        675 :     ScalarType compliance_check = UniformDistribution&lt;double&gt;::get_instance()(rng);</span></a>
+<a name="211"><span class="lineNum">     211 </span><span class="lineCov">        675 :     return compliance_check &lt;= get_compliance(intervention);</span></a>
 <a name="212"><span class="lineNum">     212 </span>            : }</a>
 <a name="213"><span class="lineNum">     213 </span>            : </a>
 <a name="214"><span class="lineNum">     214 </span><span class="lineCov">       2079 : ProtectionEvent Person::get_latest_protection() const</span></a>
@@ -299,10 +299,10 @@
 <a name="237"><span class="lineNum">     237 </span><span class="lineCov">         72 :         t.days() - latest_protection.time.days());</span></a>
 <a name="238"><span class="lineNum">     238 </span>            : }</a>
 <a name="239"><span class="lineNum">     239 </span>            : </a>
-<a name="240"><span class="lineNum">     240 </span><span class="lineCov">        360 : void Person::set_mask(MaskType type, TimePoint t)</span></a>
+<a name="240"><span class="lineNum">     240 </span><span class="lineCov">        369 : void Person::set_mask(MaskType type, TimePoint t)</span></a>
 <a name="241"><span class="lineNum">     241 </span>            : {</a>
-<a name="242"><span class="lineNum">     242 </span><span class="lineCov">        360 :     m_mask.change_mask(type, t);</span></a>
-<a name="243"><span class="lineNum">     243 </span><span class="lineCov">        360 : } </span></a>
+<a name="242"><span class="lineNum">     242 </span><span class="lineCov">        369 :     m_mask.change_mask(type, t);</span></a>
+<a name="243"><span class="lineNum">     243 </span><span class="lineCov">        369 : } </span></a>
 <a name="244"><span class="lineNum">     244 </span>            : </a>
 <a name="245"><span class="lineNum">     245 </span><span class="lineCov">         72 : void Person::add_test_result(TimePoint t, TestType type, bool result)</span></a>
 <a name="246"><span class="lineNum">     246 </span>            : {</a>
diff --git a/coverage/cpp/models/abm/person.h.func-sort-c.html b/coverage/cpp/models/abm/person.h.func-sort-c.html
index 69c1a8246e..f23b33fcaa 100644
--- a/coverage/cpp/models/abm/person.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/person.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
@@ -85,11 +85,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#361">mio::abm::Person::set_last_transport_mode(mio::abm::TransportMode)</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#309">mio::abm::Person::get_compliance(mio::abm::InterventionType) const</a></td>
-              <td class="coverFnHi">666</td>
+              <td class="coverFnHi">675</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#352">mio::abm::Person::get_last_transport_mode() const</a></td>
@@ -109,11 +109,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#119">mio::abm::Person::get_age() const</a></td>
-              <td class="coverFnHi">10026</td>
+              <td class="coverFnHi">10035</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#130">mio::abm::Person::get_location_type() const</a></td>
-              <td class="coverFnHi">10701</td>
+              <td class="coverFnHi">10692</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/person.h.func.html b/coverage/cpp/models/abm/person.h.func.html
index efee4c7f0d..f88dacc51b 100644
--- a/coverage/cpp/models/abm/person.h.func.html
+++ b/coverage/cpp/models/abm/person.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
@@ -85,7 +85,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#361">mio::abm::Person::set_last_transport_mode(mio::abm::TransportMode)</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#273">mio::abm::Person::get_mask()</a></td>
@@ -93,7 +93,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#309">mio::abm::Person::get_compliance(mio::abm::InterventionType) const</a></td>
-              <td class="coverFnHi">666</td>
+              <td class="coverFnHi">675</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#233">mio::abm::Person::is_in_quarantine(mio::abm::TimePoint, mio::abm::Parameters const&amp;) const</a></td>
@@ -101,7 +101,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#130">mio::abm::Person::get_location_type() const</a></td>
-              <td class="coverFnHi">10701</td>
+              <td class="coverFnHi">10692</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#145">mio::abm::Person::get_time_at_location() const</a></td>
@@ -113,7 +113,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="person.h.gcov.html#119">mio::abm::Person::get_age() const</a></td>
-              <td class="coverFnHi">10026</td>
+              <td class="coverFnHi">10035</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/person.h.gcov.html b/coverage/cpp/models/abm/person.h.gcov.html
index abeb45bb8b..c347f88975 100644
--- a/coverage/cpp/models/abm/person.h.gcov.html
+++ b/coverage/cpp/models/abm/person.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
@@ -180,9 +180,9 @@
 <a name="118"><span class="lineNum">     118 </span>            :      * @brief Get the AgeGroup of this Person.</a>
 <a name="119"><span class="lineNum">     119 </span>            :      * @return AgeGroup of the Person.</a>
 <a name="120"><span class="lineNum">     120 </span>            :      */</a>
-<a name="121"><span class="lineNum">     121 </span><span class="lineCov">      10026 :     AgeGroup get_age() const</span></a>
+<a name="121"><span class="lineNum">     121 </span><span class="lineCov">      10035 :     AgeGroup get_age() const</span></a>
 <a name="122"><span class="lineNum">     122 </span>            :     {</a>
-<a name="123"><span class="lineNum">     123 </span><span class="lineCov">      10026 :         return m_age;</span></a>
+<a name="123"><span class="lineNum">     123 </span><span class="lineCov">      10035 :         return m_age;</span></a>
 <a name="124"><span class="lineNum">     124 </span>            :     }</a>
 <a name="125"><span class="lineNum">     125 </span>            : </a>
 <a name="126"><span class="lineNum">     126 </span>            :     /**</a>
@@ -191,9 +191,9 @@
 <a name="129"><span class="lineNum">     129 </span>            :      */</a>
 <a name="130"><span class="lineNum">     130 </span>            :     LocationId get_location() const;</a>
 <a name="131"><span class="lineNum">     131 </span>            : </a>
-<a name="132"><span class="lineNum">     132 </span><span class="lineCov">      10701 :     LocationType get_location_type() const</span></a>
+<a name="132"><span class="lineNum">     132 </span><span class="lineCov">      10692 :     LocationType get_location_type() const</span></a>
 <a name="133"><span class="lineNum">     133 </span>            :     {</a>
-<a name="134"><span class="lineNum">     134 </span><span class="lineCov">      10701 :         return m_location_type;</span></a>
+<a name="134"><span class="lineNum">     134 </span><span class="lineCov">      10692 :         return m_location_type;</span></a>
 <a name="135"><span class="lineNum">     135 </span>            :     }</a>
 <a name="136"><span class="lineNum">     136 </span>            : </a>
 <a name="137"><span class="lineNum">     137 </span>            :     /**</a>
@@ -370,9 +370,9 @@
 <a name="308"><span class="lineNum">     308 </span>            :      * @param[in] intervention_type The #InterventionType.</a>
 <a name="309"><span class="lineNum">     309 </span>            :      * @return The probability that the Person complies to an Intervention.</a>
 <a name="310"><span class="lineNum">     310 </span>            :      */</a>
-<a name="311"><span class="lineNum">     311 </span><span class="lineCov">        666 :     ScalarType get_compliance(InterventionType intervention_type) const</span></a>
+<a name="311"><span class="lineNum">     311 </span><span class="lineCov">        675 :     ScalarType get_compliance(InterventionType intervention_type) const</span></a>
 <a name="312"><span class="lineNum">     312 </span>            :     {</a>
-<a name="313"><span class="lineNum">     313 </span><span class="lineCov">        666 :         return m_compliance[static_cast&lt;uint32_t&gt;(intervention_type)];</span></a>
+<a name="313"><span class="lineNum">     313 </span><span class="lineCov">        675 :         return m_compliance[static_cast&lt;uint32_t&gt;(intervention_type)];</span></a>
 <a name="314"><span class="lineNum">     314 </span>            :     }</a>
 <a name="315"><span class="lineNum">     315 </span>            : </a>
 <a name="316"><span class="lineNum">     316 </span>            :     /**</a>
@@ -422,10 +422,10 @@
 <a name="360"><span class="lineNum">     360 </span>            :      * @brief Set the transport mode the Person used to get to its current Location.</a>
 <a name="361"><span class="lineNum">     361 </span>            :      * @param[in] mode TransportMode the Person used to get to its current Location.</a>
 <a name="362"><span class="lineNum">     362 </span>            :      */</a>
-<a name="363"><span class="lineNum">     363 </span><span class="lineCov">        351 :     void set_last_transport_mode(const mio::abm::TransportMode mode)</span></a>
+<a name="363"><span class="lineNum">     363 </span><span class="lineCov">        360 :     void set_last_transport_mode(const mio::abm::TransportMode mode)</span></a>
 <a name="364"><span class="lineNum">     364 </span>            :     {</a>
-<a name="365"><span class="lineNum">     365 </span><span class="lineCov">        351 :         m_last_transport_mode = mode;</span></a>
-<a name="366"><span class="lineNum">     366 </span><span class="lineCov">        351 :     }</span></a>
+<a name="365"><span class="lineNum">     365 </span><span class="lineCov">        360 :         m_last_transport_mode = mode;</span></a>
+<a name="366"><span class="lineNum">     366 </span><span class="lineCov">        360 :     }</span></a>
 <a name="367"><span class="lineNum">     367 </span>            : </a>
 <a name="368"><span class="lineNum">     368 </span>            :     /**</a>
 <a name="369"><span class="lineNum">     369 </span>            :      * @brief Get this persons RandomNumberGenerator counter.</a>
diff --git a/coverage/cpp/models/abm/person_id.h.func-sort-c.html b/coverage/cpp/models/abm/person_id.h.func-sort-c.html
index 2c25ca96aa..8999212b98 100644
--- a/coverage/cpp/models/abm/person_id.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/person_id.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/person_id.h.func.html b/coverage/cpp/models/abm/person_id.h.func.html
index b219932173..bb520b247f 100644
--- a/coverage/cpp/models/abm/person_id.h.func.html
+++ b/coverage/cpp/models/abm/person_id.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/person_id.h.gcov.html b/coverage/cpp/models/abm/person_id.h.gcov.html
index 4d971f084a..4c44fcbb07 100644
--- a/coverage/cpp/models/abm/person_id.h.gcov.html
+++ b/coverage/cpp/models/abm/person_id.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/personal_rng.cpp.func-sort-c.html b/coverage/cpp/models/abm/personal_rng.cpp.func-sort-c.html
index e2d8cc763d..05fdd4dd24 100644
--- a/coverage/cpp/models/abm/personal_rng.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/personal_rng.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/personal_rng.cpp.func.html b/coverage/cpp/models/abm/personal_rng.cpp.func.html
index 8c102fbeb1..79317ffdf0 100644
--- a/coverage/cpp/models/abm/personal_rng.cpp.func.html
+++ b/coverage/cpp/models/abm/personal_rng.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/personal_rng.cpp.gcov.html b/coverage/cpp/models/abm/personal_rng.cpp.gcov.html
index 9f40785b67..550b476431 100644
--- a/coverage/cpp/models/abm/personal_rng.cpp.gcov.html
+++ b/coverage/cpp/models/abm/personal_rng.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/personal_rng.h.func-sort-c.html b/coverage/cpp/models/abm/personal_rng.h.func-sort-c.html
index 09dddc5a06..dade85ec25 100644
--- a/coverage/cpp/models/abm/personal_rng.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/personal_rng.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -61,15 +61,15 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="personal_rng.h.gcov.html#84">mio::abm::PersonalRandomNumberGenerator::increment_counter()</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="personal_rng.h.gcov.html#68">mio::abm::PersonalRandomNumberGenerator::get_key() const</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="personal_rng.h.gcov.html#76">mio::abm::PersonalRandomNumberGenerator::get_counter() const</a></td>
-              <td class="coverFnHi">2799</td>
+              <td class="coverFnHi">2754</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/personal_rng.h.func.html b/coverage/cpp/models/abm/personal_rng.h.func.html
index 0afe7281c1..1869c38acf 100644
--- a/coverage/cpp/models/abm/personal_rng.h.func.html
+++ b/coverage/cpp/models/abm/personal_rng.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -61,15 +61,15 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="personal_rng.h.gcov.html#84">mio::abm::PersonalRandomNumberGenerator::increment_counter()</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="personal_rng.h.gcov.html#76">mio::abm::PersonalRandomNumberGenerator::get_counter() const</a></td>
-              <td class="coverFnHi">2799</td>
+              <td class="coverFnHi">2754</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="personal_rng.h.gcov.html#68">mio::abm::PersonalRandomNumberGenerator::get_key() const</a></td>
-              <td class="coverFnHi">2781</td>
+              <td class="coverFnHi">2736</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/personal_rng.h.gcov.html b/coverage/cpp/models/abm/personal_rng.h.gcov.html
index 14c23a0a87..c53e55ef32 100644
--- a/coverage/cpp/models/abm/personal_rng.h.gcov.html
+++ b/coverage/cpp/models/abm/personal_rng.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
@@ -129,26 +129,26 @@
 <a name="67"><span class="lineNum">      67 </span>            :     /**</a>
 <a name="68"><span class="lineNum">      68 </span>            :      * @return Get the key.</a>
 <a name="69"><span class="lineNum">      69 </span>            :      */</a>
-<a name="70"><span class="lineNum">      70 </span><span class="lineCov">       2781 :     mio::Key&lt;uint64_t&gt; get_key() const</span></a>
+<a name="70"><span class="lineNum">      70 </span><span class="lineCov">       2736 :     mio::Key&lt;uint64_t&gt; get_key() const</span></a>
 <a name="71"><span class="lineNum">      71 </span>            :     {</a>
-<a name="72"><span class="lineNum">      72 </span><span class="lineCov">       2781 :         return m_key;</span></a>
+<a name="72"><span class="lineNum">      72 </span><span class="lineCov">       2736 :         return m_key;</span></a>
 <a name="73"><span class="lineNum">      73 </span>            :     }</a>
 <a name="74"><span class="lineNum">      74 </span>            : </a>
 <a name="75"><span class="lineNum">      75 </span>            :     /**</a>
 <a name="76"><span class="lineNum">      76 </span>            :      * @return Get the current counter.</a>
 <a name="77"><span class="lineNum">      77 </span>            :      */</a>
-<a name="78"><span class="lineNum">      78 </span><span class="lineCov">       2799 :     mio::Counter&lt;uint64_t&gt; get_counter() const</span></a>
+<a name="78"><span class="lineNum">      78 </span><span class="lineCov">       2754 :     mio::Counter&lt;uint64_t&gt; get_counter() const</span></a>
 <a name="79"><span class="lineNum">      79 </span>            :     {</a>
-<a name="80"><span class="lineNum">      80 </span><span class="lineCov">       5598 :         return mio::rng_totalsequence_counter&lt;uint64_t&gt;(m_person_id.get(), m_counter);</span></a>
+<a name="80"><span class="lineNum">      80 </span><span class="lineCov">       5508 :         return mio::rng_totalsequence_counter&lt;uint64_t&gt;(m_person_id.get(), m_counter);</span></a>
 <a name="81"><span class="lineNum">      81 </span>            :     }</a>
 <a name="82"><span class="lineNum">      82 </span>            : </a>
 <a name="83"><span class="lineNum">      83 </span>            :     /**</a>
 <a name="84"><span class="lineNum">      84 </span>            :      * Increment the counter.</a>
 <a name="85"><span class="lineNum">      85 </span>            :      */</a>
-<a name="86"><span class="lineNum">      86 </span><span class="lineCov">       2781 :     void increment_counter()</span></a>
+<a name="86"><span class="lineNum">      86 </span><span class="lineCov">       2736 :     void increment_counter()</span></a>
 <a name="87"><span class="lineNum">      87 </span>            :     {</a>
-<a name="88"><span class="lineNum">      88 </span><span class="lineCov">       2781 :         ++m_counter;</span></a>
-<a name="89"><span class="lineNum">      89 </span><span class="lineCov">       2781 :     }</span></a>
+<a name="88"><span class="lineNum">      88 </span><span class="lineCov">       2736 :         ++m_counter;</span></a>
+<a name="89"><span class="lineNum">      89 </span><span class="lineCov">       2736 :     }</span></a>
 <a name="90"><span class="lineNum">      90 </span>            : </a>
 <a name="91"><span class="lineNum">      91 </span>            : private:</a>
 <a name="92"><span class="lineNum">      92 </span>            :     mio::Key&lt;uint64_t&gt; m_key; ///&lt; Global RNG Key</a>
diff --git a/coverage/cpp/models/abm/protection_event.h.func-sort-c.html b/coverage/cpp/models/abm/protection_event.h.func-sort-c.html
index ca9a544898..e442cd6dc4 100644
--- a/coverage/cpp/models/abm/protection_event.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/protection_event.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/protection_event.h.func.html b/coverage/cpp/models/abm/protection_event.h.func.html
index c6b22e505b..048d129f9b 100644
--- a/coverage/cpp/models/abm/protection_event.h.func.html
+++ b/coverage/cpp/models/abm/protection_event.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/protection_event.h.gcov.html b/coverage/cpp/models/abm/protection_event.h.gcov.html
index b0b09ffcea..179f8d9eed 100644
--- a/coverage/cpp/models/abm/protection_event.h.gcov.html
+++ b/coverage/cpp/models/abm/protection_event.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/abm/random_events.h.func-sort-c.html b/coverage/cpp/models/abm/random_events.h.func-sort-c.html
index fd194be141..2913821d75 100644
--- a/coverage/cpp/models/abm/random_events.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/random_events.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
@@ -68,12 +68,12 @@
               <td class="coverFnHi">27</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="random_events.h.gcov.html#67">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])::{lambda(auto:1&amp;&amp;)#3}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;) const</a></td>
+              <td class="coverFn"><a href="random_events.h.gcov.html#67">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 5ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [5ul])::{lambda(auto:1&amp;&amp;)#3}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;) const</a></td>
               <td class="coverFnHi">45</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="random_events.h.gcov.html#67">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 5ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [5ul])::{lambda(auto:1&amp;&amp;)#3}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;) const</a></td>
-              <td class="coverFnHi">45</td>
+              <td class="coverFn"><a href="random_events.h.gcov.html#67">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])::{lambda(auto:1&amp;&amp;)#3}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;) const</a></td>
+              <td class="coverFnHi">54</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#57">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 5ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [5ul])::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#2}::operator()&lt;double&amp;, std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;, std::pair&lt;mio::abm::LocationType, double&gt; const&amp;) const</a></td>
@@ -85,15 +85,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#48">mio::abm::LocationType mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#57">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#2}::operator()&lt;double&amp;, std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;, std::pair&lt;mio::abm::LocationType, double&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#50">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])::{lambda(auto:1&amp;)#1}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&gt;(mio::abm::PersonalRandomNumberGenerator&amp;) const</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#48">mio::abm::VirusVariant mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::VirusVariant, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::VirusVariant, mio::abm::TimeSpan, std::pair&lt;mio::abm::VirusVariant, double&gt; const (&amp;) [1ul])</a></td>
diff --git a/coverage/cpp/models/abm/random_events.h.func.html b/coverage/cpp/models/abm/random_events.h.func.html
index 6234008f79..61a09e7ce5 100644
--- a/coverage/cpp/models/abm/random_events.h.func.html
+++ b/coverage/cpp/models/abm/random_events.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#48">mio::abm::LocationType mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#48">mio::abm::LocationType mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 5ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [5ul])</a></td>
@@ -73,15 +73,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#67">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])::{lambda(auto:1&amp;&amp;)#3}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;) const</a></td>
-              <td class="coverFnHi">45</td>
+              <td class="coverFnHi">54</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#57">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])::{lambda(auto:1&amp;&amp;, auto:2&amp;&amp;)#2}::operator()&lt;double&amp;, std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;, std::pair&lt;mio::abm::LocationType, double&gt; const&amp;) const</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#50">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 1ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [1ul])::{lambda(auto:1&amp;)#1}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&gt;(mio::abm::PersonalRandomNumberGenerator&amp;) const</a></td>
-              <td class="coverFnHi">351</td>
+              <td class="coverFnHi">360</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="random_events.h.gcov.html#67">auto mio::abm::random_transition&lt;mio::abm::PersonalRandomNumberGenerator, mio::abm::LocationType, 5ul&gt;(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::LocationType, mio::abm::TimeSpan, std::pair&lt;mio::abm::LocationType, double&gt; const (&amp;) [5ul])::{lambda(auto:1&amp;&amp;)#3}::operator()&lt;std::pair&lt;mio::abm::LocationType, double&gt; const&amp;&gt;(mio::abm::PersonalRandomNumberGenerator&amp;&amp;) const</a></td>
diff --git a/coverage/cpp/models/abm/random_events.h.gcov.html b/coverage/cpp/models/abm/random_events.h.gcov.html
index b4aff5529f..283d4311be 100644
--- a/coverage/cpp/models/abm/random_events.h.gcov.html
+++ b/coverage/cpp/models/abm/random_events.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
@@ -109,30 +109,30 @@
 <a name="47"><span class="lineNum">      47 </span>            :  * @return New state from the list if transition happens, current_state otherwise.</a>
 <a name="48"><span class="lineNum">      48 </span>            :  */</a>
 <a name="49"><span class="lineNum">      49 </span>            : template &lt;class RNG, class T, size_t NumTransitions&gt;</a>
-<a name="50"><span class="lineNum">      50 </span><span class="lineCov">       2358 : T random_transition(RNG&amp; rng, T current_state, TimeSpan dt, const std::pair&lt;T, double&gt; (&amp;transitions)[NumTransitions])</span></a>
+<a name="50"><span class="lineNum">      50 </span><span class="lineCov">       2367 : T random_transition(RNG&amp; rng, T current_state, TimeSpan dt, const std::pair&lt;T, double&gt; (&amp;transitions)[NumTransitions])</span></a>
 <a name="51"><span class="lineNum">      51 </span>            : {</a>
-<a name="52"><span class="lineNum">      52 </span><span class="lineCov">       4788 :     assert(std::all_of(std::begin(transitions), std::end(transitions),</span></a>
+<a name="52"><span class="lineNum">      52 </span><span class="lineCov">       4806 :     assert(std::all_of(std::begin(transitions), std::end(transitions),</span></a>
 <a name="53"><span class="lineNum">      53 </span>            :                        [](auto&amp; p) {</a>
 <a name="54"><span class="lineNum">      54 </span>            :                            return p.second &gt;= 0.0;</a>
 <a name="55"><span class="lineNum">      55 </span>            :                        }) &amp;&amp;</a>
 <a name="56"><span class="lineNum">      56 </span>            :            &quot;transition rates must be non-negative&quot;);</a>
 <a name="57"><span class="lineNum">      57 </span>            : </a>
 <a name="58"><span class="lineNum">      58 </span>            :     //check if any transition happens using exponential distribution with the sum of all transition rates</a>
-<a name="59"><span class="lineNum">      59 </span><span class="lineCov">       2799 :     auto sum = std::accumulate(std::begin(transitions), std::end(transitions), 0.0, [](auto&amp;&amp; a, auto&amp;&amp; t) {</span></a>
-<a name="60"><span class="lineNum">      60 </span><span class="lineCov">       2430 :         return a + t.second;</span></a>
+<a name="59"><span class="lineNum">      59 </span><span class="lineCov">       2817 :     auto sum = std::accumulate(std::begin(transitions), std::end(transitions), 0.0, [](auto&amp;&amp; a, auto&amp;&amp; t) {</span></a>
+<a name="60"><span class="lineNum">      60 </span><span class="lineCov">       2439 :         return a + t.second;</span></a>
 <a name="61"><span class="lineNum">      61 </span>            :     });</a>
-<a name="62"><span class="lineNum">      62 </span><span class="lineCov">       2358 :     if (sum &lt;= 0) { //no transitions or all transitions have rate zero</span></a>
+<a name="62"><span class="lineNum">      62 </span><span class="lineCov">       2367 :     if (sum &lt;= 0) { //no transitions or all transitions have rate zero</span></a>
 <a name="63"><span class="lineNum">      63 </span><span class="lineCov">       1872 :         return current_state;</span></a>
 <a name="64"><span class="lineNum">      64 </span>            :     }</a>
-<a name="65"><span class="lineNum">      65 </span><span class="lineCov">        486 :     auto v = ExponentialDistribution&lt;double&gt;::get_instance()(rng, sum);</span></a>
-<a name="66"><span class="lineNum">      66 </span><span class="lineCov">        486 :     if (v &lt; dt.days()) {</span></a>
+<a name="65"><span class="lineNum">      65 </span><span class="lineCov">        495 :     auto v = ExponentialDistribution&lt;double&gt;::get_instance()(rng, sum);</span></a>
+<a name="66"><span class="lineNum">      66 </span><span class="lineCov">        495 :     if (v &lt; dt.days()) {</span></a>
 <a name="67"><span class="lineNum">      67 </span>            :         //pick one of the possible transitions using discrete distribution</a>
-<a name="68"><span class="lineNum">      68 </span><span class="lineCov">         81 :         std::array&lt;double, NumTransitions&gt; rates;</span></a>
-<a name="69"><span class="lineNum">      69 </span><span class="lineCov">        171 :         std::transform(std::begin(transitions), std::end(transitions), rates.begin(), [](auto&amp;&amp; t) {</span></a>
-<a name="70"><span class="lineNum">      70 </span><span class="lineCov">        117 :             return t.second;</span></a>
+<a name="68"><span class="lineNum">      68 </span><span class="lineCov">         90 :         std::array&lt;double, NumTransitions&gt; rates;</span></a>
+<a name="69"><span class="lineNum">      69 </span><span class="lineCov">        189 :         std::transform(std::begin(transitions), std::end(transitions), rates.begin(), [](auto&amp;&amp; t) {</span></a>
+<a name="70"><span class="lineNum">      70 </span><span class="lineCov">        126 :             return t.second;</span></a>
 <a name="71"><span class="lineNum">      71 </span>            :         });</a>
-<a name="72"><span class="lineNum">      72 </span><span class="lineCov">         81 :         auto random_idx = DiscreteDistribution&lt;size_t&gt;::get_instance()(rng, rates);</span></a>
-<a name="73"><span class="lineNum">      73 </span><span class="lineCov">         81 :         return transitions[random_idx].first;</span></a>
+<a name="72"><span class="lineNum">      72 </span><span class="lineCov">         90 :         auto random_idx = DiscreteDistribution&lt;size_t&gt;::get_instance()(rng, rates);</span></a>
+<a name="73"><span class="lineNum">      73 </span><span class="lineCov">         90 :         return transitions[random_idx].first;</span></a>
 <a name="74"><span class="lineNum">      74 </span>            :     }</a>
 <a name="75"><span class="lineNum">      75 </span>            : </a>
 <a name="76"><span class="lineNum">      76 </span><span class="lineCov">        405 :     return current_state;</span></a>
diff --git a/coverage/cpp/models/abm/simulation.cpp.func-sort-c.html b/coverage/cpp/models/abm/simulation.cpp.func-sort-c.html
index 71b8cf1cb2..8abfa94112 100644
--- a/coverage/cpp/models/abm/simulation.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/simulation.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/simulation.cpp.func.html b/coverage/cpp/models/abm/simulation.cpp.func.html
index 0ba7b3f6ba..2044a36220 100644
--- a/coverage/cpp/models/abm/simulation.cpp.func.html
+++ b/coverage/cpp/models/abm/simulation.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/simulation.cpp.gcov.html b/coverage/cpp/models/abm/simulation.cpp.gcov.html
index 6345eb8cec..d6a8a6e6f6 100644
--- a/coverage/cpp/models/abm/simulation.cpp.gcov.html
+++ b/coverage/cpp/models/abm/simulation.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/abm/simulation.h.func-sort-c.html b/coverage/cpp/models/abm/simulation.h.func-sort-c.html
index ac5d7a40a1..0684f9ff2d 100644
--- a/coverage/cpp/models/abm/simulation.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/models/abm/simulation.h.func.html b/coverage/cpp/models/abm/simulation.h.func.html
index 856468e1c1..52ad57a5e2 100644
--- a/coverage/cpp/models/abm/simulation.h.func.html
+++ b/coverage/cpp/models/abm/simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/models/abm/simulation.h.gcov.html b/coverage/cpp/models/abm/simulation.h.gcov.html
index 26d5799a05..0c94894afd 100644
--- a/coverage/cpp/models/abm/simulation.h.gcov.html
+++ b/coverage/cpp/models/abm/simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
diff --git a/coverage/cpp/models/abm/test_type.h.func-sort-c.html b/coverage/cpp/models/abm/test_type.h.func-sort-c.html
index 71e1b9a91b..3d035519ee 100644
--- a/coverage/cpp/models/abm/test_type.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/test_type.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/models/abm/test_type.h.func.html b/coverage/cpp/models/abm/test_type.h.func.html
index 2d09618241..e5eaf30957 100644
--- a/coverage/cpp/models/abm/test_type.h.func.html
+++ b/coverage/cpp/models/abm/test_type.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/models/abm/test_type.h.gcov.html b/coverage/cpp/models/abm/test_type.h.gcov.html
index 07f94fd181..6c6ce21114 100644
--- a/coverage/cpp/models/abm/test_type.h.gcov.html
+++ b/coverage/cpp/models/abm/test_type.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">1</td>
diff --git a/coverage/cpp/models/abm/testing_strategy.cpp.func-sort-c.html b/coverage/cpp/models/abm/testing_strategy.cpp.func-sort-c.html
index fd6c2d5987..833339158e 100644
--- a/coverage/cpp/models/abm/testing_strategy.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/testing_strategy.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -137,7 +137,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="testing_strategy.cpp.gcov.html#175">mio::abm::TestingStrategy::run_strategy(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person&amp;, mio::abm::Location const&amp;, mio::abm::TimePoint)</a></td>
-              <td class="coverFnHi">378</td>
+              <td class="coverFnHi">387</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="testing_strategy.cpp.gcov.html#166">mio::abm::TestingStrategy::update_activity_status(mio::abm::TimePoint)</a></td>
diff --git a/coverage/cpp/models/abm/testing_strategy.cpp.func.html b/coverage/cpp/models/abm/testing_strategy.cpp.func.html
index 00027e4e26..a3adfbd918 100644
--- a/coverage/cpp/models/abm/testing_strategy.cpp.func.html
+++ b/coverage/cpp/models/abm/testing_strategy.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -89,7 +89,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="testing_strategy.cpp.gcov.html#175">mio::abm::TestingStrategy::run_strategy(mio::abm::PersonalRandomNumberGenerator&amp;, mio::abm::Person&amp;, mio::abm::Location const&amp;, mio::abm::TimePoint)</a></td>
-              <td class="coverFnHi">378</td>
+              <td class="coverFnHi">387</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="testing_strategy.cpp.gcov.html#127">mio::abm::TestingStrategy::add_testing_scheme(mio::abm::LocationType const&amp;, mio::abm::LocationId const&amp;, mio::abm::TestingScheme const&amp;)</a></td>
diff --git a/coverage/cpp/models/abm/testing_strategy.cpp.gcov.html b/coverage/cpp/models/abm/testing_strategy.cpp.gcov.html
index 462044cc43..199b35ad70 100644
--- a/coverage/cpp/models/abm/testing_strategy.cpp.gcov.html
+++ b/coverage/cpp/models/abm/testing_strategy.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -236,28 +236,28 @@
 <a name="174"><span class="lineNum">     174 </span>            :     }</a>
 <a name="175"><span class="lineNum">     175 </span><span class="lineCov">        765 : }</span></a>
 <a name="176"><span class="lineNum">     176 </span>            : </a>
-<a name="177"><span class="lineNum">     177 </span><span class="lineCov">        378 : bool TestingStrategy::run_strategy(PersonalRandomNumberGenerator&amp; rng, Person&amp; person, const Location&amp; location,</span></a>
+<a name="177"><span class="lineNum">     177 </span><span class="lineCov">        387 : bool TestingStrategy::run_strategy(PersonalRandomNumberGenerator&amp; rng, Person&amp; person, const Location&amp; location,</span></a>
 <a name="178"><span class="lineNum">     178 </span>            :                                    TimePoint t)</a>
 <a name="179"><span class="lineNum">     179 </span>            : {</a>
 <a name="180"><span class="lineNum">     180 </span>            :     // A Person is always allowed to go home and this is never called if a person is not discharged from a hospital or ICU.</a>
-<a name="181"><span class="lineNum">     181 </span><span class="lineCov">        378 :     if (location.get_type() == mio::abm::LocationType::Home) {</span></a>
+<a name="181"><span class="lineNum">     181 </span><span class="lineCov">        387 :     if (location.get_type() == mio::abm::LocationType::Home) {</span></a>
 <a name="182"><span class="lineNum">     182 </span><span class="lineCov">         54 :         return true;</span></a>
 <a name="183"><span class="lineNum">     183 </span>            :     }</a>
 <a name="184"><span class="lineNum">     184 </span>            : </a>
 <a name="185"><span class="lineNum">     185 </span>            :     // If the Person does not comply to Testing where there is a testing scheme at the target location, it is not allowed to enter.</a>
-<a name="186"><span class="lineNum">     186 </span><span class="lineCov">        324 :     if (!person.is_compliant(rng, InterventionType::Testing)) {</span></a>
+<a name="186"><span class="lineNum">     186 </span><span class="lineCov">        333 :     if (!person.is_compliant(rng, InterventionType::Testing)) {</span></a>
 <a name="187"><span class="lineNum">     187 </span><span class="lineCov">         18 :         return false;</span></a>
 <a name="188"><span class="lineNum">     188 </span>            :     }</a>
 <a name="189"><span class="lineNum">     189 </span>            : </a>
 <a name="190"><span class="lineNum">     190 </span>            :     // Lookup schemes for this specific location as well as the location type</a>
 <a name="191"><span class="lineNum">     191 </span>            :     // Lookup in std::vector instead of std::map should be much faster unless for large numbers of schemes</a>
-<a name="192"><span class="lineNum">     192 </span><span class="lineCov">       1791 :     for (auto key : {std::make_pair(location.get_type(), location.get_id()),</span></a>
-<a name="193"><span class="lineNum">     193 </span><span class="lineCov">       2097 :                      std::make_pair(location.get_type(), LocationId::invalid_id())}) {</span></a>
-<a name="194"><span class="lineNum">     194 </span><span class="lineCov">        612 :         auto iter_schemes =</span></a>
-<a name="195"><span class="lineNum">     195 </span><span class="lineCov">        612 :             std::find_if(m_location_to_schemes_map.begin(), m_location_to_schemes_map.end(), [&amp;](const auto&amp; p) {</span></a>
+<a name="192"><span class="lineNum">     192 </span><span class="lineCov">       1845 :     for (auto key : {std::make_pair(location.get_type(), location.get_id()),</span></a>
+<a name="193"><span class="lineNum">     193 </span><span class="lineCov">       2160 :                      std::make_pair(location.get_type(), LocationId::invalid_id())}) {</span></a>
+<a name="194"><span class="lineNum">     194 </span><span class="lineCov">        630 :         auto iter_schemes =</span></a>
+<a name="195"><span class="lineNum">     195 </span><span class="lineCov">        630 :             std::find_if(m_location_to_schemes_map.begin(), m_location_to_schemes_map.end(), [&amp;](const auto&amp; p) {</span></a>
 <a name="196"><span class="lineNum">     196 </span><span class="lineCov">        198 :                 return p.type == key.first &amp;&amp; p.id == key.second;</span></a>
 <a name="197"><span class="lineNum">     197 </span>            :             });</a>
-<a name="198"><span class="lineNum">     198 </span><span class="lineCov">        612 :         if (iter_schemes != m_location_to_schemes_map.end()) {</span></a>
+<a name="198"><span class="lineNum">     198 </span><span class="lineCov">        630 :         if (iter_schemes != m_location_to_schemes_map.end()) {</span></a>
 <a name="199"><span class="lineNum">     199 </span>            :             // Apply all testing schemes that are found</a>
 <a name="200"><span class="lineNum">     200 </span><span class="lineCov">         81 :             auto&amp; schemes = iter_schemes-&gt;schemes;</span></a>
 <a name="201"><span class="lineNum">     201 </span>            :             // Whether the Person is allowed to enter or not depends on the test result(s).</a>
@@ -268,7 +268,7 @@
 <a name="206"><span class="lineNum">     206 </span>            :             }</a>
 <a name="207"><span class="lineNum">     207 </span>            :         }</a>
 <a name="208"><span class="lineNum">     208 </span>            :     }</a>
-<a name="209"><span class="lineNum">     209 </span><span class="lineCov">        261 :     return true;</span></a>
+<a name="209"><span class="lineNum">     209 </span><span class="lineCov">        270 :     return true;</span></a>
 <a name="210"><span class="lineNum">     210 </span>            : }</a>
 <a name="211"><span class="lineNum">     211 </span>            : </a>
 <a name="212"><span class="lineNum">     212 </span>            : } // namespace abm</a>
diff --git a/coverage/cpp/models/abm/testing_strategy.h.func-sort-c.html b/coverage/cpp/models/abm/testing_strategy.h.func-sort-c.html
index 8819c42966..e451ac7cc9 100644
--- a/coverage/cpp/models/abm/testing_strategy.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/testing_strategy.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/abm/testing_strategy.h.func.html b/coverage/cpp/models/abm/testing_strategy.h.func.html
index 157ad355b5..716d199f32 100644
--- a/coverage/cpp/models/abm/testing_strategy.h.func.html
+++ b/coverage/cpp/models/abm/testing_strategy.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/abm/testing_strategy.h.gcov.html b/coverage/cpp/models/abm/testing_strategy.h.gcov.html
index de4197b668..ad18316785 100644
--- a/coverage/cpp/models/abm/testing_strategy.h.gcov.html
+++ b/coverage/cpp/models/abm/testing_strategy.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/abm/time.h.func-sort-c.html b/coverage/cpp/models/abm/time.h.func-sort-c.html
index 73c9319fdf..b75c03718d 100644
--- a/coverage/cpp/models/abm/time.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/time.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">38</td>
@@ -104,12 +104,12 @@
               <td class="coverFnHi">900</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="time.h.gcov.html#316">mio::abm::minutes(int)</a></td>
-              <td class="coverFnHi">946</td>
+              <td class="coverFn"><a href="time.h.gcov.html#85">mio::abm::TimeSpan::operator&lt;(mio::abm::TimeSpan const&amp;) const</a></td>
+              <td class="coverFnHi">945</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="time.h.gcov.html#85">mio::abm::TimeSpan::operator&lt;(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">954</td>
+              <td class="coverFn"><a href="time.h.gcov.html#316">mio::abm::minutes(int)</a></td>
+              <td class="coverFnHi">946</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#246">mio::abm::TimePoint::operator&lt;=(mio::abm::TimePoint const&amp;) const</a></td>
@@ -121,19 +121,23 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#307">mio::abm::seconds(int)</a></td>
-              <td class="coverFnHi">1215</td>
+              <td class="coverFnHi">1206</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#273">mio::abm::TimePoint::operator-(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">1368</td>
+              <td class="coverFnHi">1359</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#107">mio::abm::TimeSpan::operator+(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">1629</td>
+              <td class="coverFnHi">1611</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#225">mio::abm::TimePoint::time_since_midnight() const</a></td>
-              <td class="coverFnHi">1638</td>
+              <td class="coverFnHi">1629</td>
+            </tr>
+    <tr>
+              <td class="coverFn"><a href="time.h.gcov.html#339">mio::abm::days(double)</a></td>
+              <td class="coverFnHi">1656</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#217">mio::abm::TimePoint::hour_of_day() const</a></td>
@@ -147,10 +151,6 @@
               <td class="coverFn"><a href="time.h.gcov.html#135">mio::abm::TimeSpan::operator/(int) const</a></td>
               <td class="coverFnHi">1701</td>
             </tr>
-    <tr>
-              <td class="coverFn"><a href="time.h.gcov.html#339">mio::abm::days(double)</a></td>
-              <td class="coverFnHi">1728</td>
-            </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#254">mio::abm::TimePoint::operator&gt;=(mio::abm::TimePoint const&amp;) const</a></td>
               <td class="coverFnHi">2538</td>
@@ -161,11 +161,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#52">mio::abm::TimeSpan::days() const</a></td>
-              <td class="coverFnHi">2808</td>
+              <td class="coverFnHi">2817</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#193">mio::abm::TimePoint::seconds() const</a></td>
-              <td class="coverFnHi">2835</td>
+              <td class="coverFnHi">2826</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#111">mio::abm::TimeSpan::operator+=(mio::abm::TimeSpan const&amp;)</a></td>
@@ -173,7 +173,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#201">mio::abm::TimePoint::day_of_week() const</a></td>
-              <td class="coverFnHi">3069</td>
+              <td class="coverFnHi">3060</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#325">mio::abm::hours(int)</a></td>
@@ -181,15 +181,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#264">mio::abm::TimePoint::operator+(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">6543</td>
+              <td class="coverFnHi">6480</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#179">mio::abm::TimePoint::days() const</a></td>
-              <td class="coverFnHi">10067</td>
+              <td class="coverFnHi">10058</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#68">mio::abm::TimeSpan::seconds() const</a></td>
-              <td class="coverFnHi">14922</td>
+              <td class="coverFnHi">14832</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#242">mio::abm::TimePoint::operator&lt;(mio::abm::TimePoint const&amp;) const</a></td>
@@ -197,15 +197,15 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#44">mio::abm::TimeSpan::TimeSpan(int)</a></td>
-              <td class="coverFnHi">20942</td>
+              <td class="coverFnHi">20843</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="time.h.gcov.html#250">mio::abm::TimePoint::operator&gt;(mio::abm::TimePoint const&amp;) const</a></td>
-              <td class="coverFnHi">28710</td>
+              <td class="coverFn"><a href="time.h.gcov.html#171">mio::abm::TimePoint::TimePoint(int)</a></td>
+              <td class="coverFnHi">33238</td>
             </tr>
     <tr>
-              <td class="coverFn"><a href="time.h.gcov.html#171">mio::abm::TimePoint::TimePoint(int)</a></td>
-              <td class="coverFnHi">33310</td>
+              <td class="coverFn"><a href="time.h.gcov.html#250">mio::abm::TimePoint::operator&gt;(mio::abm::TimePoint const&amp;) const</a></td>
+              <td class="coverFnHi">36495</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#38">mio::abm::TimeSpan::TimeSpan()</a></td>
diff --git a/coverage/cpp/models/abm/time.h.func.html b/coverage/cpp/models/abm/time.h.func.html
index 83dc2446db..300cce8210 100644
--- a/coverage/cpp/models/abm/time.h.func.html
+++ b/coverage/cpp/models/abm/time.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">38</td>
@@ -61,7 +61,7 @@
     </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#339">mio::abm::days(double)</a></td>
-              <td class="coverFnHi">1728</td>
+              <td class="coverFnHi">1656</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#334">mio::abm::days(int)</a></td>
@@ -77,7 +77,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#307">mio::abm::seconds(int)</a></td>
-              <td class="coverFnHi">1215</td>
+              <td class="coverFnHi">1206</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#147">mio::abm::TimeSpan::default_serialize()</a></td>
@@ -85,7 +85,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#44">mio::abm::TimeSpan::TimeSpan(int)</a></td>
-              <td class="coverFnHi">20942</td>
+              <td class="coverFnHi">20843</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#38">mio::abm::TimeSpan::TimeSpan()</a></td>
@@ -101,7 +101,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#171">mio::abm::TimePoint::TimePoint(int)</a></td>
-              <td class="coverFnHi">33310</td>
+              <td class="coverFnHi">33238</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#166">mio::abm::TimePoint::TimePoint()</a></td>
@@ -113,7 +113,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#52">mio::abm::TimeSpan::days() const</a></td>
-              <td class="coverFnHi">2808</td>
+              <td class="coverFnHi">2817</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#60">mio::abm::TimeSpan::hours() const</a></td>
@@ -121,7 +121,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#68">mio::abm::TimeSpan::seconds() const</a></td>
-              <td class="coverFnHi">14922</td>
+              <td class="coverFnHi">14832</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#135">mio::abm::TimeSpan::operator/(int) const</a></td>
@@ -145,11 +145,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#85">mio::abm::TimeSpan::operator&lt;(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">954</td>
+              <td class="coverFnHi">945</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#107">mio::abm::TimeSpan::operator+(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">1629</td>
+              <td class="coverFnHi">1611</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#209">mio::abm::TimePoint::is_weekend() const</a></td>
@@ -157,7 +157,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#201">mio::abm::TimePoint::day_of_week() const</a></td>
-              <td class="coverFnHi">3069</td>
+              <td class="coverFnHi">3060</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#217">mio::abm::TimePoint::hour_of_day() const</a></td>
@@ -165,11 +165,11 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#225">mio::abm::TimePoint::time_since_midnight() const</a></td>
-              <td class="coverFnHi">1638</td>
+              <td class="coverFnHi">1629</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#179">mio::abm::TimePoint::days() const</a></td>
-              <td class="coverFnHi">10067</td>
+              <td class="coverFnHi">10058</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#186">mio::abm::TimePoint::hours() const</a></td>
@@ -177,7 +177,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#193">mio::abm::TimePoint::seconds() const</a></td>
-              <td class="coverFnHi">2835</td>
+              <td class="coverFnHi">2826</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#234">mio::abm::TimePoint::operator==(mio::abm::TimePoint const&amp;) const</a></td>
@@ -189,7 +189,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#250">mio::abm::TimePoint::operator&gt;(mio::abm::TimePoint const&amp;) const</a></td>
-              <td class="coverFnHi">28710</td>
+              <td class="coverFnHi">36495</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#246">mio::abm::TimePoint::operator&lt;=(mio::abm::TimePoint const&amp;) const</a></td>
@@ -201,7 +201,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#273">mio::abm::TimePoint::operator-(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">1368</td>
+              <td class="coverFnHi">1359</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#288">mio::abm::TimePoint::operator-(mio::abm::TimePoint const&amp;) const</a></td>
@@ -209,7 +209,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="time.h.gcov.html#264">mio::abm::TimePoint::operator+(mio::abm::TimeSpan const&amp;) const</a></td>
-              <td class="coverFnHi">6543</td>
+              <td class="coverFnHi">6480</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/abm/time.h.gcov.html b/coverage/cpp/models/abm/time.h.gcov.html
index 1a8f39c417..f786d03b52 100644
--- a/coverage/cpp/models/abm/time.h.gcov.html
+++ b/coverage/cpp/models/abm/time.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">38</td>
@@ -105,17 +105,17 @@
 <a name="43"><span class="lineNum">      43 </span>            :      * @brief Creates a TimeSpan that represents a number of seconds.</a>
 <a name="44"><span class="lineNum">      44 </span>            :      * @param[in] seconds The number of seconds.</a>
 <a name="45"><span class="lineNum">      45 </span>            :      */</a>
-<a name="46"><span class="lineNum">      46 </span><span class="lineCov">      20942 :     explicit TimeSpan(int seconds)</span></a>
-<a name="47"><span class="lineNum">      47 </span><span class="lineCov">      20942 :         : m_seconds(seconds)</span></a>
+<a name="46"><span class="lineNum">      46 </span><span class="lineCov">      20843 :     explicit TimeSpan(int seconds)</span></a>
+<a name="47"><span class="lineNum">      47 </span><span class="lineCov">      20843 :         : m_seconds(seconds)</span></a>
 <a name="48"><span class="lineNum">      48 </span>            :     {</a>
-<a name="49"><span class="lineNum">      49 </span><span class="lineCov">      20942 :     }</span></a>
+<a name="49"><span class="lineNum">      49 </span><span class="lineCov">      20843 :     }</span></a>
 <a name="50"><span class="lineNum">      50 </span>            : </a>
 <a name="51"><span class="lineNum">      51 </span>            :     /**</a>
 <a name="52"><span class="lineNum">      52 </span>            :      * @brief Length of time in days.</a>
 <a name="53"><span class="lineNum">      53 </span>            :      */</a>
-<a name="54"><span class="lineNum">      54 </span><span class="lineCov">       2808 :     double days() const</span></a>
+<a name="54"><span class="lineNum">      54 </span><span class="lineCov">       2817 :     double days() const</span></a>
 <a name="55"><span class="lineNum">      55 </span>            :     {</a>
-<a name="56"><span class="lineNum">      56 </span><span class="lineCov">       2808 :         return double(m_seconds) / (24 * 60 * 60);</span></a>
+<a name="56"><span class="lineNum">      56 </span><span class="lineCov">       2817 :         return double(m_seconds) / (24 * 60 * 60);</span></a>
 <a name="57"><span class="lineNum">      57 </span>            :     }</a>
 <a name="58"><span class="lineNum">      58 </span>            : </a>
 <a name="59"><span class="lineNum">      59 </span>            :     /**</a>
@@ -129,9 +129,9 @@
 <a name="67"><span class="lineNum">      67 </span>            :     /**</a>
 <a name="68"><span class="lineNum">      68 </span>            :      * @brief Length of time in seconds.</a>
 <a name="69"><span class="lineNum">      69 </span>            :      */</a>
-<a name="70"><span class="lineNum">      70 </span><span class="lineCov">      14922 :     int seconds() const</span></a>
+<a name="70"><span class="lineNum">      70 </span><span class="lineCov">      14832 :     int seconds() const</span></a>
 <a name="71"><span class="lineNum">      71 </span>            :     {</a>
-<a name="72"><span class="lineNum">      72 </span><span class="lineCov">      14922 :         return m_seconds;</span></a>
+<a name="72"><span class="lineNum">      72 </span><span class="lineCov">      14832 :         return m_seconds;</span></a>
 <a name="73"><span class="lineNum">      73 </span>            :     }</a>
 <a name="74"><span class="lineNum">      74 </span>            : </a>
 <a name="75"><span class="lineNum">      75 </span>            :     /**</a>
@@ -146,9 +146,9 @@
 <a name="84"><span class="lineNum">      84 </span>            :     {</a>
 <a name="85"><span class="lineNum">      85 </span>            :         return !(*this == other);</a>
 <a name="86"><span class="lineNum">      86 </span>            :     }</a>
-<a name="87"><span class="lineNum">      87 </span><span class="lineCov">        954 :     bool operator&lt;(const TimeSpan&amp; other) const</span></a>
+<a name="87"><span class="lineNum">      87 </span><span class="lineCov">        945 :     bool operator&lt;(const TimeSpan&amp; other) const</span></a>
 <a name="88"><span class="lineNum">      88 </span>            :     {</a>
-<a name="89"><span class="lineNum">      89 </span><span class="lineCov">        954 :         return m_seconds &lt; other.m_seconds;</span></a>
+<a name="89"><span class="lineNum">      89 </span><span class="lineCov">        945 :         return m_seconds &lt; other.m_seconds;</span></a>
 <a name="90"><span class="lineNum">      90 </span>            :     }</a>
 <a name="91"><span class="lineNum">      91 </span><span class="lineCov">        126 :     bool operator&lt;=(const TimeSpan&amp; other) const</span></a>
 <a name="92"><span class="lineNum">      92 </span>            :     {</a>
@@ -168,9 +168,9 @@
 <a name="106"><span class="lineNum">     106 </span>            :      * @name Numeric operators for addition, subtraction, and scalar integer multiplication and division. </a>
 <a name="107"><span class="lineNum">     107 </span>            :      * @{</a>
 <a name="108"><span class="lineNum">     108 </span>            :      */</a>
-<a name="109"><span class="lineNum">     109 </span><span class="lineCov">       1629 :     TimeSpan operator+(const TimeSpan&amp; s) const</span></a>
+<a name="109"><span class="lineNum">     109 </span><span class="lineCov">       1611 :     TimeSpan operator+(const TimeSpan&amp; s) const</span></a>
 <a name="110"><span class="lineNum">     110 </span>            :     {</a>
-<a name="111"><span class="lineNum">     111 </span><span class="lineCov">       1629 :         return TimeSpan{m_seconds + s.m_seconds};</span></a>
+<a name="111"><span class="lineNum">     111 </span><span class="lineCov">       1611 :         return TimeSpan{m_seconds + s.m_seconds};</span></a>
 <a name="112"><span class="lineNum">     112 </span>            :     }</a>
 <a name="113"><span class="lineNum">     113 </span><span class="lineCov">       2844 :     TimeSpan&amp; operator+=(const TimeSpan&amp; s)</span></a>
 <a name="114"><span class="lineNum">     114 </span>            :     {</a>
@@ -232,17 +232,17 @@
 <a name="170"><span class="lineNum">     170 </span>            :      * @brief Creates a TimePoint from a specified number of seconds.</a>
 <a name="171"><span class="lineNum">     171 </span>            :      * @param[in] seconds The number of seconds after the epoch.</a>
 <a name="172"><span class="lineNum">     172 </span>            :      */</a>
-<a name="173"><span class="lineNum">     173 </span><span class="lineCov">      33310 :     explicit TimePoint(int seconds)</span></a>
-<a name="174"><span class="lineNum">     174 </span><span class="lineCov">      33310 :         : m_seconds(seconds)</span></a>
+<a name="173"><span class="lineNum">     173 </span><span class="lineCov">      33238 :     explicit TimePoint(int seconds)</span></a>
+<a name="174"><span class="lineNum">     174 </span><span class="lineCov">      33238 :         : m_seconds(seconds)</span></a>
 <a name="175"><span class="lineNum">     175 </span>            :     {</a>
-<a name="176"><span class="lineNum">     176 </span><span class="lineCov">      33310 :     }</span></a>
+<a name="176"><span class="lineNum">     176 </span><span class="lineCov">      33238 :     }</span></a>
 <a name="177"><span class="lineNum">     177 </span>            : </a>
 <a name="178"><span class="lineNum">     178 </span>            :     /**</a>
 <a name="179"><span class="lineNum">     179 </span>            :      * @brief Time since the epoch in days.</a>
 <a name="180"><span class="lineNum">     180 </span>            :      */</a>
-<a name="181"><span class="lineNum">     181 </span><span class="lineCov">      10067 :     double days() const</span></a>
+<a name="181"><span class="lineNum">     181 </span><span class="lineCov">      10058 :     double days() const</span></a>
 <a name="182"><span class="lineNum">     182 </span>            :     {</a>
-<a name="183"><span class="lineNum">     183 </span><span class="lineCov">      10067 :         return double(m_seconds) / (24 * 60 * 60);</span></a>
+<a name="183"><span class="lineNum">     183 </span><span class="lineCov">      10058 :         return double(m_seconds) / (24 * 60 * 60);</span></a>
 <a name="184"><span class="lineNum">     184 </span>            :     }</a>
 <a name="185"><span class="lineNum">     185 </span>            :     /**</a>
 <a name="186"><span class="lineNum">     186 </span>            :      * @brief Time since the epoch in hours.</a>
@@ -254,17 +254,17 @@
 <a name="192"><span class="lineNum">     192 </span>            :     /**</a>
 <a name="193"><span class="lineNum">     193 </span>            :      * @brief Time since the epoch in seconds.</a>
 <a name="194"><span class="lineNum">     194 </span>            :      */</a>
-<a name="195"><span class="lineNum">     195 </span><span class="lineCov">       2835 :     int seconds() const</span></a>
+<a name="195"><span class="lineNum">     195 </span><span class="lineCov">       2826 :     int seconds() const</span></a>
 <a name="196"><span class="lineNum">     196 </span>            :     {</a>
-<a name="197"><span class="lineNum">     197 </span><span class="lineCov">       2835 :         return m_seconds;</span></a>
+<a name="197"><span class="lineNum">     197 </span><span class="lineCov">       2826 :         return m_seconds;</span></a>
 <a name="198"><span class="lineNum">     198 </span>            :     }</a>
 <a name="199"><span class="lineNum">     199 </span>            : </a>
 <a name="200"><span class="lineNum">     200 </span>            :     /**</a>
 <a name="201"><span class="lineNum">     201 </span>            :      * @brief Index of current day of the week (0,...,6 = Mo,...,Sun).</a>
 <a name="202"><span class="lineNum">     202 </span>            :      */</a>
-<a name="203"><span class="lineNum">     203 </span><span class="lineCov">       3069 :     int day_of_week() const</span></a>
+<a name="203"><span class="lineNum">     203 </span><span class="lineCov">       3060 :     int day_of_week() const</span></a>
 <a name="204"><span class="lineNum">     204 </span>            :     {</a>
-<a name="205"><span class="lineNum">     205 </span><span class="lineCov">       3069 :         return int(days()) % 7;</span></a>
+<a name="205"><span class="lineNum">     205 </span><span class="lineCov">       3060 :         return int(days()) % 7;</span></a>
 <a name="206"><span class="lineNum">     206 </span>            :     }</a>
 <a name="207"><span class="lineNum">     207 </span>            : </a>
 <a name="208"><span class="lineNum">     208 </span>            :     /**</a>
@@ -286,9 +286,9 @@
 <a name="224"><span class="lineNum">     224 </span>            :     /**</a>
 <a name="225"><span class="lineNum">     225 </span>            :      * @brief Time since midnight.</a>
 <a name="226"><span class="lineNum">     226 </span>            :      */</a>
-<a name="227"><span class="lineNum">     227 </span><span class="lineCov">       1638 :     TimeSpan time_since_midnight() const</span></a>
+<a name="227"><span class="lineNum">     227 </span><span class="lineCov">       1629 :     TimeSpan time_since_midnight() const</span></a>
 <a name="228"><span class="lineNum">     228 </span>            :     {</a>
-<a name="229"><span class="lineNum">     229 </span><span class="lineCov">       1638 :         return TimeSpan(seconds() - ((int)days()) * 60 * 60 * 24);</span></a>
+<a name="229"><span class="lineNum">     229 </span><span class="lineCov">       1629 :         return TimeSpan(seconds() - ((int)days()) * 60 * 60 * 24);</span></a>
 <a name="230"><span class="lineNum">     230 </span>            :     }</a>
 <a name="231"><span class="lineNum">     231 </span>            : </a>
 <a name="232"><span class="lineNum">     232 </span>            :     /**</a>
@@ -311,9 +311,9 @@
 <a name="249"><span class="lineNum">     249 </span>            :     {</a>
 <a name="250"><span class="lineNum">     250 </span><span class="lineCov">        972 :         return m_seconds &lt;= other.m_seconds;</span></a>
 <a name="251"><span class="lineNum">     251 </span>            :     }</a>
-<a name="252"><span class="lineNum">     252 </span><span class="lineCov">      28710 :     bool operator&gt;(const TimePoint&amp; other) const</span></a>
+<a name="252"><span class="lineNum">     252 </span><span class="lineCov">      36495 :     bool operator&gt;(const TimePoint&amp; other) const</span></a>
 <a name="253"><span class="lineNum">     253 </span>            :     {</a>
-<a name="254"><span class="lineNum">     254 </span><span class="lineCov">      28710 :         return m_seconds &gt; other.m_seconds;</span></a>
+<a name="254"><span class="lineNum">     254 </span><span class="lineCov">      36495 :         return m_seconds &gt; other.m_seconds;</span></a>
 <a name="255"><span class="lineNum">     255 </span>            :     }</a>
 <a name="256"><span class="lineNum">     256 </span><span class="lineCov">       2538 :     bool operator&gt;=(const TimePoint&amp; other) const</span></a>
 <a name="257"><span class="lineNum">     257 </span>            :     {</a>
@@ -325,18 +325,18 @@
 <a name="263"><span class="lineNum">     263 </span>            :      * @brief Add or subtract a TimeSpan.</a>
 <a name="264"><span class="lineNum">     264 </span>            :      * @{</a>
 <a name="265"><span class="lineNum">     265 </span>            :      */</a>
-<a name="266"><span class="lineNum">     266 </span><span class="lineCov">       6543 :     TimePoint operator+(const TimeSpan&amp; s) const</span></a>
+<a name="266"><span class="lineNum">     266 </span><span class="lineCov">       6480 :     TimePoint operator+(const TimeSpan&amp; s) const</span></a>
 <a name="267"><span class="lineNum">     267 </span>            :     {</a>
-<a name="268"><span class="lineNum">     268 </span><span class="lineCov">       6543 :         return TimePoint{m_seconds + s.seconds()};</span></a>
+<a name="268"><span class="lineNum">     268 </span><span class="lineCov">       6480 :         return TimePoint{m_seconds + s.seconds()};</span></a>
 <a name="269"><span class="lineNum">     269 </span>            :     }</a>
 <a name="270"><span class="lineNum">     270 </span><span class="lineCov">        675 :     TimePoint&amp; operator+=(const TimeSpan&amp; s)</span></a>
 <a name="271"><span class="lineNum">     271 </span>            :     {</a>
 <a name="272"><span class="lineNum">     272 </span><span class="lineCov">        675 :         m_seconds += s.seconds();</span></a>
 <a name="273"><span class="lineNum">     273 </span><span class="lineCov">        675 :         return *this;</span></a>
 <a name="274"><span class="lineNum">     274 </span>            :     }</a>
-<a name="275"><span class="lineNum">     275 </span><span class="lineCov">       1368 :     TimePoint operator-(const TimeSpan&amp; s) const</span></a>
+<a name="275"><span class="lineNum">     275 </span><span class="lineCov">       1359 :     TimePoint operator-(const TimeSpan&amp; s) const</span></a>
 <a name="276"><span class="lineNum">     276 </span>            :     {</a>
-<a name="277"><span class="lineNum">     277 </span><span class="lineCov">       1368 :         return TimePoint{m_seconds - s.seconds()};</span></a>
+<a name="277"><span class="lineNum">     277 </span><span class="lineCov">       1359 :         return TimePoint{m_seconds - s.seconds()};</span></a>
 <a name="278"><span class="lineNum">     278 </span>            :     }</a>
 <a name="279"><span class="lineNum">     279 </span>            :     TimePoint&amp; operator-=(const TimeSpan&amp; s)</a>
 <a name="280"><span class="lineNum">     280 </span>            :     {</a>
@@ -368,9 +368,9 @@
 <a name="306"><span class="lineNum">     306 </span>            :  * @brief Create a TimeSpan of a specified number of seconds.</a>
 <a name="307"><span class="lineNum">     307 </span>            :  * @param[in] seconds Number of seconds in the TimeSpan.</a>
 <a name="308"><span class="lineNum">     308 </span>            :  */</a>
-<a name="309"><span class="lineNum">     309 </span><span class="lineCov">       1215 : inline TimeSpan seconds(int seconds)</span></a>
+<a name="309"><span class="lineNum">     309 </span><span class="lineCov">       1206 : inline TimeSpan seconds(int seconds)</span></a>
 <a name="310"><span class="lineNum">     310 </span>            : {</a>
-<a name="311"><span class="lineNum">     311 </span><span class="lineCov">       1215 :     return TimeSpan(seconds);</span></a>
+<a name="311"><span class="lineNum">     311 </span><span class="lineCov">       1206 :     return TimeSpan(seconds);</span></a>
 <a name="312"><span class="lineNum">     312 </span>            : }</a>
 <a name="313"><span class="lineNum">     313 </span>            : </a>
 <a name="314"><span class="lineNum">     314 </span>            : /**</a>
@@ -400,9 +400,9 @@
 <a name="338"><span class="lineNum">     338 </span><span class="lineCov">       2539 :     return TimeSpan(days * 24 * 60 * 60);</span></a>
 <a name="339"><span class="lineNum">     339 </span>            : }</a>
 <a name="340"><span class="lineNum">     340 </span>            : </a>
-<a name="341"><span class="lineNum">     341 </span><span class="lineCov">       1728 : inline TimeSpan days(double days)</span></a>
+<a name="341"><span class="lineNum">     341 </span><span class="lineCov">       1656 : inline TimeSpan days(double days)</span></a>
 <a name="342"><span class="lineNum">     342 </span>            : {</a>
-<a name="343"><span class="lineNum">     343 </span><span class="lineCov">       1728 :     return TimeSpan((int)(days * 24 * 60 * 60));</span></a>
+<a name="343"><span class="lineNum">     343 </span><span class="lineCov">       1656 :     return TimeSpan((int)(days * 24 * 60 * 60));</span></a>
 <a name="344"><span class="lineNum">     344 </span>            : }</a>
 <a name="345"><span class="lineNum">     345 </span>            : </a>
 <a name="346"><span class="lineNum">     346 </span>            : } // namespace abm</a>
diff --git a/coverage/cpp/models/abm/trip_list.cpp.func-sort-c.html b/coverage/cpp/models/abm/trip_list.cpp.func-sort-c.html
index 2ad4b69567..4c8e2082b4 100644
--- a/coverage/cpp/models/abm/trip_list.cpp.func-sort-c.html
+++ b/coverage/cpp/models/abm/trip_list.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/abm/trip_list.cpp.func.html b/coverage/cpp/models/abm/trip_list.cpp.func.html
index f65c0d6c50..6f857de0db 100644
--- a/coverage/cpp/models/abm/trip_list.cpp.func.html
+++ b/coverage/cpp/models/abm/trip_list.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/abm/trip_list.cpp.gcov.html b/coverage/cpp/models/abm/trip_list.cpp.gcov.html
index 956eeb04b7..44249e102a 100644
--- a/coverage/cpp/models/abm/trip_list.cpp.gcov.html
+++ b/coverage/cpp/models/abm/trip_list.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/abm/trip_list.h.func-sort-c.html b/coverage/cpp/models/abm/trip_list.h.func-sort-c.html
index 564bdfc68e..55fb70d13d 100644
--- a/coverage/cpp/models/abm/trip_list.h.func-sort-c.html
+++ b/coverage/cpp/models/abm/trip_list.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/abm/trip_list.h.func.html b/coverage/cpp/models/abm/trip_list.h.func.html
index 369c10c4b7..e27b164ccd 100644
--- a/coverage/cpp/models/abm/trip_list.h.func.html
+++ b/coverage/cpp/models/abm/trip_list.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/abm/trip_list.h.gcov.html b/coverage/cpp/models/abm/trip_list.h.gcov.html
index 0b6ca6b9eb..1a6a7ca7b5 100644
--- a/coverage/cpp/models/abm/trip_list.h.gcov.html
+++ b/coverage/cpp/models/abm/trip_list.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/glct_secir/index-sort-f.html b/coverage/cpp/models/glct_secir/index-sort-f.html
index 4f728d21ab..f7c4b5b50a 100644
--- a/coverage/cpp/models/glct_secir/index-sort-f.html
+++ b/coverage/cpp/models/glct_secir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">28</td>
diff --git a/coverage/cpp/models/glct_secir/index-sort-l.html b/coverage/cpp/models/glct_secir/index-sort-l.html
index b842305028..f98d93169b 100644
--- a/coverage/cpp/models/glct_secir/index-sort-l.html
+++ b/coverage/cpp/models/glct_secir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">28</td>
diff --git a/coverage/cpp/models/glct_secir/index.html b/coverage/cpp/models/glct_secir/index.html
index c7ebe5f787..82054ca607 100644
--- a/coverage/cpp/models/glct_secir/index.html
+++ b/coverage/cpp/models/glct_secir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">28</td>
diff --git a/coverage/cpp/models/glct_secir/model.h.func-sort-c.html b/coverage/cpp/models/glct_secir/model.h.func-sort-c.html
index eaa93a2994..cfa0ea6c6a 100644
--- a/coverage/cpp/models/glct_secir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/glct_secir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/glct_secir/model.h.func.html b/coverage/cpp/models/glct_secir/model.h.func.html
index c8af3dd3d5..3845ccc618 100644
--- a/coverage/cpp/models/glct_secir/model.h.func.html
+++ b/coverage/cpp/models/glct_secir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/glct_secir/model.h.gcov.html b/coverage/cpp/models/glct_secir/model.h.gcov.html
index 97cdaec143..caf072b974 100644
--- a/coverage/cpp/models/glct_secir/model.h.gcov.html
+++ b/coverage/cpp/models/glct_secir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/glct_secir/parameters.h.func-sort-c.html b/coverage/cpp/models/glct_secir/parameters.h.func-sort-c.html
index b2abca88e2..27c585404d 100644
--- a/coverage/cpp/models/glct_secir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/glct_secir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">22</td>
diff --git a/coverage/cpp/models/glct_secir/parameters.h.func.html b/coverage/cpp/models/glct_secir/parameters.h.func.html
index b5b6cc3fa5..7cdc5ba0bb 100644
--- a/coverage/cpp/models/glct_secir/parameters.h.func.html
+++ b/coverage/cpp/models/glct_secir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">22</td>
diff --git a/coverage/cpp/models/glct_secir/parameters.h.gcov.html b/coverage/cpp/models/glct_secir/parameters.h.gcov.html
index 7ec0ce86dd..f95060a4af 100644
--- a/coverage/cpp/models/glct_secir/parameters.h.gcov.html
+++ b/coverage/cpp/models/glct_secir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">22</td>
diff --git a/coverage/cpp/models/ide_secir/index-sort-f.html b/coverage/cpp/models/ide_secir/index-sort-f.html
index 95ae9b5d8a..67ebe6eb0b 100644
--- a/coverage/cpp/models/ide_secir/index-sort-f.html
+++ b/coverage/cpp/models/ide_secir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">37</td>
diff --git a/coverage/cpp/models/ide_secir/index-sort-l.html b/coverage/cpp/models/ide_secir/index-sort-l.html
index 00003ce608..b50651bc95 100644
--- a/coverage/cpp/models/ide_secir/index-sort-l.html
+++ b/coverage/cpp/models/ide_secir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">37</td>
diff --git a/coverage/cpp/models/ide_secir/index.html b/coverage/cpp/models/ide_secir/index.html
index 5fb74030f3..20c9f142f7 100644
--- a/coverage/cpp/models/ide_secir/index.html
+++ b/coverage/cpp/models/ide_secir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">37</td>
diff --git a/coverage/cpp/models/ide_secir/model.cpp.func-sort-c.html b/coverage/cpp/models/ide_secir/model.cpp.func-sort-c.html
index c8e2d3422b..e04eee1ed6 100644
--- a/coverage/cpp/models/ide_secir/model.cpp.func-sort-c.html
+++ b/coverage/cpp/models/ide_secir/model.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">15</td>
diff --git a/coverage/cpp/models/ide_secir/model.cpp.func.html b/coverage/cpp/models/ide_secir/model.cpp.func.html
index 052ad34568..3ddfa7bb1a 100644
--- a/coverage/cpp/models/ide_secir/model.cpp.func.html
+++ b/coverage/cpp/models/ide_secir/model.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">15</td>
diff --git a/coverage/cpp/models/ide_secir/model.cpp.gcov.html b/coverage/cpp/models/ide_secir/model.cpp.gcov.html
index f1620a720d..b5208e237c 100644
--- a/coverage/cpp/models/ide_secir/model.cpp.gcov.html
+++ b/coverage/cpp/models/ide_secir/model.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">15</td>
diff --git a/coverage/cpp/models/ide_secir/model.h.func-sort-c.html b/coverage/cpp/models/ide_secir/model.h.func-sort-c.html
index ed3fa14550..f960a04d3c 100644
--- a/coverage/cpp/models/ide_secir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/ide_secir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ide_secir/model.h.func.html b/coverage/cpp/models/ide_secir/model.h.func.html
index 1b45ba1f2c..952532fb3c 100644
--- a/coverage/cpp/models/ide_secir/model.h.func.html
+++ b/coverage/cpp/models/ide_secir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ide_secir/model.h.gcov.html b/coverage/cpp/models/ide_secir/model.h.gcov.html
index 0615fd4294..c6a1d99342 100644
--- a/coverage/cpp/models/ide_secir/model.h.gcov.html
+++ b/coverage/cpp/models/ide_secir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ide_secir/parameters.h.func-sort-c.html b/coverage/cpp/models/ide_secir/parameters.h.func-sort-c.html
index 6112c5a54d..cb95d5fe94 100644
--- a/coverage/cpp/models/ide_secir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/ide_secir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ide_secir/parameters.h.func.html b/coverage/cpp/models/ide_secir/parameters.h.func.html
index 3c20eab02b..c14ed4e899 100644
--- a/coverage/cpp/models/ide_secir/parameters.h.func.html
+++ b/coverage/cpp/models/ide_secir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ide_secir/parameters.h.gcov.html b/coverage/cpp/models/ide_secir/parameters.h.gcov.html
index 9984e5c2c4..6faa577594 100644
--- a/coverage/cpp/models/ide_secir/parameters.h.gcov.html
+++ b/coverage/cpp/models/ide_secir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ide_secir/parameters_io.cpp.func-sort-c.html b/coverage/cpp/models/ide_secir/parameters_io.cpp.func-sort-c.html
index d638443ea7..34c012de43 100644
--- a/coverage/cpp/models/ide_secir/parameters_io.cpp.func-sort-c.html
+++ b/coverage/cpp/models/ide_secir/parameters_io.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ide_secir/parameters_io.cpp.func.html b/coverage/cpp/models/ide_secir/parameters_io.cpp.func.html
index 69892a192f..98db59aa1c 100644
--- a/coverage/cpp/models/ide_secir/parameters_io.cpp.func.html
+++ b/coverage/cpp/models/ide_secir/parameters_io.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ide_secir/parameters_io.cpp.gcov.html b/coverage/cpp/models/ide_secir/parameters_io.cpp.gcov.html
index 322a2fd61c..117ed38055 100644
--- a/coverage/cpp/models/ide_secir/parameters_io.cpp.gcov.html
+++ b/coverage/cpp/models/ide_secir/parameters_io.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ide_secir/simulation.cpp.func-sort-c.html b/coverage/cpp/models/ide_secir/simulation.cpp.func-sort-c.html
index fa3a0e48dc..40f43b8644 100644
--- a/coverage/cpp/models/ide_secir/simulation.cpp.func-sort-c.html
+++ b/coverage/cpp/models/ide_secir/simulation.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/ide_secir/simulation.cpp.func.html b/coverage/cpp/models/ide_secir/simulation.cpp.func.html
index 6b08568312..48ece8ca3a 100644
--- a/coverage/cpp/models/ide_secir/simulation.cpp.func.html
+++ b/coverage/cpp/models/ide_secir/simulation.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/ide_secir/simulation.cpp.gcov.html b/coverage/cpp/models/ide_secir/simulation.cpp.gcov.html
index b929877a13..ad48c0b712 100644
--- a/coverage/cpp/models/ide_secir/simulation.cpp.gcov.html
+++ b/coverage/cpp/models/ide_secir/simulation.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/ide_secir/simulation.h.func-sort-c.html b/coverage/cpp/models/ide_secir/simulation.h.func-sort-c.html
index f1e96b181a..31a6205f15 100644
--- a/coverage/cpp/models/ide_secir/simulation.h.func-sort-c.html
+++ b/coverage/cpp/models/ide_secir/simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ide_secir/simulation.h.func.html b/coverage/cpp/models/ide_secir/simulation.h.func.html
index c4d93f5ce2..2a1fb0e3ed 100644
--- a/coverage/cpp/models/ide_secir/simulation.h.func.html
+++ b/coverage/cpp/models/ide_secir/simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ide_secir/simulation.h.gcov.html b/coverage/cpp/models/ide_secir/simulation.h.gcov.html
index d05704d1f1..a3bf40f57f 100644
--- a/coverage/cpp/models/ide_secir/simulation.h.gcov.html
+++ b/coverage/cpp/models/ide_secir/simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ide_seir/index-sort-f.html b/coverage/cpp/models/ide_seir/index-sort-f.html
index 297b8e4ee9..4dc536b5ed 100644
--- a/coverage/cpp/models/ide_seir/index-sort-f.html
+++ b/coverage/cpp/models/ide_seir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ide_seir/index-sort-l.html b/coverage/cpp/models/ide_seir/index-sort-l.html
index fa1fbb53ae..e7f6cfb905 100644
--- a/coverage/cpp/models/ide_seir/index-sort-l.html
+++ b/coverage/cpp/models/ide_seir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ide_seir/index.html b/coverage/cpp/models/ide_seir/index.html
index 1206c84350..b4e621d06b 100644
--- a/coverage/cpp/models/ide_seir/index.html
+++ b/coverage/cpp/models/ide_seir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ide_seir/model.h.func-sort-c.html b/coverage/cpp/models/ide_seir/model.h.func-sort-c.html
index 2ea0b41df6..a8f380dd42 100644
--- a/coverage/cpp/models/ide_seir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/ide_seir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/ide_seir/model.h.func.html b/coverage/cpp/models/ide_seir/model.h.func.html
index c86cefec03..004fd07d50 100644
--- a/coverage/cpp/models/ide_seir/model.h.func.html
+++ b/coverage/cpp/models/ide_seir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/ide_seir/model.h.gcov.html b/coverage/cpp/models/ide_seir/model.h.gcov.html
index fbb1ded7a3..427ef2abcc 100644
--- a/coverage/cpp/models/ide_seir/model.h.gcov.html
+++ b/coverage/cpp/models/ide_seir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/ide_seir/parameters.h.func-sort-c.html b/coverage/cpp/models/ide_seir/parameters.h.func-sort-c.html
index 01d1cc9a9d..9a332a2d6c 100644
--- a/coverage/cpp/models/ide_seir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/ide_seir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ide_seir/parameters.h.func.html b/coverage/cpp/models/ide_seir/parameters.h.func.html
index dfa18eb62e..9e6ab717d7 100644
--- a/coverage/cpp/models/ide_seir/parameters.h.func.html
+++ b/coverage/cpp/models/ide_seir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ide_seir/parameters.h.gcov.html b/coverage/cpp/models/ide_seir/parameters.h.gcov.html
index 337c484e2c..4c4d8b5f6b 100644
--- a/coverage/cpp/models/ide_seir/parameters.h.gcov.html
+++ b/coverage/cpp/models/ide_seir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/lct_secir/index-sort-f.html b/coverage/cpp/models/lct_secir/index-sort-f.html
index fa01643933..d9f3d7bebf 100644
--- a/coverage/cpp/models/lct_secir/index-sort-f.html
+++ b/coverage/cpp/models/lct_secir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">200</td>
diff --git a/coverage/cpp/models/lct_secir/index-sort-l.html b/coverage/cpp/models/lct_secir/index-sort-l.html
index bda8ddec7f..e76b2d765c 100644
--- a/coverage/cpp/models/lct_secir/index-sort-l.html
+++ b/coverage/cpp/models/lct_secir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">200</td>
diff --git a/coverage/cpp/models/lct_secir/index.html b/coverage/cpp/models/lct_secir/index.html
index af5e877176..d762afe2a9 100644
--- a/coverage/cpp/models/lct_secir/index.html
+++ b/coverage/cpp/models/lct_secir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">200</td>
diff --git a/coverage/cpp/models/lct_secir/initializer_flows.h.func-sort-c.html b/coverage/cpp/models/lct_secir/initializer_flows.h.func-sort-c.html
index 99b3e32f3e..1511f53db0 100644
--- a/coverage/cpp/models/lct_secir/initializer_flows.h.func-sort-c.html
+++ b/coverage/cpp/models/lct_secir/initializer_flows.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">48</td>
diff --git a/coverage/cpp/models/lct_secir/initializer_flows.h.func.html b/coverage/cpp/models/lct_secir/initializer_flows.h.func.html
index 9cdb931ff1..cf341ff678 100644
--- a/coverage/cpp/models/lct_secir/initializer_flows.h.func.html
+++ b/coverage/cpp/models/lct_secir/initializer_flows.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">48</td>
diff --git a/coverage/cpp/models/lct_secir/initializer_flows.h.gcov.html b/coverage/cpp/models/lct_secir/initializer_flows.h.gcov.html
index 697ec7d50a..2032eccb44 100644
--- a/coverage/cpp/models/lct_secir/initializer_flows.h.gcov.html
+++ b/coverage/cpp/models/lct_secir/initializer_flows.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">48</td>
diff --git a/coverage/cpp/models/lct_secir/model.h.func-sort-c.html b/coverage/cpp/models/lct_secir/model.h.func-sort-c.html
index a68fb366e1..e5c56ed6a6 100644
--- a/coverage/cpp/models/lct_secir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/lct_secir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">103</td>
diff --git a/coverage/cpp/models/lct_secir/model.h.func.html b/coverage/cpp/models/lct_secir/model.h.func.html
index e24272894b..3131398b4f 100644
--- a/coverage/cpp/models/lct_secir/model.h.func.html
+++ b/coverage/cpp/models/lct_secir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">103</td>
diff --git a/coverage/cpp/models/lct_secir/model.h.gcov.html b/coverage/cpp/models/lct_secir/model.h.gcov.html
index b916935d46..d38648bf8b 100644
--- a/coverage/cpp/models/lct_secir/model.h.gcov.html
+++ b/coverage/cpp/models/lct_secir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">103</td>
diff --git a/coverage/cpp/models/lct_secir/parameters.h.func-sort-c.html b/coverage/cpp/models/lct_secir/parameters.h.func-sort-c.html
index 0b59fa973e..23775e3724 100644
--- a/coverage/cpp/models/lct_secir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/lct_secir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">17</td>
diff --git a/coverage/cpp/models/lct_secir/parameters.h.func.html b/coverage/cpp/models/lct_secir/parameters.h.func.html
index 5d18b8a16e..8a95f1ae80 100644
--- a/coverage/cpp/models/lct_secir/parameters.h.func.html
+++ b/coverage/cpp/models/lct_secir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">17</td>
diff --git a/coverage/cpp/models/lct_secir/parameters.h.gcov.html b/coverage/cpp/models/lct_secir/parameters.h.gcov.html
index d84a8d50a9..e9304b392b 100644
--- a/coverage/cpp/models/lct_secir/parameters.h.gcov.html
+++ b/coverage/cpp/models/lct_secir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">17</td>
diff --git a/coverage/cpp/models/lct_secir/parameters_io.h.func-sort-c.html b/coverage/cpp/models/lct_secir/parameters_io.h.func-sort-c.html
index b3e49050b2..fa20eaf99c 100644
--- a/coverage/cpp/models/lct_secir/parameters_io.h.func-sort-c.html
+++ b/coverage/cpp/models/lct_secir/parameters_io.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">32</td>
diff --git a/coverage/cpp/models/lct_secir/parameters_io.h.func.html b/coverage/cpp/models/lct_secir/parameters_io.h.func.html
index 59bee03040..24b5776339 100644
--- a/coverage/cpp/models/lct_secir/parameters_io.h.func.html
+++ b/coverage/cpp/models/lct_secir/parameters_io.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">32</td>
diff --git a/coverage/cpp/models/lct_secir/parameters_io.h.gcov.html b/coverage/cpp/models/lct_secir/parameters_io.h.gcov.html
index 1b4fe576f7..60d1fc2a66 100644
--- a/coverage/cpp/models/lct_secir/parameters_io.h.gcov.html
+++ b/coverage/cpp/models/lct_secir/parameters_io.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">32</td>
diff --git a/coverage/cpp/models/ode_seair/index-sort-f.html b/coverage/cpp/models/ode_seair/index-sort-f.html
index 25379427e2..93987c4c4a 100644
--- a/coverage/cpp/models/ode_seair/index-sort-f.html
+++ b/coverage/cpp/models/ode_seair/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">24</td>
diff --git a/coverage/cpp/models/ode_seair/index-sort-l.html b/coverage/cpp/models/ode_seair/index-sort-l.html
index ab3f2a7ccf..dcf9a9400c 100644
--- a/coverage/cpp/models/ode_seair/index-sort-l.html
+++ b/coverage/cpp/models/ode_seair/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">24</td>
diff --git a/coverage/cpp/models/ode_seair/index.html b/coverage/cpp/models/ode_seair/index.html
index 47eb3df2cc..f1e16fcc28 100644
--- a/coverage/cpp/models/ode_seair/index.html
+++ b/coverage/cpp/models/ode_seair/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">24</td>
diff --git a/coverage/cpp/models/ode_seair/model.h.func-sort-c.html b/coverage/cpp/models/ode_seair/model.h.func-sort-c.html
index 40c80d21d9..b2f75f0e14 100644
--- a/coverage/cpp/models/ode_seair/model.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_seair/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ode_seair/model.h.func.html b/coverage/cpp/models/ode_seair/model.h.func.html
index 624a0e9713..c5a7311aff 100644
--- a/coverage/cpp/models/ode_seair/model.h.func.html
+++ b/coverage/cpp/models/ode_seair/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ode_seair/model.h.gcov.html b/coverage/cpp/models/ode_seair/model.h.gcov.html
index d1a9e3a656..dd704b9c7d 100644
--- a/coverage/cpp/models/ode_seair/model.h.gcov.html
+++ b/coverage/cpp/models/ode_seair/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">4</td>
diff --git a/coverage/cpp/models/ode_seair/parameters.h.func-sort-c.html b/coverage/cpp/models/ode_seair/parameters.h.func-sort-c.html
index 9e305fe9c7..c544243eb9 100644
--- a/coverage/cpp/models/ode_seair/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_seair/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
diff --git a/coverage/cpp/models/ode_seair/parameters.h.func.html b/coverage/cpp/models/ode_seair/parameters.h.func.html
index 43e7cd5164..8fd649cff5 100644
--- a/coverage/cpp/models/ode_seair/parameters.h.func.html
+++ b/coverage/cpp/models/ode_seair/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
diff --git a/coverage/cpp/models/ode_seair/parameters.h.gcov.html b/coverage/cpp/models/ode_seair/parameters.h.gcov.html
index 447c1a29d0..574b9f0cfc 100644
--- a/coverage/cpp/models/ode_seair/parameters.h.gcov.html
+++ b/coverage/cpp/models/ode_seair/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">20</td>
diff --git a/coverage/cpp/models/ode_secir/analyze_result.h.func-sort-c.html b/coverage/cpp/models/ode_secir/analyze_result.h.func-sort-c.html
index c5ac681caf..7c1fb12c25 100644
--- a/coverage/cpp/models/ode_secir/analyze_result.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secir/analyze_result.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">52</td>
diff --git a/coverage/cpp/models/ode_secir/analyze_result.h.func.html b/coverage/cpp/models/ode_secir/analyze_result.h.func.html
index cc1cb226a3..0ad3836a41 100644
--- a/coverage/cpp/models/ode_secir/analyze_result.h.func.html
+++ b/coverage/cpp/models/ode_secir/analyze_result.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">52</td>
diff --git a/coverage/cpp/models/ode_secir/analyze_result.h.gcov.html b/coverage/cpp/models/ode_secir/analyze_result.h.gcov.html
index 34ef3aa2de..072848fe20 100644
--- a/coverage/cpp/models/ode_secir/analyze_result.h.gcov.html
+++ b/coverage/cpp/models/ode_secir/analyze_result.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">52</td>
diff --git a/coverage/cpp/models/ode_secir/index-sort-f.html b/coverage/cpp/models/ode_secir/index-sort-f.html
index 024f430792..3456aac5cf 100644
--- a/coverage/cpp/models/ode_secir/index-sort-f.html
+++ b/coverage/cpp/models/ode_secir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">157</td>
diff --git a/coverage/cpp/models/ode_secir/index-sort-l.html b/coverage/cpp/models/ode_secir/index-sort-l.html
index 13c8a2f2a5..d97ba6a9af 100644
--- a/coverage/cpp/models/ode_secir/index-sort-l.html
+++ b/coverage/cpp/models/ode_secir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">157</td>
diff --git a/coverage/cpp/models/ode_secir/index.html b/coverage/cpp/models/ode_secir/index.html
index 941e5fa61c..6dd57847e8 100644
--- a/coverage/cpp/models/ode_secir/index.html
+++ b/coverage/cpp/models/ode_secir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">157</td>
diff --git a/coverage/cpp/models/ode_secir/model.h.func-sort-c.html b/coverage/cpp/models/ode_secir/model.h.func-sort-c.html
index 3050eb83e1..eb26239723 100644
--- a/coverage/cpp/models/ode_secir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -145,7 +145,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#77">mio::osecir::Model&lt;double&gt;::get_flows(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393903</td>
+              <td class="coverFnHi">414963</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/ode_secir/model.h.func.html b/coverage/cpp/models/ode_secir/model.h.func.html
index f7c0c0dae8..cd5e6d9406 100644
--- a/coverage/cpp/models/ode_secir/model.h.func.html
+++ b/coverage/cpp/models/ode_secir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -121,7 +121,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#77">mio::osecir::Model&lt;double&gt;::get_flows(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">393903</td>
+              <td class="coverFnHi">414963</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#215">void mio::osecir::Model&lt;double&gt;::serialize&lt;mio::JsonContext&gt;(mio::JsonContext&amp;) const</a></td>
diff --git a/coverage/cpp/models/ode_secir/model.h.gcov.html b/coverage/cpp/models/ode_secir/model.h.gcov.html
index 92880fdeff..6418c935cc 100644
--- a/coverage/cpp/models/ode_secir/model.h.gcov.html
+++ b/coverage/cpp/models/ode_secir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
@@ -138,138 +138,138 @@
 <a name="76"><span class="lineNum">      76 </span>            :     {</a>
 <a name="77"><span class="lineNum">      77 </span><span class="lineCov">        362 :     }</span></a>
 <a name="78"><span class="lineNum">      78 </span>            : </a>
-<a name="79"><span class="lineNum">      79 </span><span class="lineCov">     393903 :     void get_flows(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
+<a name="79"><span class="lineNum">      79 </span><span class="lineCov">     414963 :     void get_flows(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
 <a name="80"><span class="lineNum">      80 </span>            :                    Eigen::Ref&lt;Vector&lt;FP&gt;&gt; flows) const override</a>
 <a name="81"><span class="lineNum">      81 </span>            :     {</a>
-<a name="82"><span class="lineNum">      82 </span><span class="lineCov">     393903 :         auto const&amp; params   = this-&gt;parameters;</span></a>
-<a name="83"><span class="lineNum">      83 </span><span class="lineCov">     393903 :         AgeGroup n_agegroups = params.get_num_groups();</span></a>
+<a name="82"><span class="lineNum">      82 </span><span class="lineCov">     414963 :         auto const&amp; params   = this-&gt;parameters;</span></a>
+<a name="83"><span class="lineNum">      83 </span><span class="lineCov">     414963 :         AgeGroup n_agegroups = params.get_num_groups();</span></a>
 <a name="84"><span class="lineNum">      84 </span>            : </a>
-<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     393903 :         ContactMatrixGroup const&amp; contact_matrix = params.template get&lt;ContactPatterns&lt;FP&gt;&gt;();</span></a>
+<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     414963 :         ContactMatrixGroup const&amp; contact_matrix = params.template get&lt;ContactPatterns&lt;FP&gt;&gt;();</span></a>
 <a name="86"><span class="lineNum">      86 </span>            : </a>
-<a name="87"><span class="lineNum">      87 </span><span class="lineCov">     393903 :         auto icu_occupancy           = 0.0;</span></a>
-<a name="88"><span class="lineNum">      88 </span><span class="lineCov">     393903 :         auto test_and_trace_required = 0.0;</span></a>
-<a name="89"><span class="lineNum">      89 </span><span class="lineCov">     799998 :         for (auto i = AgeGroup(0); i &lt; n_agegroups; ++i) {</span></a>
-<a name="90"><span class="lineNum">      90 </span><span class="lineCov">     812190 :             test_and_trace_required += (1 - params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) /</span></a>
-<a name="91"><span class="lineNum">      91 </span><span class="lineCov">     406095 :                                        params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i] *</span></a>
-<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     406095 :                                        this-&gt;populations.get_from(pop, {i, InfectionState::InfectedNoSymptoms});</span></a>
-<a name="93"><span class="lineNum">      93 </span><span class="lineCov">     406095 :             icu_occupancy += this-&gt;populations.get_from(pop, {i, InfectionState::InfectedCritical});</span></a>
+<a name="87"><span class="lineNum">      87 </span><span class="lineCov">     414963 :         auto icu_occupancy           = 0.0;</span></a>
+<a name="88"><span class="lineNum">      88 </span><span class="lineCov">     414963 :         auto test_and_trace_required = 0.0;</span></a>
+<a name="89"><span class="lineNum">      89 </span><span class="lineCov">     842118 :         for (auto i = AgeGroup(0); i &lt; n_agegroups; ++i) {</span></a>
+<a name="90"><span class="lineNum">      90 </span><span class="lineCov">     854310 :             test_and_trace_required += (1 - params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) /</span></a>
+<a name="91"><span class="lineNum">      91 </span><span class="lineCov">     427155 :                                        params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i] *</span></a>
+<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     427155 :                                        this-&gt;populations.get_from(pop, {i, InfectionState::InfectedNoSymptoms});</span></a>
+<a name="93"><span class="lineNum">      93 </span><span class="lineCov">     427155 :             icu_occupancy += this-&gt;populations.get_from(pop, {i, InfectionState::InfectedCritical});</span></a>
 <a name="94"><span class="lineNum">      94 </span>            :         }</a>
 <a name="95"><span class="lineNum">      95 </span>            : </a>
-<a name="96"><span class="lineNum">      96 </span><span class="lineCov">     799998 :         for (auto i = AgeGroup(0); i &lt; n_agegroups; i++) {</span></a>
+<a name="96"><span class="lineNum">      96 </span><span class="lineCov">     842118 :         for (auto i = AgeGroup(0); i &lt; n_agegroups; i++) {</span></a>
 <a name="97"><span class="lineNum">      97 </span>            : </a>
-<a name="98"><span class="lineNum">      98 </span><span class="lineCov">     406095 :             size_t Si    = this-&gt;populations.get_flat_index({i, InfectionState::Susceptible});</span></a>
-<a name="99"><span class="lineNum">      99 </span><span class="lineCov">     406095 :             size_t Ei    = this-&gt;populations.get_flat_index({i, InfectionState::Exposed});</span></a>
-<a name="100"><span class="lineNum">     100 </span><span class="lineCov">     406095 :             size_t INSi  = this-&gt;populations.get_flat_index({i, InfectionState::InfectedNoSymptoms});</span></a>
-<a name="101"><span class="lineNum">     101 </span><span class="lineCov">     406095 :             size_t INSCi = this-&gt;populations.get_flat_index({i, InfectionState::InfectedNoSymptomsConfirmed});</span></a>
-<a name="102"><span class="lineNum">     102 </span><span class="lineCov">     406095 :             size_t ISyi  = this-&gt;populations.get_flat_index({i, InfectionState::InfectedSymptoms});</span></a>
-<a name="103"><span class="lineNum">     103 </span><span class="lineCov">     406095 :             size_t ISyCi = this-&gt;populations.get_flat_index({i, InfectionState::InfectedSymptomsConfirmed});</span></a>
-<a name="104"><span class="lineNum">     104 </span><span class="lineCov">     406095 :             size_t ISevi = this-&gt;populations.get_flat_index({i, InfectionState::InfectedSevere});</span></a>
-<a name="105"><span class="lineNum">     105 </span><span class="lineCov">     406095 :             size_t ICri  = this-&gt;populations.get_flat_index({i, InfectionState::InfectedCritical});</span></a>
+<a name="98"><span class="lineNum">      98 </span><span class="lineCov">     427155 :             size_t Si    = this-&gt;populations.get_flat_index({i, InfectionState::Susceptible});</span></a>
+<a name="99"><span class="lineNum">      99 </span><span class="lineCov">     427155 :             size_t Ei    = this-&gt;populations.get_flat_index({i, InfectionState::Exposed});</span></a>
+<a name="100"><span class="lineNum">     100 </span><span class="lineCov">     427155 :             size_t INSi  = this-&gt;populations.get_flat_index({i, InfectionState::InfectedNoSymptoms});</span></a>
+<a name="101"><span class="lineNum">     101 </span><span class="lineCov">     427155 :             size_t INSCi = this-&gt;populations.get_flat_index({i, InfectionState::InfectedNoSymptomsConfirmed});</span></a>
+<a name="102"><span class="lineNum">     102 </span><span class="lineCov">     427155 :             size_t ISyi  = this-&gt;populations.get_flat_index({i, InfectionState::InfectedSymptoms});</span></a>
+<a name="103"><span class="lineNum">     103 </span><span class="lineCov">     427155 :             size_t ISyCi = this-&gt;populations.get_flat_index({i, InfectionState::InfectedSymptomsConfirmed});</span></a>
+<a name="104"><span class="lineNum">     104 </span><span class="lineCov">     427155 :             size_t ISevi = this-&gt;populations.get_flat_index({i, InfectionState::InfectedSevere});</span></a>
+<a name="105"><span class="lineNum">     105 </span><span class="lineCov">     427155 :             size_t ICri  = this-&gt;populations.get_flat_index({i, InfectionState::InfectedCritical});</span></a>
 <a name="106"><span class="lineNum">     106 </span>            : </a>
-<a name="107"><span class="lineNum">     107 </span><span class="lineCov">     848766 :             for (auto j = AgeGroup(0); j &lt; n_agegroups; j++) {</span></a>
-<a name="108"><span class="lineNum">     108 </span><span class="lineCov">     442671 :                 size_t Sj    = this-&gt;populations.get_flat_index({j, InfectionState::Susceptible});</span></a>
-<a name="109"><span class="lineNum">     109 </span><span class="lineCov">     442671 :                 size_t Ej    = this-&gt;populations.get_flat_index({j, InfectionState::Exposed});</span></a>
-<a name="110"><span class="lineNum">     110 </span><span class="lineCov">     442671 :                 size_t INSj  = this-&gt;populations.get_flat_index({j, InfectionState::InfectedNoSymptoms});</span></a>
-<a name="111"><span class="lineNum">     111 </span><span class="lineCov">     442671 :                 size_t ISyj  = this-&gt;populations.get_flat_index({j, InfectionState::InfectedSymptoms});</span></a>
-<a name="112"><span class="lineNum">     112 </span><span class="lineCov">     442671 :                 size_t ISevj = this-&gt;populations.get_flat_index({j, InfectionState::InfectedSevere});</span></a>
-<a name="113"><span class="lineNum">     113 </span><span class="lineCov">     442671 :                 size_t ICrj  = this-&gt;populations.get_flat_index({j, InfectionState::InfectedCritical});</span></a>
-<a name="114"><span class="lineNum">     114 </span><span class="lineCov">     442671 :                 size_t Rj    = this-&gt;populations.get_flat_index({j, InfectionState::Recovered});</span></a>
+<a name="107"><span class="lineNum">     107 </span><span class="lineCov">     890886 :             for (auto j = AgeGroup(0); j &lt; n_agegroups; j++) {</span></a>
+<a name="108"><span class="lineNum">     108 </span><span class="lineCov">     463731 :                 size_t Sj    = this-&gt;populations.get_flat_index({j, InfectionState::Susceptible});</span></a>
+<a name="109"><span class="lineNum">     109 </span><span class="lineCov">     463731 :                 size_t Ej    = this-&gt;populations.get_flat_index({j, InfectionState::Exposed});</span></a>
+<a name="110"><span class="lineNum">     110 </span><span class="lineCov">     463731 :                 size_t INSj  = this-&gt;populations.get_flat_index({j, InfectionState::InfectedNoSymptoms});</span></a>
+<a name="111"><span class="lineNum">     111 </span><span class="lineCov">     463731 :                 size_t ISyj  = this-&gt;populations.get_flat_index({j, InfectionState::InfectedSymptoms});</span></a>
+<a name="112"><span class="lineNum">     112 </span><span class="lineCov">     463731 :                 size_t ISevj = this-&gt;populations.get_flat_index({j, InfectionState::InfectedSevere});</span></a>
+<a name="113"><span class="lineNum">     113 </span><span class="lineCov">     463731 :                 size_t ICrj  = this-&gt;populations.get_flat_index({j, InfectionState::InfectedCritical});</span></a>
+<a name="114"><span class="lineNum">     114 </span><span class="lineCov">     463731 :                 size_t Rj    = this-&gt;populations.get_flat_index({j, InfectionState::Recovered});</span></a>
 <a name="115"><span class="lineNum">     115 </span>            : </a>
 <a name="116"><span class="lineNum">     116 </span>            :                 //symptomatic are less well quarantined when testing and tracing is overwhelmed so they infect more people</a>
 <a name="117"><span class="lineNum">     117 </span>            :                 auto riskFromInfectedSymptomatic =</a>
-<a name="118"><span class="lineNum">     118 </span><span class="lineCov">    1770684 :                     smoother_cosine(test_and_trace_required, params.template get&lt;TestAndTraceCapacity&lt;FP&gt;&gt;(),</span></a>
-<a name="119"><span class="lineNum">     119 </span><span class="lineCov">     885342 :                                     params.template get&lt;TestAndTraceCapacity&lt;FP&gt;&gt;() *</span></a>
-<a name="120"><span class="lineNum">     120 </span><span class="lineCov">     442671 :                                         params.template get&lt;TestAndTraceCapacityMaxRisk&lt;FP&gt;&gt;(),</span></a>
-<a name="121"><span class="lineNum">     121 </span><span class="lineCov">     442671 :                                     params.template get&lt;RiskOfInfectionFromSymptomatic&lt;FP&gt;&gt;()[j],</span></a>
-<a name="122"><span class="lineNum">     122 </span><span class="lineCov">     442671 :                                     params.template get&lt;MaxRiskOfInfectionFromSymptomatic&lt;FP&gt;&gt;()[j]);</span></a>
+<a name="118"><span class="lineNum">     118 </span><span class="lineCov">    1854924 :                     smoother_cosine(test_and_trace_required, params.template get&lt;TestAndTraceCapacity&lt;FP&gt;&gt;(),</span></a>
+<a name="119"><span class="lineNum">     119 </span><span class="lineCov">     927462 :                                     params.template get&lt;TestAndTraceCapacity&lt;FP&gt;&gt;() *</span></a>
+<a name="120"><span class="lineNum">     120 </span><span class="lineCov">     463731 :                                         params.template get&lt;TestAndTraceCapacityMaxRisk&lt;FP&gt;&gt;(),</span></a>
+<a name="121"><span class="lineNum">     121 </span><span class="lineCov">     463731 :                                     params.template get&lt;RiskOfInfectionFromSymptomatic&lt;FP&gt;&gt;()[j],</span></a>
+<a name="122"><span class="lineNum">     122 </span><span class="lineCov">     463731 :                                     params.template get&lt;MaxRiskOfInfectionFromSymptomatic&lt;FP&gt;&gt;()[j]);</span></a>
 <a name="123"><span class="lineNum">     123 </span>            : </a>
 <a name="124"><span class="lineNum">     124 </span>            :                 // effective contact rate by contact rate between groups i and j and damping j</a>
-<a name="125"><span class="lineNum">     125 </span><span class="lineCov">     442671 :                 ScalarType season_val =</span></a>
-<a name="126"><span class="lineNum">     126 </span><span class="lineCov">     442671 :                     (1 + params.template get&lt;Seasonality&lt;FP&gt;&gt;() *</span></a>
-<a name="127"><span class="lineNum">     127 </span><span class="lineCov">     442671 :                              sin(3.141592653589793 * ((params.template get&lt;StartDay&gt;() + t) / 182.5 + 0.5)));</span></a>
-<a name="128"><span class="lineNum">     128 </span><span class="lineCov">     442671 :                 ScalarType cont_freq_eff =</span></a>
-<a name="129"><span class="lineNum">     129 </span><span class="lineCov">     885342 :                     season_val * contact_matrix.get_matrix_at(t)(static_cast&lt;Eigen::Index&gt;((size_t)i),</span></a>
-<a name="130"><span class="lineNum">     130 </span><span class="lineCov">     442671 :                                                                  static_cast&lt;Eigen::Index&gt;((size_t)j));</span></a>
-<a name="131"><span class="lineNum">     131 </span><span class="lineCov">     442671 :                 ScalarType Nj =</span></a>
-<a name="132"><span class="lineNum">     132 </span><span class="lineCov">     442671 :                     pop[Sj] + pop[Ej] + pop[INSj] + pop[ISyj] + pop[ISevj] + pop[ICrj] + pop[Rj]; // without died people</span></a>
-<a name="133"><span class="lineNum">     133 </span><span class="lineCov">     442671 :                 const ScalarType divNj = (Nj &lt; Limits&lt;ScalarType&gt;::zero_tolerance()) ? 0.0 : 1.0 / Nj;</span></a>
-<a name="134"><span class="lineNum">     134 </span><span class="lineCov">     885342 :                 ScalarType dummy_S     = y[Si] * cont_freq_eff * divNj *</span></a>
-<a name="135"><span class="lineNum">     135 </span><span class="lineCov">     442671 :                                      params.template get&lt;TransmissionProbabilityOnContact&lt;FP&gt;&gt;()[i] *</span></a>
-<a name="136"><span class="lineNum">     136 </span><span class="lineCov">     442671 :                                      (params.template get&lt;RelativeTransmissionNoSymptoms&lt;FP&gt;&gt;()[j] * pop[INSj] +</span></a>
-<a name="137"><span class="lineNum">     137 </span><span class="lineCov">     442671 :                                       riskFromInfectedSymptomatic * pop[ISyj]);</span></a>
+<a name="125"><span class="lineNum">     125 </span><span class="lineCov">     463731 :                 ScalarType season_val =</span></a>
+<a name="126"><span class="lineNum">     126 </span><span class="lineCov">     463731 :                     (1 + params.template get&lt;Seasonality&lt;FP&gt;&gt;() *</span></a>
+<a name="127"><span class="lineNum">     127 </span><span class="lineCov">     463731 :                              sin(3.141592653589793 * ((params.template get&lt;StartDay&gt;() + t) / 182.5 + 0.5)));</span></a>
+<a name="128"><span class="lineNum">     128 </span><span class="lineCov">     463731 :                 ScalarType cont_freq_eff =</span></a>
+<a name="129"><span class="lineNum">     129 </span><span class="lineCov">     927462 :                     season_val * contact_matrix.get_matrix_at(t)(static_cast&lt;Eigen::Index&gt;((size_t)i),</span></a>
+<a name="130"><span class="lineNum">     130 </span><span class="lineCov">     463731 :                                                                  static_cast&lt;Eigen::Index&gt;((size_t)j));</span></a>
+<a name="131"><span class="lineNum">     131 </span><span class="lineCov">     463731 :                 ScalarType Nj =</span></a>
+<a name="132"><span class="lineNum">     132 </span><span class="lineCov">     463731 :                     pop[Sj] + pop[Ej] + pop[INSj] + pop[ISyj] + pop[ISevj] + pop[ICrj] + pop[Rj]; // without died people</span></a>
+<a name="133"><span class="lineNum">     133 </span><span class="lineCov">     463731 :                 const ScalarType divNj = (Nj &lt; Limits&lt;ScalarType&gt;::zero_tolerance()) ? 0.0 : 1.0 / Nj;</span></a>
+<a name="134"><span class="lineNum">     134 </span><span class="lineCov">     927462 :                 ScalarType dummy_S     = y[Si] * cont_freq_eff * divNj *</span></a>
+<a name="135"><span class="lineNum">     135 </span><span class="lineCov">     463731 :                                      params.template get&lt;TransmissionProbabilityOnContact&lt;FP&gt;&gt;()[i] *</span></a>
+<a name="136"><span class="lineNum">     136 </span><span class="lineCov">     463731 :                                      (params.template get&lt;RelativeTransmissionNoSymptoms&lt;FP&gt;&gt;()[j] * pop[INSj] +</span></a>
+<a name="137"><span class="lineNum">     137 </span><span class="lineCov">     463731 :                                       riskFromInfectedSymptomatic * pop[ISyj]);</span></a>
 <a name="138"><span class="lineNum">     138 </span>            : </a>
 <a name="139"><span class="lineNum">     139 </span>            :                 // Susceptible -&gt; Exposed</a>
-<a name="140"><span class="lineNum">     140 </span><span class="lineCov">     442671 :                 flows[this-&gt;template get_flat_flow_index&lt;InfectionState::Susceptible, InfectionState::Exposed&gt;({i})] +=</span></a>
+<a name="140"><span class="lineNum">     140 </span><span class="lineCov">     463731 :                 flows[this-&gt;template get_flat_flow_index&lt;InfectionState::Susceptible, InfectionState::Exposed&gt;({i})] +=</span></a>
 <a name="141"><span class="lineNum">     141 </span>            :                     dummy_S;</a>
 <a name="142"><span class="lineNum">     142 </span>            :             }</a>
 <a name="143"><span class="lineNum">     143 </span>            : </a>
 <a name="144"><span class="lineNum">     144 </span>            :             // ICU capacity shortage is close</a>
-<a name="145"><span class="lineNum">     145 </span><span class="lineCov">    1218285 :             ScalarType criticalPerSevereAdjusted = smoother_cosine(</span></a>
-<a name="146"><span class="lineNum">     146 </span><span class="lineCov">     812190 :                 icu_occupancy, 0.90 * params.template get&lt;ICUCapacity&lt;FP&gt;&gt;(), params.template get&lt;ICUCapacity&lt;FP&gt;&gt;(),</span></a>
-<a name="147"><span class="lineNum">     147 </span><span class="lineCov">     406095 :                 params.template get&lt;CriticalPerSevere&lt;FP&gt;&gt;()[i], 0);</span></a>
+<a name="145"><span class="lineNum">     145 </span><span class="lineCov">    1281465 :             ScalarType criticalPerSevereAdjusted = smoother_cosine(</span></a>
+<a name="146"><span class="lineNum">     146 </span><span class="lineCov">     854310 :                 icu_occupancy, 0.90 * params.template get&lt;ICUCapacity&lt;FP&gt;&gt;(), params.template get&lt;ICUCapacity&lt;FP&gt;&gt;(),</span></a>
+<a name="147"><span class="lineNum">     147 </span><span class="lineCov">     427155 :                 params.template get&lt;CriticalPerSevere&lt;FP&gt;&gt;()[i], 0);</span></a>
 <a name="148"><span class="lineNum">     148 </span>            : </a>
-<a name="149"><span class="lineNum">     149 </span><span class="lineCov">     406095 :             ScalarType deathsPerSevereAdjusted =</span></a>
-<a name="150"><span class="lineNum">     150 </span><span class="lineCov">     406095 :                 params.template get&lt;CriticalPerSevere&lt;FP&gt;&gt;()[i] - criticalPerSevereAdjusted;</span></a>
+<a name="149"><span class="lineNum">     149 </span><span class="lineCov">     427155 :             ScalarType deathsPerSevereAdjusted =</span></a>
+<a name="150"><span class="lineNum">     150 </span><span class="lineCov">     427155 :                 params.template get&lt;CriticalPerSevere&lt;FP&gt;&gt;()[i] - criticalPerSevereAdjusted;</span></a>
 <a name="151"><span class="lineNum">     151 </span>            : </a>
 <a name="152"><span class="lineNum">     152 </span>            :             // Exposed -&gt; InfectedNoSymptoms</a>
-<a name="153"><span class="lineNum">     153 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::Exposed, InfectionState::InfectedNoSymptoms&gt;(</span></a>
-<a name="154"><span class="lineNum">     154 </span><span class="lineCov">     812190 :                 {i})] = (1 / params.template get&lt;TimeExposed&lt;FP&gt;&gt;()[i]) * y[Ei];</span></a>
+<a name="153"><span class="lineNum">     153 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::Exposed, InfectionState::InfectedNoSymptoms&gt;(</span></a>
+<a name="154"><span class="lineNum">     154 </span><span class="lineCov">     854310 :                 {i})] = (1 / params.template get&lt;TimeExposed&lt;FP&gt;&gt;()[i]) * y[Ei];</span></a>
 <a name="155"><span class="lineNum">     155 </span>            : </a>
 <a name="156"><span class="lineNum">     156 </span>            :             // InfectedNoSymptoms -&gt; InfectedSymptoms / Recovered</a>
-<a name="157"><span class="lineNum">     157 </span><span class="lineCov">     812190 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptoms,</span></a>
-<a name="158"><span class="lineNum">     158 </span><span class="lineCov">     406095 :                                                      InfectionState::InfectedSymptoms&gt;({i})] =</span></a>
-<a name="159"><span class="lineNum">     159 </span><span class="lineCov">     406095 :                 (1 - params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) *</span></a>
-<a name="160"><span class="lineNum">     160 </span><span class="lineCov">     406095 :                 (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSi];</span></a>
-<a name="161"><span class="lineNum">     161 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptoms, InfectionState::Recovered&gt;(</span></a>
-<a name="162"><span class="lineNum">     162 </span><span class="lineCov">     812190 :                 {i})] = params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i] *</span></a>
-<a name="163"><span class="lineNum">     163 </span><span class="lineCov">     406095 :                         (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSi];</span></a>
+<a name="157"><span class="lineNum">     157 </span><span class="lineCov">     854310 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptoms,</span></a>
+<a name="158"><span class="lineNum">     158 </span><span class="lineCov">     427155 :                                                      InfectionState::InfectedSymptoms&gt;({i})] =</span></a>
+<a name="159"><span class="lineNum">     159 </span><span class="lineCov">     427155 :                 (1 - params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) *</span></a>
+<a name="160"><span class="lineNum">     160 </span><span class="lineCov">     427155 :                 (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSi];</span></a>
+<a name="161"><span class="lineNum">     161 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptoms, InfectionState::Recovered&gt;(</span></a>
+<a name="162"><span class="lineNum">     162 </span><span class="lineCov">     854310 :                 {i})] = params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i] *</span></a>
+<a name="163"><span class="lineNum">     163 </span><span class="lineCov">     427155 :                         (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSi];</span></a>
 <a name="164"><span class="lineNum">     164 </span>            : </a>
 <a name="165"><span class="lineNum">     165 </span>            :             // InfectedNoSymptomsConfirmed -&gt; InfectedSymptomsConfirmed / Recovered</a>
-<a name="166"><span class="lineNum">     166 </span><span class="lineCov">     812190 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptomsConfirmed,</span></a>
-<a name="167"><span class="lineNum">     167 </span><span class="lineCov">     406095 :                                                      InfectionState::InfectedSymptomsConfirmed&gt;({i})] =</span></a>
-<a name="168"><span class="lineNum">     168 </span><span class="lineCov">     406095 :                 (1 - params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) *</span></a>
-<a name="169"><span class="lineNum">     169 </span><span class="lineCov">     406095 :                 (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSCi];</span></a>
-<a name="170"><span class="lineNum">     170 </span><span class="lineCov">     812190 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptomsConfirmed,</span></a>
-<a name="171"><span class="lineNum">     171 </span><span class="lineCov">     406095 :                                                      InfectionState::Recovered&gt;({i})] =</span></a>
-<a name="172"><span class="lineNum">     172 </span><span class="lineCov">     406095 :                 params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i] *</span></a>
-<a name="173"><span class="lineNum">     173 </span><span class="lineCov">     406095 :                 (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSCi];</span></a>
+<a name="166"><span class="lineNum">     166 </span><span class="lineCov">     854310 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptomsConfirmed,</span></a>
+<a name="167"><span class="lineNum">     167 </span><span class="lineCov">     427155 :                                                      InfectionState::InfectedSymptomsConfirmed&gt;({i})] =</span></a>
+<a name="168"><span class="lineNum">     168 </span><span class="lineCov">     427155 :                 (1 - params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) *</span></a>
+<a name="169"><span class="lineNum">     169 </span><span class="lineCov">     427155 :                 (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSCi];</span></a>
+<a name="170"><span class="lineNum">     170 </span><span class="lineCov">     854310 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedNoSymptomsConfirmed,</span></a>
+<a name="171"><span class="lineNum">     171 </span><span class="lineCov">     427155 :                                                      InfectionState::Recovered&gt;({i})] =</span></a>
+<a name="172"><span class="lineNum">     172 </span><span class="lineCov">     427155 :                 params.template get&lt;RecoveredPerInfectedNoSymptoms&lt;FP&gt;&gt;()[i] *</span></a>
+<a name="173"><span class="lineNum">     173 </span><span class="lineCov">     427155 :                 (1 / params.template get&lt;TimeInfectedNoSymptoms&lt;FP&gt;&gt;()[i]) * y[INSCi];</span></a>
 <a name="174"><span class="lineNum">     174 </span>            : </a>
 <a name="175"><span class="lineNum">     175 </span>            :             // InfectedSymptoms -&gt; InfectedSevere / Recovered</a>
-<a name="176"><span class="lineNum">     176 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptoms, InfectionState::InfectedSevere&gt;(</span></a>
-<a name="177"><span class="lineNum">     177 </span><span class="lineCov">    1218285 :                 {i})] = params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i] /</span></a>
-<a name="178"><span class="lineNum">     178 </span><span class="lineCov">     812190 :                         params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyi];</span></a>
-<a name="179"><span class="lineNum">     179 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptoms, InfectionState::Recovered&gt;(</span></a>
-<a name="180"><span class="lineNum">     180 </span><span class="lineCov">    1218285 :                 {i})] = (1 - params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i]) /</span></a>
-<a name="181"><span class="lineNum">     181 </span><span class="lineCov">     812190 :                         params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyi];</span></a>
+<a name="176"><span class="lineNum">     176 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptoms, InfectionState::InfectedSevere&gt;(</span></a>
+<a name="177"><span class="lineNum">     177 </span><span class="lineCov">    1281465 :                 {i})] = params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i] /</span></a>
+<a name="178"><span class="lineNum">     178 </span><span class="lineCov">     854310 :                         params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyi];</span></a>
+<a name="179"><span class="lineNum">     179 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptoms, InfectionState::Recovered&gt;(</span></a>
+<a name="180"><span class="lineNum">     180 </span><span class="lineCov">    1281465 :                 {i})] = (1 - params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i]) /</span></a>
+<a name="181"><span class="lineNum">     181 </span><span class="lineCov">     854310 :                         params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyi];</span></a>
 <a name="182"><span class="lineNum">     182 </span>            : </a>
 <a name="183"><span class="lineNum">     183 </span>            :             // InfectedSymptomsConfirmed -&gt; InfectedSevere / Recovered</a>
-<a name="184"><span class="lineNum">     184 </span><span class="lineCov">     812190 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptomsConfirmed,</span></a>
-<a name="185"><span class="lineNum">     185 </span><span class="lineCov">     406095 :                                                      InfectionState::InfectedSevere&gt;({i})] =</span></a>
-<a name="186"><span class="lineNum">     186 </span><span class="lineCov">     812190 :                 params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i] /</span></a>
-<a name="187"><span class="lineNum">     187 </span><span class="lineCov">     812190 :                 params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyCi];</span></a>
-<a name="188"><span class="lineNum">     188 </span><span class="lineCov">     812190 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptomsConfirmed,</span></a>
-<a name="189"><span class="lineNum">     189 </span><span class="lineCov">     406095 :                                                      InfectionState::Recovered&gt;({i})] =</span></a>
-<a name="190"><span class="lineNum">     190 </span><span class="lineCov">     812190 :                 (1 - params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i]) /</span></a>
-<a name="191"><span class="lineNum">     191 </span><span class="lineCov">     812190 :                 params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyCi];</span></a>
+<a name="184"><span class="lineNum">     184 </span><span class="lineCov">     854310 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptomsConfirmed,</span></a>
+<a name="185"><span class="lineNum">     185 </span><span class="lineCov">     427155 :                                                      InfectionState::InfectedSevere&gt;({i})] =</span></a>
+<a name="186"><span class="lineNum">     186 </span><span class="lineCov">     854310 :                 params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i] /</span></a>
+<a name="187"><span class="lineNum">     187 </span><span class="lineCov">     854310 :                 params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyCi];</span></a>
+<a name="188"><span class="lineNum">     188 </span><span class="lineCov">     854310 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSymptomsConfirmed,</span></a>
+<a name="189"><span class="lineNum">     189 </span><span class="lineCov">     427155 :                                                      InfectionState::Recovered&gt;({i})] =</span></a>
+<a name="190"><span class="lineNum">     190 </span><span class="lineCov">     854310 :                 (1 - params.template get&lt;SeverePerInfectedSymptoms&lt;FP&gt;&gt;()[i]) /</span></a>
+<a name="191"><span class="lineNum">     191 </span><span class="lineCov">     854310 :                 params.template get&lt;TimeInfectedSymptoms&lt;FP&gt;&gt;()[i] * y[ISyCi];</span></a>
 <a name="192"><span class="lineNum">     192 </span>            : </a>
 <a name="193"><span class="lineNum">     193 </span>            :             // InfectedSevere -&gt; InfectedCritical / Recovered / Dead</a>
-<a name="194"><span class="lineNum">     194 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSevere, InfectionState::InfectedCritical&gt;(</span></a>
-<a name="195"><span class="lineNum">     195 </span><span class="lineCov">     812190 :                 {i})] = criticalPerSevereAdjusted / params.template get&lt;TimeInfectedSevere&lt;FP&gt;&gt;()[i] * y[ISevi];</span></a>
-<a name="196"><span class="lineNum">     196 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSevere, InfectionState::Recovered&gt;({i})] =</span></a>
-<a name="197"><span class="lineNum">     197 </span><span class="lineCov">     812190 :                 (1 - params.template get&lt;CriticalPerSevere&lt;FP&gt;&gt;()[i]) /</span></a>
-<a name="198"><span class="lineNum">     198 </span><span class="lineCov">     812190 :                 params.template get&lt;TimeInfectedSevere&lt;FP&gt;&gt;()[i] * y[ISevi];</span></a>
-<a name="199"><span class="lineNum">     199 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSevere, InfectionState::Dead&gt;({i})] =</span></a>
-<a name="200"><span class="lineNum">     200 </span><span class="lineCov">     406095 :                 deathsPerSevereAdjusted / params.template get&lt;TimeInfectedSevere&lt;FP&gt;&gt;()[i] * y[ISevi];</span></a>
+<a name="194"><span class="lineNum">     194 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSevere, InfectionState::InfectedCritical&gt;(</span></a>
+<a name="195"><span class="lineNum">     195 </span><span class="lineCov">     854310 :                 {i})] = criticalPerSevereAdjusted / params.template get&lt;TimeInfectedSevere&lt;FP&gt;&gt;()[i] * y[ISevi];</span></a>
+<a name="196"><span class="lineNum">     196 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSevere, InfectionState::Recovered&gt;({i})] =</span></a>
+<a name="197"><span class="lineNum">     197 </span><span class="lineCov">     854310 :                 (1 - params.template get&lt;CriticalPerSevere&lt;FP&gt;&gt;()[i]) /</span></a>
+<a name="198"><span class="lineNum">     198 </span><span class="lineCov">     854310 :                 params.template get&lt;TimeInfectedSevere&lt;FP&gt;&gt;()[i] * y[ISevi];</span></a>
+<a name="199"><span class="lineNum">     199 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedSevere, InfectionState::Dead&gt;({i})] =</span></a>
+<a name="200"><span class="lineNum">     200 </span><span class="lineCov">     427155 :                 deathsPerSevereAdjusted / params.template get&lt;TimeInfectedSevere&lt;FP&gt;&gt;()[i] * y[ISevi];</span></a>
 <a name="201"><span class="lineNum">     201 </span>            : </a>
 <a name="202"><span class="lineNum">     202 </span>            :             // InfectedCritical -&gt; Dead / Recovered</a>
-<a name="203"><span class="lineNum">     203 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedCritical, InfectionState::Dead&gt;({i})] =</span></a>
-<a name="204"><span class="lineNum">     204 </span><span class="lineCov">     406095 :                 params.template get&lt;DeathsPerCritical&lt;FP&gt;&gt;()[i] / params.template get&lt;TimeInfectedCritical&lt;FP&gt;&gt;()[i] *</span></a>
-<a name="205"><span class="lineNum">     205 </span><span class="lineCov">     406095 :                 y[ICri];</span></a>
-<a name="206"><span class="lineNum">     206 </span><span class="lineCov">     406095 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedCritical, InfectionState::Recovered&gt;(</span></a>
-<a name="207"><span class="lineNum">     207 </span><span class="lineCov">    1218285 :                 {i})] = (1 - params.template get&lt;DeathsPerCritical&lt;FP&gt;&gt;()[i]) /</span></a>
-<a name="208"><span class="lineNum">     208 </span><span class="lineCov">     812190 :                         params.template get&lt;TimeInfectedCritical&lt;FP&gt;&gt;()[i] * y[ICri];</span></a>
+<a name="203"><span class="lineNum">     203 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedCritical, InfectionState::Dead&gt;({i})] =</span></a>
+<a name="204"><span class="lineNum">     204 </span><span class="lineCov">     427155 :                 params.template get&lt;DeathsPerCritical&lt;FP&gt;&gt;()[i] / params.template get&lt;TimeInfectedCritical&lt;FP&gt;&gt;()[i] *</span></a>
+<a name="205"><span class="lineNum">     205 </span><span class="lineCov">     427155 :                 y[ICri];</span></a>
+<a name="206"><span class="lineNum">     206 </span><span class="lineCov">     427155 :             flows[this-&gt;template get_flat_flow_index&lt;InfectionState::InfectedCritical, InfectionState::Recovered&gt;(</span></a>
+<a name="207"><span class="lineNum">     207 </span><span class="lineCov">    1281465 :                 {i})] = (1 - params.template get&lt;DeathsPerCritical&lt;FP&gt;&gt;()[i]) /</span></a>
+<a name="208"><span class="lineNum">     208 </span><span class="lineCov">     854310 :                         params.template get&lt;TimeInfectedCritical&lt;FP&gt;&gt;()[i] * y[ICri];</span></a>
 <a name="209"><span class="lineNum">     209 </span>            :         }</a>
-<a name="210"><span class="lineNum">     210 </span><span class="lineCov">     393903 :     }</span></a>
+<a name="210"><span class="lineNum">     210 </span><span class="lineCov">     414963 :     }</span></a>
 <a name="211"><span class="lineNum">     211 </span>            : </a>
 <a name="212"><span class="lineNum">     212 </span>            :     /**</a>
 <a name="213"><span class="lineNum">     213 </span>            :      * serialize this. </a>
diff --git a/coverage/cpp/models/ode_secir/parameter_space.h.func-sort-c.html b/coverage/cpp/models/ode_secir/parameter_space.h.func-sort-c.html
index 64d579e359..1098170020 100644
--- a/coverage/cpp/models/ode_secir/parameter_space.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secir/parameter_space.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/ode_secir/parameter_space.h.func.html b/coverage/cpp/models/ode_secir/parameter_space.h.func.html
index fae64c99d5..698eeb0760 100644
--- a/coverage/cpp/models/ode_secir/parameter_space.h.func.html
+++ b/coverage/cpp/models/ode_secir/parameter_space.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/ode_secir/parameter_space.h.gcov.html b/coverage/cpp/models/ode_secir/parameter_space.h.gcov.html
index b019aa7725..be3affeba9 100644
--- a/coverage/cpp/models/ode_secir/parameter_space.h.gcov.html
+++ b/coverage/cpp/models/ode_secir/parameter_space.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/ode_secir/parameters.h.func-sort-c.html b/coverage/cpp/models/ode_secir/parameters.h.func-sort-c.html
index 188b0673dd..3c8b1ad1d8 100644
--- a/coverage/cpp/models/ode_secir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">53</td>
@@ -269,7 +269,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameters.h.gcov.html#405">mio::osecir::Parameters&lt;double&gt;::get_num_groups() const</a></td>
-              <td class="coverFnHi">396557</td>
+              <td class="coverFnHi">417653</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/ode_secir/parameters.h.func.html b/coverage/cpp/models/ode_secir/parameters.h.func.html
index d89611a45d..2a06e8d7cd 100644
--- a/coverage/cpp/models/ode_secir/parameters.h.func.html
+++ b/coverage/cpp/models/ode_secir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">53</td>
@@ -265,7 +265,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="parameters.h.gcov.html#405">mio::osecir::Parameters&lt;double&gt;::get_num_groups() const</a></td>
-              <td class="coverFnHi">396557</td>
+              <td class="coverFnHi">417653</td>
             </tr>
     <tr>
               <td class="coverFn"><a href="parameters.h.gcov.html#623">mio::osecir::Parameters&lt;double&gt;::check_constraints() const</a></td>
diff --git a/coverage/cpp/models/ode_secir/parameters.h.gcov.html b/coverage/cpp/models/ode_secir/parameters.h.gcov.html
index e9c0da9ed4..e0e9fd4ce9 100644
--- a/coverage/cpp/models/ode_secir/parameters.h.gcov.html
+++ b/coverage/cpp/models/ode_secir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">53</td>
@@ -466,9 +466,9 @@
 <a name="404"><span class="lineNum">     404 </span>            :     {</a>
 <a name="405"><span class="lineNum">     405 </span><span class="lineCov">        371 :     }</span></a>
 <a name="406"><span class="lineNum">     406 </span>            : </a>
-<a name="407"><span class="lineNum">     407 </span><span class="lineCov">     396557 :     AgeGroup get_num_groups() const</span></a>
+<a name="407"><span class="lineNum">     407 </span><span class="lineCov">     417653 :     AgeGroup get_num_groups() const</span></a>
 <a name="408"><span class="lineNum">     408 </span>            :     {</a>
-<a name="409"><span class="lineNum">     409 </span><span class="lineCov">     396557 :         return m_num_groups;</span></a>
+<a name="409"><span class="lineNum">     409 </span><span class="lineCov">     417653 :         return m_num_groups;</span></a>
 <a name="410"><span class="lineNum">     410 </span>            :     }</a>
 <a name="411"><span class="lineNum">     411 </span>            : </a>
 <a name="412"><span class="lineNum">     412 </span>            :     /**</a>
diff --git a/coverage/cpp/models/ode_secir/parameters_io.cpp.func-sort-c.html b/coverage/cpp/models/ode_secir/parameters_io.cpp.func-sort-c.html
index 5828d69c9e..5dfefd5e19 100644
--- a/coverage/cpp/models/ode_secir/parameters_io.cpp.func-sort-c.html
+++ b/coverage/cpp/models/ode_secir/parameters_io.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/models/ode_secir/parameters_io.cpp.func.html b/coverage/cpp/models/ode_secir/parameters_io.cpp.func.html
index 4d102dec58..2b48cd9c7a 100644
--- a/coverage/cpp/models/ode_secir/parameters_io.cpp.func.html
+++ b/coverage/cpp/models/ode_secir/parameters_io.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/models/ode_secir/parameters_io.cpp.gcov.html b/coverage/cpp/models/ode_secir/parameters_io.cpp.gcov.html
index 02bd2f6a7f..ba307a37bd 100644
--- a/coverage/cpp/models/ode_secir/parameters_io.cpp.gcov.html
+++ b/coverage/cpp/models/ode_secir/parameters_io.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/models/ode_secir/parameters_io.h.func-sort-c.html b/coverage/cpp/models/ode_secir/parameters_io.h.func-sort-c.html
index a15949fcbf..042e229e40 100644
--- a/coverage/cpp/models/ode_secir/parameters_io.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secir/parameters_io.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ode_secir/parameters_io.h.func.html b/coverage/cpp/models/ode_secir/parameters_io.h.func.html
index 8528b9d537..9e12b02451 100644
--- a/coverage/cpp/models/ode_secir/parameters_io.h.func.html
+++ b/coverage/cpp/models/ode_secir/parameters_io.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ode_secir/parameters_io.h.gcov.html b/coverage/cpp/models/ode_secir/parameters_io.h.gcov.html
index 68bf9a384b..62e3e6800a 100644
--- a/coverage/cpp/models/ode_secir/parameters_io.h.gcov.html
+++ b/coverage/cpp/models/ode_secir/parameters_io.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/ode_secirvvs/analyze_result.h.func-sort-c.html b/coverage/cpp/models/ode_secirvvs/analyze_result.h.func-sort-c.html
index 4445d7536b..f31559e408 100644
--- a/coverage/cpp/models/ode_secirvvs/analyze_result.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secirvvs/analyze_result.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">94</td>
diff --git a/coverage/cpp/models/ode_secirvvs/analyze_result.h.func.html b/coverage/cpp/models/ode_secirvvs/analyze_result.h.func.html
index e95668ecb6..908db9335f 100644
--- a/coverage/cpp/models/ode_secirvvs/analyze_result.h.func.html
+++ b/coverage/cpp/models/ode_secirvvs/analyze_result.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">94</td>
diff --git a/coverage/cpp/models/ode_secirvvs/analyze_result.h.gcov.html b/coverage/cpp/models/ode_secirvvs/analyze_result.h.gcov.html
index 1d2749d5b1..f64ee83fb5 100644
--- a/coverage/cpp/models/ode_secirvvs/analyze_result.h.gcov.html
+++ b/coverage/cpp/models/ode_secirvvs/analyze_result.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">94</td>
diff --git a/coverage/cpp/models/ode_secirvvs/index-sort-f.html b/coverage/cpp/models/ode_secirvvs/index-sort-f.html
index d905da9e39..b63b7d72cc 100644
--- a/coverage/cpp/models/ode_secirvvs/index-sort-f.html
+++ b/coverage/cpp/models/ode_secirvvs/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">230</td>
diff --git a/coverage/cpp/models/ode_secirvvs/index-sort-l.html b/coverage/cpp/models/ode_secirvvs/index-sort-l.html
index 9e9acd4073..57d78f917a 100644
--- a/coverage/cpp/models/ode_secirvvs/index-sort-l.html
+++ b/coverage/cpp/models/ode_secirvvs/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">230</td>
diff --git a/coverage/cpp/models/ode_secirvvs/index.html b/coverage/cpp/models/ode_secirvvs/index.html
index 7585a07851..c47f600d10 100644
--- a/coverage/cpp/models/ode_secirvvs/index.html
+++ b/coverage/cpp/models/ode_secirvvs/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">230</td>
diff --git a/coverage/cpp/models/ode_secirvvs/model.h.func-sort-c.html b/coverage/cpp/models/ode_secirvvs/model.h.func-sort-c.html
index 329314ad78..9775912fda 100644
--- a/coverage/cpp/models/ode_secirvvs/model.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secirvvs/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
diff --git a/coverage/cpp/models/ode_secirvvs/model.h.func.html b/coverage/cpp/models/ode_secirvvs/model.h.func.html
index d90c1cf87f..06bfe60491 100644
--- a/coverage/cpp/models/ode_secirvvs/model.h.func.html
+++ b/coverage/cpp/models/ode_secirvvs/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
diff --git a/coverage/cpp/models/ode_secirvvs/model.h.gcov.html b/coverage/cpp/models/ode_secirvvs/model.h.gcov.html
index 905878f786..0a7080385a 100644
--- a/coverage/cpp/models/ode_secirvvs/model.h.gcov.html
+++ b/coverage/cpp/models/ode_secirvvs/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">21</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameter_space.h.func-sort-c.html b/coverage/cpp/models/ode_secirvvs/parameter_space.h.func-sort-c.html
index 1302aaacc5..1cc55e0464 100644
--- a/coverage/cpp/models/ode_secirvvs/parameter_space.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secirvvs/parameter_space.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameter_space.h.func.html b/coverage/cpp/models/ode_secirvvs/parameter_space.h.func.html
index 8ee259fd9c..4655a867c1 100644
--- a/coverage/cpp/models/ode_secirvvs/parameter_space.h.func.html
+++ b/coverage/cpp/models/ode_secirvvs/parameter_space.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameter_space.h.gcov.html b/coverage/cpp/models/ode_secirvvs/parameter_space.h.gcov.html
index 5844d8963d..95e4315060 100644
--- a/coverage/cpp/models/ode_secirvvs/parameter_space.h.gcov.html
+++ b/coverage/cpp/models/ode_secirvvs/parameter_space.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">3</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters.h.func-sort-c.html b/coverage/cpp/models/ode_secirvvs/parameters.h.func-sort-c.html
index b18f31ca1d..75201c5127 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">82</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters.h.func.html b/coverage/cpp/models/ode_secirvvs/parameters.h.func.html
index 6e3ec3317e..a2cbc91c3a 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters.h.func.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">82</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters.h.gcov.html b/coverage/cpp/models/ode_secirvvs/parameters.h.gcov.html
index ece779922b..e15c40364b 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters.h.gcov.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">82</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func-sort-c.html b/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func-sort-c.html
index eeb7b1b7b7..a77c919f99 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func-sort-c.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func.html b/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func.html
index a050babce8..74e55d5d65 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.gcov.html b/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.gcov.html
index 046fa83687..57a9d04c9c 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.gcov.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters_io.cpp.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters_io.h.func-sort-c.html b/coverage/cpp/models/ode_secirvvs/parameters_io.h.func-sort-c.html
index 04e9a1223c..6a79817573 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters_io.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters_io.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters_io.h.func.html b/coverage/cpp/models/ode_secirvvs/parameters_io.h.func.html
index a2b1fb6c50..2709a5d23b 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters_io.h.func.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters_io.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
diff --git a/coverage/cpp/models/ode_secirvvs/parameters_io.h.gcov.html b/coverage/cpp/models/ode_secirvvs/parameters_io.h.gcov.html
index 7cff65c799..6b5c9937b3 100644
--- a/coverage/cpp/models/ode_secirvvs/parameters_io.h.gcov.html
+++ b/coverage/cpp/models/ode_secirvvs/parameters_io.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">12</td>
diff --git a/coverage/cpp/models/ode_seir/index-sort-f.html b/coverage/cpp/models/ode_seir/index-sort-f.html
index 6107a8811c..d50c502025 100644
--- a/coverage/cpp/models/ode_seir/index-sort-f.html
+++ b/coverage/cpp/models/ode_seir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">13</td>
diff --git a/coverage/cpp/models/ode_seir/index-sort-l.html b/coverage/cpp/models/ode_seir/index-sort-l.html
index 3198adb91d..6ab675cb53 100644
--- a/coverage/cpp/models/ode_seir/index-sort-l.html
+++ b/coverage/cpp/models/ode_seir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">13</td>
diff --git a/coverage/cpp/models/ode_seir/index.html b/coverage/cpp/models/ode_seir/index.html
index 25945bf832..ac50913583 100644
--- a/coverage/cpp/models/ode_seir/index.html
+++ b/coverage/cpp/models/ode_seir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">13</td>
diff --git a/coverage/cpp/models/ode_seir/model.h.func-sort-c.html b/coverage/cpp/models/ode_seir/model.h.func-sort-c.html
index dc620f4234..7f4efa53c1 100644
--- a/coverage/cpp/models/ode_seir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_seir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
@@ -77,7 +77,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#69">mio::oseir::Model&lt;double&gt;::get_flows(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">386424</td>
+              <td class="coverFnHi">386532</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/ode_seir/model.h.func.html b/coverage/cpp/models/ode_seir/model.h.func.html
index 478b612f20..c4f6d06c98 100644
--- a/coverage/cpp/models/ode_seir/model.h.func.html
+++ b/coverage/cpp/models/ode_seir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
@@ -77,7 +77,7 @@
             </tr>
     <tr>
               <td class="coverFn"><a href="model.h.gcov.html#69">mio::oseir::Model&lt;double&gt;::get_flows(Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt; const, 0, Eigen::InnerStride&lt;1&gt; &gt;, double, Eigen::Ref&lt;Eigen::Matrix&lt;double, -1, 1, 0, -1, 1&gt;, 0, Eigen::InnerStride&lt;1&gt; &gt;) const</a></td>
-              <td class="coverFnHi">386424</td>
+              <td class="coverFnHi">386532</td>
             </tr>
   </table>
   <br>
diff --git a/coverage/cpp/models/ode_seir/model.h.gcov.html b/coverage/cpp/models/ode_seir/model.h.gcov.html
index 5f1e4f8856..f6300845bf 100644
--- a/coverage/cpp/models/ode_seir/model.h.gcov.html
+++ b/coverage/cpp/models/ode_seir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">5</td>
@@ -130,38 +130,38 @@
 <a name="68"><span class="lineNum">      68 </span>            :     {</a>
 <a name="69"><span class="lineNum">      69 </span><span class="lineCov">        147 :     }</span></a>
 <a name="70"><span class="lineNum">      70 </span>            : </a>
-<a name="71"><span class="lineNum">      71 </span><span class="lineCov">     386424 :     void get_flows(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
+<a name="71"><span class="lineNum">      71 </span><span class="lineCov">     386532 :     void get_flows(Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; pop, Eigen::Ref&lt;const Vector&lt;FP&gt;&gt; y, FP t,</span></a>
 <a name="72"><span class="lineNum">      72 </span>            :                    Eigen::Ref&lt;Vector&lt;FP&gt;&gt; flows) const override</a>
 <a name="73"><span class="lineNum">      73 </span>            :     {</a>
-<a name="74"><span class="lineNum">      74 </span><span class="lineCov">     386424 :         const Index&lt;AgeGroup&gt; age_groups = reduce_index&lt;Index&lt;AgeGroup&gt;&gt;(this-&gt;populations.size());</span></a>
-<a name="75"><span class="lineNum">      75 </span><span class="lineCov">     386424 :         const auto&amp; params               = this-&gt;parameters;</span></a>
+<a name="74"><span class="lineNum">      74 </span><span class="lineCov">     386532 :         const Index&lt;AgeGroup&gt; age_groups = reduce_index&lt;Index&lt;AgeGroup&gt;&gt;(this-&gt;populations.size());</span></a>
+<a name="75"><span class="lineNum">      75 </span><span class="lineCov">     386532 :         const auto&amp; params               = this-&gt;parameters;</span></a>
 <a name="76"><span class="lineNum">      76 </span>            : </a>
-<a name="77"><span class="lineNum">      77 </span><span class="lineCov">    1159272 :         for (auto i : make_index_range(age_groups)) {</span></a>
-<a name="78"><span class="lineNum">      78 </span><span class="lineCov">     386424 :             const size_t Si = this-&gt;populations.get_flat_index({i, InfectionState::Susceptible});</span></a>
-<a name="79"><span class="lineNum">      79 </span><span class="lineCov">     386424 :             const size_t Ei = this-&gt;populations.get_flat_index({i, InfectionState::Exposed});</span></a>
-<a name="80"><span class="lineNum">      80 </span><span class="lineCov">     386424 :             const size_t Ii = this-&gt;populations.get_flat_index({i, InfectionState::Infected});</span></a>
+<a name="77"><span class="lineNum">      77 </span><span class="lineCov">    1159596 :         for (auto i : make_index_range(age_groups)) {</span></a>
+<a name="78"><span class="lineNum">      78 </span><span class="lineCov">     386532 :             const size_t Si = this-&gt;populations.get_flat_index({i, InfectionState::Susceptible});</span></a>
+<a name="79"><span class="lineNum">      79 </span><span class="lineCov">     386532 :             const size_t Ei = this-&gt;populations.get_flat_index({i, InfectionState::Exposed});</span></a>
+<a name="80"><span class="lineNum">      80 </span><span class="lineCov">     386532 :             const size_t Ii = this-&gt;populations.get_flat_index({i, InfectionState::Infected});</span></a>
 <a name="81"><span class="lineNum">      81 </span>            : </a>
-<a name="82"><span class="lineNum">      82 </span><span class="lineCov">    1159272 :             for (auto j : make_index_range(age_groups)) {</span></a>
-<a name="83"><span class="lineNum">      83 </span><span class="lineCov">     386424 :                 const size_t Sj = this-&gt;populations.get_flat_index({i, InfectionState::Susceptible});</span></a>
-<a name="84"><span class="lineNum">      84 </span><span class="lineCov">     386424 :                 const size_t Ej = this-&gt;populations.get_flat_index({j, InfectionState::Exposed});</span></a>
-<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     386424 :                 const size_t Ij = this-&gt;populations.get_flat_index({j, InfectionState::Infected});</span></a>
-<a name="86"><span class="lineNum">      86 </span><span class="lineCov">     386424 :                 const size_t Rj = this-&gt;populations.get_flat_index({j, InfectionState::Recovered});</span></a>
+<a name="82"><span class="lineNum">      82 </span><span class="lineCov">    1159596 :             for (auto j : make_index_range(age_groups)) {</span></a>
+<a name="83"><span class="lineNum">      83 </span><span class="lineCov">     386532 :                 const size_t Sj = this-&gt;populations.get_flat_index({i, InfectionState::Susceptible});</span></a>
+<a name="84"><span class="lineNum">      84 </span><span class="lineCov">     386532 :                 const size_t Ej = this-&gt;populations.get_flat_index({j, InfectionState::Exposed});</span></a>
+<a name="85"><span class="lineNum">      85 </span><span class="lineCov">     386532 :                 const size_t Ij = this-&gt;populations.get_flat_index({j, InfectionState::Infected});</span></a>
+<a name="86"><span class="lineNum">      86 </span><span class="lineCov">     386532 :                 const size_t Rj = this-&gt;populations.get_flat_index({j, InfectionState::Recovered});</span></a>
 <a name="87"><span class="lineNum">      87 </span>            : </a>
-<a name="88"><span class="lineNum">      88 </span><span class="lineCov">     386424 :                 const ScalarType Nj    = pop[Sj] + pop[Ej] + pop[Ij] + pop[Rj];</span></a>
-<a name="89"><span class="lineNum">      89 </span><span class="lineCov">     386424 :                 const ScalarType divNj = (Nj &lt; Limits&lt;ScalarType&gt;::zero_tolerance()) ? 0.0 : 1.0 / Nj;</span></a>
-<a name="90"><span class="lineNum">      90 </span><span class="lineCov">     386424 :                 const ScalarType coeffStoE =</span></a>
-<a name="91"><span class="lineNum">      91 </span><span class="lineCov">     772848 :                     params.template get&lt;ContactPatterns&lt;FP&gt;&gt;().get_cont_freq_mat().get_matrix_at(t)(i.get(), j.get()) *</span></a>
-<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     386424 :                     params.template get&lt;TransmissionProbabilityOnContact&lt;FP&gt;&gt;()[i] * divNj;</span></a>
+<a name="88"><span class="lineNum">      88 </span><span class="lineCov">     386532 :                 const ScalarType Nj    = pop[Sj] + pop[Ej] + pop[Ij] + pop[Rj];</span></a>
+<a name="89"><span class="lineNum">      89 </span><span class="lineCov">     386532 :                 const ScalarType divNj = (Nj &lt; Limits&lt;ScalarType&gt;::zero_tolerance()) ? 0.0 : 1.0 / Nj;</span></a>
+<a name="90"><span class="lineNum">      90 </span><span class="lineCov">     386532 :                 const ScalarType coeffStoE =</span></a>
+<a name="91"><span class="lineNum">      91 </span><span class="lineCov">     773064 :                     params.template get&lt;ContactPatterns&lt;FP&gt;&gt;().get_cont_freq_mat().get_matrix_at(t)(i.get(), j.get()) *</span></a>
+<a name="92"><span class="lineNum">      92 </span><span class="lineCov">     386532 :                     params.template get&lt;TransmissionProbabilityOnContact&lt;FP&gt;&gt;()[i] * divNj;</span></a>
 <a name="93"><span class="lineNum">      93 </span>            : </a>
-<a name="94"><span class="lineNum">      94 </span><span class="lineCov">     386424 :                 flows[Base::template get_flat_flow_index&lt;InfectionState::Susceptible, InfectionState::Exposed&gt;(i)] +=</span></a>
-<a name="95"><span class="lineNum">      95 </span><span class="lineCov">     386424 :                     coeffStoE * y[Si] * pop[Ij];</span></a>
+<a name="94"><span class="lineNum">      94 </span><span class="lineCov">     386532 :                 flows[Base::template get_flat_flow_index&lt;InfectionState::Susceptible, InfectionState::Exposed&gt;(i)] +=</span></a>
+<a name="95"><span class="lineNum">      95 </span><span class="lineCov">     386532 :                     coeffStoE * y[Si] * pop[Ij];</span></a>
 <a name="96"><span class="lineNum">      96 </span>            :             }</a>
-<a name="97"><span class="lineNum">      97 </span><span class="lineCov">     386424 :             flows[Base::template get_flat_flow_index&lt;InfectionState::Exposed, InfectionState::Infected&gt;(i)] =</span></a>
-<a name="98"><span class="lineNum">      98 </span><span class="lineCov">     386424 :                 (1.0 / params.template get&lt;TimeExposed&lt;FP&gt;&gt;()[i]) * y[Ei];</span></a>
-<a name="99"><span class="lineNum">      99 </span><span class="lineCov">     386424 :             flows[Base::template get_flat_flow_index&lt;InfectionState::Infected, InfectionState::Recovered&gt;(i)] =</span></a>
-<a name="100"><span class="lineNum">     100 </span><span class="lineCov">     386424 :                 (1.0 / params.template get&lt;TimeInfected&lt;FP&gt;&gt;()[i]) * y[Ii];</span></a>
+<a name="97"><span class="lineNum">      97 </span><span class="lineCov">     386532 :             flows[Base::template get_flat_flow_index&lt;InfectionState::Exposed, InfectionState::Infected&gt;(i)] =</span></a>
+<a name="98"><span class="lineNum">      98 </span><span class="lineCov">     386532 :                 (1.0 / params.template get&lt;TimeExposed&lt;FP&gt;&gt;()[i]) * y[Ei];</span></a>
+<a name="99"><span class="lineNum">      99 </span><span class="lineCov">     386532 :             flows[Base::template get_flat_flow_index&lt;InfectionState::Infected, InfectionState::Recovered&gt;(i)] =</span></a>
+<a name="100"><span class="lineNum">     100 </span><span class="lineCov">     386532 :                 (1.0 / params.template get&lt;TimeInfected&lt;FP&gt;&gt;()[i]) * y[Ii];</span></a>
 <a name="101"><span class="lineNum">     101 </span>            :         }</a>
-<a name="102"><span class="lineNum">     102 </span><span class="lineCov">     386424 :     }</span></a>
+<a name="102"><span class="lineNum">     102 </span><span class="lineCov">     386532 :     }</span></a>
 <a name="103"><span class="lineNum">     103 </span>            : </a>
 <a name="104"><span class="lineNum">     104 </span>            :     /**</a>
 <a name="105"><span class="lineNum">     105 </span>            :     *@brief Computes the reproduction number at a given index time of the Model output obtained by the Simulation.</a>
diff --git a/coverage/cpp/models/ode_seir/parameters.h.func-sort-c.html b/coverage/cpp/models/ode_seir/parameters.h.func-sort-c.html
index fef671a3bb..54e8f9a216 100644
--- a/coverage/cpp/models/ode_seir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_seir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/models/ode_seir/parameters.h.func.html b/coverage/cpp/models/ode_seir/parameters.h.func.html
index fd657b4b46..f3c0d15331 100644
--- a/coverage/cpp/models/ode_seir/parameters.h.func.html
+++ b/coverage/cpp/models/ode_seir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/models/ode_seir/parameters.h.gcov.html b/coverage/cpp/models/ode_seir/parameters.h.gcov.html
index fc812fb9c1..1adf8dd940 100644
--- a/coverage/cpp/models/ode_seir/parameters.h.gcov.html
+++ b/coverage/cpp/models/ode_seir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">8</td>
diff --git a/coverage/cpp/models/ode_sir/index-sort-f.html b/coverage/cpp/models/ode_sir/index-sort-f.html
index 70a35f4d0a..3c2982c6e4 100644
--- a/coverage/cpp/models/ode_sir/index-sort-f.html
+++ b/coverage/cpp/models/ode_sir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/ode_sir/index-sort-l.html b/coverage/cpp/models/ode_sir/index-sort-l.html
index 9988f1cedd..d3f5c4be7d 100644
--- a/coverage/cpp/models/ode_sir/index-sort-l.html
+++ b/coverage/cpp/models/ode_sir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/ode_sir/index.html b/coverage/cpp/models/ode_sir/index.html
index 7ad20e12af..fdffab2dfb 100644
--- a/coverage/cpp/models/ode_sir/index.html
+++ b/coverage/cpp/models/ode_sir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">9</td>
diff --git a/coverage/cpp/models/ode_sir/model.h.func-sort-c.html b/coverage/cpp/models/ode_sir/model.h.func-sort-c.html
index 8f0505b18c..5a6a9c817f 100644
--- a/coverage/cpp/models/ode_sir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_sir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/ode_sir/model.h.func.html b/coverage/cpp/models/ode_sir/model.h.func.html
index 9c1ff10bb7..6a4f2039ad 100644
--- a/coverage/cpp/models/ode_sir/model.h.func.html
+++ b/coverage/cpp/models/ode_sir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/ode_sir/model.h.gcov.html b/coverage/cpp/models/ode_sir/model.h.gcov.html
index efb26cc653..95e1b2a012 100644
--- a/coverage/cpp/models/ode_sir/model.h.gcov.html
+++ b/coverage/cpp/models/ode_sir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/ode_sir/parameters.h.func-sort-c.html b/coverage/cpp/models/ode_sir/parameters.h.func-sort-c.html
index 22a81c95a1..1b2b9a9daf 100644
--- a/coverage/cpp/models/ode_sir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/ode_sir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/ode_sir/parameters.h.func.html b/coverage/cpp/models/ode_sir/parameters.h.func.html
index ef29bdfbc5..c894a89e18 100644
--- a/coverage/cpp/models/ode_sir/parameters.h.func.html
+++ b/coverage/cpp/models/ode_sir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/ode_sir/parameters.h.gcov.html b/coverage/cpp/models/ode_sir/parameters.h.gcov.html
index e90dd9f77f..f6d79c7976 100644
--- a/coverage/cpp/models/ode_sir/parameters.h.gcov.html
+++ b/coverage/cpp/models/ode_sir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/sde_seirvv/index-sort-f.html b/coverage/cpp/models/sde_seirvv/index-sort-f.html
index 0c926759cb..1658f802a6 100644
--- a/coverage/cpp/models/sde_seirvv/index-sort-f.html
+++ b/coverage/cpp/models/sde_seirvv/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
diff --git a/coverage/cpp/models/sde_seirvv/index-sort-l.html b/coverage/cpp/models/sde_seirvv/index-sort-l.html
index f0636ce6cd..5460428be3 100644
--- a/coverage/cpp/models/sde_seirvv/index-sort-l.html
+++ b/coverage/cpp/models/sde_seirvv/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
diff --git a/coverage/cpp/models/sde_seirvv/index.html b/coverage/cpp/models/sde_seirvv/index.html
index 721cd11a3b..efddf5875d 100644
--- a/coverage/cpp/models/sde_seirvv/index.html
+++ b/coverage/cpp/models/sde_seirvv/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">18</td>
diff --git a/coverage/cpp/models/sde_seirvv/model.h.func-sort-c.html b/coverage/cpp/models/sde_seirvv/model.h.func-sort-c.html
index d1c34aead6..405fe257c1 100644
--- a/coverage/cpp/models/sde_seirvv/model.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_seirvv/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_seirvv/model.h.func.html b/coverage/cpp/models/sde_seirvv/model.h.func.html
index ff44172c61..9a578760dc 100644
--- a/coverage/cpp/models/sde_seirvv/model.h.func.html
+++ b/coverage/cpp/models/sde_seirvv/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_seirvv/model.h.gcov.html b/coverage/cpp/models/sde_seirvv/model.h.gcov.html
index 98273be49c..091d1d9cb9 100644
--- a/coverage/cpp/models/sde_seirvv/model.h.gcov.html
+++ b/coverage/cpp/models/sde_seirvv/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_seirvv/parameters.h.func-sort-c.html b/coverage/cpp/models/sde_seirvv/parameters.h.func-sort-c.html
index 92038d19e8..ec6215e259 100644
--- a/coverage/cpp/models/sde_seirvv/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_seirvv/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/sde_seirvv/parameters.h.func.html b/coverage/cpp/models/sde_seirvv/parameters.h.func.html
index 3855f97202..80bd4ec16e 100644
--- a/coverage/cpp/models/sde_seirvv/parameters.h.func.html
+++ b/coverage/cpp/models/sde_seirvv/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/sde_seirvv/parameters.h.gcov.html b/coverage/cpp/models/sde_seirvv/parameters.h.gcov.html
index 43ae562631..e267b3197d 100644
--- a/coverage/cpp/models/sde_seirvv/parameters.h.gcov.html
+++ b/coverage/cpp/models/sde_seirvv/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">10</td>
diff --git a/coverage/cpp/models/sde_seirvv/simulation.h.func-sort-c.html b/coverage/cpp/models/sde_seirvv/simulation.h.func-sort-c.html
index 9409b716df..ee049a8b3a 100644
--- a/coverage/cpp/models/sde_seirvv/simulation.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_seirvv/simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_seirvv/simulation.h.func.html b/coverage/cpp/models/sde_seirvv/simulation.h.func.html
index ecdfc04b0b..5975b17230 100644
--- a/coverage/cpp/models/sde_seirvv/simulation.h.func.html
+++ b/coverage/cpp/models/sde_seirvv/simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_seirvv/simulation.h.gcov.html b/coverage/cpp/models/sde_seirvv/simulation.h.gcov.html
index 04cb7fa506..3daa9ac02f 100644
--- a/coverage/cpp/models/sde_seirvv/simulation.h.gcov.html
+++ b/coverage/cpp/models/sde_seirvv/simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sir/index-sort-f.html b/coverage/cpp/models/sde_sir/index-sort-f.html
index 11e4d6b384..f47491b016 100644
--- a/coverage/cpp/models/sde_sir/index-sort-f.html
+++ b/coverage/cpp/models/sde_sir/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/models/sde_sir/index-sort-l.html b/coverage/cpp/models/sde_sir/index-sort-l.html
index a297b5d4dd..03d07fc0f0 100644
--- a/coverage/cpp/models/sde_sir/index-sort-l.html
+++ b/coverage/cpp/models/sde_sir/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/models/sde_sir/index.html b/coverage/cpp/models/sde_sir/index.html
index 28cada9c41..2a7e32854a 100644
--- a/coverage/cpp/models/sde_sir/index.html
+++ b/coverage/cpp/models/sde_sir/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">14</td>
diff --git a/coverage/cpp/models/sde_sir/model.h.func-sort-c.html b/coverage/cpp/models/sde_sir/model.h.func-sort-c.html
index 471a609f85..d831bd0dba 100644
--- a/coverage/cpp/models/sde_sir/model.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_sir/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_sir/model.h.func.html b/coverage/cpp/models/sde_sir/model.h.func.html
index b8f5b41008..ae6e614998 100644
--- a/coverage/cpp/models/sde_sir/model.h.func.html
+++ b/coverage/cpp/models/sde_sir/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_sir/model.h.gcov.html b/coverage/cpp/models/sde_sir/model.h.gcov.html
index a78707dab9..f23d3f1295 100644
--- a/coverage/cpp/models/sde_sir/model.h.gcov.html
+++ b/coverage/cpp/models/sde_sir/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_sir/parameters.h.func-sort-c.html b/coverage/cpp/models/sde_sir/parameters.h.func-sort-c.html
index f482c31a22..f2350d9350 100644
--- a/coverage/cpp/models/sde_sir/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_sir/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sir/parameters.h.func.html b/coverage/cpp/models/sde_sir/parameters.h.func.html
index 817b9cf380..2a81b89219 100644
--- a/coverage/cpp/models/sde_sir/parameters.h.func.html
+++ b/coverage/cpp/models/sde_sir/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sir/parameters.h.gcov.html b/coverage/cpp/models/sde_sir/parameters.h.gcov.html
index 1a740b8c1e..dac0543412 100644
--- a/coverage/cpp/models/sde_sir/parameters.h.gcov.html
+++ b/coverage/cpp/models/sde_sir/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sir/simulation.h.func-sort-c.html b/coverage/cpp/models/sde_sir/simulation.h.func-sort-c.html
index 7dbc822cc6..9e90f1424e 100644
--- a/coverage/cpp/models/sde_sir/simulation.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_sir/simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sir/simulation.h.func.html b/coverage/cpp/models/sde_sir/simulation.h.func.html
index 09cd915ebe..5f6c260d2a 100644
--- a/coverage/cpp/models/sde_sir/simulation.h.func.html
+++ b/coverage/cpp/models/sde_sir/simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sir/simulation.h.gcov.html b/coverage/cpp/models/sde_sir/simulation.h.gcov.html
index 3125425f7f..a2b74b4845 100644
--- a/coverage/cpp/models/sde_sir/simulation.h.gcov.html
+++ b/coverage/cpp/models/sde_sir/simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sirs/index-sort-f.html b/coverage/cpp/models/sde_sirs/index-sort-f.html
index a6b5a46947..c961cbb878 100644
--- a/coverage/cpp/models/sde_sirs/index-sort-f.html
+++ b/coverage/cpp/models/sde_sirs/index-sort-f.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">15</td>
diff --git a/coverage/cpp/models/sde_sirs/index-sort-l.html b/coverage/cpp/models/sde_sirs/index-sort-l.html
index 2b5025427e..bd36cf1141 100644
--- a/coverage/cpp/models/sde_sirs/index-sort-l.html
+++ b/coverage/cpp/models/sde_sirs/index-sort-l.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">15</td>
diff --git a/coverage/cpp/models/sde_sirs/index.html b/coverage/cpp/models/sde_sirs/index.html
index b7dfb187e5..5a714f96c7 100644
--- a/coverage/cpp/models/sde_sirs/index.html
+++ b/coverage/cpp/models/sde_sirs/index.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">15</td>
diff --git a/coverage/cpp/models/sde_sirs/model.h.func-sort-c.html b/coverage/cpp/models/sde_sirs/model.h.func-sort-c.html
index 30ef433f75..76b48e930f 100644
--- a/coverage/cpp/models/sde_sirs/model.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_sirs/model.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_sirs/model.h.func.html b/coverage/cpp/models/sde_sirs/model.h.func.html
index 6c65920dfa..008e336cca 100644
--- a/coverage/cpp/models/sde_sirs/model.h.func.html
+++ b/coverage/cpp/models/sde_sirs/model.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_sirs/model.h.gcov.html b/coverage/cpp/models/sde_sirs/model.h.gcov.html
index 217de3c902..e8169e76ac 100644
--- a/coverage/cpp/models/sde_sirs/model.h.gcov.html
+++ b/coverage/cpp/models/sde_sirs/model.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">2</td>
diff --git a/coverage/cpp/models/sde_sirs/parameters.h.func-sort-c.html b/coverage/cpp/models/sde_sirs/parameters.h.func-sort-c.html
index f481ba7b8b..238e906e1b 100644
--- a/coverage/cpp/models/sde_sirs/parameters.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_sirs/parameters.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/sde_sirs/parameters.h.func.html b/coverage/cpp/models/sde_sirs/parameters.h.func.html
index bb984f3e9e..a410fb9ca8 100644
--- a/coverage/cpp/models/sde_sirs/parameters.h.func.html
+++ b/coverage/cpp/models/sde_sirs/parameters.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/sde_sirs/parameters.h.gcov.html b/coverage/cpp/models/sde_sirs/parameters.h.gcov.html
index 2a7ddd17d6..caec8cc504 100644
--- a/coverage/cpp/models/sde_sirs/parameters.h.gcov.html
+++ b/coverage/cpp/models/sde_sirs/parameters.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">7</td>
diff --git a/coverage/cpp/models/sde_sirs/simulation.h.func-sort-c.html b/coverage/cpp/models/sde_sirs/simulation.h.func-sort-c.html
index 1467706a6f..6934db5a7b 100644
--- a/coverage/cpp/models/sde_sirs/simulation.h.func-sort-c.html
+++ b/coverage/cpp/models/sde_sirs/simulation.h.func-sort-c.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sirs/simulation.h.func.html b/coverage/cpp/models/sde_sirs/simulation.h.func.html
index 1a60ffec8f..46de87f95a 100644
--- a/coverage/cpp/models/sde_sirs/simulation.h.func.html
+++ b/coverage/cpp/models/sde_sirs/simulation.h.func.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/cpp/models/sde_sirs/simulation.h.gcov.html b/coverage/cpp/models/sde_sirs/simulation.h.gcov.html
index 7fd0104fcd..058abb2248 100644
--- a/coverage/cpp/models/sde_sirs/simulation.h.gcov.html
+++ b/coverage/cpp/models/sde_sirs/simulation.h.gcov.html
@@ -37,7 +37,7 @@
           </tr>
           <tr>
             <td class="headerItem">Date:</td>
-            <td class="headerValue">2024-11-28 16:36:30</td>
+            <td class="headerValue">2024-11-29 10:36:44</td>
             <td></td>
             <td class="headerItem">Functions:</td>
             <td class="headerCovTableEntry">6</td>
diff --git a/coverage/python/class_index.html b/coverage/python/class_index.html
index 08cd6419eb..956af7bef7 100644
--- a/coverage/python/class_index.html
+++ b/coverage/python/class_index.html
@@ -55,7 +55,7 @@ <h2>
         </h2>
         <p class="text">
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </header>
@@ -188,7 +188,7 @@ <h2>
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
     <aside class="hidden">
diff --git a/coverage/python/function_index.html b/coverage/python/function_index.html
index 1d6b909dc7..94dcd46cc4 100644
--- a/coverage/python/function_index.html
+++ b/coverage/python/function_index.html
@@ -55,7 +55,7 @@ <h2>
         </h2>
         <p class="text">
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </header>
@@ -460,7 +460,7 @@ <h2>
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
     <aside class="hidden">
diff --git a/coverage/python/index.html b/coverage/python/index.html
index b1fefdf0cc..5e0634bafa 100644
--- a/coverage/python/index.html
+++ b/coverage/python/index.html
@@ -54,7 +54,7 @@ <h2>
         </h2>
         <p class="text">
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </header>
@@ -173,7 +173,7 @@ <h2>
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
     <aside class="hidden">
diff --git a/coverage/python/z_0c24ffff949aeae7___init___py.html b/coverage/python/z_0c24ffff949aeae7___init___py.html
index 9e17d3ef50..a1880b4d3e 100644
--- a/coverage/python/z_0c24ffff949aeae7___init___py.html
+++ b/coverage/python/z_0c24ffff949aeae7___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_3fc004d8eec66cca___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -112,7 +112,7 @@ <h2>
             <a class="nav" href="z_3fc004d8eec66cca___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_0ea8cd790dc48d60___init___py.html b/coverage/python/z_0ea8cd790dc48d60___init___py.html
index 536626a627..ee30c3fa78 100644
--- a/coverage/python/z_0ea8cd790dc48d60___init___py.html
+++ b/coverage/python/z_0ea8cd790dc48d60___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_cf1fd21791a8519d___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -112,7 +112,7 @@ <h2>
             <a class="nav" href="z_cf1fd21791a8519d___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_35d823b5d09d8cc6___init___py.html b/coverage/python/z_35d823b5d09d8cc6___init___py.html
index 71fe972a04..f4b5b7e886 100644
--- a/coverage/python/z_35d823b5d09d8cc6___init___py.html
+++ b/coverage/python/z_35d823b5d09d8cc6___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_927a2fb05d3663b1___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -114,7 +114,7 @@ <h2>
             <a class="nav" href="z_927a2fb05d3663b1___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_3fc004d8eec66cca___init___py.html b/coverage/python/z_3fc004d8eec66cca___init___py.html
index 817c1f1858..2999b756d5 100644
--- a/coverage/python/z_3fc004d8eec66cca___init___py.html
+++ b/coverage/python/z_3fc004d8eec66cca___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_3fc004d8eec66cca_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -112,7 +112,7 @@ <h2>
             <a class="nav" href="z_3fc004d8eec66cca_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_3fc004d8eec66cca_data_generation_py.html b/coverage/python/z_3fc004d8eec66cca_data_generation_py.html
index 155f2c12ac..6073a526ad 100644
--- a/coverage/python/z_3fc004d8eec66cca_data_generation_py.html
+++ b/coverage/python/z_3fc004d8eec66cca_data_generation_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_3fc004d8eec66cca_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -416,7 +416,7 @@ <h2>
             <a class="nav" href="z_3fc004d8eec66cca_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_3fc004d8eec66cca_model_py.html b/coverage/python/z_3fc004d8eec66cca_model_py.html
index 1b883f98cf..0cabe6d00d 100644
--- a/coverage/python/z_3fc004d8eec66cca_model_py.html
+++ b/coverage/python/z_3fc004d8eec66cca_model_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_3fc004d8eec66cca_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -600,7 +600,7 @@ <h2>
             <a class="nav" href="z_3fc004d8eec66cca_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_3fc004d8eec66cca_network_architectures_py.html b/coverage/python/z_3fc004d8eec66cca_network_architectures_py.html
index 526d6c0ddb..1777d73f11 100644
--- a/coverage/python/z_3fc004d8eec66cca_network_architectures_py.html
+++ b/coverage/python/z_3fc004d8eec66cca_network_architectures_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_4984fdf5492a4f01___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -191,7 +191,7 @@ <h2>
             <a class="nav" href="z_4984fdf5492a4f01___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_4984fdf5492a4f01___init___py.html b/coverage/python/z_4984fdf5492a4f01___init___py.html
index 05c8aad2e3..fd44d9aa8f 100644
--- a/coverage/python/z_4984fdf5492a4f01___init___py.html
+++ b/coverage/python/z_4984fdf5492a4f01___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_4984fdf5492a4f01_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -112,7 +112,7 @@ <h2>
             <a class="nav" href="z_4984fdf5492a4f01_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_4984fdf5492a4f01_data_generation_py.html b/coverage/python/z_4984fdf5492a4f01_data_generation_py.html
index 438702a7de..daa7df0ff6 100644
--- a/coverage/python/z_4984fdf5492a4f01_data_generation_py.html
+++ b/coverage/python/z_4984fdf5492a4f01_data_generation_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_4984fdf5492a4f01_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -299,7 +299,7 @@ <h2>
             <a class="nav" href="z_4984fdf5492a4f01_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_4984fdf5492a4f01_model_py.html b/coverage/python/z_4984fdf5492a4f01_model_py.html
index ed605fb588..da4351da61 100644
--- a/coverage/python/z_4984fdf5492a4f01_model_py.html
+++ b/coverage/python/z_4984fdf5492a4f01_model_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_4984fdf5492a4f01_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -327,7 +327,7 @@ <h2>
             <a class="nav" href="z_4984fdf5492a4f01_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_4984fdf5492a4f01_network_architectures_py.html b/coverage/python/z_4984fdf5492a4f01_network_architectures_py.html
index 23900180c5..263fbd6764 100644
--- a/coverage/python/z_4984fdf5492a4f01_network_architectures_py.html
+++ b/coverage/python/z_4984fdf5492a4f01_network_architectures_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="index.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -178,7 +178,7 @@ <h2>
             <a class="nav" href="index.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_564950c39d8772a4___init___py.html b/coverage/python/z_564950c39d8772a4___init___py.html
index d5cde4426d..23fd0c9156 100644
--- a/coverage/python/z_564950c39d8772a4___init___py.html
+++ b/coverage/python/z_564950c39d8772a4___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_564950c39d8772a4_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -112,7 +112,7 @@ <h2>
             <a class="nav" href="z_564950c39d8772a4_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_564950c39d8772a4_data_generation_py.html b/coverage/python/z_564950c39d8772a4_data_generation_py.html
index fe5547bc30..45b5f8f305 100644
--- a/coverage/python/z_564950c39d8772a4_data_generation_py.html
+++ b/coverage/python/z_564950c39d8772a4_data_generation_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_564950c39d8772a4_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -299,7 +299,7 @@ <h2>
             <a class="nav" href="z_564950c39d8772a4_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_564950c39d8772a4_model_py.html b/coverage/python/z_564950c39d8772a4_model_py.html
index 83422649e8..0e8566a2da 100644
--- a/coverage/python/z_564950c39d8772a4_model_py.html
+++ b/coverage/python/z_564950c39d8772a4_model_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_564950c39d8772a4_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -327,7 +327,7 @@ <h2>
             <a class="nav" href="z_564950c39d8772a4_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_564950c39d8772a4_network_architectures_py.html b/coverage/python/z_564950c39d8772a4_network_architectures_py.html
index 4705e27c4a..edcdcd4ad6 100644
--- a/coverage/python/z_564950c39d8772a4_network_architectures_py.html
+++ b/coverage/python/z_564950c39d8772a4_network_architectures_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="index.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -178,7 +178,7 @@ <h2>
             <a class="nav" href="index.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_7d625457ac6be0e7___init___py.html b/coverage/python/z_7d625457ac6be0e7___init___py.html
index ebba73528e..35711e9806 100644
--- a/coverage/python/z_7d625457ac6be0e7___init___py.html
+++ b/coverage/python/z_7d625457ac6be0e7___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_7d625457ac6be0e7_osecir_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -139,7 +139,7 @@ <h2>
             <a class="nav" href="z_7d625457ac6be0e7_osecir_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_7d625457ac6be0e7_osecir_py.html b/coverage/python/z_7d625457ac6be0e7_osecir_py.html
index a3ea9f4f70..25558db997 100644
--- a/coverage/python/z_7d625457ac6be0e7_osecir_py.html
+++ b/coverage/python/z_7d625457ac6be0e7_osecir_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_0ea8cd790dc48d60___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -114,7 +114,7 @@ <h2>
             <a class="nav" href="z_0ea8cd790dc48d60___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_927a2fb05d3663b1___init___py.html b/coverage/python/z_927a2fb05d3663b1___init___py.html
index 1a35df851b..a466b8e655 100644
--- a/coverage/python/z_927a2fb05d3663b1___init___py.html
+++ b/coverage/python/z_927a2fb05d3663b1___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_927a2fb05d3663b1_osecir_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -139,7 +139,7 @@ <h2>
             <a class="nav" href="z_927a2fb05d3663b1_osecir_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_927a2fb05d3663b1_osecir_py.html b/coverage/python/z_927a2fb05d3663b1_osecir_py.html
index eadb1dfa57..eacaa8e834 100644
--- a/coverage/python/z_927a2fb05d3663b1_osecir_py.html
+++ b/coverage/python/z_927a2fb05d3663b1_osecir_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_0c24ffff949aeae7___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -114,7 +114,7 @@ <h2>
             <a class="nav" href="z_0c24ffff949aeae7___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.1">coverage.py v7.6.1</a>,
-            created at 2024-11-28 16:12 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_ab666848b4f949ff___init___py.html b/coverage/python/z_ab666848b4f949ff___init___py.html
index c604f87a53..3ef3aa9c48 100644
--- a/coverage/python/z_ab666848b4f949ff___init___py.html
+++ b/coverage/python/z_ab666848b4f949ff___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_7d625457ac6be0e7___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -114,7 +114,7 @@ <h2>
             <a class="nav" href="z_7d625457ac6be0e7___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_cf1fd21791a8519d___init___py.html b/coverage/python/z_cf1fd21791a8519d___init___py.html
index b1bcafac38..973abd9b76 100644
--- a/coverage/python/z_cf1fd21791a8519d___init___py.html
+++ b/coverage/python/z_cf1fd21791a8519d___init___py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_cf1fd21791a8519d_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -112,7 +112,7 @@ <h2>
             <a class="nav" href="z_cf1fd21791a8519d_data_generation_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_cf1fd21791a8519d_data_generation_py.html b/coverage/python/z_cf1fd21791a8519d_data_generation_py.html
index fcaad2f9b7..00efb3a507 100644
--- a/coverage/python/z_cf1fd21791a8519d_data_generation_py.html
+++ b/coverage/python/z_cf1fd21791a8519d_data_generation_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_cf1fd21791a8519d_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -416,7 +416,7 @@ <h2>
             <a class="nav" href="z_cf1fd21791a8519d_model_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_cf1fd21791a8519d_model_py.html b/coverage/python/z_cf1fd21791a8519d_model_py.html
index 389dea0298..2b8dcb1e8b 100644
--- a/coverage/python/z_cf1fd21791a8519d_model_py.html
+++ b/coverage/python/z_cf1fd21791a8519d_model_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_cf1fd21791a8519d_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -600,7 +600,7 @@ <h2>
             <a class="nav" href="z_cf1fd21791a8519d_network_architectures_py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/coverage/python/z_cf1fd21791a8519d_network_architectures_py.html b/coverage/python/z_cf1fd21791a8519d_network_architectures_py.html
index 3600610d7c..9cb82768b1 100644
--- a/coverage/python/z_cf1fd21791a8519d_network_architectures_py.html
+++ b/coverage/python/z_cf1fd21791a8519d_network_architectures_py.html
@@ -65,7 +65,7 @@ <h2>
             <a id="nextFileLink" class="nav" href="z_564950c39d8772a4___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
         <aside class="hidden">
             <button type="button" class="button_next_chunk" data-shortcut="j"></button>
@@ -191,7 +191,7 @@ <h2>
             <a class="nav" href="z_564950c39d8772a4___init___py.html">&#xbb; next</a>
             &nbsp; &nbsp; &nbsp;
             <a class="nav" href="https://coverage.readthedocs.io/en/7.6.8">coverage.py v7.6.8</a>,
-            created at 2024-11-28 16:13 +0000
+            created at 2024-11-29 10:24 +0000
         </p>
     </div>
 </footer>
diff --git a/pylint/index.html b/pylint/index.html
index 1e49a0e4c9..4865e1a793 100644
--- a/pylint/index.html
+++ b/pylint/index.html
@@ -7202,13 +7202,15 @@ <h3>Module <code>memilio.epidata.transformWeatherData</code> (<code>memilio/epid
                 <td><pre>Similar lines in 2 files
 ==memilio.epidata.getJHData:[97:106]
 ==memilio.epidata_test.test_epidata_get_jh_data:[122:129]
-        directory_ger = os.path.join(out_folder, &#39;Germany/&#39;)
-        directory_es = os.path.join(out_folder, &#39;Spain/&#39;)
-        directory_fr = os.path.join(out_folder, &#39;France/&#39;)
-        directory_it = os.path.join(out_folder, &#39;Italy/&#39;)
-        directory_us = os.path.join(out_folder, &#39;US/&#39;)
-        directory_rok = os.path.join(out_folder, &#39;SouthKorea/&#39;)
-        directory_prc = os.path.join(out_folder, &#39;China/&#39;)</pre></td>
+    directory_ger = os.path.join(out_folder, &#39;Germany/&#39;)
+    directory_es = os.path.join(out_folder, &#39;Spain/&#39;)
+    directory_fr = os.path.join(out_folder, &#39;France/&#39;)
+    directory_it = os.path.join(out_folder, &#39;Italy/&#39;)
+    directory_us = os.path.join(out_folder, &#39;US/&#39;)
+    directory_rok = os.path.join(out_folder, &#39;SouthKorea/&#39;)
+    directory_prc = os.path.join(out_folder, &#39;China/&#39;)
+
+    # dictionary of countries</pre></td>
             </tr>
             
             <tr>
@@ -7246,9 +7248,7 @@ <h3>Module <code>memilio.epidata.transformWeatherData</code> (<code>memilio/epid
 from memilio.epidata import defaultDict as dd
 from memilio.epidata import geoModificationGermany as geoger
 from memilio.epidata import getDataIntoPandasDataFrame as gd
-from memilio.epidata import modifyDataframeSeries as mdfs
-
-# activate CoW for more predictable behaviour of pandas DataFrames</pre></td>
+from memilio.epidata import modifyDataframeSeries as mdfs</pre></td>
             </tr>
             
             <tr>
@@ -7356,16 +7356,28 @@ <h3>Module <code>memilio.epidata.transformWeatherData</code> (<code>memilio/epid
 # activate CoW for more predictable behaviour of pandas DataFrames
 pd.options.mode.copy_on_write = True
 
-# Downloads testing data from RKI
 
-
-def download_testing_data():
-    &#34;&#34;&#34;! Downloads the Sars-CoV-2 test data sets from RKI on country
-    and federal state level. Information on federal state level do not sum
-    up to country-wide information since less laboratories are participating.
-
-    @return dataframe array with country level information first and
-        federal state level second
+def transformWeatherData(read_data=dd.defaultDict[&#39;read_data&#39;],
+                         file_format=dd.defaultDict[&#39;file_format&#39;],
+                         out_folder=dd.defaultDict[&#39;out_folder&#39;],
+                         start_date=dd.defaultDict[&#39;start_date&#39;],
+                         end_date=dd.defaultDict[&#39;end_date&#39;],
+                         moving_average=dd.defaultDict[&#39;moving_average&#39;],
+                         merge_berlin=True,
+                         merge_eisenach=False,
+                         **kwargs
+                         ):
+    &#34;&#34;&#34;! ...
+    @param file_format File format which is used for writing the data.
+        Default defined in defaultDict.
+    @param out_folder Path to folder where data is written in folder
+        out_folder/Germany.
+    @param start_date [Default = &#39;&#39;, taken from read data] Start date
+        of stored data frames.
+    @param end_date [Default = &#39;&#39;, taken from read data] End date of
+        stored data frames.
+    @param moving_average 0 [Default] or Number &gt; 0. Defines the number of
+        days for which a centered moving average is computed.
     &#34;&#34;&#34;</pre></td>
             </tr>
             
@@ -7496,15 +7508,35 @@ <h3>Module <code>memilio.epidata.transformWeatherData</code> (<code>memilio/epid
 pd.options.mode.copy_on_write = True
 
 
-def hospit_sanity_checks(df):
-    &#34;&#34;&#34;! Checks the sanity of the hospitalization_data dataframe
+def get_jh_data(read_data=dd.defaultDict[&#39;read_data&#39;],
+                file_format=dd.defaultDict[&#39;file_format&#39;],
+                out_folder=dd.defaultDict[&#39;out_folder&#39;],
+                start_date=date(2020, 1, 22),
+                end_date=dd.defaultDict[&#39;end_date&#39;],
+                impute_dates=dd.defaultDict[&#39;impute_dates&#39;],
+                **kwargs):
+    &#34;&#34;&#34;! Download data from John Hopkins University
 
-    Checks if type of the given data is a dataframe
-    Checks if the headers of the dataframe are those which are needed
+   Data is either downloaded and afterwards stored or loaded from a stored filed.
+   The file is &#34;FullData_JohnHopkins.json&#34;
 
-    @param df The dataframe which has to be checked
-    &#34;&#34;&#34;
-    # test if dataframe is empty</pre></td>
+   Working with the data includes
+   - rename columns such that &#34;/&#34; is deleted, e.g Country/Region becomes CountryRegion
+   - data of all countries together are written to a file
+   - download the data from following countries in a separate file
+   and are stored in the according folders with the country name
+       - Germany, SouthKorea, Spain, France, Italy, US, China
+   - furthermore, all countries, for which provinces are added, are written to a file
+
+    @param read_data True or False. Defines if data is read from file or downloaded. Default defined in defaultDict.
+    @param file_format File format which is used for writing the data. Default defined in defaultDict.
+    @param out_folder Folder where data is written to. Default defined in defaultDict.
+    @param start_date Date of first date in dataframe. Default defined in defaultDict.
+    @param end_date Date of last date in dataframe. Default defined in defaultDict.
+    @param impute_dates [Currently not used] True or False. Defines if values for dates without new information are imputed. Default defined in defaultDict.
+    @param moving_average [Currently not used] Integers &gt;=0. Applies an &#39;moving_average&#39;-days moving average on all time series
+        to smooth out effects of irregular reporting. Default defined in defaultDict.
+   &#34;&#34;&#34;</pre></td>
             </tr>
             
             <tr>
@@ -7563,8 +7595,11 @@ <h3>Module <code>memilio.epidata.transformWeatherData</code> (<code>memilio/epid
     def setUp(self):
         self.setUpPyfakefs()
 
-    @patch(&#39;builtins.print&#39;)
-    def test_verify_sorted(self, mock_print):</pre></td>
+    @patch(&#39;memilio.epidata.getVaccinationData.download_vaccination_data&#39;,
+           return_value=df_vacc_data_altern)
+    @patch(&#39;memilio.epidata.getPopulationData.get_population_data&#39;, return_value=df_pop)
+    @patch(&#39;memilio.epidata.getDataIntoPandasDataFrame.user_choice&#39;, return_value=True)
+    def test_get_vaccination_data_alternative_ages(self, mockin, mockp, mockv):</pre></td>
             </tr>
             
             <tr>