From 59d7ab5a324ee62996f093f353ea2a7f274a9721 Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Fri, 17 Mar 2023 10:12:02 +0100
Subject: [PATCH 001/103] first draft

---
 cpp/memilio/utils/history.h | 90 +++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 cpp/memilio/utils/history.h

diff --git a/cpp/memilio/utils/history.h b/cpp/memilio/utils/history.h
new file mode 100644
index 0000000000..7907c1bf9c
--- /dev/null
+++ b/cpp/memilio/utils/history.h
@@ -0,0 +1,90 @@
+/* 
+* Copyright (C) 2020-2021 German Aerospace Center (DLR-SC)
+*
+* Authors: Daniel Abele, Elisabeth Kluth
+*
+* Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#ifndef MIO_ABM_HISTORY_H
+#define MIO_ABM_HISTORY_H
+namespace mio
+{
+namespace abm
+{
+
+template <class... Types>
+class Writer
+{
+    write(Types... args)
+    {
+    }
+    using Data = std::tuple<Types...>;
+};
+
+template <class Writer, class... Loggers>
+class History
+{
+public:
+    //TODO: maybe change this to arglist
+    template <class T>
+    void log(const T& t)
+    {
+        log_impl(t);
+        // write(Loggers::log(t)...);
+    }
+
+    TimeSeries<Writer::Data> get_data()
+    {
+        return m_data;
+    }
+
+private:
+    Writer::Data m_data;
+
+    template <class T, class Logger, class... Loggers>
+    std::enable_if_t<std::is_derived<Logger, LogOnce>> log_impl(const T& t)
+    {
+        Writer::write(Logger::log(t));
+        log_impl<T, Loggers...>(t);
+    }
+
+    template <class T, class Logger, class... Loggers>
+    std::enable_if_t<std::is_derived<Logger, LogAlways>> log_impl(const T& t)
+    {
+        Writer::write(Logger::log(t));
+        log_impl<T, Loggers...>(t);
+    }
+
+    template <class T>
+    log_impl(const T&)
+    {
+        // end of recursion
+    }
+};
+struct LogOnce {
+};
+
+struct LogLocId : public LogOnce {
+    using Type = std::vector<location_id>;
+    static Type log(const World& world)
+    {
+        [world.get_location().get_id()];
+    }
+};
+
+} // namespace abm
+} // namespace mio
+
+#endif
\ No newline at end of file

From 72f9c6052f18053ad52d25f58f4d1eb8528d091d Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Mon, 27 Mar 2023 17:00:37 +0200
Subject: [PATCH 002/103] add another logger

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/memilio/utils/history.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cpp/memilio/utils/history.h b/cpp/memilio/utils/history.h
index 7907c1bf9c..ae64f5f02e 100644
--- a/cpp/memilio/utils/history.h
+++ b/cpp/memilio/utils/history.h
@@ -73,6 +73,7 @@ class History
         // end of recursion
     }
 };
+
 struct LogOnce {
 };
 
@@ -84,6 +85,17 @@ struct LogLocId : public LogOnce {
     }
 };
 
+struct LogAlways {
+};
+
+struct LogTime : public LogAlways {
+    using Type = std::vector<double>;
+    static Type log(const World& world)
+    {
+        [world.get_time()];
+    }
+};
+
 } // namespace abm
 } // namespace mio
 

From 6e977374485962547184417155c41d87001afea4 Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Mon, 27 Mar 2023 23:45:12 +0200
Subject: [PATCH 003/103] change some things

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/memilio/utils/history.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/memilio/utils/history.h b/cpp/memilio/utils/history.h
index ae64f5f02e..012d08dbb2 100644
--- a/cpp/memilio/utils/history.h
+++ b/cpp/memilio/utils/history.h
@@ -81,7 +81,7 @@ struct LogLocId : public LogOnce {
     using Type = std::vector<location_id>;
     static Type log(const World& world)
     {
-        [world.get_location().get_id()];
+        return [world.get_location().get_id()];
     }
 };
 

From b49606f9903324fba687e701e6d179a7277ef9f0 Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Mon, 27 Mar 2023 23:45:33 +0200
Subject: [PATCH 004/103] example for testing purposes

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/memilio/utils/history_example.cpp | 97 +++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 cpp/memilio/utils/history_example.cpp

diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
new file mode 100644
index 0000000000..6d72e0efd1
--- /dev/null
+++ b/cpp/memilio/utils/history_example.cpp
@@ -0,0 +1,97 @@
+/* 
+* Copyright (C) 2020-2021 German Aerospace Center (DLR-SC)
+*
+* Authors: Daniel Abele, Elisabeth Kluth
+*
+* Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#include <vector>
+#include <tuple>
+
+template <class... Types>
+class Writer
+{
+    write(Types... args)
+    {
+    }
+    using Data = std::tuple<Types...>;
+};
+
+template <class Writer, class... Loggers>
+class History
+{
+public:
+    //TODO: maybe change this to arglist
+    template <class T>
+    void log(const T& t)
+    {
+        log_impl(t);
+        // write(Loggers::log(t)...);
+    }
+
+    TimeSeries<Writer::Data> get_data()
+    {
+        return m_data;
+    }
+
+private:
+    Writer::Data m_data;
+
+    template <class T, class Logger, class... Loggers>
+    std::enable_if_t<std::is_derived<Logger, LogOnce>> log_impl(const T& t)
+    {
+        Writer::write(Logger::log(t));
+        log_impl<T, Loggers...>(t);
+    }
+
+    template <class T, class Logger, class... Loggers>
+    std::enable_if_t<std::is_derived<Logger, LogAlways>> log_impl(const T& t)
+    {
+        Writer::write(Logger::log(t));
+        log_impl<T, Loggers...>(t);
+    }
+
+    template <class T>
+    log_impl(const T&)
+    {
+        // end of recursion
+    }
+};
+
+struct LogOnce {
+};
+
+struct LogLocId : public LogOnce {
+    using Type = std::vector<double>;
+    static Type log(const double id)
+    {
+        return [world.get_location().get_id()];
+    }
+};
+
+struct LogAlways {
+};
+
+struct LogTime : public LogAlways {
+    using Type = std::vector<double>;
+    static Type log(const double time)
+    {
+        [world.get_time()];
+    }
+};
+
+int main()
+{
+}
\ No newline at end of file

From bf5099501a4cd5fd505301677082d2936ff7045a Mon Sep 17 00:00:00 2001
From: Sascha <51127093+xsaschako@users.noreply.github.com>
Date: Thu, 30 Mar 2023 16:36:00 +0200
Subject: [PATCH 005/103] barebone implementation

---
 cpp/memilio/utils/history_example.cpp | 107 ++++++++++++++++----------
 1 file changed, 68 insertions(+), 39 deletions(-)

diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
index 6d72e0efd1..67a630477c 100644
--- a/cpp/memilio/utils/history_example.cpp
+++ b/cpp/memilio/utils/history_example.cpp
@@ -1,7 +1,7 @@
 /* 
 * Copyright (C) 2020-2021 German Aerospace Center (DLR-SC)
 *
-* Authors: Daniel Abele, Elisabeth Kluth
+* Authors: Sascha Korf, Rene Schmieding 
 *
 * Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
 *
@@ -19,79 +19,108 @@
 */
 #include <vector>
 #include <tuple>
+#include <iostream>
 
-template <class... Types>
-class Writer
+class example
 {
-    write(Types... args)
+public:
+    int a = 1;
+    int b = 2;
+};
+struct LogOnce {
+};
+
+struct LogA : LogOnce {
+    using Type = int;
+    static Type log(const example& ex)
+    {
+        return ex.a;
+    }
+};
+
+struct LogAlways {
+};
+
+struct LogB : LogAlways {
+    using Type = int;
+    static Type log(const example& ex)
     {
+        return ex.b;
     }
-    using Data = std::tuple<Types...>;
 };
 
-template <class Writer, class... Loggers>
+template <class... Loggers>
+struct Writer {
+    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
+    template <class Logger>
+    static void write(const typename Logger::Type& t, Data& data)
+    {
+        //std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
+        std::cout << t << std::endl;
+    }
+};
+
+template <template <class...> class Writer, class... Loggers>
 class History
 {
 public:
-    //TODO: maybe change this to arglist
+    using Wri = Writer<Loggers...>;
     template <class T>
     void log(const T& t)
     {
-        log_impl(t);
-        // write(Loggers::log(t)...);
+        log_impl<T, Loggers...>(t);
     }
 
-    TimeSeries<Writer::Data> get_data()
+    const typename Wri::Data& get_log() const
     {
         return m_data;
     }
 
 private:
-    Writer::Data m_data;
+    typename Wri::Data m_data;
+
+    bool m_log_once_flag = true;
 
-    template <class T, class Logger, class... Loggers>
-    std::enable_if_t<std::is_derived<Logger, LogOnce>> log_impl(const T& t)
+    template <class T, class logger, class... loggers>
+    std::enable_if_t<std::is_base_of<LogOnce, logger>::value> log_impl(const T& t)
     {
-        Writer::write(Logger::log(t));
-        log_impl<T, Loggers...>(t);
+
+        if (m_log_once_flag) {
+            Wri::write<logger>(logger::log(t), m_data);
+            m_log_once_flag = false;
+        }
+        log_impl<T, loggers...>(t);
     }
 
-    template <class T, class Logger, class... Loggers>
-    std::enable_if_t<std::is_derived<Logger, LogAlways>> log_impl(const T& t)
+    template <class T, class logger, class... loggers>
+    std::enable_if_t<std::is_base_of<LogAlways, logger>::value> log_impl(const T& t)
     {
-        Writer::write(Logger::log(t));
-        log_impl<T, Loggers...>(t);
+        log_impl<T, loggers...>(t);
+        Wri::write<logger>(logger::log(t), m_data);
     }
 
     template <class T>
-    log_impl(const T&)
+    void log_impl(const T&)
     {
         // end of recursion
     }
 };
 
-struct LogOnce {
-};
+int main()
+{
 
-struct LogLocId : public LogOnce {
-    using Type = std::vector<double>;
-    static Type log(const double id)
-    {
-        return [world.get_location().get_id()];
-    }
-};
+    History<Writer, LogA, LogB> history;
+    example ex;
 
-struct LogAlways {
-};
+    int step = 0;
+    while (step < 10) {
+        ex.a = step;
+        ex.b = -step;
 
-struct LogTime : public LogAlways {
-    using Type = std::vector<double>;
-    static Type log(const double time)
-    {
-        [world.get_time()];
+        history.log(ex);
+
+        step++;
     }
-};
 
-int main()
-{
+    history.get_log();
 }
\ No newline at end of file

From 7879f103bc5175721fa2bc8a1c11fc5028c8b76b Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 30 Mar 2023 16:37:12 +0200
Subject: [PATCH 006/103] add simulation for abm demonstrator

---
 cpp/simulations/CMakeLists.txt              |   6 +-
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 416 ++++++++++++++++++++
 2 files changed, 421 insertions(+), 1 deletion(-)
 create mode 100644 cpp/simulations/abm_INSIDe_demonstrator.cpp

diff --git a/cpp/simulations/CMakeLists.txt b/cpp/simulations/CMakeLists.txt
index 0110fee9c4..49e5ce2b63 100644
--- a/cpp/simulations/CMakeLists.txt
+++ b/cpp/simulations/CMakeLists.txt
@@ -6,8 +6,12 @@ if(MEMILIO_HAS_JSONCPP AND MEMILIO_HAS_HDF5)
     add_executable(2021_vaccination_delta 2021_vaccination_sarscov2_delta_germany.cpp)
     target_link_libraries(2021_vaccination_delta PRIVATE memilio ode_secirvvs Boost::filesystem ${HDF5_C_LIBRARIES})
     target_compile_options(2021_vaccination_delta PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
-    
+
     add_executable(abm_simulation abm.cpp)
     target_link_libraries(abm_simulation PRIVATE memilio abm Boost::filesystem ${HDF5_C_LIBRARIES})
     target_compile_options(abm_simulation PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
+
+    add_executable(abm_demonstrator abm_INSIDe_demonstrator.cpp)
+    target_link_libraries(abm_demonstrator PRIVATE memilio abm Boost::filesystem ${HDF5_C_LIBRARIES})
+    target_compile_options(abm_demonstrator PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
 endif()
diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
new file mode 100644
index 0000000000..eb1f743116
--- /dev/null
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -0,0 +1,416 @@
+/*
+* Copyright (C) 2020-2023 German Aerospace Center (DLR-SC)
+*
+* Authors: Daniel Abele, Khoa Nguyen
+*
+* Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "abm/household.h"
+#include "abm/state.h"
+#include "abm/location.h"
+#include "memilio/io/result_io.h"
+#include "memilio/utils/uncertain_value.h"
+#include "memilio/io/io.h"
+#include "memilio/utils/random_number_generator.h"
+#include "boost/filesystem.hpp"
+#include <fstream>
+#include <sstream>
+
+namespace fs = boost::filesystem;
+
+struct LocationMapping {
+    std::string inputId;
+    std::vector<std::string> modelId{};
+};
+
+void read_txt(std::vector<std::pair<std::string, std::string>>& areas, std::vector<int>& inhabitants,
+              const fs::path& input_dir)
+{
+    std::ifstream file;
+    file.open(input_dir.string());
+    std::string line = "";
+    while (std::getline(file, line)) {
+        int inhabitant;
+        std::string Id;
+        std::string area;
+        std::string tmpString;
+        std::stringstream inputString(line);
+        std::getline(inputString, Id, ',');
+        std::getline(inputString, tmpString, ',');
+        inhabitant = atoi(tmpString.c_str());
+        inhabitants.push_back(inhabitant);
+        std::getline(inputString, area, ',');
+        areas.push_back(std::make_pair(Id, area));
+        line = "";
+    }
+}
+
+mio::abm::LocationId add_location(mio::abm::World& world, mio::abm::LocationType type, double max_contacts, int persons,
+                                  int volume)
+{
+    //add a social event to the world
+    auto location = world.add_location(type);
+    //set maximum number of contacts and capacity //TODO
+    world.get_individualized_location(location).get_infection_parameters().set<mio::abm::MaximumContacts>(max_contacts);
+    world.get_individualized_location(location).set_capacity(persons, volume);
+
+    return location;
+}
+
+void insert_locations_to_map(std::vector<LocationMapping>& locationIds, std::string& inputId,
+                             std::vector<mio::abm::LocationId>& locations)
+{
+    LocationMapping map;
+    map.inputId = inputId;
+    std::string locationType;
+    std::string locationIndex;
+    for (auto& location : locations) {
+        locationType  = std::to_string(int(location.type));
+        locationIndex = std::to_string(location.index);
+        if (int(location.type) < 10) {
+            locationType = "0" + locationType;
+        }
+        if (location.index < 10) {
+            locationIndex = "0" + locationIndex;
+        }
+        map.modelId.push_back((locationType + locationIndex));
+    }
+
+    locationIds.push_back(map);
+}
+
+mio::abm::HouseholdGroup make_one_person_households(const mio::abm::HouseholdMember& member, int household_size,
+                                                    int number_of_households)
+{
+    auto household_group = mio::abm::HouseholdGroup();
+    for (int hh = 0; hh < number_of_households; ++hh) {
+        auto household = mio::abm::Household();
+        household.add_members(member, household_size);
+        household_group.add_households(household, 1);
+    }
+    return household_group;
+}
+
+mio::abm::HouseholdGroup make_multiple_person_households(const mio::abm::HouseholdMember& child,
+                                                         const mio::abm::HouseholdMember& parent,
+                                                         const mio::abm::HouseholdMember& other, int household_size,
+                                                         int number_of_two_parent_households,
+                                                         int number_of_one_parent_households,
+                                                         int number_of_other_households)
+{
+    auto household_group = mio::abm::HouseholdGroup();
+
+    //Add two parent households
+    auto hh_two_parents = mio::abm::Household();
+    hh_two_parents.add_members(child, household_size - 2);
+    hh_two_parents.add_members(parent, 2);
+    household_group.add_households(hh_two_parents, number_of_two_parent_households);
+
+    //Add one parent households
+    auto hh_one_parent = mio::abm::Household();
+    hh_one_parent.add_members(child, household_size - 1);
+    hh_one_parent.add_members(parent, 1);
+    household_group.add_households(hh_one_parent, number_of_one_parent_households);
+
+    //add other households
+    auto hh_other = mio::abm::Household();
+    hh_other.add_members(other, household_size);
+    household_group.add_households(hh_other, number_of_other_households);
+
+    return household_group;
+}
+
+std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::vector<double>& distribution,
+                                                 int num_inhabitants)
+{
+    std::vector<int> households(distribution.size());
+    size_t household_size;
+    std::vector<mio::abm::LocationId> locations;
+    int new_index = (int)world.get_locations()[(uint32_t)mio::abm::LocationType::Home].size();
+    while (num_inhabitants > 0) {
+        household_size = mio::DiscreteDistribution<size_t>::get_instance()(distribution);
+        households[household_size] += 1;
+        num_inhabitants -= (int)(household_size + 1);
+    }
+
+    //One-Person Households
+    auto one_person_household_member = mio::abm::HouseholdMember();
+    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age15to34, 5);
+    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age35to59, 6);
+    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age60to79, 4);
+    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age80plus, 2);
+    int number_of_one_person_households = households[0];
+
+    auto one_person_household_group =
+        make_one_person_households(one_person_household_member, 1, number_of_one_person_households);
+    add_household_group_to_world(world, one_person_household_group);
+
+    //Members for multiple person households
+    auto child = mio::abm::HouseholdMember();
+    child.set_age_weight(mio::abm::AgeGroup::Age0to4, 1);
+    child.set_age_weight(mio::abm::AgeGroup::Age5to14, 1);
+
+    auto parent = mio::abm::HouseholdMember();
+    parent.set_age_weight(mio::abm::AgeGroup::Age15to34, 2);
+    parent.set_age_weight(mio::abm::AgeGroup::Age35to59, 2);
+    parent.set_age_weight(mio::abm::AgeGroup::Age60to79, 1);
+
+    auto other = mio::abm::HouseholdMember();
+    other.set_age_weight(mio::abm::AgeGroup::Age0to4, 1);
+    other.set_age_weight(mio::abm::AgeGroup::Age5to14, 2);
+    other.set_age_weight(mio::abm::AgeGroup::Age15to34, 3);
+    other.set_age_weight(mio::abm::AgeGroup::Age35to59, 3);
+    other.set_age_weight(mio::abm::AgeGroup::Age60to79, 2);
+    other.set_age_weight(mio::abm::AgeGroup::Age80plus, 2);
+
+    //Two-Person Households
+    int two_person_two_parents = (int)(0.4 * households[1]);
+    int two_person_one_parent  = (int)(0.4 * households[1]);
+    int two_person_others      = households[1] - two_person_two_parents - two_person_one_parent;
+
+    auto two_person_household_group = make_multiple_person_households(child, parent, other, 2, two_person_two_parents,
+                                                                      two_person_one_parent, two_person_others);
+    add_household_group_to_world(world, two_person_household_group);
+
+    //Three-Person Households
+    int three_person_two_parents = (int)(0.4 * households[2]);
+    int three_person_one_parent  = (int)(0.4 * households[2]);
+    int three_person_others      = households[2] - three_person_two_parents - three_person_one_parent;
+
+    auto three_person_household_group = make_multiple_person_households(
+        child, parent, other, 3, three_person_two_parents, three_person_one_parent, three_person_others);
+    add_household_group_to_world(world, three_person_household_group);
+
+    //Four-Person Households
+    int four_person_two_parents = (int)(0.5 * households[3]);
+    int four_person_one_parent  = (int)(0.2 * households[3]);
+    int four_person_others      = households[3] - four_person_two_parents - four_person_one_parent;
+
+    auto four_person_household_group = make_multiple_person_households(child, parent, other, 4, four_person_two_parents,
+                                                                       four_person_one_parent, four_person_others);
+    add_household_group_to_world(world, four_person_household_group);
+
+    //Five-Person Households
+    int five_person_two_parents = (int)(0.6 * households[4]);
+    int five_person_one_parent  = (int)(0.1 * households[4]);
+    int five_person_others      = households[4] - five_person_two_parents - five_person_one_parent;
+
+    auto five_person_household_group = make_multiple_person_households(child, parent, other, 5, five_person_two_parents,
+                                                                       five_person_one_parent, five_person_others);
+    add_household_group_to_world(world, five_person_household_group);
+
+    //fill location id vector with new locations for mapping
+    mio::abm::LocationId id;
+    id.type = mio::abm::LocationType::Home;
+    //add LocationIds for Mapping
+    for (int hh = 0; hh < std::accumulate(households.begin(), households.end(), 0); ++hh) {
+        id.index = new_index;
+        locations.emplace_back(id);
+        ++new_index;
+    }
+
+    return locations;
+}
+
+void create_locations_from_input(std::vector<std::pair<std::string, std::string>>& areas, std::vector<int>& inhabitants,
+                                 mio::abm::World& world, std::vector<LocationMapping>& locationIds,
+                                 ScalarType one_person_hh, ScalarType two_person_hh, ScalarType three_person_hh,
+                                 ScalarType four_person_hh, ScalarType five_person_hh)
+{
+    assert(areas.size() == inhabitants.size());
+    std::string res                                = "residential";
+    std::vector<ScalarType> household_distribution = {one_person_hh, two_person_hh, three_person_hh, four_person_hh,
+                                                      five_person_hh};
+    bool has_school                                = false;
+    for (auto loc = 0; loc < areas.size(); ++loc) {
+        std::vector<mio::abm::LocationId> locations;
+        if (std::search((areas[loc].second).begin(), (areas[loc].second).end(), res.begin(), res.end()) !=
+            (areas[loc].second).end()) {
+            //Home
+            locations = add_households(world, household_distribution, inhabitants[loc]);
+        }
+        else if (areas[loc].second == "mixed") {
+            size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(std::vector<double>{1, 1});
+            if (location_type) {
+                locations.emplace_back(add_location(world, mio::abm::LocationType::Work, 40., 100, 2000));
+            }
+            else {
+                //Home
+                locations = add_households(world, household_distribution, inhabitants[loc]);
+            }
+        }
+        else {
+            if (areas[loc].second == "recreational") {
+                //Social Event
+                locations.emplace_back(add_location(world, mio::abm::LocationType::SocialEvent, 30., 30, 40));
+            }
+            else if (areas[loc].second == "shopping_business") {
+
+                if (!has_school) {
+                    locations.emplace_back(add_location(world, mio::abm::LocationType::School, 40., 500, 2000));
+                    has_school = true;
+                }
+                else {
+                    //uniformly draw whether shopping_business should be work or BasicsShop
+                    size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(std::vector<double>{1, 1});
+                    if (location_type) {
+                        locations.emplace_back(add_location(world, mio::abm::LocationType::BasicsShop, 20., 100, 1000));
+                    }
+                    else {
+                        locations.emplace_back(add_location(world, mio::abm::LocationType::Work, 40., 300, 2000));
+                    }
+                }
+            }
+            else if (areas[loc].second == "university") {
+                locations.emplace_back(add_location(world, mio::abm::LocationType::Work, 50., 200, 4000));
+            }
+            else {
+                mio::log_error("Area input type does not match to abm location type.");
+            }
+        }
+
+        insert_locations_to_map(locationIds, areas[loc].first, locations);
+    }
+}
+
+mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infected_no_symptoms,
+                                             ScalarType infected_symptoms, ScalarType infected_severe,
+                                             ScalarType infected_critical, ScalarType recovered_infected_no_symptoms,
+                                             ScalarType recovered_infected)
+{
+    ScalarType susceptible = 1 - exposed - infected_no_symptoms - infected_symptoms - infected_severe -
+                             infected_critical - recovered_infected_no_symptoms - recovered_infected;
+    std::vector<ScalarType> weights = {
+        susceptible,     exposed,           infected_no_symptoms,           infected_symptoms,
+        infected_severe, infected_critical, recovered_infected_no_symptoms, recovered_infected};
+    if (weights.size() != (size_t)mio::abm::InfectionState::Count - 1) {
+        mio::log_error("Initialization in ABM wrong, please correct vector length.");
+    }
+    size_t state = mio::DiscreteDistribution<size_t>::get_instance()(weights);
+    return (mio::abm::InfectionState)state;
+}
+
+void assign_infection_states(mio::abm::World& world, ScalarType exposed, ScalarType infected_no_symptoms,
+                             ScalarType infected_symptoms, ScalarType infected_severe, ScalarType infected_critical,
+                             ScalarType recovered_infected_no_symptoms, ScalarType recovered_infected)
+{
+    auto persons = world.get_persons();
+    for (auto& person : persons) {
+        world.set_infection_state(person, get_infection_state(exposed, infected_no_symptoms, infected_symptoms,
+                                                              infected_severe, infected_critical,
+                                                              recovered_infected_no_symptoms, recovered_infected));
+    }
+}
+
+void assign_locations(mio::abm::World& world)
+{
+    //TODO: add hospital and ICU
+    std::vector<mio::abm::Location> schools = world.get_locations()[(uint32_t)mio::abm::LocationType::School];
+    std::vector<ScalarType> school_weights(schools.size(), 1);
+    std::vector<mio::abm::Location> workplaces = world.get_locations()[(uint32_t)mio::abm::LocationType::Work];
+    std::vector<ScalarType> workplaces_weights(workplaces.size(), 1);
+    std::vector<mio::abm::Location> basic_shops = world.get_locations()[(uint32_t)mio::abm::LocationType::BasicsShop];
+    std::vector<ScalarType> basic_shops_weights(basic_shops.size(), 1);
+    std::vector<mio::abm::Location> social_events =
+        world.get_locations()[(uint32_t)mio::abm::LocationType::SocialEvent];
+    std::vector<ScalarType> social_event_weights(social_events.size(), 1);
+
+    auto persons = world.get_persons();
+    for (auto& person : persons) {
+        //assign shop
+        size_t shop = mio::DiscreteDistribution<size_t>::get_instance()(basic_shops_weights);
+        person.set_assigned_location(basic_shops[shop]);
+        //assign event
+        size_t event = mio::DiscreteDistribution<size_t>::get_instance()(social_event_weights);
+        person.set_assigned_location(social_events[event]);
+        //assign work and school
+        if (person.get_age() == mio::abm::AgeGroup::Age5to14) {
+            size_t school = mio::DiscreteDistribution<size_t>::get_instance()(school_weights);
+            person.set_assigned_location(schools[school]);
+        }
+        if (person.get_age() == mio::abm::AgeGroup::Age15to34 || person.get_age() == mio::abm::AgeGroup::Age35to59) {
+            size_t work = mio::DiscreteDistribution<size_t>::get_instance()(workplaces_weights);
+            person.set_assigned_location(workplaces[work]);
+        }
+    }
+}
+
+mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, const fs::path& input_dir,
+                                               std::vector<LocationMapping>& LocationIds)
+{
+    std::vector<std::pair<std::string, std::string>> areas;
+    std::vector<int> inhabitants;
+    // Read input file containing the locations and the number of inhabitants per location
+    read_txt(areas, inhabitants, input_dir);
+
+    //Assumed percentage for 1-Person, 2-Person, 3-Person, 4-Person and 5-Persons households
+    ScalarType one_person_hh_pct = 0.37, two_person_hh_pct = 0.33, three_person_hh_pct = 0.15, four_person_hh_pct = 0.1,
+               five_person_hh_pct = 0.05;
+    // Assumed percentage of infection state at the beginning of the simulation.
+    ScalarType exposed_pct = 0.005, infected_no_symptoms_pct = 0.001, infected_symptoms_pct = 0.001,
+               infected_severe_pct = 0.0001, infected_critical_pct = 0.0, recovered_infected_no_symptoms_pct = 0.0,
+               recovered_infected_symptoms_pct = 0.0;
+    //Set global infection parameters
+    mio::abm::GlobalInfectionParameters infection_params;
+
+    //TODO: set infection parameters
+
+    // Create the world with infection parameters.
+    auto world = mio::abm::World(infection_params);
+
+    //Transform the input location to correspondin abm location
+    create_locations_from_input(areas, inhabitants, world, LocationIds, one_person_hh_pct, two_person_hh_pct,
+                                three_person_hh_pct, four_person_hh_pct, five_person_hh_pct);
+
+    //Assign an infection state to every person
+    assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct, infected_severe_pct,
+                            infected_critical_pct, recovered_infected_no_symptoms_pct, recovered_infected_symptoms_pct);
+    //Assign the locations to persons
+    assign_locations(world);
+
+    auto sim = mio::abm::Simulation(t0, std::move(world));
+    return sim;
+}
+
+mio::IOResult<void> run(const fs::path& input_dir)
+{
+    auto t0      = mio::abm::TimePoint(0); // Start time per simulation
+    auto tmax    = mio::abm::TimePoint(0) + mio::abm::days(14); // End time per simulation
+    auto results = std::vector<mio::TimeSeries<ScalarType>>{}; // Vector of collected results
+
+    std::vector<LocationMapping> LocationIds;
+
+    auto sim = create_sampled_simulation(t0, input_dir, LocationIds);
+    sim.advance(tmax);
+    return mio::success();
+}
+
+template <class T>
+void print(T& data)
+{
+    for (auto item : data) {
+        std::cout << item << " ";
+    }
+    std::cout << std::endl;
+}
+
+int main()
+{
+    const fs::path input_dir =
+        "C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
+    auto result = run(input_dir);
+    return 0;
+}
\ No newline at end of file

From cf260b7fd0d8199f67e89eb76fa717fdb98f7a06 Mon Sep 17 00:00:00 2001
From: Sascha <51127093+xsaschako@users.noreply.github.com>
Date: Thu, 30 Mar 2023 16:57:59 +0200
Subject: [PATCH 007/103] add to cmakelist

---
 cpp/memilio/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cpp/memilio/CMakeLists.txt b/cpp/memilio/CMakeLists.txt
index 62ec49b240..8fede20077 100644
--- a/cpp/memilio/CMakeLists.txt
+++ b/cpp/memilio/CMakeLists.txt
@@ -99,3 +99,6 @@ endif()
 if(MEMILIO_HAS_JSONCPP)
     target_link_libraries(memilio PUBLIC JsonCpp::JsonCpp)
 endif()
+
+
+add_executable(hist utils/history_example.cpp)
\ No newline at end of file

From 929753ac3cb3a6b85d73215bcc3b22970e629187 Mon Sep 17 00:00:00 2001
From: Sascha <51127093+xsaschako@users.noreply.github.com>
Date: Mon, 3 Apr 2023 15:55:08 +0200
Subject: [PATCH 008/103] further enhance object file

---
 cpp/memilio/CMakeLists.txt            |  3 ++-
 cpp/memilio/utils/history_example.cpp | 31 +++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/cpp/memilio/CMakeLists.txt b/cpp/memilio/CMakeLists.txt
index 8fede20077..96e295866e 100644
--- a/cpp/memilio/CMakeLists.txt
+++ b/cpp/memilio/CMakeLists.txt
@@ -101,4 +101,5 @@ if(MEMILIO_HAS_JSONCPP)
 endif()
 
 
-add_executable(hist utils/history_example.cpp)
\ No newline at end of file
+add_executable(hist utils/history_example.cpp)
+target_link_libraries(hist memilio)
\ No newline at end of file
diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
index 67a630477c..44a861bbe7 100644
--- a/cpp/memilio/utils/history_example.cpp
+++ b/cpp/memilio/utils/history_example.cpp
@@ -20,7 +20,9 @@
 #include <vector>
 #include <tuple>
 #include <iostream>
+#include "memilio/utils/index.h"
 
+//TODO: Maybe rename Log... something like Reader or something similar.
 class example
 {
 public:
@@ -59,6 +61,32 @@ struct Writer {
         std::cout << t << std::endl;
     }
 };
+template <class... Loggers>
+struct DataWriter {
+    using Data  = std::tuple<std::vector<typename Loggers::Type>...>;
+    using Types = mio::Index<Loggers...>;
+    template <class Logger>
+    static void write(const typename Logger::Type& t, Data& data)
+    {
+        std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
+    }
+};
+
+template <class... Loggers>
+struct ToFileWriter {
+    using Data  = std::tuple<std::vector<typename Loggers::Type>...>;
+    using Types = mio::Index<Loggers...>;
+    template <class Logger>
+    static void write(const typename Logger::Type& t, Data& data)
+    {
+        std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
+    }
+};
+
+void write_to_file(const std::vector<int>& data)
+{
+    // write to file
+}
 
 template <template <class...> class Writer, class... Loggers>
 class History
@@ -108,8 +136,8 @@ class History
 
 int main()
 {
-
     History<Writer, LogA, LogB> history;
+
     example ex;
 
     int step = 0;
@@ -121,6 +149,5 @@ int main()
 
         step++;
     }
-
     history.get_log();
 }
\ No newline at end of file

From 8cf13dd863911e6114643d161b0aa978476a1128 Mon Sep 17 00:00:00 2001
From: Sascha <51127093+xsaschako@users.noreply.github.com>
Date: Mon, 3 Apr 2023 16:46:17 +0200
Subject: [PATCH 009/103] some more

---
 cpp/memilio/utils/history_example.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
index 44a861bbe7..82778a62d4 100644
--- a/cpp/memilio/utils/history_example.cpp
+++ b/cpp/memilio/utils/history_example.cpp
@@ -83,7 +83,7 @@ struct ToFileWriter {
     }
 };
 
-void write_to_file(const std::vector<int>& data)
+void write_to_file_julia(const std::vector<int>& data)
 {
     // write to file
 }

From 2d7892e156c08e43caa05bfaccaad78dc20fbf69 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 4 Apr 2023 09:53:10 +0200
Subject: [PATCH 010/103] comments

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 366 +++++++++++++++++++-
 1 file changed, 348 insertions(+), 18 deletions(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index eb1f743116..7a389a27e1 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -36,6 +36,12 @@ struct LocationMapping {
     std::vector<std::string> modelId{};
 };
 
+/**
+ * read input test file and save input areas and inhabitants per area
+ * @param[in, out] areas vector that is filled with area types and area ids from input file
+ * @param[in, out] inhabitants vector that is filled with the inhabitants per area given in the input file
+ * @param[in] input_dir path to input txt file
+*/
 void read_txt(std::vector<std::pair<std::string, std::string>>& areas, std::vector<int>& inhabitants,
               const fs::path& input_dir)
 {
@@ -58,10 +64,19 @@ void read_txt(std::vector<std::pair<std::string, std::string>>& areas, std::vect
     }
 }
 
+/**
+ * Add location to world
+ * @param[in] world world object the location is added to
+ * @param[in] type location type
+ * @param[in] max_contacts maximum number of contacts at the location
+ * @param[in] persons maximum number of persons for location capacity
+ * @param[in] volume maximum volume for location capacity
+ * @return added location
+*/
 mio::abm::LocationId add_location(mio::abm::World& world, mio::abm::LocationType type, double max_contacts, int persons,
                                   int volume)
 {
-    //add a social event to the world
+    //add a location of given type to the world
     auto location = world.add_location(type);
     //set maximum number of contacts and capacity //TODO
     world.get_individualized_location(location).get_infection_parameters().set<mio::abm::MaximumContacts>(max_contacts);
@@ -70,6 +85,13 @@ mio::abm::LocationId add_location(mio::abm::World& world, mio::abm::LocationType
     return location;
 }
 
+/**
+ * Insert the abm location Ids to mapping for the corresponding input area id.
+ * @param[in, out] locationIds vector that maps every input area id to the corresponding abm location ids
+ * @param[in] inputId input area id that is added to mapping vector
+ * @param[in] locations abm locations that correspond to inputId
+ * @return mapping vector 
+*/
 void insert_locations_to_map(std::vector<LocationMapping>& locationIds, std::string& inputId,
                              std::vector<mio::abm::LocationId>& locations)
 {
@@ -77,6 +99,9 @@ void insert_locations_to_map(std::vector<LocationMapping>& locationIds, std::str
     map.inputId = inputId;
     std::string locationType;
     std::string locationIndex;
+    //An abm locationId consists of a type and an index.
+    //For the mapping the locationId is stored as a string of the form xxyy where xx specifies
+    //the location type and yy the location index
     for (auto& location : locations) {
         locationType  = std::to_string(int(location.type));
         locationIndex = std::to_string(location.index);
@@ -92,18 +117,36 @@ void insert_locations_to_map(std::vector<LocationMapping>& locationIds, std::str
     locationIds.push_back(map);
 }
 
-mio::abm::HouseholdGroup make_one_person_households(const mio::abm::HouseholdMember& member, int household_size,
-                                                    int number_of_households)
+/**
+ * Make a one-person household group
+ * @param[in] member household member
+ * @param[in] number_of_households number of one-person households in the household group
+ * @return household_group The one-person household group
+ * 
+*/
+mio::abm::HouseholdGroup make_one_person_households(const mio::abm::HouseholdMember& member, int number_of_households)
 {
     auto household_group = mio::abm::HouseholdGroup();
     for (int hh = 0; hh < number_of_households; ++hh) {
         auto household = mio::abm::Household();
-        household.add_members(member, household_size);
+        household.add_members(member, 1);
+        //add one-person household to household group
         household_group.add_households(household, 1);
     }
     return household_group;
 }
 
+/**
+ * Make a multiple-person household group
+ * @param[in] child household member representing a child
+ * @param[in] parent household member representing a parent
+ * @param[in] other random household member
+ * @param[in] household_size household size e.g 2-person household, 3-person household etc.
+ * @param[in] number_of_two_parent_households number of households with two parents and (household_size - 2) children
+ * @param[in] number_of_one_parent_households number of households with one parent and (household_size - 1) children
+ * @param[in] number_of_other_households number of households with random members
+ * @return household_group multiple-person household group
+*/
 mio::abm::HouseholdGroup make_multiple_person_households(const mio::abm::HouseholdMember& child,
                                                          const mio::abm::HouseholdMember& parent,
                                                          const mio::abm::HouseholdMember& other, int household_size,
@@ -133,15 +176,26 @@ mio::abm::HouseholdGroup make_multiple_person_households(const mio::abm::Househo
     return household_group;
 }
 
+/**
+ * Add households to the world for a given number of inhabitants.
+ * @param[in, out] world
+ * @param[in] distribution vector containing the percentages of 1-person, 2-person, ... households
+ * @param[in] num_inhabitants number of inhabitants that should be distributed to households
+ * @return locations vector with location ids of the added households
+*/
 std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::vector<double>& distribution,
                                                  int num_inhabitants)
 {
+    //vector that saves the number of households for every household size
     std::vector<int> households(distribution.size());
     size_t household_size;
     std::vector<mio::abm::LocationId> locations;
+    //index of the first new household
     int new_index = (int)world.get_locations()[(uint32_t)mio::abm::LocationType::Home].size();
     while (num_inhabitants > 0) {
+        //draw household size from the given distribution
         household_size = mio::DiscreteDistribution<size_t>::get_instance()(distribution);
+        //increase the number of households of the drawn household size
         households[household_size] += 1;
         num_inhabitants -= (int)(household_size + 1);
     }
@@ -155,7 +209,7 @@ std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::ve
     int number_of_one_person_households = households[0];
 
     auto one_person_household_group =
-        make_one_person_households(one_person_household_member, 1, number_of_one_person_households);
+        make_one_person_households(one_person_household_member, number_of_one_person_households);
     add_household_group_to_world(world, one_person_household_group);
 
     //Members for multiple person households
@@ -225,24 +279,39 @@ std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::ve
     return locations;
 }
 
+/**
+ * Creates abm locations from input areas
+ * @param[in] areas input areas consisting of a type and an id
+ * @param[in] inhabitants number of inhabitants per input area
+ * @param[in, out] world
+ * @param[in, out] locationIds mapping of abm location ids to corresponding input area ids
+ * @param[in] one_person_hh percentage of one-person households
+ * @param[in] two_person_hh percentage of two-person households
+ * @param[in] three_person_hh percentage of three-person households
+ * @param[in] four_person_hh percentage of four-person households
+ * @param[in] five_person_hh percentage of five-person households
+*/
 void create_locations_from_input(std::vector<std::pair<std::string, std::string>>& areas, std::vector<int>& inhabitants,
                                  mio::abm::World& world, std::vector<LocationMapping>& locationIds,
                                  ScalarType one_person_hh, ScalarType two_person_hh, ScalarType three_person_hh,
                                  ScalarType four_person_hh, ScalarType five_person_hh)
 {
     assert(areas.size() == inhabitants.size());
-    std::string res                                = "residential";
+    std::string residential                        = "residential";
     std::vector<ScalarType> household_distribution = {one_person_hh, two_person_hh, three_person_hh, four_person_hh,
                                                       five_person_hh};
-    bool has_school                                = false;
+    //school and hospital is needed for migration rules
+    bool has_school   = false;
+    bool has_hospital = false;
     for (auto loc = 0; loc < areas.size(); ++loc) {
         std::vector<mio::abm::LocationId> locations;
-        if (std::search((areas[loc].second).begin(), (areas[loc].second).end(), res.begin(), res.end()) !=
-            (areas[loc].second).end()) {
+        if (std::search((areas[loc].second).begin(), (areas[loc].second).end(), residential.begin(),
+                        residential.end()) != (areas[loc].second).end()) {
             //Home
             locations = add_households(world, household_distribution, inhabitants[loc]);
         }
         else if (areas[loc].second == "mixed") {
+            //areas of type "mixed" are equally distributed to  of location of type Home amd type Work
             size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(std::vector<double>{1, 1});
             if (location_type) {
                 locations.emplace_back(add_location(world, mio::abm::LocationType::Work, 40., 100, 2000));
@@ -258,13 +327,18 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
                 locations.emplace_back(add_location(world, mio::abm::LocationType::SocialEvent, 30., 30, 40));
             }
             else if (areas[loc].second == "shopping_business") {
-
+                //school, hospital and icu are added first
                 if (!has_school) {
                     locations.emplace_back(add_location(world, mio::abm::LocationType::School, 40., 500, 2000));
                     has_school = true;
                 }
+                else if (!has_hospital) {
+                    locations.emplace_back(add_location(world, mio::abm::LocationType::Hospital, 5., 300, 10000));
+                    locations.emplace_back(add_location(world, mio::abm::LocationType::ICU, 5., 30, 1000));
+                    has_hospital = true;
+                }
                 else {
-                    //uniformly draw whether shopping_business should be work or BasicsShop
+                    //the other areas of type 'shopping_business' are equally distributed to locations of type BasicsShop and type Work
                     size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(std::vector<double>{1, 1});
                     if (location_type) {
                         locations.emplace_back(add_location(world, mio::abm::LocationType::BasicsShop, 20., 100, 1000));
@@ -275,17 +349,217 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
                 }
             }
             else if (areas[loc].second == "university") {
+                //area of type 'university' is converted to location of type Work
                 locations.emplace_back(add_location(world, mio::abm::LocationType::Work, 50., 200, 4000));
             }
             else {
                 mio::log_error("Area input type does not match to abm location type.");
             }
         }
-
+        //insert locations to input area mapping
         insert_locations_to_map(locationIds, areas[loc].first, locations);
     }
 }
 
+/**
+ * Set infection parameters
+ * @param[in, out] infection_params infection parameters 
+*/
+void set_infection_parameters(mio::abm::GlobalInfectionParameters infection_params)
+{
+    infection_params.set<mio::abm::IncubationPeriod>(
+        {{mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 4.});
+
+    //0-4
+    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age0to4,
+                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.05;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age0to4,
+                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.05;
+    infection_params
+        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.276;
+    infection_params
+        .get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.092;
+    infection_params
+        .get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.142;
+    infection_params
+        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.001;
+    infection_params
+        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.186;
+    infection_params
+        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.015;
+    infection_params
+        .get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.143;
+    infection_params
+        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.001;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age0to4,
+                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+
+    //5-14
+    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age5to14,
+                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.1;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age5to14,
+                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.1;
+    infection_params
+        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.276;
+    infection_params
+        .get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.092;
+    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age5to14,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.142;
+    infection_params
+        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.001;
+    infection_params
+        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.186;
+    infection_params
+        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.015;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age5to14,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.143;
+    infection_params
+        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.001;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age5to14,
+                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+
+    //15-34
+    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age15to34,
+                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.13;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age15to34,
+                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.13;
+    infection_params
+        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.315;
+    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age15to34,
+                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
+    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age15to34,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.139;
+    infection_params
+        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.003;
+    infection_params
+        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.157;
+    infection_params
+        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.013;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age15to34,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.126;
+    infection_params
+        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.021;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age15to34,
+                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+
+    //35-59
+    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age35to59,
+                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.11;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age35to59,
+                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.11;
+    infection_params
+        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.315;
+    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age35to59,
+                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
+    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age35to59,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.136;
+    infection_params
+        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.009;
+    infection_params
+        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.113;
+    infection_params
+        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.02;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age35to59,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.05;
+    infection_params
+        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.008;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age35to59,
+                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+
+    //60-79
+    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age60to79,
+                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.04;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age60to79,
+                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.04;
+    infection_params
+        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.315;
+    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age60to79,
+                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
+    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age60to79,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.123;
+    infection_params
+        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.024;
+    infection_params
+        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.083;
+    infection_params
+        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.035;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age60to79,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.035;
+    infection_params
+        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.023;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age60to79,
+                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+
+    //80+
+    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age80plus,
+                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.07;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age80plus,
+                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.07;
+    infection_params
+        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.315;
+    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age80plus,
+                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
+    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age80plus,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.115;
+    infection_params
+        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.033;
+    infection_params
+        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.055;
+    infection_params
+        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.036;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age80plus,
+                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.035;
+    infection_params
+        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.052;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age80plus,
+                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+}
+
+/**
+ * Get a person's infection state according to a given distribution
+ * @param[in] exposed percentage of infection state 'exposed'
+ * @param[in] infected_no_symptoms percentage of infection state 'infected no symptoms'
+ * @param[in] infected_symptoms percentage of of infection state 'infected symptoms'
+ * @param[in] infected_severe percentage of infection state 'infected severe'
+ * @param[in] infected_critical percentage of infection state 'infected critical'
+ * @param[in] recovered_infected_no_symptoms percentage of infection state 'recovered of state infected no symptoms'
+ * @param[in] recovered_infected percentage of infection state 'recovered of other infection state'
+ * @return state drawn infection state
+*/
 mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infected_no_symptoms,
                                              ScalarType infected_symptoms, ScalarType infected_severe,
                                              ScalarType infected_critical, ScalarType recovered_infected_no_symptoms,
@@ -303,6 +577,17 @@ mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infe
     return (mio::abm::InfectionState)state;
 }
 
+/**
+ * Assign an infection state to each person.
+ * @param[in, out] world
+ * @param[in] exposed percentage of infection state 'exposed'
+ * @param[in] infected_no_symptoms percentage of infection state 'infected no symptoms'
+ * @param[in] infected_symptoms percentage of of infection state 'infected symptoms'
+ * @param[in] infected_severe percentage of infection state 'infected severe'
+ * @param[in] infected_critical percentage of infection state 'infected critical'
+ * @param[in] recovered_infected_no_symptoms percentage of infection state 'recovered of state infected no symptoms'
+ * @param[in] recovered_infected percentage of infection state 'recovered of other infection state'
+*/
 void assign_infection_states(mio::abm::World& world, ScalarType exposed, ScalarType infected_no_symptoms,
                              ScalarType infected_symptoms, ScalarType infected_severe, ScalarType infected_critical,
                              ScalarType recovered_infected_no_symptoms, ScalarType recovered_infected)
@@ -315,15 +600,29 @@ void assign_infection_states(mio::abm::World& world, ScalarType exposed, ScalarT
     }
 }
 
+/**
+ * Assign locations to persons.
+ * @param[in, out] world
+*/
 void assign_locations(mio::abm::World& world)
 {
-    //TODO: add hospital and ICU
+    //get locations from word
+    //schools
     std::vector<mio::abm::Location> schools = world.get_locations()[(uint32_t)mio::abm::LocationType::School];
     std::vector<ScalarType> school_weights(schools.size(), 1);
+    //hispitals
+    std::vector<mio::abm::Location> hospitals = world.get_locations()[(uint32_t)mio::abm::LocationType::Hospital];
+    std::vector<ScalarType> hospital_weights(hospitals.size(), 1);
+    //icu
+    std::vector<mio::abm::Location> icus = world.get_locations()[(uint32_t)mio::abm::LocationType::ICU];
+    std::vector<ScalarType> icu_weights(icus.size(), 1);
+    //workplaces
     std::vector<mio::abm::Location> workplaces = world.get_locations()[(uint32_t)mio::abm::LocationType::Work];
     std::vector<ScalarType> workplaces_weights(workplaces.size(), 1);
+    //shops
     std::vector<mio::abm::Location> basic_shops = world.get_locations()[(uint32_t)mio::abm::LocationType::BasicsShop];
     std::vector<ScalarType> basic_shops_weights(basic_shops.size(), 1);
+    //social events
     std::vector<mio::abm::Location> social_events =
         world.get_locations()[(uint32_t)mio::abm::LocationType::SocialEvent];
     std::vector<ScalarType> social_event_weights(social_events.size(), 1);
@@ -333,6 +632,12 @@ void assign_locations(mio::abm::World& world)
         //assign shop
         size_t shop = mio::DiscreteDistribution<size_t>::get_instance()(basic_shops_weights);
         person.set_assigned_location(basic_shops[shop]);
+        //assign hospital
+        size_t hospital = mio::DiscreteDistribution<size_t>::get_instance()(hospital_weights);
+        person.set_assigned_location(hospitals[hospital]);
+        //assign icu
+        size_t icu = mio::DiscreteDistribution<size_t>::get_instance()(icu_weights);
+        person.set_assigned_location(icus[icu]);
         //assign event
         size_t event = mio::DiscreteDistribution<size_t>::get_instance()(social_event_weights);
         person.set_assigned_location(social_events[event]);
@@ -348,8 +653,15 @@ void assign_locations(mio::abm::World& world)
     }
 }
 
+/**
+ * Create sampled simulation with start time t0.
+ * @param[in] t0 start time of the simulation
+ * @param[in] input_dir text file with the locations and the inhabitants per residential area
+ * @param[in, out] locationIds mapping of input area to abm locations
+ * @return sim abm simulation
+*/
 mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, const fs::path& input_dir,
-                                               std::vector<LocationMapping>& LocationIds)
+                                               std::vector<LocationMapping>& locationIds)
 {
     std::vector<std::pair<std::string, std::string>> areas;
     std::vector<int> inhabitants;
@@ -365,14 +677,13 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
                recovered_infected_symptoms_pct = 0.0;
     //Set global infection parameters
     mio::abm::GlobalInfectionParameters infection_params;
-
-    //TODO: set infection parameters
+    set_infection_parameters(infection_params);
 
     // Create the world with infection parameters.
     auto world = mio::abm::World(infection_params);
 
     //Transform the input location to correspondin abm location
-    create_locations_from_input(areas, inhabitants, world, LocationIds, one_person_hh_pct, two_person_hh_pct,
+    create_locations_from_input(areas, inhabitants, world, locationIds, one_person_hh_pct, two_person_hh_pct,
                                 three_person_hh_pct, four_person_hh_pct, five_person_hh_pct);
 
     //Assign an infection state to every person
@@ -391,10 +702,28 @@ mio::IOResult<void> run(const fs::path& input_dir)
     auto tmax    = mio::abm::TimePoint(0) + mio::abm::days(14); // End time per simulation
     auto results = std::vector<mio::TimeSeries<ScalarType>>{}; // Vector of collected results
 
+    //mapping of input areas to abm locations
     std::vector<LocationMapping> LocationIds;
-
+    //create sampled simulation
     auto sim = create_sampled_simulation(t0, input_dir, LocationIds);
+    //advance until tmax
     sim.advance(tmax);
+
+    std::cout << "# t S E C I I_s I_c R_C R_I D\n";
+    for (auto i = 0; i < sim.get_result().get_num_time_points(); ++i) {
+        std::cout << sim.get_result().get_time(i) << " ";
+        auto v = sim.get_result().get_value(i);
+        for (auto j = 0; j < v.size(); ++j) {
+            std::cout << v[j] << " ";
+            if (j < v.size() - 1) {
+                std::cout << " ";
+            }
+        }
+        if (i < sim.get_result().get_num_time_points() - 1) {
+            std::cout << "\n";
+        }
+    }
+
     return mio::success();
 }
 
@@ -412,5 +741,6 @@ int main()
     const fs::path input_dir =
         "C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
     auto result = run(input_dir);
+
     return 0;
 }
\ No newline at end of file

From 22c7e3e258804b30dc23ea9a10f51630f9e9e89b Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 4 Apr 2023 12:10:03 +0200
Subject: [PATCH 011/103] convert size to int

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 7a389a27e1..548d63972f 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -303,7 +303,7 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
     //school and hospital is needed for migration rules
     bool has_school   = false;
     bool has_hospital = false;
-    for (auto loc = 0; loc < areas.size(); ++loc) {
+    for (auto loc = 0; loc < (int)areas.size(); ++loc) {
         std::vector<mio::abm::LocationId> locations;
         if (std::search((areas[loc].second).begin(), (areas[loc].second).end(), residential.begin(),
                         residential.end()) != (areas[loc].second).end()) {

From 93819a057571452222f141e36f09b8133c5b6309 Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Tue, 4 Apr 2023 13:49:28 +0200
Subject: [PATCH 012/103] add another logger

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/memilio/utils/history_example.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
index 82778a62d4..35c56033f9 100644
--- a/cpp/memilio/utils/history_example.cpp
+++ b/cpp/memilio/utils/history_example.cpp
@@ -51,6 +51,14 @@ struct LogB : LogAlways {
     }
 };
 
+struct LogC : LogAlways {
+    using Type = std::pair<int, int>;
+    static Type log(const example& ex)
+    {
+        return {ex.a, ex.b};
+    }
+};
+
 template <class... Loggers>
 struct Writer {
     using Data = std::tuple<std::vector<typename Loggers::Type>...>;
@@ -64,11 +72,11 @@ struct Writer {
 template <class... Loggers>
 struct DataWriter {
     using Data  = std::tuple<std::vector<typename Loggers::Type>...>;
-    using Types = mio::Index<Loggers...>;
+    using Index = mio::Index<Loggers...>;
     template <class Logger>
     static void write(const typename Logger::Type& t, Data& data)
     {
-        std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
+        std::get<mio::details::IndexPosition<Logger, Index>::value>(data).push_back(t);
     }
 };
 
@@ -79,7 +87,7 @@ struct ToFileWriter {
     template <class Logger>
     static void write(const typename Logger::Type& t, Data& data)
     {
-        std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
+        //std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
     }
 };
 
@@ -112,7 +120,6 @@ class History
     template <class T, class logger, class... loggers>
     std::enable_if_t<std::is_base_of<LogOnce, logger>::value> log_impl(const T& t)
     {
-
         if (m_log_once_flag) {
             Wri::write<logger>(logger::log(t), m_data);
             m_log_once_flag = false;

From f9037d8708fc989f44d8ad1e950376d8909e8a15 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 5 Apr 2023 14:45:44 +0200
Subject: [PATCH 013/103] python abm demonstrator

---
 .../examples/simulation/abm_demonstrator.py   | 159 ++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 pycode/examples/simulation/abm_demonstrator.py

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
new file mode 100644
index 0000000000..647564eceb
--- /dev/null
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -0,0 +1,159 @@
+#############################################################################
+# Copyright (C) 2020-2021 German Aerospace Center (DLR-SC)
+#
+# Authors: Martin J. Kuehn, Wadim Koslow, Daniel Abele
+#
+# Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
+import argparse
+import pandas as pd
+import numpy as np
+
+from memilio.simulation import abm
+from memilio.simulation.abm import AgeGroup
+from memilio.simulation.abm import VaccinationState
+
+class LocationMapping:
+
+    def __init__(self):
+        self.inputId = None
+        self.modelId = None
+
+def set_infection_parameters():
+    infection_params = abm.GlobalInfectionParameters()
+
+    #0-4
+    infection_params.IncubationPeriod[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.05
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.05
+    infection_params.CarrierToInfected[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.276
+    infection_params.CarrierToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.092
+    infection_params.InfectedToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.142
+    infection_params.InfectedToSevere[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.001
+    infection_params.SevereToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.186
+    infection_params.SevereToCritical[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.015
+    infection_params.CriticalToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.143
+    infection_params.CriticalToDead[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.001
+    infection_params.RecoveredToSusceptible[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0
+
+    #5-14
+    infection_params.IncubationPeriod[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.1
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.1
+    infection_params.CarrierToInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.276
+    infection_params.CarrierToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.092
+    infection_params.InfectedToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.142
+    infection_params.InfectedToSevere[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.001
+    infection_params.SevereToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.186
+    infection_params.SevereToCritical[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.015
+    infection_params.CriticalToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.143
+    infection_params.CriticalToDead[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.001
+    infection_params.RecoveredToSusceptible[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.
+
+    #15-34
+    infection_params.IncubationPeriod[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.13
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.13
+    infection_params.CarrierToInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.139
+    infection_params.InfectedToSevere[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.003
+    infection_params.SevereToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.157
+    infection_params.SevereToCritical[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.013
+    infection_params.CriticalToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.126
+    infection_params.CriticalToDead[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.021
+    infection_params.RecoveredToSusceptible[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.
+
+    #35-59
+    infection_params.IncubationPeriod[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.11
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.11
+    infection_params.CarrierToInfected[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.136
+    infection_params.InfectedToSevere[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.009
+    infection_params.SevereToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.113
+    infection_params.SevereToCritical[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.02
+    infection_params.CriticalToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.05
+    infection_params.CriticalToDead[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.008
+    infection_params.RecoveredToSusceptible[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.
+
+    #60-79
+    infection_params.IncubationPeriod[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.04
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.04
+    infection_params.CarrierToInfected[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.123
+    infection_params.InfectedToSevere[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.024
+    infection_params.SevereToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.083
+    infection_params.SevereToCritical[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.035
+    infection_params.CriticalToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.035
+    infection_params.CriticalToDead[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.023
+    infection_params.RecoveredToSusceptible[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.
+
+    
+
+    return infection_params
+
+def read_txt(path):
+    input = pd.read_csv(path, sep='\t')
+    return input
+
+def add_households(world, distribution, num_inhabitants):
+    household_sizes = np.zeros(len(distribution))
+    while num_inhabitants > 0:
+        size = np.random.choice(np.arange(0, len(distribution)), p = distribution)
+        household_sizes[size] += 1
+        num_inhabitants -= (size + 1)
+
+    #one-person household
+    one_person_household_member = abm.HouseholdMember()
+
+def create_locations_from_input(world, input_areas):
+    has_school = False
+    has_hospital = False
+    for index, area in input_areas.iterrows():
+        if('residential' in area.type):
+            add_households(world, [0., 0.1, 0., 0., 0.9], area.inhabitants)
+        elif(area.type == 'recreational'):
+            continue
+        elif(area.type == 'shopping_business'):
+            continue
+        elif(area.type == 'university'):
+            continue
+        elif(area.type == 'mixed'):
+            continue
+
+def run_abm_simulation():
+
+    LocationIds = []
+
+    infection_params = set_infection_parameters()
+    world = abm.World(infection_params)
+
+    t0 = abm.TimePoint(0)
+    tmax = t0 + abm.days(14)
+
+    areas = read_txt('C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
+    create_locations_from_input(world, areas)
+    #print(areas)
+
+if __name__ == "__main__":
+    arg_parser = argparse.ArgumentParser(
+        'abm demonstrator',
+        description='Example demonstrating the agent-based model for a synthetic population.')
+    args = arg_parser.parse_args()
+    run_abm_simulation(**args.__dict__)
\ No newline at end of file

From ee57e2d09fd73a856e79a1edc509ab338f9fcac3 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 6 Apr 2023 15:33:10 +0200
Subject: [PATCH 014/103] [CI SKIP] inside demonstrator

---
 .../examples/simulation/abm_demonstrator.py   | 207 ++++++++++++++++--
 .../memilio/simulation/abm.cpp                |  22 +-
 2 files changed, 207 insertions(+), 22 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 647564eceb..54c42cb0be 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -63,18 +63,18 @@ def set_infection_parameters():
     infection_params.RecoveredToSusceptible[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.
 
     #15-34
-    infection_params.IncubationPeriod[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.13
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.13
-    infection_params.CarrierToInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.139
-    infection_params.InfectedToSevere[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.003
-    infection_params.SevereToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.157
-    infection_params.SevereToCritical[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.013
-    infection_params.CriticalToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.126
-    infection_params.CriticalToDead[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.021
-    infection_params.RecoveredToSusceptible[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.
+    infection_params.IncubationPeriod[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.13
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.13
+    infection_params.CarrierToInfected[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.139
+    infection_params.InfectedToSevere[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.003
+    infection_params.SevereToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.157
+    infection_params.SevereToCritical[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.013
+    infection_params.CriticalToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.126
+    infection_params.CriticalToDead[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.021
+    infection_params.RecoveredToSusceptible[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.
 
     #35-59
     infection_params.IncubationPeriod[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 4
@@ -112,6 +112,64 @@ def read_txt(path):
     input = pd.read_csv(path, sep='\t')
     return input
 
+def make_one_person_households(number_of_households):
+    #one-person household member
+    one_person_household_member = abm.HouseholdMember()
+    one_person_household_member.set_age_weight(AgeGroup.Age15to34, 5)
+    one_person_household_member.set_age_weight(AgeGroup.Age35to59, 6)
+    one_person_household_member.set_age_weight(AgeGroup.Age60to79, 4)
+    one_person_household_member.set_age_weight(AgeGroup.Age80plus, 2)
+
+    #create one-person household group
+    household_group = abm.HouseholdGroup()
+    for hh in range(int(number_of_households)):
+        household = abm.Household()
+        household.add_members(one_person_household_member, 1)
+        household_group.add_households(household, 1)
+
+    return household_group
+
+def make_multiple_person_households(household_size,
+                                    number_of_two_parent_households, number_of_one_parent_households,
+                                    number_of_other_households):
+    
+    #members for multiple person households
+    child = abm.HouseholdMember()
+    child.set_age_weight(AgeGroup.Age0to4, 1)
+    child.set_age_weight(AgeGroup.Age5to14, 1)
+
+    parent = abm.HouseholdMember()
+    parent.set_age_weight(AgeGroup.Age15to34, 2)
+    parent.set_age_weight(AgeGroup.Age35to59, 2)
+    parent.set_age_weight(AgeGroup.Age60to79, 1)
+
+    other = abm.HouseholdMember()
+    other.set_age_weight(AgeGroup.Age0to4, 1)
+    other.set_age_weight(AgeGroup.Age5to14, 2)
+    other.set_age_weight(AgeGroup.Age15to34, 3)
+    other.set_age_weight(AgeGroup.Age35to59, 3)
+    other.set_age_weight(AgeGroup.Age60to79, 2)
+    other.set_age_weight(AgeGroup.Age80plus, 2)
+
+    household_group = abm.HouseholdGroup()
+    #add two parent households
+    hh_two_parents = abm.Household()
+    hh_two_parents.add_members(child, household_size - 2)
+    hh_two_parents.add_members(parent, 2)
+    household_group.add_households(hh_two_parents, number_of_two_parent_households)
+    #add one parent households
+    hh_one_parent = abm.Household()
+    hh_one_parent.add_members(child, household_size - 1)
+    hh_one_parent.add_members(parent, 1)
+    household_group.add_households(hh_one_parent, number_of_one_parent_households)
+    #add other households
+    hh_other = abm.Household()
+    hh_other.add_members(other, household_size)
+    household_group.add_households(hh_other, number_of_other_households)
+
+    return household_group
+
+
 def add_households(world, distribution, num_inhabitants):
     household_sizes = np.zeros(len(distribution))
     while num_inhabitants > 0:
@@ -120,22 +178,127 @@ def add_households(world, distribution, num_inhabitants):
         num_inhabitants -= (size + 1)
 
     #one-person household
-    one_person_household_member = abm.HouseholdMember()
+    one_person_household_group = make_one_person_households(household_sizes[0])
+    abm.add_household_group_to_world(world, one_person_household_group)
+
+    #two-person households
+    two_person_two_parents = int(0.4 * household_sizes[1])
+    two_person_one_parent = int(0.4 * household_sizes[1])
+    two_person_other = int(household_sizes[1] - two_person_two_parents - two_person_one_parent)
+    two_person_household_group = make_multiple_person_households(2, two_person_two_parents,
+                                                                 two_person_one_parent, two_person_other)
+    abm.add_household_group_to_world(world, two_person_household_group)
+
+    #three-person households
+    three_person_two_parents = int(0.4 * household_sizes[2])
+    three_person_one_parent = int(0.4 * household_sizes[2])
+    three_person_other = int(household_sizes[2] - three_person_two_parents - three_person_one_parent)
+    three_person_household_group = make_multiple_person_households(3, three_person_two_parents,
+                                                                   three_person_one_parent, three_person_other)
+    abm.add_household_group_to_world(world, three_person_household_group)
+
+    #four-person households
+    four_person_two_parents = int(0.5 * household_sizes[3])
+    four_person_one_parent = int(0.2 * household_sizes[3])
+    four_person_other = int(household_sizes[3] - four_person_two_parents - four_person_one_parent)
+    four_person_household_group = make_multiple_person_households(4, four_person_two_parents,
+                                                                  four_person_one_parent, four_person_other)
+    abm.add_household_group_to_world(world, four_person_household_group)
+
+    #five-person households
+    five_person_two_parents = int(0.6 * household_sizes[4])
+    five_person_one_parent = int(0.1 * household_sizes[4])
+    five_person_other = int(household_sizes[4] - five_person_two_parents - five_person_one_parent)
+    five_person_household_group = make_multiple_person_households(5, five_person_two_parents,
+                                                                  five_person_one_parent, five_person_other)
+    abm.add_household_group_to_world(world, five_person_household_group)
+    
+
 
 def create_locations_from_input(world, input_areas):
     has_school = False
     has_hospital = False
     for index, area in input_areas.iterrows():
         if('residential' in area.type):
-            add_households(world, [0., 0.1, 0., 0., 0.9], area.inhabitants)
+            add_households(world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
         elif(area.type == 'recreational'):
-            continue
+            location = world.add_location(abm.LocationType.SocialEvent)
+            #world.get_individualized_location(location).infection_parameters.MaximumContacts = 30.
+            #world.get_individualized_location(location).set_capacity(30, 40)
         elif(area.type == 'shopping_business'):
-            continue
+            if(not has_school):
+                location = world.add_location(abm.LocationType.School)
+                has_school = True
+            elif(not has_hospital):
+                location = world.add_location(abm.LocationType.Hospital)
+                location = world.add_location(abm.LocationType.ICU)
+                has_hospital = True
+            else:
+                type = np.random.choice(np.arange(0, 2), p = [0.5, 0.5])
+                if(type):
+                    location = world.add_location(abm.LocationType.BasicsShop)
+                else:
+                    location = world.add_location(abm.LocationType.Work)
         elif(area.type == 'university'):
-            continue
+            location = world.add_location(abm.LocationType.Work)
         elif(area.type == 'mixed'):
-            continue
+            type = np.random.choice(np.arange(0, 2), p = [0.5, 0.5])
+            if(type):
+                location = world.add_location(abm.LocationType.Work)
+            else:
+                add_households(world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
+
+def assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
+                            infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
+                            recovered_infected):
+    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - infected_severe_pct - infected_critical_pct - recovered_infected_no_symptoms - recovered_infected
+    for person in world.persons:
+        infection_state = np.random.choice(np.arange(0, int(abm.InfectionState.Count)),
+                             p = [susceptible_pct, exposed_pct, infected_no_symptoms_pct, 
+                                  infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
+                                  recovered_infected, 0.0])
+        person.infection_state = abm.InfectionState(infection_state)
+
+def assign_locations(world):
+    schools = world.locations[abm.LocationType.School]
+    school_weights = [(1/len(schools)) for i in range(len(schools))]
+
+    hospitals = world.locations[abm.LocationType.Hospital]
+    hospital_weights = [(1/len(hospitals)) for i in range(len(hospitals))]
+
+    icus = world.locations[abm.LocationType.ICU]
+    icu_weights = [(1/len(icus)) for i in range(len(icus))]
+
+    workplaces = world.locations[abm.LocationType.Work]
+    workplace_weights = [(1/len(workplaces)) for i in range(len(workplaces))]
+
+    basic_shops = world.locations[abm.LocationType.BasicsShop]
+    shop_weights = [(1/len(basic_shops)) for i in range(len(basic_shops))]
+
+    social_events = world.locations[abm.LocationType.SocialEvent]
+    event_weights = [(1/len(social_events)) for i in range(len(social_events))]
+
+    for person in world.persons:
+        shop = np.random.choice(np.arange(0, len(basic_shops)), p = shop_weights)
+        person.set_assigned_location(abm.LocationId(basic_shops[int(shop)].index, basic_shops[int(shop)].type))
+
+        hospital = np.random.choice(np.arange(0, len(hospitals)), p = hospital_weights)
+        person.set_assigned_location(abm.LocationId(hospitals[int(hospital)].index, hospitals[int(hospital)].type))
+
+        icu = np.random.choice(np.arange(0, len(icus)), p = icu_weights)
+        person.set_assigned_location(abm.LocationId(icus[int(icu)].index, icus[int(icu)].type))
+
+        event = np.random.choice(np.arange(0, len(social_events)), p = event_weights)
+        person.set_assigned_location(abm.LocationId(social_events[int(event)].index, social_events[int(event)].type))
+
+        if(person.age == AgeGroup.Age5to14):
+            school = np.random.choice(np.arange(0, len(schools)), p = school_weights)
+            person.set_assigned_location(abm.LocationId(schools[int(school)].index, schools[int(school)].type))
+
+        if(person.age == AgeGroup.Age15to34 or person.age == AgeGroup.Age35to59):
+            work = np.random.choice(np.arange(0, len(workplaces)), p = workplace_weights)
+            person.set_assigned_location(abm.LocationId(workplaces[int(work)].index, workplaces[int(work)].type))
+
 
 def run_abm_simulation():
 
@@ -147,9 +310,13 @@ def run_abm_simulation():
     t0 = abm.TimePoint(0)
     tmax = t0 + abm.days(14)
 
-    areas = read_txt('C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
+    areas = read_txt('/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
     create_locations_from_input(world, areas)
-    #print(areas)
+    assign_infection_states(world, 0.005, 0.001, 0.001, 0.0001, 0.0, 0.0, 0.0)
+    assign_locations(world)
+    sim = abm.Simulation(t0)
+    sim.advance(tmax)
+    print('done')
 
 if __name__ == "__main__":
     arg_parser = argparse.ArgumentParser(
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index a8396ea3b6..91cc917e01 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -23,6 +23,7 @@
 #include "utils/parameter_set.h"
 #include "utils/index.h"
 #include "abm/abm.h"
+#include "abm/household.h"
 #include "pybind11/attr.h"
 #include "pybind11/cast.h"
 #include "pybind11/pybind11.h"
@@ -42,7 +43,8 @@ PYBIND11_MODULE(_simulation_abm, m)
         .value("Infected_Critical", mio::abm::InfectionState::Infected_Critical)
         .value("Recovered_Carrier", mio::abm::InfectionState::Recovered_Carrier)
         .value("Recovered_Infected", mio::abm::InfectionState::Recovered_Infected)
-        .value("Dead", mio::abm::InfectionState::Dead);
+        .value("Dead", mio::abm::InfectionState::Dead)
+        .value("Count", mio::abm::InfectionState::Count);
 
     pymio::iterable_enum<mio::abm::AgeGroup>(m, "AgeGroup")
         .value("Age0to4", mio::abm::AgeGroup::Age0to4)
@@ -149,6 +151,20 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def_property_readonly("age", &mio::abm::Person::get_age)
         .def_property_readonly("is_in_quarantine", &mio::abm::Person::is_in_quarantine);
 
+    py::class_<mio::abm::HouseholdMember>(m, "HouseholdMember")
+        .def(py::init<>())
+        .def("set_age_weight", &mio::abm::HouseholdMember::set_age_weight);
+    
+    py::class_<mio::abm::Household>(m, "Household")
+        .def(py::init<>())
+        .def("add_members", &mio::abm::Household::add_members);
+
+    m.def("add_household_group_to_world", &mio::abm::add_household_group_to_world);
+    
+    py::class_<mio::abm::HouseholdGroup>(m, "HouseholdGroup")
+        .def(py::init<>())
+        .def("add_households", &mio::abm::HouseholdGroup::add_households);
+
     py::class_<mio::abm::TestingCriteria>(m, "TestingCriteria")
         .def(py::init<const std::vector<mio::abm::AgeGroup>&, const std::vector<mio::abm::LocationType>&,
                       const std::vector<mio::abm::InfectionState>&>(),
@@ -169,6 +185,7 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def(py::init<const std::vector<mio::abm::TestingScheme>&>());
 
     py::class_<mio::abm::Location>(m, "Location")
+        .def("set_capacity", &mio::abm::Location::set_capacity)
         .def_property_readonly("type", &mio::abm::Location::get_type)
         .def_property_readonly("index", &mio::abm::Location::get_index)
         .def_property("infection_parameters",
@@ -203,6 +220,7 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("add_location", &mio::abm::World::add_location, py::arg("location_type"), py::arg("num_cells") = 0,
              py::return_value_policy::reference_internal)
         .def("add_person", &mio::abm::World::add_person, py::return_value_policy::reference_internal)
+        //.def("get_individualized_location", &mio::abm::World::get_individualized_location)
         .def_property_readonly("locations", &mio::abm::World::get_locations,
                                py::keep_alive<1, 0>{}) //keep this world alive while contents are referenced in ranges
         .def_property_readonly("persons", &mio::abm::World::get_persons, py::keep_alive<1, 0>{})
@@ -234,7 +252,7 @@ PYBIND11_MODULE(_simulation_abm, m)
             py::return_value_policy::reference_internal);
 
     py::class_<mio::abm::Simulation>(m, "Simulation")
-        .def(py::init<mio::abm::TimePoint>())
+        .def(py::init<mio::abm::TimePoint>()) //, mio::abm::World&&
         .def("advance", &mio::abm::Simulation::advance)
         .def_property_readonly("result", &mio::abm::Simulation::get_result)
         .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world));

From a3d3423dc8e33a2cb963a2124cba3e7611fa31bc Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 12 Apr 2023 15:08:59 +0200
Subject: [PATCH 015/103] python demonstrator

---
 .../examples/simulation/abm_demonstrator.py   | 402 ++++++++++++------
 1 file changed, 275 insertions(+), 127 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 54c42cb0be..e9649c4c18 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -25,102 +25,190 @@
 from memilio.simulation.abm import AgeGroup
 from memilio.simulation.abm import VaccinationState
 
+
 class LocationMapping:
 
     def __init__(self):
         self.inputId = None
-        self.modelId = None
+        self.modelId = []
+
 
 def set_infection_parameters():
     infection_params = abm.GlobalInfectionParameters()
 
-    #0-4
-    infection_params.IncubationPeriod[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.05
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.05
-    infection_params.CarrierToInfected[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.276
-    infection_params.CarrierToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.092
-    infection_params.InfectedToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.142
-    infection_params.InfectedToSevere[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.001
-    infection_params.SevereToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.186
-    infection_params.SevereToCritical[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.015
-    infection_params.CriticalToRecovered[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.143
-    infection_params.CriticalToDead[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0.001
-    infection_params.RecoveredToSusceptible[AgeGroup.Age0to4, VaccinationState.Unvaccinated] = 0
-
-    #5-14
-    infection_params.IncubationPeriod[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.1
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.1
-    infection_params.CarrierToInfected[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.276
-    infection_params.CarrierToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.092
-    infection_params.InfectedToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.142
-    infection_params.InfectedToSevere[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.001
-    infection_params.SevereToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.186
-    infection_params.SevereToCritical[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.015
-    infection_params.CriticalToRecovered[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.143
-    infection_params.CriticalToDead[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.001
-    infection_params.RecoveredToSusceptible[AgeGroup.Age5to14, VaccinationState.Unvaccinated] = 0.
-
-    #15-34
-    infection_params.IncubationPeriod[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.13
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.13
-    infection_params.CarrierToInfected[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.139
-    infection_params.InfectedToSevere[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.003
-    infection_params.SevereToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.157
-    infection_params.SevereToCritical[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.013
-    infection_params.CriticalToRecovered[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.126
-    infection_params.CriticalToDead[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.021
-    infection_params.RecoveredToSusceptible[AgeGroup.Age15to34, VaccinationState.Unvaccinated] = 0.
-
-    #35-59
-    infection_params.IncubationPeriod[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.11
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.11
-    infection_params.CarrierToInfected[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.136
-    infection_params.InfectedToSevere[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.009
-    infection_params.SevereToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.113
-    infection_params.SevereToCritical[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.02
-    infection_params.CriticalToRecovered[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.05
-    infection_params.CriticalToDead[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.008
-    infection_params.RecoveredToSusceptible[AgeGroup.Age35to59, VaccinationState.Unvaccinated] = 0.
-
-    #60-79
-    infection_params.IncubationPeriod[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.04
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.04
-    infection_params.CarrierToInfected[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.123
-    infection_params.InfectedToSevere[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.024
-    infection_params.SevereToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.083
-    infection_params.SevereToCritical[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.035
-    infection_params.CriticalToRecovered[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.035
-    infection_params.CriticalToDead[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.023
-    infection_params.RecoveredToSusceptible[AgeGroup.Age60to79, VaccinationState.Unvaccinated] = 0.
-
-    
+    # 0-4
+    infection_params.IncubationPeriod[AgeGroup.Age0to4,
+                                      VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age0to4,
+                                                   VaccinationState.Unvaccinated] = 0.05
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age0to4,
+                                                    VaccinationState.Unvaccinated] = 0.05
+    infection_params.CarrierToInfected[AgeGroup.Age0to4,
+                                       VaccinationState.Unvaccinated] = 0.276
+    infection_params.CarrierToRecovered[AgeGroup.Age0to4,
+                                        VaccinationState.Unvaccinated] = 0.092
+    infection_params.InfectedToRecovered[AgeGroup.Age0to4,
+                                         VaccinationState.Unvaccinated] = 0.142
+    infection_params.InfectedToSevere[AgeGroup.Age0to4,
+                                      VaccinationState.Unvaccinated] = 0.001
+    infection_params.SevereToRecovered[AgeGroup.Age0to4,
+                                       VaccinationState.Unvaccinated] = 0.186
+    infection_params.SevereToCritical[AgeGroup.Age0to4,
+                                      VaccinationState.Unvaccinated] = 0.015
+    infection_params.CriticalToRecovered[AgeGroup.Age0to4,
+                                         VaccinationState.Unvaccinated] = 0.143
+    infection_params.CriticalToDead[AgeGroup.Age0to4,
+                                    VaccinationState.Unvaccinated] = 0.001
+    infection_params.RecoveredToSusceptible[AgeGroup.Age0to4,
+                                            VaccinationState.Unvaccinated] = 0
+
+    # 5-14
+    infection_params.IncubationPeriod[AgeGroup.Age5to14,
+                                      VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age5to14,
+                                                   VaccinationState.Unvaccinated] = 0.1
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age5to14,
+                                                    VaccinationState.Unvaccinated] = 0.1
+    infection_params.CarrierToInfected[AgeGroup.Age5to14,
+                                       VaccinationState.Unvaccinated] = 0.276
+    infection_params.CarrierToRecovered[AgeGroup.Age5to14,
+                                        VaccinationState.Unvaccinated] = 0.092
+    infection_params.InfectedToRecovered[AgeGroup.Age5to14,
+                                         VaccinationState.Unvaccinated] = 0.142
+    infection_params.InfectedToSevere[AgeGroup.Age5to14,
+                                      VaccinationState.Unvaccinated] = 0.001
+    infection_params.SevereToRecovered[AgeGroup.Age5to14,
+                                       VaccinationState.Unvaccinated] = 0.186
+    infection_params.SevereToCritical[AgeGroup.Age5to14,
+                                      VaccinationState.Unvaccinated] = 0.015
+    infection_params.CriticalToRecovered[AgeGroup.Age5to14,
+                                         VaccinationState.Unvaccinated] = 0.143
+    infection_params.CriticalToDead[AgeGroup.Age5to14,
+                                    VaccinationState.Unvaccinated] = 0.001
+    infection_params.RecoveredToSusceptible[AgeGroup.Age5to14,
+                                            VaccinationState.Unvaccinated] = 0.
+
+    # 15-34
+    infection_params.IncubationPeriod[AgeGroup.Age15to34,
+                                      VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age15to34,
+                                                   VaccinationState.Unvaccinated] = 0.13
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age15to34,
+                                                    VaccinationState.Unvaccinated] = 0.13
+    infection_params.CarrierToInfected[AgeGroup.Age15to34,
+                                       VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age15to34,
+                                        VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age15to34,
+                                         VaccinationState.Unvaccinated] = 0.139
+    infection_params.InfectedToSevere[AgeGroup.Age15to34,
+                                      VaccinationState.Unvaccinated] = 0.003
+    infection_params.SevereToRecovered[AgeGroup.Age15to34,
+                                       VaccinationState.Unvaccinated] = 0.157
+    infection_params.SevereToCritical[AgeGroup.Age15to34,
+                                      VaccinationState.Unvaccinated] = 0.013
+    infection_params.CriticalToRecovered[AgeGroup.Age15to34,
+                                         VaccinationState.Unvaccinated] = 0.126
+    infection_params.CriticalToDead[AgeGroup.Age15to34,
+                                    VaccinationState.Unvaccinated] = 0.021
+    infection_params.RecoveredToSusceptible[AgeGroup.Age15to34,
+                                            VaccinationState.Unvaccinated] = 0.
+
+    # 35-59
+    infection_params.IncubationPeriod[AgeGroup.Age35to59,
+                                      VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age35to59,
+                                                   VaccinationState.Unvaccinated] = 0.11
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age35to59,
+                                                    VaccinationState.Unvaccinated] = 0.11
+    infection_params.CarrierToInfected[AgeGroup.Age35to59,
+                                       VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age35to59,
+                                        VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age35to59,
+                                         VaccinationState.Unvaccinated] = 0.136
+    infection_params.InfectedToSevere[AgeGroup.Age35to59,
+                                      VaccinationState.Unvaccinated] = 0.009
+    infection_params.SevereToRecovered[AgeGroup.Age35to59,
+                                       VaccinationState.Unvaccinated] = 0.113
+    infection_params.SevereToCritical[AgeGroup.Age35to59,
+                                      VaccinationState.Unvaccinated] = 0.02
+    infection_params.CriticalToRecovered[AgeGroup.Age35to59,
+                                         VaccinationState.Unvaccinated] = 0.05
+    infection_params.CriticalToDead[AgeGroup.Age35to59,
+                                    VaccinationState.Unvaccinated] = 0.008
+    infection_params.RecoveredToSusceptible[AgeGroup.Age35to59,
+                                            VaccinationState.Unvaccinated] = 0.
+
+    # 60-79
+    infection_params.IncubationPeriod[AgeGroup.Age60to79,
+                                      VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age60to79,
+                                                   VaccinationState.Unvaccinated] = 0.04
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age60to79,
+                                                    VaccinationState.Unvaccinated] = 0.04
+    infection_params.CarrierToInfected[AgeGroup.Age60to79,
+                                       VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age60to79,
+                                        VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age60to79,
+                                         VaccinationState.Unvaccinated] = 0.123
+    infection_params.InfectedToSevere[AgeGroup.Age60to79,
+                                      VaccinationState.Unvaccinated] = 0.024
+    infection_params.SevereToRecovered[AgeGroup.Age60to79,
+                                       VaccinationState.Unvaccinated] = 0.083
+    infection_params.SevereToCritical[AgeGroup.Age60to79,
+                                      VaccinationState.Unvaccinated] = 0.035
+    infection_params.CriticalToRecovered[AgeGroup.Age60to79,
+                                         VaccinationState.Unvaccinated] = 0.035
+    infection_params.CriticalToDead[AgeGroup.Age60to79,
+                                    VaccinationState.Unvaccinated] = 0.023
+    infection_params.RecoveredToSusceptible[AgeGroup.Age60to79,
+                                            VaccinationState.Unvaccinated] = 0.
+
+    # 80+
+    infection_params.IncubationPeriod[AgeGroup.Age80plus,
+                                      VaccinationState.Unvaccinated] = 4
+    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age80plus,
+                                                   VaccinationState.Unvaccinated] = 0.07
+    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age80plus,
+                                                    VaccinationState.Unvaccinated] = 0.07
+    infection_params.CarrierToInfected[AgeGroup.Age80plus,
+                                       VaccinationState.Unvaccinated] = 0.315
+    infection_params.CarrierToRecovered[AgeGroup.Age80plus,
+                                        VaccinationState.Unvaccinated] = 0.079
+    infection_params.InfectedToRecovered[AgeGroup.Age80plus,
+                                         VaccinationState.Unvaccinated] = 0.115
+    infection_params.InfectedToSevere[AgeGroup.Age80plus,
+                                      VaccinationState.Unvaccinated] = 0.033
+    infection_params.SevereToRecovered[AgeGroup.Age80plus,
+                                       VaccinationState.Unvaccinated] = 0.055
+    infection_params.SevereToCritical[AgeGroup.Age80plus,
+                                      VaccinationState.Unvaccinated] = 0.036
+    infection_params.CriticalToRecovered[AgeGroup.Age80plus,
+                                         VaccinationState.Unvaccinated] = 0.035
+    infection_params.CriticalToDead[AgeGroup.Age80plus,
+                                    VaccinationState.Unvaccinated] = 0.052
+    infection_params.RecoveredToSusceptible[AgeGroup.Age80plus,
+                                            VaccinationState.Unvaccinated] = 0.
 
     return infection_params
 
+
 def read_txt(path):
     input = pd.read_csv(path, sep='\t')
     return input
 
+
 def make_one_person_households(number_of_households):
-    #one-person household member
+    # one-person household member
     one_person_household_member = abm.HouseholdMember()
     one_person_household_member.set_age_weight(AgeGroup.Age15to34, 5)
     one_person_household_member.set_age_weight(AgeGroup.Age35to59, 6)
     one_person_household_member.set_age_weight(AgeGroup.Age60to79, 4)
     one_person_household_member.set_age_weight(AgeGroup.Age80plus, 2)
 
-    #create one-person household group
+    # create one-person household group
     household_group = abm.HouseholdGroup()
     for hh in range(int(number_of_households)):
         household = abm.Household()
@@ -129,11 +217,12 @@ def make_one_person_households(number_of_households):
 
     return household_group
 
+
 def make_multiple_person_households(household_size,
                                     number_of_two_parent_households, number_of_one_parent_households,
                                     number_of_other_households):
-    
-    #members for multiple person households
+
+    # members for multiple person households
     child = abm.HouseholdMember()
     child.set_age_weight(AgeGroup.Age0to4, 1)
     child.set_age_weight(AgeGroup.Age5to14, 1)
@@ -152,17 +241,19 @@ def make_multiple_person_households(household_size,
     other.set_age_weight(AgeGroup.Age80plus, 2)
 
     household_group = abm.HouseholdGroup()
-    #add two parent households
+    # add two parent households
     hh_two_parents = abm.Household()
     hh_two_parents.add_members(child, household_size - 2)
     hh_two_parents.add_members(parent, 2)
-    household_group.add_households(hh_two_parents, number_of_two_parent_households)
-    #add one parent households
+    household_group.add_households(
+        hh_two_parents, number_of_two_parent_households)
+    # add one parent households
     hh_one_parent = abm.Household()
     hh_one_parent.add_members(child, household_size - 1)
     hh_one_parent.add_members(parent, 1)
-    household_group.add_households(hh_one_parent, number_of_one_parent_households)
-    #add other households
+    household_group.add_households(
+        hh_one_parent, number_of_one_parent_households)
+    # add other households
     hh_other = abm.Household()
     hh_other.add_members(other, household_size)
     household_group.add_households(hh_other, number_of_other_households)
@@ -172,93 +263,138 @@ def make_multiple_person_households(household_size,
 
 def add_households(world, distribution, num_inhabitants):
     household_sizes = np.zeros(len(distribution))
+    locationIds = []
+    new_index = len(world.locations[int(abm.LocationType.Home)])
     while num_inhabitants > 0:
-        size = np.random.choice(np.arange(0, len(distribution)), p = distribution)
+        size = np.random.choice(
+            np.arange(0, len(distribution)), p=distribution)
         household_sizes[size] += 1
         num_inhabitants -= (size + 1)
 
-    #one-person household
+    # one-person household
     one_person_household_group = make_one_person_households(household_sizes[0])
     abm.add_household_group_to_world(world, one_person_household_group)
 
-    #two-person households
+    # two-person households
     two_person_two_parents = int(0.4 * household_sizes[1])
     two_person_one_parent = int(0.4 * household_sizes[1])
-    two_person_other = int(household_sizes[1] - two_person_two_parents - two_person_one_parent)
+    two_person_other = int(
+        household_sizes[1] - two_person_two_parents - two_person_one_parent)
     two_person_household_group = make_multiple_person_households(2, two_person_two_parents,
                                                                  two_person_one_parent, two_person_other)
     abm.add_household_group_to_world(world, two_person_household_group)
 
-    #three-person households
+    # three-person households
     three_person_two_parents = int(0.4 * household_sizes[2])
     three_person_one_parent = int(0.4 * household_sizes[2])
-    three_person_other = int(household_sizes[2] - three_person_two_parents - three_person_one_parent)
+    three_person_other = int(
+        household_sizes[2] - three_person_two_parents - three_person_one_parent)
     three_person_household_group = make_multiple_person_households(3, three_person_two_parents,
                                                                    three_person_one_parent, three_person_other)
     abm.add_household_group_to_world(world, three_person_household_group)
 
-    #four-person households
+    # four-person households
     four_person_two_parents = int(0.5 * household_sizes[3])
     four_person_one_parent = int(0.2 * household_sizes[3])
-    four_person_other = int(household_sizes[3] - four_person_two_parents - four_person_one_parent)
+    four_person_other = int(
+        household_sizes[3] - four_person_two_parents - four_person_one_parent)
     four_person_household_group = make_multiple_person_households(4, four_person_two_parents,
                                                                   four_person_one_parent, four_person_other)
     abm.add_household_group_to_world(world, four_person_household_group)
 
-    #five-person households
+    # five-person households
     five_person_two_parents = int(0.6 * household_sizes[4])
     five_person_one_parent = int(0.1 * household_sizes[4])
-    five_person_other = int(household_sizes[4] - five_person_two_parents - five_person_one_parent)
+    five_person_other = int(
+        household_sizes[4] - five_person_two_parents - five_person_one_parent)
     five_person_household_group = make_multiple_person_households(5, five_person_two_parents,
                                                                   five_person_one_parent, five_person_other)
     abm.add_household_group_to_world(world, five_person_household_group)
-    
+
+    for hh in range(int(sum(household_sizes))):
+        id = abm.LocationId(new_index, abm.LocationType.Home)
+        locationIds.append(id)
+        new_index += 1
+    return locationIds
+
+
+def insert_locations_to_map(mapping, inputId, locationIds):
+    map = LocationMapping()
+    map.inputId = inputId
+    for id in locationIds:
+        type = str(int(id.type))
+        index = str(id.index)
+        if int(id.type) < 10:
+            type = "0" + type
+        if int(id.index) < 10:
+            index = "0" + index
+        map.modelId.append(type+index)
+    mapping.append(map)
+    return mapping
 
 
 def create_locations_from_input(world, input_areas):
+    mapping = []
     has_school = False
     has_hospital = False
+    print(input_areas)
     for index, area in input_areas.iterrows():
-        if('residential' in area.type):
-            add_households(world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
-        elif(area.type == 'recreational'):
+        locationIds = []
+        if ('residential' in area.type):
+            locationIds = add_households(
+                world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
+        elif (area.type == 'recreational'):
             location = world.add_location(abm.LocationType.SocialEvent)
+            locationIds.append(location)
             #world.get_individualized_location(location).infection_parameters.MaximumContacts = 30.
             #world.get_individualized_location(location).set_capacity(30, 40)
-        elif(area.type == 'shopping_business'):
-            if(not has_school):
+        elif (area.type == 'shopping_business'):
+            if (not has_school):
                 location = world.add_location(abm.LocationType.School)
+                locationIds.append(location)
                 has_school = True
-            elif(not has_hospital):
-                location = world.add_location(abm.LocationType.Hospital)
-                location = world.add_location(abm.LocationType.ICU)
+            elif (not has_hospital):
+                locHosp = world.add_location(abm.LocationType.Hospital)
+                locICU = world.add_location(abm.LocationType.ICU)
+                locationIds.append(locHosp)
+                locationIds.append(locICU)
                 has_hospital = True
             else:
-                type = np.random.choice(np.arange(0, 2), p = [0.5, 0.5])
-                if(type):
+                type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
+                if (type):
                     location = world.add_location(abm.LocationType.BasicsShop)
+                    locationIds.append(location)
                 else:
                     location = world.add_location(abm.LocationType.Work)
-        elif(area.type == 'university'):
+                    locationIds.append(location)
+        elif (area.type == 'university'):
             location = world.add_location(abm.LocationType.Work)
-        elif(area.type == 'mixed'):
-            type = np.random.choice(np.arange(0, 2), p = [0.5, 0.5])
-            if(type):
+            locationIds.append(location)
+        elif (area.type == 'mixed'):
+            type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
+            if (type):
                 location = world.add_location(abm.LocationType.Work)
+                locationIds.append(location)
             else:
-                add_households(world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
+                locationIds = add_households(
+                    world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
+        insert_locations_to_map(mapping, area.id, locationIds)
+
 
 def assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
                             infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
                             recovered_infected):
-    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - infected_severe_pct - infected_critical_pct - recovered_infected_no_symptoms - recovered_infected
+    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - \
+        infected_severe_pct - infected_critical_pct - \
+        recovered_infected_no_symptoms - recovered_infected
     for person in world.persons:
         infection_state = np.random.choice(np.arange(0, int(abm.InfectionState.Count)),
-                             p = [susceptible_pct, exposed_pct, infected_no_symptoms_pct, 
-                                  infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
-                                  recovered_infected, 0.0])
+                                           p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
+                                               infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
+                                               recovered_infected, 0.0])
         person.infection_state = abm.InfectionState(infection_state)
 
+
 def assign_locations(world):
     schools = world.locations[abm.LocationType.School]
     school_weights = [(1/len(schools)) for i in range(len(schools))]
@@ -279,25 +415,35 @@ def assign_locations(world):
     event_weights = [(1/len(social_events)) for i in range(len(social_events))]
 
     for person in world.persons:
-        shop = np.random.choice(np.arange(0, len(basic_shops)), p = shop_weights)
-        person.set_assigned_location(abm.LocationId(basic_shops[int(shop)].index, basic_shops[int(shop)].type))
+        shop = np.random.choice(np.arange(0, len(basic_shops)), p=shop_weights)
+        person.set_assigned_location(abm.LocationId(
+            basic_shops[int(shop)].index, basic_shops[int(shop)].type))
 
-        hospital = np.random.choice(np.arange(0, len(hospitals)), p = hospital_weights)
-        person.set_assigned_location(abm.LocationId(hospitals[int(hospital)].index, hospitals[int(hospital)].type))
+        hospital = np.random.choice(
+            np.arange(0, len(hospitals)), p=hospital_weights)
+        person.set_assigned_location(abm.LocationId(
+            hospitals[int(hospital)].index, hospitals[int(hospital)].type))
 
-        icu = np.random.choice(np.arange(0, len(icus)), p = icu_weights)
-        person.set_assigned_location(abm.LocationId(icus[int(icu)].index, icus[int(icu)].type))
+        icu = np.random.choice(np.arange(0, len(icus)), p=icu_weights)
+        person.set_assigned_location(abm.LocationId(
+            icus[int(icu)].index, icus[int(icu)].type))
 
-        event = np.random.choice(np.arange(0, len(social_events)), p = event_weights)
-        person.set_assigned_location(abm.LocationId(social_events[int(event)].index, social_events[int(event)].type))
+        event = np.random.choice(
+            np.arange(0, len(social_events)), p=event_weights)
+        person.set_assigned_location(abm.LocationId(
+            social_events[int(event)].index, social_events[int(event)].type))
 
-        if(person.age == AgeGroup.Age5to14):
-            school = np.random.choice(np.arange(0, len(schools)), p = school_weights)
-            person.set_assigned_location(abm.LocationId(schools[int(school)].index, schools[int(school)].type))
+        if (person.age == AgeGroup.Age5to14):
+            school = np.random.choice(
+                np.arange(0, len(schools)), p=school_weights)
+            person.set_assigned_location(abm.LocationId(
+                schools[int(school)].index, schools[int(school)].type))
 
-        if(person.age == AgeGroup.Age15to34 or person.age == AgeGroup.Age35to59):
-            work = np.random.choice(np.arange(0, len(workplaces)), p = workplace_weights)
-            person.set_assigned_location(abm.LocationId(workplaces[int(work)].index, workplaces[int(work)].type))
+        if (person.age == AgeGroup.Age15to34 or person.age == AgeGroup.Age35to59):
+            work = np.random.choice(
+                np.arange(0, len(workplaces)), p=workplace_weights)
+            person.set_assigned_location(abm.LocationId(
+                workplaces[int(work)].index, workplaces[int(work)].type))
 
 
 def run_abm_simulation():
@@ -310,7 +456,8 @@ def run_abm_simulation():
     t0 = abm.TimePoint(0)
     tmax = t0 + abm.days(14)
 
-    areas = read_txt('/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
+    areas = read_txt(
+        '/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
     create_locations_from_input(world, areas)
     assign_infection_states(world, 0.005, 0.001, 0.001, 0.0001, 0.0, 0.0, 0.0)
     assign_locations(world)
@@ -318,9 +465,10 @@ def run_abm_simulation():
     sim.advance(tmax)
     print('done')
 
+
 if __name__ == "__main__":
     arg_parser = argparse.ArgumentParser(
         'abm demonstrator',
         description='Example demonstrating the agent-based model for a synthetic population.')
     args = arg_parser.parse_args()
-    run_abm_simulation(**args.__dict__)
\ No newline at end of file
+    run_abm_simulation(**args.__dict__)

From 82177764ea53fdc72294ad4ad3576c7253d3d67c Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 14 Apr 2023 11:58:48 +0200
Subject: [PATCH 016/103] [ci skip] add location capacities

---
 .../examples/simulation/abm_demonstrator.py   | 32 +++++++++++++++++--
 .../memilio/simulation/abm.cpp                |  5 +--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index e9649c4c18..be91dce15a 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -346,16 +346,29 @@ def create_locations_from_input(world, input_areas):
         elif (area.type == 'recreational'):
             location = world.add_location(abm.LocationType.SocialEvent)
             locationIds.append(location)
-            #world.get_individualized_location(location).infection_parameters.MaximumContacts = 30.
-            #world.get_individualized_location(location).set_capacity(30, 40)
+            world.get_individualized_location(
+                location).infection_parameters.MaximumContacts = 30.
+            world.get_individualized_location(location).set_capacity(30, 40)
         elif (area.type == 'shopping_business'):
             if (not has_school):
                 location = world.add_location(abm.LocationType.School)
                 locationIds.append(location)
+                world.get_individualized_location(
+                    location).infection_parameters.MaximumContacts = 40.
+                world.get_individualized_location(
+                    location).set_capacity(500, 2000)
                 has_school = True
             elif (not has_hospital):
                 locHosp = world.add_location(abm.LocationType.Hospital)
+                world.get_individualized_location(
+                    locHosp).infection_parameters.MaximumContacts = 5.
+                world.get_individualized_location(
+                    locHosp).set_capacity(300, 10000)
                 locICU = world.add_location(abm.LocationType.ICU)
+                world.get_individualized_location(
+                    locICU).infection_parameters.MaximumContacts = 5.
+                world.get_individualized_location(
+                    locICU).set_capacity(30, 1000)
                 locationIds.append(locHosp)
                 locationIds.append(locICU)
                 has_hospital = True
@@ -363,18 +376,33 @@ def create_locations_from_input(world, input_areas):
                 type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
                 if (type):
                     location = world.add_location(abm.LocationType.BasicsShop)
+                    world.get_individualized_location(
+                        location).infection_parameters.MaximumContacts = 20.
+                    world.get_individualized_location(
+                        location).set_capacity(100, 1000)
                     locationIds.append(location)
                 else:
                     location = world.add_location(abm.LocationType.Work)
+                    world.get_individualized_location(
+                        location).infection_parameters.MaximumContacts = 40.
+                    world.get_individualized_location(
+                        location).set_capacity(300, 2000)
                     locationIds.append(location)
         elif (area.type == 'university'):
             location = world.add_location(abm.LocationType.Work)
+            world.get_individualized_location(
+                location).infection_parameters.MaximumContacts = 50.
+            world.get_individualized_location(location).set_capacity(200, 4000)
             locationIds.append(location)
         elif (area.type == 'mixed'):
             type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
             if (type):
                 location = world.add_location(abm.LocationType.Work)
                 locationIds.append(location)
+                world.get_individualized_location(
+                    location).infection_parameters.MaximumContacts = 40.
+                world.get_individualized_location(
+                    location).set_capacity(100, 2000)
             else:
                 locationIds = add_households(
                     world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 91cc917e01..1f17c75e33 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -220,7 +220,7 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("add_location", &mio::abm::World::add_location, py::arg("location_type"), py::arg("num_cells") = 0,
              py::return_value_policy::reference_internal)
         .def("add_person", &mio::abm::World::add_person, py::return_value_policy::reference_internal)
-        //.def("get_individualized_location", &mio::abm::World::get_individualized_location)
+        .def("get_individualized_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::World::get_individualized_location, py::const_), py::return_value_policy::reference_internal)
         .def_property_readonly("locations", &mio::abm::World::get_locations,
                                py::keep_alive<1, 0>{}) //keep this world alive while contents are referenced in ranges
         .def_property_readonly("persons", &mio::abm::World::get_persons, py::keep_alive<1, 0>{})
@@ -252,7 +252,8 @@ PYBIND11_MODULE(_simulation_abm, m)
             py::return_value_policy::reference_internal);
 
     py::class_<mio::abm::Simulation>(m, "Simulation")
-        .def(py::init<mio::abm::TimePoint>()) //, mio::abm::World&&
+        .def(py::init<mio::abm::TimePoint>())
+        //.def(py::init<mio::abm::TimePoint, mio::abm::World&&>())
         .def("advance", &mio::abm::Simulation::advance)
         .def_property_readonly("result", &mio::abm::Simulation::get_result)
         .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world));

From ad215b7eeb03d19ee7a43d8319d3bc1f42a0cb65 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 14 Apr 2023 14:36:27 +0200
Subject: [PATCH 017/103] [ci skip] comments

---
 .../examples/simulation/abm_demonstrator.py   | 61 +++++++++++++++----
 1 file changed, 49 insertions(+), 12 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index be91dce15a..fa4571bfb4 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -25,6 +25,8 @@
 from memilio.simulation.abm import AgeGroup
 from memilio.simulation.abm import VaccinationState
 
+# class used to map input area ids to abm location ids
+
 
 class LocationMapping:
 
@@ -32,6 +34,8 @@ def __init__(self):
         self.inputId = None
         self.modelId = []
 
+# infection parameters are dependent on age group and vaccination state
+
 
 def set_infection_parameters():
     infection_params = abm.GlobalInfectionParameters()
@@ -196,6 +200,7 @@ def set_infection_parameters():
 
 
 def read_txt(path):
+    # read input file and save it in a pd.Dataframe
     input = pd.read_csv(path, sep='\t')
     return input
 
@@ -203,6 +208,7 @@ def read_txt(path):
 def make_one_person_households(number_of_households):
     # one-person household member
     one_person_household_member = abm.HouseholdMember()
+    # set weights for household member
     one_person_household_member.set_age_weight(AgeGroup.Age15to34, 5)
     one_person_household_member.set_age_weight(AgeGroup.Age35to59, 6)
     one_person_household_member.set_age_weight(AgeGroup.Age60to79, 4)
@@ -265,6 +271,7 @@ def add_households(world, distribution, num_inhabitants):
     household_sizes = np.zeros(len(distribution))
     locationIds = []
     new_index = len(world.locations[int(abm.LocationType.Home)])
+    # distribute inhabintants to households
     while num_inhabitants > 0:
         size = np.random.choice(
             np.arange(0, len(distribution)), p=distribution)
@@ -333,38 +340,49 @@ def insert_locations_to_map(mapping, inputId, locationIds):
     return mapping
 
 
-def create_locations_from_input(world, input_areas):
+def create_locations_from_input(world, input_areas, household_distribution):
+    # mapping to map input area ids to abm location ids
     mapping = []
+    # bools to make sure the world has a school and a hospital
     has_school = False
     has_hospital = False
-    print(input_areas)
     for index, area in input_areas.iterrows():
+        # locations ids; relevant for the mapping
         locationIds = []
         if ('residential' in area.type):
+            # area 'residential' corresponds to location type 'Home'
             locationIds = add_households(
-                world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
+                world, household_distribution, area.inhabitants)
         elif (area.type == 'recreational'):
+            # area 'recreational' corresponds to location type 'SocialEvent'
             location = world.add_location(abm.LocationType.SocialEvent)
-            locationIds.append(location)
+            # set maximum contacts and capacity for social events
             world.get_individualized_location(
                 location).infection_parameters.MaximumContacts = 30.
             world.get_individualized_location(location).set_capacity(30, 40)
+            locationIds.append(location)
         elif (area.type == 'shopping_business'):
+            # area 'shopping_business' corresponds to location type School, Hospital, BasicsShops, Work
             if (not has_school):
+                # if world does not have a school yet, a school is added
                 location = world.add_location(abm.LocationType.School)
-                locationIds.append(location)
+                # set maximum contacts and capacity for school
                 world.get_individualized_location(
                     location).infection_parameters.MaximumContacts = 40.
                 world.get_individualized_location(
                     location).set_capacity(500, 2000)
+                locationIds.append(location)
                 has_school = True
             elif (not has_hospital):
+                # if world does not have a hospital yet, a hospital and a icu is added
                 locHosp = world.add_location(abm.LocationType.Hospital)
+                # set maximum contacts and capacity for hospital
                 world.get_individualized_location(
                     locHosp).infection_parameters.MaximumContacts = 5.
                 world.get_individualized_location(
                     locHosp).set_capacity(300, 10000)
                 locICU = world.add_location(abm.LocationType.ICU)
+                # set maximum contacts and capacity for icu
                 world.get_individualized_location(
                     locICU).infection_parameters.MaximumContacts = 5.
                 world.get_individualized_location(
@@ -373,9 +391,12 @@ def create_locations_from_input(world, input_areas):
                 locationIds.append(locICU)
                 has_hospital = True
             else:
+                # when hospital and school has been added, the area 'shopping_business' is either
+                # transformed to location type BasicsShop or location type Work with same probability
                 type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
                 if (type):
                     location = world.add_location(abm.LocationType.BasicsShop)
+                    # set maximum contacts and capacity for basics shops
                     world.get_individualized_location(
                         location).infection_parameters.MaximumContacts = 20.
                     world.get_individualized_location(
@@ -383,29 +404,34 @@ def create_locations_from_input(world, input_areas):
                     locationIds.append(location)
                 else:
                     location = world.add_location(abm.LocationType.Work)
+                    # set maximum contacts and capacity for work
                     world.get_individualized_location(
                         location).infection_parameters.MaximumContacts = 40.
                     world.get_individualized_location(
                         location).set_capacity(300, 2000)
                     locationIds.append(location)
         elif (area.type == 'university'):
+            # area 'university' corresponds to location type 'Work'
             location = world.add_location(abm.LocationType.Work)
+            # set maximum contacts and capacity for work
             world.get_individualized_location(
                 location).infection_parameters.MaximumContacts = 50.
             world.get_individualized_location(location).set_capacity(200, 4000)
             locationIds.append(location)
         elif (area.type == 'mixed'):
+            # area 'mixed' corresponds either to location type 'Work' or location type 'Home' with same probability
             type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
             if (type):
                 location = world.add_location(abm.LocationType.Work)
-                locationIds.append(location)
+                # set maximum contacts and capacity for work
                 world.get_individualized_location(
                     location).infection_parameters.MaximumContacts = 40.
                 world.get_individualized_location(
                     location).set_capacity(100, 2000)
+                locationIds.append(location)
             else:
                 locationIds = add_households(
-                    world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
+                    world, household_distribution, area.inhabitants)
         insert_locations_to_map(mapping, area.id, locationIds)
 
 
@@ -424,6 +450,7 @@ def assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infect
 
 
 def assign_locations(world):
+    # get locations from world
     schools = world.locations[abm.LocationType.School]
     school_weights = [(1/len(schools)) for i in range(len(schools))]
 
@@ -442,6 +469,7 @@ def assign_locations(world):
     social_events = world.locations[abm.LocationType.SocialEvent]
     event_weights = [(1/len(social_events)) for i in range(len(social_events))]
 
+    # assign locations to persons
     for person in world.persons:
         shop = np.random.choice(np.arange(0, len(basic_shops)), p=shop_weights)
         person.set_assigned_location(abm.LocationId(
@@ -461,12 +489,13 @@ def assign_locations(world):
         person.set_assigned_location(abm.LocationId(
             social_events[int(event)].index, social_events[int(event)].type))
 
+        # assign school for persons between 5 and 14 years
         if (person.age == AgeGroup.Age5to14):
             school = np.random.choice(
                 np.arange(0, len(schools)), p=school_weights)
             person.set_assigned_location(abm.LocationId(
                 schools[int(school)].index, schools[int(school)].type))
-
+        # assign work for persons between 15 and 59
         if (person.age == AgeGroup.Age15to34 or person.age == AgeGroup.Age35to59):
             work = np.random.choice(
                 np.arange(0, len(workplaces)), p=workplace_weights)
@@ -476,20 +505,28 @@ def assign_locations(world):
 
 def run_abm_simulation():
 
-    LocationIds = []
-
+    # set infection parameters
     infection_params = set_infection_parameters()
+    # create abm world with infection parameters
     world = abm.World(infection_params)
-
+    # starting time point
     t0 = abm.TimePoint(0)
+    # simulation will run 14 days
     tmax = t0 + abm.days(14)
+    # distribution to distribute the residential areas to one, two-, three-, four- and five-person households
+    household_distribution = [0.2, 0.2, 0.2, 0.2, 0.2]
 
+    # read txt file with inputs
     areas = read_txt(
         '/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
-    create_locations_from_input(world, areas)
+    # create abm locations from input
+    create_locations_from_input(world, areas, household_distribution)
+    # assign starting infection states for all agents
     assign_infection_states(world, 0.005, 0.001, 0.001, 0.0001, 0.0, 0.0, 0.0)
+    # assign locations to agents
     assign_locations(world)
     sim = abm.Simulation(t0)
+    # run simulation
     sim.advance(tmax)
     print('done')
 

From 84d11350e7d9d1ae880ec963b3518849ce343ba6 Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Fri, 14 Apr 2023 19:45:25 +0200
Subject: [PATCH 018/103] add hiistory buffer

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/memilio/utils/history.h           | 69 +++++++--------------
 cpp/memilio/utils/history_example.cpp | 86 +++++++++++++++++----------
 2 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/cpp/memilio/utils/history.h b/cpp/memilio/utils/history.h
index 012d08dbb2..dc4277d357 100644
--- a/cpp/memilio/utils/history.h
+++ b/cpp/memilio/utils/history.h
@@ -1,7 +1,7 @@
 /* 
 * Copyright (C) 2020-2021 German Aerospace Center (DLR-SC)
 *
-* Authors: Daniel Abele, Elisabeth Kluth
+* Authors: Sascha Korf, Rene Schmieding 
 *
 * Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
 *
@@ -17,6 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 #ifndef MIO_ABM_HISTORY_H
 #define MIO_ABM_HISTORY_H
 namespace mio
@@ -24,78 +25,50 @@ namespace mio
 namespace abm
 {
 
-template <class... Types>
-class Writer
-{
-    write(Types... args)
-    {
-    }
-    using Data = std::tuple<Types...>;
-};
-
-template <class Writer, class... Loggers>
+template <template <class...> class Writer, class... Loggers>
 class History
 {
 public:
-    //TODO: maybe change this to arglist
+    using Wri = Writer<Loggers...>;
     template <class T>
     void log(const T& t)
     {
-        log_impl(t);
-        // write(Loggers::log(t)...);
+        log_impl<T, Loggers...>(t);
     }
 
-    TimeSeries<Writer::Data> get_data()
+    const typename Wri::Data& get_log() const
     {
         return m_data;
     }
 
 private:
-    Writer::Data m_data;
+    typename Wri::Data m_data;
+
+    bool m_log_once_flag = true;
 
-    template <class T, class Logger, class... Loggers>
-    std::enable_if_t<std::is_derived<Logger, LogOnce>> log_impl(const T& t)
+    template <class T, class logger, class... loggers>
+    std::enable_if_t<std::is_base_of<LogOnce, logger>::value> log_impl(const T& t)
     {
-        Writer::write(Logger::log(t));
-        log_impl<T, Loggers...>(t);
+        if (m_log_once_flag) { //TODO: Check if this really prints/writes all and not just the first logger
+            Wri::template write_this<logger>(logger::log(t), m_data);
+            m_log_once_flag = false;
+        }
+        log_impl<T, loggers...>(t);
     }
 
-    template <class T, class Logger, class... Loggers>
-    std::enable_if_t<std::is_derived<Logger, LogAlways>> log_impl(const T& t)
+    template <class T, class logger, class... loggers>
+    std::enable_if_t<std::is_base_of<LogAlways, logger>::value> log_impl(const T& t)
     {
-        Writer::write(Logger::log(t));
-        log_impl<T, Loggers...>(t);
+        log_impl<T, loggers...>(t);
+        Wri::template write_this<logger>(logger::log(t), m_data);
     }
 
     template <class T>
-    log_impl(const T&)
+    void log_impl(const T&)
     {
         // end of recursion
     }
 };
-
-struct LogOnce {
-};
-
-struct LogLocId : public LogOnce {
-    using Type = std::vector<location_id>;
-    static Type log(const World& world)
-    {
-        return [world.get_location().get_id()];
-    }
-};
-
-struct LogAlways {
-};
-
-struct LogTime : public LogAlways {
-    using Type = std::vector<double>;
-    static Type log(const World& world)
-    {
-        [world.get_time()];
-    }
-};
-
 } // namespace abm
 } // namespace mio
 
diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
index 35c56033f9..932283d944 100644
--- a/cpp/memilio/utils/history_example.cpp
+++ b/cpp/memilio/utils/history_example.cpp
@@ -32,22 +32,22 @@ class example
 struct LogOnce {
 };
 
+struct LogAlways {
+};
+
 struct LogA : LogOnce {
     using Type = int;
     static Type log(const example& ex)
     {
-        return ex.a;
+        return 90;
     }
 };
 
-struct LogAlways {
-};
-
 struct LogB : LogAlways {
     using Type = int;
     static Type log(const example& ex)
     {
-        return ex.b;
+        return 85;
     }
 };
 
@@ -59,41 +59,55 @@ struct LogC : LogAlways {
     }
 };
 
+struct LogD : LogOnce {
+    using Type = int;
+    static Type log(const example& ex)
+    {
+        return 99;
+    }
+};
+
 template <class... Loggers>
-struct Writer {
+struct WriterConsoleInt {
     using Data = std::tuple<std::vector<typename Loggers::Type>...>;
     template <class Logger>
-    static void write(const typename Logger::Type& t, Data& data)
+    static void write_this(const typename Logger::Type& t, const Data& data)
     {
-        //std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
         std::cout << t << std::endl;
     }
 };
+
 template <class... Loggers>
-struct DataWriter {
-    using Data  = std::tuple<std::vector<typename Loggers::Type>...>;
-    using Index = mio::Index<Loggers...>;
+struct WriterConsoleList {
+    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
     template <class Logger>
-    static void write(const typename Logger::Type& t, Data& data)
+    static void write_this(const typename Logger::Type& t, const Data& data)
     {
-        std::get<mio::details::IndexPosition<Logger, Index>::value>(data).push_back(t);
+        std::cout << t.first << " " << t.second << std::endl;
     }
 };
 
+template <typename T, typename U = void, typename... Types>
+constexpr size_t indexte()
+{
+    return std::is_same<T, U>::value ? 0 : 1 + indexte<T, Types...>();
+}
+
 template <class... Loggers>
-struct ToFileWriter {
-    using Data  = std::tuple<std::vector<typename Loggers::Type>...>;
-    using Types = mio::Index<Loggers...>;
+struct DataWriterToBuffer {
+    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
     template <class Logger>
-    static void write(const typename Logger::Type& t, Data& data)
+    static void write_this(const typename Logger::Type& t, Data& data)
     {
-        //std::get<mio::details::IndexPosition<Logger, Types>::value>(data).push_back(t);
+        std::get<indexte<Logger, Loggers...>()>(data).push_back(t);
     }
 };
 
-void write_to_file_julia(const std::vector<int>& data)
+void write_data_to_file(const std::vector<std::pair<int, int>>& data)
 {
-    // write to file
+    for (const auto& d : data) {
+        std::cout << d.first << " " << d.second << std::endl;
+    }
 }
 
 template <template <class...> class Writer, class... Loggers>
@@ -113,16 +127,18 @@ class History
     }
 
 private:
-    typename Wri::Data m_data;
+    bool logged          = false;
+    bool first_recursion = true;
+
+    int index_counter = sizeof...(Loggers);
 
-    bool m_log_once_flag = true;
+    typename Wri::Data m_data;
 
     template <class T, class logger, class... loggers>
     std::enable_if_t<std::is_base_of<LogOnce, logger>::value> log_impl(const T& t)
     {
-        if (m_log_once_flag) {
-            Wri::write<logger>(logger::log(t), m_data);
-            m_log_once_flag = false;
+        if (!logged) {
+            Wri::template write_this<logger>(logger::log(t), m_data);
         }
         log_impl<T, loggers...>(t);
     }
@@ -131,19 +147,26 @@ class History
     std::enable_if_t<std::is_base_of<LogAlways, logger>::value> log_impl(const T& t)
     {
         log_impl<T, loggers...>(t);
-        Wri::write<logger>(logger::log(t), m_data);
+        Wri::template write_this<logger>(logger::log(t), m_data);
     }
 
     template <class T>
     void log_impl(const T&)
     {
-        // end of recursion
+
+        if (first_recursion) { //need this to make sure every "once" logger is written just once
+            logged          = true;
+            first_recursion = false;
+        }
+        index_counter = sizeof...(Loggers) - 1;
     }
 };
 
 int main()
 {
-    History<Writer, LogA, LogB> history;
+    // History<WriterConsoleInt, LogA, LogB, LogD> history;
+    // History<WriterConsoleList, LogC> history2;
+    History<DataWriterToBuffer, LogA, LogB, LogD> history3;
 
     example ex;
 
@@ -152,9 +175,12 @@ int main()
         ex.a = step;
         ex.b = -step;
 
-        history.log(ex);
+        // history.log(ex);
+        //history2.log(ex);
+        history3.log(ex);
 
         step++;
     }
-    history.get_log();
+
+    //auto logData = history.get_log();
 }
\ No newline at end of file

From 80f4bf3ca76d5e83c2486aa1dea4fd94f0e77eee Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Tue, 18 Apr 2023 15:38:45 +0200
Subject: [PATCH 019/103] some additions

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/memilio/utils/history.h           | 50 +++++++++++++++++++--------
 cpp/memilio/utils/history_example.cpp | 11 +++---
 cpp/models/abm/simulation.h           |  9 +++++
 3 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/cpp/memilio/utils/history.h b/cpp/memilio/utils/history.h
index dc4277d357..3b8a53bfae 100644
--- a/cpp/memilio/utils/history.h
+++ b/cpp/memilio/utils/history.h
@@ -17,13 +17,32 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+#include <vector>
+#include <tuple>
+#include <iostream>
 
-#ifndef MIO_ABM_HISTORY_H
-#define MIO_ABM_HISTORY_H
-namespace mio
-{
-namespace abm
+//TODO: Maybe rename Log... something like Reader or something similar
+struct LogOnce {
+};
+
+struct LogAlways {
+};
+
+template <typename T, typename U = void, typename... Types>
+constexpr size_t indexte()
 {
+    return std::is_same<T, U>::value ? 0 : 1 + indexte<T, Types...>();
+}
+
+template <class... Loggers>
+struct DataWriterToBuffer {
+    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
+    template <class Logger>
+    static void write_this(const typename Logger::Type& t, Data& data)
+    {
+        std::get<indexte<Logger, Loggers...>()>(data).push_back(t);
+    }
+};
 
 template <template <class...> class Writer, class... Loggers>
 class History
@@ -42,16 +61,18 @@ class History
     }
 
 private:
-    typename Wri::Data m_data;
+    bool logged          = false;
+    bool first_recursion = true;
 
-    bool m_log_once_flag = true;
+    int index_counter = sizeof...(Loggers);
+
+    typename Wri::Data m_data;
 
     template <class T, class logger, class... loggers>
     std::enable_if_t<std::is_base_of<LogOnce, logger>::value> log_impl(const T& t)
     {
-        if (m_log_once_flag) { //TODO: Check if this really prints/writes all and not just the first logger
+        if (!logged) {
             Wri::template write_this<logger>(logger::log(t), m_data);
-            m_log_once_flag = false;
         }
         log_impl<T, loggers...>(t);
     }
@@ -66,10 +87,11 @@ class History
     template <class T>
     void log_impl(const T&)
     {
-        // end of recursion
+
+        if (first_recursion) { //need this to make sure every "once" logger is written just once
+            logged          = true;
+            first_recursion = false;
+        }
+        index_counter = sizeof...(Loggers) - 1;
     }
 };
-} // namespace abm
-} // namespace mio
-
-#endif
\ No newline at end of file
diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
index 932283d944..caa13ace6d 100644
--- a/cpp/memilio/utils/history_example.cpp
+++ b/cpp/memilio/utils/history_example.cpp
@@ -164,8 +164,8 @@ class History
 
 int main()
 {
-    // History<WriterConsoleInt, LogA, LogB, LogD> history;
-    // History<WriterConsoleList, LogC> history2;
+    History<WriterConsoleInt, LogA, LogB, LogD> history;
+    History<WriterConsoleList, LogC> history2;
     History<DataWriterToBuffer, LogA, LogB, LogD> history3;
 
     example ex;
@@ -175,12 +175,13 @@ int main()
         ex.a = step;
         ex.b = -step;
 
-        // history.log(ex);
-        //history2.log(ex);
+        history.log(ex);
+        history2.log(ex);
         history3.log(ex);
 
         step++;
     }
 
-    //auto logData = history.get_log();
+    auto logData = history3.get_log();
+    std::cout << "EndFile and debug." << std::endl;
 }
\ No newline at end of file
diff --git a/cpp/models/abm/simulation.h b/cpp/models/abm/simulation.h
index 47e2ed96a0..3d4db3111f 100644
--- a/cpp/models/abm/simulation.h
+++ b/cpp/models/abm/simulation.h
@@ -23,6 +23,7 @@
 #include "abm/world.h"
 #include "abm/time.h"
 #include "memilio/utils/time_series.h"
+#include "memilio/utils/history.h"
 
 namespace mio
 {
@@ -61,6 +62,14 @@ class Simulation
      */
     void advance(TimePoint tmax);
 
+     /** 
+     * @brief Run the Simulation from the current time to tmax.
+     * @param[in] tmax Time to stop.
+     * @param[in] history History to store the result of the Simulation.
+     */
+    template <class History>
+    void advance(TimePoint tmax, History& history);
+
     /**
      * @brief Get the result of the Simulation.
      * Sum over all Location%s of the number of Person%s in an #InfectionState.

From 1d8069492fe445ee95325a13deffe608c76e97e2 Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Thu, 20 Apr 2023 10:52:04 +0200
Subject: [PATCH 020/103] new additions

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/examples/abm_minimal.cpp | 31 ++++++++++++++++++++++++++++++-
 cpp/models/abm/simulation.h  | 22 ++++++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/cpp/examples/abm_minimal.cpp b/cpp/examples/abm_minimal.cpp
index fc2d4a38cd..6496cc2b20 100644
--- a/cpp/examples/abm_minimal.cpp
+++ b/cpp/examples/abm_minimal.cpp
@@ -20,6 +20,8 @@
 #include "abm/abm.h"
 #include "abm/household.h"
 #include <cstdio>
+#include "abm/world.h"
+#include "memilio/io/io.h"
 
 int main()
 {
@@ -124,7 +126,34 @@ int main()
     auto t0   = mio::abm::TimePoint(0);
     auto tmax = mio::abm::TimePoint(0) + mio::abm::days(30);
     auto sim  = mio::abm::Simulation(t0, std::move(world));
-    sim.advance(tmax);
+
+    struct LogTimePoint : LogAlways {
+        using Type = double;
+        static Type log(const mio::abm::Simulation& sim)
+        {
+            return sim.get_time().days();
+        }
+    };
+    struct LogTimeCompartments : LogAlways {
+        using Type = std::vector<double>;
+        static Type log(const mio::abm::Simulation& sim)
+        {   
+            std::vector<double> result;
+            for (auto& compartment : compartments) {
+                result.push_back(compartment.second);
+            }
+            return result;
+        }
+    };
+
+
+
+    History<DataWriterToBuffer, LogTimePoint, Log> history;
+
+
+
+    sim.advance(tmax, history);
+    auto logg = history.get_log();
 
     // The results are saved in a table with 9 rows.
     // The first row is t = time, the others correspond to the number of people with a certain infection state at this time:
diff --git a/cpp/models/abm/simulation.h b/cpp/models/abm/simulation.h
index 3d4db3111f..e9b3f3d4df 100644
--- a/cpp/models/abm/simulation.h
+++ b/cpp/models/abm/simulation.h
@@ -67,8 +67,18 @@ class Simulation
      * @param[in] tmax Time to stop.
      * @param[in] history History to store the result of the Simulation.
      */
-    template <class History>
-    void advance(TimePoint tmax, History& history);
+    template<typename History>
+    void advance(TimePoint tmax, History& history)
+    {
+        auto t = m_t;
+        while (t < tmax) {
+            auto dt = std::min(m_dt, tmax - t);
+            m_world.evolve(t, dt);
+            t += m_dt;
+            history.log(this);
+        }
+    }
+
 
     /**
      * @brief Get the result of the Simulation.
@@ -79,6 +89,14 @@ class Simulation
         return m_result;
     }
 
+    /**
+     * @brief Get the current time of the Simulation.
+     */
+    TimePoint get_time() const
+    {
+        return m_t;
+    }
+
     /**
      * @brief Get the World that this Simulation evolves.
      */

From 284ed760e20388bd350b0fc57870b4291306a3ad Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Thu, 20 Apr 2023 16:05:09 +0200
Subject: [PATCH 021/103] added julias output

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/examples/abm_minimal.cpp | 37 ++++++++++++++++++++++++------------
 cpp/models/abm/person.cpp    | 33 ++++++++++++++++++++++++++++++++
 cpp/models/abm/person.h      | 10 ++++++++++
 cpp/models/abm/simulation.h  | 11 +++++------
 4 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/cpp/examples/abm_minimal.cpp b/cpp/examples/abm_minimal.cpp
index 6496cc2b20..e6391eca57 100644
--- a/cpp/examples/abm_minimal.cpp
+++ b/cpp/examples/abm_minimal.cpp
@@ -22,6 +22,7 @@
 #include <cstdio>
 #include "abm/world.h"
 #include "memilio/io/io.h"
+#include "abm/location_type.h"
 
 int main()
 {
@@ -131,28 +132,40 @@ int main()
         using Type = double;
         static Type log(const mio::abm::Simulation& sim)
         {
-            return sim.get_time().days();
+            return sim.get_time().hours();
         }
     };
-    struct LogTimeCompartments : LogAlways {
-        using Type = std::vector<double>;
+    struct LogLocationIds : LogOnce {
+        using Type = std::vector<std::tuple<mio::abm::LocationType, uint32_t>>;
         static Type log(const mio::abm::Simulation& sim)
-        {   
-            std::vector<double> result;
-            for (auto& compartment : compartments) {
-                result.push_back(compartment.second);
+        {
+            std::vector<std::tuple<mio::abm::LocationType, uint32_t>> location_ids{};
+            for (auto&& locations : sim.get_world().get_locations()) {
+                for (auto location : locations) {
+                    location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
+                }
             }
-            return result;
+            return location_ids;
         }
     };
 
+    struct LogPersonsPerLocationAndInfectionTime : LogAlways {
+        using Type = std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan>>;
+        static Type log(const mio::abm::Simulation& sim)
+        {
+            std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan>> location_ids_person{};
+            for (auto&& person : sim.get_world().get_persons()) {
+                location_ids_person.push_back(std::make_tuple(person.get_location_id(), person.get_person_id(),
+                                                              person.get_time_since_transmission()));
+            }
+            return location_ids_person;
+        }
+    };
 
-
-    History<DataWriterToBuffer, LogTimePoint, Log> history;
-
-
+    History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime> history;
 
     sim.advance(tmax, history);
+
     auto logg = history.get_log();
 
     // The results are saved in a table with 9 rows.
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 317e247967..ed3de6a9af 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -39,6 +39,7 @@ Person::Person(LocationId id, InfectionProperties infection_properties, AgeGroup
     , m_infection_state(infection_properties.state)
     , m_vaccination_state(vaccination_state)
     , m_time_until_carrier(std::numeric_limits<int>::max())
+    , m_time_since_transmission(-std::numeric_limits<int>::max() / 2)
     , m_quarantine(false)
     , m_age(age)
     , m_time_at_location(std::numeric_limits<int>::max() / 2) //avoid overflow on next steps
@@ -96,6 +97,8 @@ void Person::interact(TimeSpan dt, const GlobalInfectionParameters& global_infec
         m_quarantine = false;
     }
 
+    change_time_since_transmission(m_infection_state, new_infection_state, dt);
+
     m_infection_state = new_infection_state;
     if (infection_state != new_infection_state) {
         loc.changed_state(*this, infection_state);
@@ -104,6 +107,36 @@ void Person::interact(TimeSpan dt, const GlobalInfectionParameters& global_infec
     m_time_at_location += dt;
 }
 
+bool Person::is_infected()
+{
+    return m_infection_state == InfectionState::Exposed || m_infection_state == InfectionState::Carrier ||
+           m_infection_state == InfectionState::Infected_Severe ||
+           m_infection_state == InfectionState::Infected_Severe ||
+           m_infection_state == InfectionState::Infected_Critical;
+}
+
+void Person::change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
+                                            const TimeSpan dt)
+{
+    if (curr_inf_state != new_inf_state) {
+        if (new_inf_state == InfectionState::Recovered_Carrier || new_inf_state == InfectionState::Recovered_Infected ||
+            new_inf_state == InfectionState::Dead) {
+            m_time_since_transmission = mio::abm::TimeSpan(-std::numeric_limits<int>::max() / 2);
+        }
+        else if (new_inf_state == InfectionState::Exposed) {
+            m_time_since_transmission = mio::abm::TimeSpan(0);
+        }
+        else {
+            m_time_since_transmission += dt;
+        }
+    }
+    else {
+        if (is_infected()) {
+            m_time_since_transmission += dt;
+        }
+    }
+}
+
 void Person::migrate_to(Location& loc_old, Location& loc_new, const std::vector<uint32_t>& cells)
 {
     if (&loc_old != &loc_new) {
diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index ec78803305..84b5a5dfec 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -325,12 +325,22 @@ class Person
         return m_wears_mask;
     }
 
+    bool is_infected();
+    TimeSpan get_time_since_transmission()
+    {
+        return m_time_since_transmission;
+    };
+
 private:
+    void change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
+                                        const TimeSpan dt);
+
     LocationId m_location_id;
     std::vector<uint32_t> m_assigned_locations;
     InfectionState m_infection_state;
     VaccinationState m_vaccination_state;
     TimeSpan m_time_until_carrier;
+    TimeSpan m_time_since_transmission;
     bool m_quarantine;
     AgeGroup m_age;
     TimeSpan m_time_at_location;
diff --git a/cpp/models/abm/simulation.h b/cpp/models/abm/simulation.h
index e9b3f3d4df..c83037504b 100644
--- a/cpp/models/abm/simulation.h
+++ b/cpp/models/abm/simulation.h
@@ -70,12 +70,11 @@ class Simulation
     template<typename History>
     void advance(TimePoint tmax, History& history)
     {
-        auto t = m_t;
-        while (t < tmax) {
-            auto dt = std::min(m_dt, tmax - t);
-            m_world.evolve(t, dt);
-            t += m_dt;
-            history.log(this);
+        while (m_t < tmax) {
+            auto dt = std::min(m_dt, tmax - m_t);
+            m_world.evolve(m_t, dt);
+            m_t += m_dt;
+            history.log(*this);
         }
     }
 

From 26d555ddc3e21a83ecb73e489a51b1b279555a8b Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 24 Apr 2023 15:06:53 +0200
Subject: [PATCH 022/103] [ci skip] simulation python binding

---
 pycode/examples/simulation/abm_demonstrator.py    | 15 ++++++++-------
 .../memilio-simulation/memilio/simulation/abm.cpp |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index be91dce15a..2a5a7e89c3 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -337,7 +337,6 @@ def create_locations_from_input(world, input_areas):
     mapping = []
     has_school = False
     has_hospital = False
-    print(input_areas)
     for index, area in input_areas.iterrows():
         locationIds = []
         if ('residential' in area.type):
@@ -407,6 +406,7 @@ def create_locations_from_input(world, input_areas):
                 locationIds = add_households(
                     world, [0.2, 0.2, 0.2, 0.2, 0.2], area.inhabitants)
         insert_locations_to_map(mapping, area.id, locationIds)
+    return mapping
 
 
 def assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
@@ -476,20 +476,21 @@ def assign_locations(world):
 
 def run_abm_simulation():
 
-    LocationIds = []
-
     infection_params = set_infection_parameters()
-    world = abm.World(infection_params)
 
     t0 = abm.TimePoint(0)
     tmax = t0 + abm.days(14)
 
     areas = read_txt(
         '/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
-    create_locations_from_input(world, areas)
-    assign_infection_states(world, 0.005, 0.001, 0.001, 0.0001, 0.0, 0.0, 0.0)
-    assign_locations(world)
     sim = abm.Simulation(t0)
+    sim.world.infection_parameters = infection_params
+    mapping = create_locations_from_input(sim.world, areas)
+    assign_infection_states(sim.world, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
+    assign_locations(sim.world)
+    for m in mapping:
+        print(m.inputId)
+        print(m.modelId)
     sim.advance(tmax)
     print('done')
 
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 1f17c75e33..8fdfcba4c8 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -256,5 +256,5 @@ PYBIND11_MODULE(_simulation_abm, m)
         //.def(py::init<mio::abm::TimePoint, mio::abm::World&&>())
         .def("advance", &mio::abm::Simulation::advance)
         .def_property_readonly("result", &mio::abm::Simulation::get_result)
-        .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world));
+        .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world), py::return_value_policy::reference_internal);
 }

From cd4e51c35b517618bc99d214c6c795a7a021517a Mon Sep 17 00:00:00 2001
From: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
Date: Tue, 25 Apr 2023 16:21:39 +0200
Subject: [PATCH 023/103] implement basic output for julia

Signed-off-by: Sascha Korf <51127093+xsaschako@users.noreply.github.com>
---
 cpp/examples/abm_minimal.cpp | 47 +++++++++++++++++++++++++++++++++---
 cpp/models/abm/person.cpp    | 14 +++++++----
 cpp/models/abm/simulation.h  |  6 ++---
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/cpp/examples/abm_minimal.cpp b/cpp/examples/abm_minimal.cpp
index e6391eca57..2bd88febfe 100644
--- a/cpp/examples/abm_minimal.cpp
+++ b/cpp/examples/abm_minimal.cpp
@@ -23,6 +23,28 @@
 #include "abm/world.h"
 #include "memilio/io/io.h"
 #include "abm/location_type.h"
+#include <fstream>
+#include <string>
+#include <iostream>
+
+std::string convert_loc_id_to_string(std::tuple<mio::abm::LocationType, uint32_t> tuple_id)
+{
+    return std::to_string(static_cast<std::uint32_t>(std::get<0>(tuple_id))) + "_" +
+           std::to_string(std::get<1>(tuple_id));
+}
+
+std::vector<uint32_t> get_agents_per_location(
+    std::tuple<mio::abm::LocationType, uint32_t> loc_id,
+    std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>& log)
+{
+    std::vector<uint32_t> agents_per_location;
+    for (auto& log_tuple : log) {
+        if (std::get<0>(log_tuple).type == std::get<0>(loc_id) && std::get<0>(log_tuple).index == std::get<1>(loc_id)) {
+            agents_per_location.push_back(std::get<1>(log_tuple));
+        }
+    }
+    return agents_per_location;
+}
 
 int main()
 {
@@ -150,13 +172,16 @@ int main()
     };
 
     struct LogPersonsPerLocationAndInfectionTime : LogAlways {
-        using Type = std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan>>;
+        using Type =
+            std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>;
         static Type log(const mio::abm::Simulation& sim)
         {
-            std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan>> location_ids_person{};
+            std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>
+                location_ids_person{};
             for (auto&& person : sim.get_world().get_persons()) {
                 location_ids_person.push_back(std::make_tuple(person.get_location_id(), person.get_person_id(),
-                                                              person.get_time_since_transmission()));
+                                                              person.get_time_since_transmission(),
+                                                              person.get_infection_state()));
             }
             return location_ids_person;
         }
@@ -168,6 +193,21 @@ int main()
 
     auto logg = history.get_log();
 
+    // Write the results to a file.
+    auto loc_id = std::get<1>(logg);
+    auto rest   = std::get<2>(logg);
+    std::string input;
+    std::ofstream myfile("julias_output.txt");
+    for (auto loc_id_index = 0; loc_id_index < loc_id[0].size(); ++loc_id_index) {
+        input  = convert_loc_id_to_string(loc_id[0][loc_id_index]);
+        auto a = get_agents_per_location(loc_id[0][loc_id_index], rest[0]);
+        // for (auto rest_index = 0; rest_index < rest[0].size(); ++rest_index) {
+
+        // }
+        myfile << input << "\n";
+    }
+    myfile.close();
+
     // The results are saved in a table with 9 rows.
     // The first row is t = time, the others correspond to the number of people with a certain infection state at this time:
     // S = Susceptible, E = Exposed, C= Carrier, I= Infected, I_s = Infected_Severe,
@@ -188,4 +228,5 @@ int main()
         }
     }
     fclose(f_abm);
+    std::cout << "Results written to abm_minimal.txt" << std::endl;
 }
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index ed3de6a9af..45fc9dcad8 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -39,7 +39,7 @@ Person::Person(LocationId id, InfectionProperties infection_properties, AgeGroup
     , m_infection_state(infection_properties.state)
     , m_vaccination_state(vaccination_state)
     , m_time_until_carrier(std::numeric_limits<int>::max())
-    , m_time_since_transmission(-std::numeric_limits<int>::max() / 2)
+    , m_time_since_transmission(std::numeric_limits<int>::max() / 2)
     , m_quarantine(false)
     , m_age(age)
     , m_time_at_location(std::numeric_limits<int>::max() / 2) //avoid overflow on next steps
@@ -110,8 +110,7 @@ void Person::interact(TimeSpan dt, const GlobalInfectionParameters& global_infec
 bool Person::is_infected()
 {
     return m_infection_state == InfectionState::Exposed || m_infection_state == InfectionState::Carrier ||
-           m_infection_state == InfectionState::Infected_Severe ||
-           m_infection_state == InfectionState::Infected_Severe ||
+           m_infection_state == InfectionState::Infected || m_infection_state == InfectionState::Infected_Severe ||
            m_infection_state == InfectionState::Infected_Critical;
 }
 
@@ -121,7 +120,7 @@ void Person::change_time_since_transmission(const InfectionState curr_inf_state,
     if (curr_inf_state != new_inf_state) {
         if (new_inf_state == InfectionState::Recovered_Carrier || new_inf_state == InfectionState::Recovered_Infected ||
             new_inf_state == InfectionState::Dead) {
-            m_time_since_transmission = mio::abm::TimeSpan(-std::numeric_limits<int>::max() / 2);
+            m_time_since_transmission = mio::abm::TimeSpan(std::numeric_limits<int>::max() / 2);
         }
         else if (new_inf_state == InfectionState::Exposed) {
             m_time_since_transmission = mio::abm::TimeSpan(0);
@@ -132,7 +131,12 @@ void Person::change_time_since_transmission(const InfectionState curr_inf_state,
     }
     else {
         if (is_infected()) {
-            m_time_since_transmission += dt;
+            if (m_time_since_transmission > mio::abm::TimeSpan(std::numeric_limits<int>::max() / 4)) {
+                m_time_since_transmission = mio::abm::TimeSpan(0);
+            }
+            else {
+                m_time_since_transmission += dt;
+            }
         }
     }
 }
diff --git a/cpp/models/abm/simulation.h b/cpp/models/abm/simulation.h
index c83037504b..15b6563342 100644
--- a/cpp/models/abm/simulation.h
+++ b/cpp/models/abm/simulation.h
@@ -62,12 +62,12 @@ class Simulation
      */
     void advance(TimePoint tmax);
 
-     /** 
+    /** 
      * @brief Run the Simulation from the current time to tmax.
      * @param[in] tmax Time to stop.
      * @param[in] history History to store the result of the Simulation.
      */
-    template<typename History>
+    template <typename History>
     void advance(TimePoint tmax, History& history)
     {
         while (m_t < tmax) {
@@ -75,10 +75,10 @@ class Simulation
             m_world.evolve(m_t, dt);
             m_t += m_dt;
             history.log(*this);
+            store_result_at(m_t);
         }
     }
 
-
     /**
      * @brief Get the result of the Simulation.
      * Sum over all Location%s of the number of Person%s in an #InfectionState.

From 1ab0476a141ddd042aa0cb4ae3cdad047890abaa Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 3 May 2023 10:07:54 +0200
Subject: [PATCH 024/103] test output txt using output object

---
 cpp/examples/abm_minimal.cpp | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/cpp/examples/abm_minimal.cpp b/cpp/examples/abm_minimal.cpp
index 2bd88febfe..18034df1fc 100644
--- a/cpp/examples/abm_minimal.cpp
+++ b/cpp/examples/abm_minimal.cpp
@@ -33,14 +33,14 @@ std::string convert_loc_id_to_string(std::tuple<mio::abm::LocationType, uint32_t
            std::to_string(std::get<1>(tuple_id));
 }
 
-std::vector<uint32_t> get_agents_per_location(
+std::vector<std::tuple<uint32_t, mio::abm::TimeSpan>> get_agents_per_location(
     std::tuple<mio::abm::LocationType, uint32_t> loc_id,
     std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>& log)
 {
-    std::vector<uint32_t> agents_per_location;
+    std::vector<std::tuple<uint32_t, mio::abm::TimeSpan>> agents_per_location;
     for (auto& log_tuple : log) {
         if (std::get<0>(log_tuple).type == std::get<0>(loc_id) && std::get<0>(log_tuple).index == std::get<1>(loc_id)) {
-            agents_per_location.push_back(std::get<1>(log_tuple));
+            agents_per_location.push_back(std::make_tuple(std::get<1>(log_tuple), std::get<2>(log_tuple)));
         }
     }
     return agents_per_location;
@@ -194,16 +194,27 @@ int main()
     auto logg = history.get_log();
 
     // Write the results to a file.
-    auto loc_id = std::get<1>(logg);
-    auto rest   = std::get<2>(logg);
+    auto loc_id      = std::get<1>(logg);
+    auto agents      = std::get<2>(logg);
+    auto time_points = std::get<0>(logg);
     std::string input;
-    std::ofstream myfile("julias_output.txt");
+    std::ofstream myfile("test_output.txt");
     for (auto loc_id_index = 0; loc_id_index < loc_id[0].size(); ++loc_id_index) {
-        input  = convert_loc_id_to_string(loc_id[0][loc_id_index]);
-        auto a = get_agents_per_location(loc_id[0][loc_id_index], rest[0]);
-        // for (auto rest_index = 0; rest_index < rest[0].size(); ++rest_index) {
-
-        // }
+        input = convert_loc_id_to_string(loc_id[0][loc_id_index]) + " " + std::to_string(time_points.size());
+        for (int t = 0; t < time_points.size(); ++t) {
+            auto a_per_loc = get_agents_per_location(loc_id[0][loc_id_index], agents[t]);
+            input += " " + std::to_string(time_points[t]) + " " + std::to_string(a_per_loc.size());
+            for (auto& agent : a_per_loc) {
+                double time_since_transmission;
+                if (std::get<1>(agent) > mio::abm::TimeSpan(std::numeric_limits<int>::max() / 4)) {
+                    time_since_transmission = -1;
+                }
+                else {
+                    time_since_transmission = std::get<1>(agent).hours();
+                }
+                input += " " + std::to_string(std::get<0>(agent)) + " " + std::to_string(time_since_transmission);
+            }
+        }
         myfile << input << "\n";
     }
     myfile.close();

From d9b8f372feadda8b1dd6897b25ba96737196163a Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 3 May 2023 10:21:40 +0200
Subject: [PATCH 025/103] log first time point

---
 cpp/models/abm/simulation.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cpp/models/abm/simulation.h b/cpp/models/abm/simulation.h
index 15b6563342..27b051919c 100644
--- a/cpp/models/abm/simulation.h
+++ b/cpp/models/abm/simulation.h
@@ -73,10 +73,12 @@ class Simulation
         while (m_t < tmax) {
             auto dt = std::min(m_dt, tmax - m_t);
             m_world.evolve(m_t, dt);
-            m_t += m_dt;
             history.log(*this);
+            m_t += m_dt;
             store_result_at(m_t);
         }
+        //log last time point
+        history.log(*this);
     }
 
     /**

From 6703fa7e91802ef086ef79a2a5e8750071251ca6 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 3 May 2023 12:38:55 +0200
Subject: [PATCH 026/103] set initial time_since_transmission

---
 cpp/models/abm/person.cpp   | 6 ++++++
 cpp/models/abm/simulation.h | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 45fc9dcad8..6df03afd83 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -61,6 +61,9 @@ Person::Person(LocationId id, InfectionProperties infection_properties, AgeGroup
         m_time_until_carrier = hours(UniformIntDistribution<int>::get_instance()(
             0, int(global_params.get<IncubationPeriod>()[{m_age, m_vaccination_state}] * 24)));
     }
+    if (is_infected()) {
+        m_time_since_transmission = mio::abm::TimeSpan(0);
+    }
 }
 
 Person::Person(Location& location, InfectionProperties infection_properties, AgeGroup age,
@@ -165,6 +168,9 @@ void Person::set_assigned_location(LocationId id)
 void Person::set_infection_state(InfectionState inf_state)
 {
     m_infection_state = inf_state;
+    if (is_infected()) {
+        m_time_since_transmission = mio::abm::TimeSpan(0);
+    }
 }
 
 uint32_t Person::get_assigned_location_index(LocationType type) const
diff --git a/cpp/models/abm/simulation.h b/cpp/models/abm/simulation.h
index 27b051919c..753947869b 100644
--- a/cpp/models/abm/simulation.h
+++ b/cpp/models/abm/simulation.h
@@ -70,15 +70,16 @@ class Simulation
     template <typename History>
     void advance(TimePoint tmax, History& history)
     {
+        //log initial system state
+        history.log(*this);
+
         while (m_t < tmax) {
             auto dt = std::min(m_dt, tmax - m_t);
             m_world.evolve(m_t, dt);
-            history.log(*this);
             m_t += m_dt;
+            history.log(*this);
             store_result_at(m_t);
         }
-        //log last time point
-        history.log(*this);
     }
 
     /**

From 1b3eae245b4b67e938a1df5d1c79d33705583b97 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 3 May 2023 16:01:28 +0200
Subject: [PATCH 027/103] output object for cpp demonstrator

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 102 +++++++++++++++++++-
 1 file changed, 101 insertions(+), 1 deletion(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 548d63972f..964245360b 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -36,6 +36,25 @@ struct LocationMapping {
     std::vector<std::string> modelId{};
 };
 
+std::string convert_loc_id_to_string(std::tuple<mio::abm::LocationType, uint32_t> tuple_id)
+{
+    return std::to_string(static_cast<std::uint32_t>(std::get<0>(tuple_id))) + "_" +
+           std::to_string(std::get<1>(tuple_id));
+}
+
+std::vector<std::tuple<uint32_t, mio::abm::TimeSpan>> get_agents_per_location(
+    std::tuple<mio::abm::LocationType, uint32_t> loc_id,
+    std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>& log)
+{
+    std::vector<std::tuple<uint32_t, mio::abm::TimeSpan>> agents_per_location;
+    for (auto& log_tuple : log) {
+        if (std::get<0>(log_tuple).type == std::get<0>(loc_id) && std::get<0>(log_tuple).index == std::get<1>(loc_id)) {
+            agents_per_location.push_back(std::make_tuple(std::get<1>(log_tuple), std::get<2>(log_tuple)));
+        }
+    }
+    return agents_per_location;
+}
+
 /**
  * read input test file and save input areas and inhabitants per area
  * @param[in, out] areas vector that is filled with area types and area ids from input file
@@ -696,6 +715,79 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
     return sim;
 }
 
+//Loggers used for output object
+
+//time point logger
+struct LogTimePoint : LogAlways {
+    using Type = double;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        return sim.get_time().hours();
+    }
+};
+
+//LocationId logger
+struct LogLocationIds : LogOnce {
+    using Type = std::vector<std::tuple<mio::abm::LocationType, uint32_t>>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<std::tuple<mio::abm::LocationType, uint32_t>> location_ids{};
+        for (auto&& locations : sim.get_world().get_locations()) {
+            for (auto location : locations) {
+                location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
+            }
+        }
+        return location_ids;
+    }
+};
+
+//agent logger
+struct LogPersonsPerLocationAndInfectionTime : LogAlways {
+    using Type = std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>
+            location_ids_person{};
+        for (auto&& person : sim.get_world().get_persons()) {
+            location_ids_person.push_back(std::make_tuple(person.get_location_id(), person.get_person_id(),
+                                                          person.get_time_since_transmission(),
+                                                          person.get_infection_state()));
+        }
+        return location_ids_person;
+    }
+};
+
+void write_results_to_file(
+    std::string path,
+    History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>::Wri::Data& logg)
+{
+    auto location_ids = std::get<1>(logg);
+    auto agents       = std::get<2>(logg);
+    auto time_points  = std::get<0>(logg);
+
+    std::string input;
+    std::ofstream myfile(path);
+    for (auto loc_id_index = 0; loc_id_index < location_ids[0].size(); ++loc_id_index) {
+        input = convert_loc_id_to_string(location_ids[0][loc_id_index]) + " " + std::to_string(time_points.size());
+        for (int t = 0; t < time_points.size(); ++t) {
+            auto a_per_loc = get_agents_per_location(location_ids[0][loc_id_index], agents[t]);
+            input += " " + std::to_string(time_points[t]) + " " + std::to_string(a_per_loc.size());
+            for (auto& agent : a_per_loc) {
+                double time_since_transmission;
+                if (std::get<1>(agent) > mio::abm::TimeSpan(std::numeric_limits<int>::max() / 4)) {
+                    time_since_transmission = -1;
+                }
+                else {
+                    time_since_transmission = std::get<1>(agent).hours();
+                }
+                input += " " + std::to_string(std::get<0>(agent)) + " " + std::to_string(time_since_transmission);
+            }
+        }
+        myfile << input << "\n";
+    }
+    myfile.close();
+}
+
 mio::IOResult<void> run(const fs::path& input_dir)
 {
     auto t0      = mio::abm::TimePoint(0); // Start time per simulation
@@ -706,8 +798,16 @@ mio::IOResult<void> run(const fs::path& input_dir)
     std::vector<LocationMapping> LocationIds;
     //create sampled simulation
     auto sim = create_sampled_simulation(t0, input_dir, LocationIds);
+
+    //output object
+    History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime> history;
+
     //advance until tmax
-    sim.advance(tmax);
+    sim.advance(tmax, history);
+
+    //output
+    auto logg = history.get_log();
+    write_results_to_file("C:/Users/bick_ju/Documents/output_abm_demonstrator.txt", logg);
 
     std::cout << "# t S E C I I_s I_c R_C R_I D\n";
     for (auto i = 0; i < sim.get_result().get_num_time_points(); ++i) {

From 153c3c38e6ff2ac0d94daed3016da2116517b2b2 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 5 May 2023 10:21:13 +0200
Subject: [PATCH 028/103] write location mapping to file

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 30 ++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 964245360b..38694a1018 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -38,8 +38,16 @@ struct LocationMapping {
 
 std::string convert_loc_id_to_string(std::tuple<mio::abm::LocationType, uint32_t> tuple_id)
 {
-    return std::to_string(static_cast<std::uint32_t>(std::get<0>(tuple_id))) + "_" +
-           std::to_string(std::get<1>(tuple_id));
+    std::string locationType  = std::to_string(static_cast<std::uint32_t>(std::get<0>(tuple_id)));
+    std::string locationIndex = std::to_string(std::get<1>(tuple_id));
+    if (static_cast<std::uint32_t>(std::get<0>(tuple_id)) < 10) {
+        locationType = "0" + locationType;
+    }
+    if (std::get<1>(tuple_id) < 10) {
+        locationIndex = "0" + locationIndex;
+    }
+
+    return locationType + locationIndex;
 }
 
 std::vector<std::tuple<uint32_t, mio::abm::TimeSpan>> get_agents_per_location(
@@ -788,6 +796,21 @@ void write_results_to_file(
     myfile.close();
 }
 
+void write_location_mapping_to_file(std::string path, std::vector<LocationMapping>& LocationIds)
+{
+    std::string input;
+    std::ofstream myfile(path);
+    for (auto& id : LocationIds) {
+        input = id.inputId + " ";
+        for (auto& model_id : id.modelId) {
+            input += model_id + " ";
+        }
+        myfile << input << "\n";
+    }
+
+    myfile.close();
+}
+
 mio::IOResult<void> run(const fs::path& input_dir)
 {
     auto t0      = mio::abm::TimePoint(0); // Start time per simulation
@@ -807,7 +830,8 @@ mio::IOResult<void> run(const fs::path& input_dir)
 
     //output
     auto logg = history.get_log();
-    write_results_to_file("C:/Users/bick_ju/Documents/output_abm_demonstrator.txt", logg);
+    write_results_to_file("output_abm_demonstrator.txt", logg);
+    write_location_mapping_to_file("location_mapping.txt", LocationIds);
 
     std::cout << "# t S E C I I_s I_c R_C R_I D\n";
     for (auto i = 0; i < sim.get_result().get_num_time_points(); ++i) {

From 3dce4d765957aa03cd435d7445820a0b5e68dd7e Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 5 May 2023 11:41:29 +0200
Subject: [PATCH 029/103] [ci skip] run simulation on linux

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 38694a1018..5022d27a33 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -330,14 +330,14 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
     //school and hospital is needed for migration rules
     bool has_school   = false;
     bool has_hospital = false;
-    for (auto loc = 0; loc < (int)areas.size(); ++loc) {
+    for (size_t loc = 0; loc < areas.size(); ++loc) {
         std::vector<mio::abm::LocationId> locations;
         if (std::search((areas[loc].second).begin(), (areas[loc].second).end(), residential.begin(),
                         residential.end()) != (areas[loc].second).end()) {
             //Home
             locations = add_households(world, household_distribution, inhabitants[loc]);
         }
-        else if (areas[loc].second == "mixed") {
+        else if (areas[loc].second == "mixed" || areas[loc].second == "mixed\r") {
             //areas of type "mixed" are equally distributed to  of location of type Home amd type Work
             size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(std::vector<double>{1, 1});
             if (location_type) {
@@ -349,11 +349,11 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
             }
         }
         else {
-            if (areas[loc].second == "recreational") {
+            if (areas[loc].second == "recreational" || areas[loc].second == "recreational\r") {
                 //Social Event
                 locations.emplace_back(add_location(world, mio::abm::LocationType::SocialEvent, 30., 30, 40));
             }
-            else if (areas[loc].second == "shopping_business") {
+            else if (areas[loc].second == "shopping_business" || areas[loc].second == "shopping_business\r") {
                 //school, hospital and icu are added first
                 if (!has_school) {
                     locations.emplace_back(add_location(world, mio::abm::LocationType::School, 40., 500, 2000));
@@ -375,7 +375,7 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
                     }
                 }
             }
-            else if (areas[loc].second == "university") {
+            else if (areas[loc].second == "university" || areas[loc].second == "university\r") {
                 //area of type 'university' is converted to location of type Work
                 locations.emplace_back(add_location(world, mio::abm::LocationType::Work, 50., 200, 4000));
             }
@@ -775,9 +775,9 @@ void write_results_to_file(
 
     std::string input;
     std::ofstream myfile(path);
-    for (auto loc_id_index = 0; loc_id_index < location_ids[0].size(); ++loc_id_index) {
+    for (size_t loc_id_index = 0; loc_id_index < location_ids[0].size(); ++loc_id_index) {
         input = convert_loc_id_to_string(location_ids[0][loc_id_index]) + " " + std::to_string(time_points.size());
-        for (int t = 0; t < time_points.size(); ++t) {
+        for (size_t t = 0; t < time_points.size(); ++t) {
             auto a_per_loc = get_agents_per_location(location_ids[0][loc_id_index], agents[t]);
             input += " " + std::to_string(time_points[t]) + " " + std::to_string(a_per_loc.size());
             for (auto& agent : a_per_loc) {
@@ -863,7 +863,7 @@ void print(T& data)
 int main()
 {
     const fs::path input_dir =
-        "C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
+        "/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
     auto result = run(input_dir);
 
     return 0;

From 4711b9aaf67d1492465559da116fb7993383d111 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 5 May 2023 14:47:38 +0200
Subject: [PATCH 030/103] [ci skip] python demonstrator

---
 cpp/simulations/CMakeLists.txt                |  8 ++--
 .../examples/simulation/abm_demonstrator.py   | 16 ++++---
 .../memilio/simulation/abm.cpp                | 47 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/cpp/simulations/CMakeLists.txt b/cpp/simulations/CMakeLists.txt
index 49e5ce2b63..1a2c356608 100644
--- a/cpp/simulations/CMakeLists.txt
+++ b/cpp/simulations/CMakeLists.txt
@@ -10,8 +10,8 @@ if(MEMILIO_HAS_JSONCPP AND MEMILIO_HAS_HDF5)
     add_executable(abm_simulation abm.cpp)
     target_link_libraries(abm_simulation PRIVATE memilio abm Boost::filesystem ${HDF5_C_LIBRARIES})
     target_compile_options(abm_simulation PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
-
-    add_executable(abm_demonstrator abm_INSIDe_demonstrator.cpp)
-    target_link_libraries(abm_demonstrator PRIVATE memilio abm Boost::filesystem ${HDF5_C_LIBRARIES})
-    target_compile_options(abm_demonstrator PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
 endif()
+
+add_executable(abm_demonstrator abm_INSIDe_demonstrator.cpp)
+target_link_libraries(abm_demonstrator PRIVATE memilio abm)
+target_compile_options(abm_demonstrator PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
\ No newline at end of file
diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 1d2b4db329..0fe8b49bfb 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -24,6 +24,7 @@
 from memilio.simulation import abm
 from memilio.simulation.abm import AgeGroup
 from memilio.simulation.abm import VaccinationState
+from memilio.simulation.abm import History
 
 # class used to map input area ids to abm location ids
 
@@ -514,7 +515,7 @@ def run_abm_simulation():
     # simulation will run 14 days
     tmax = t0 + abm.days(14)
     # distribution to distribute the residential areas to one, two-, three-, four- and five-person households
-    household_distribution = [0.2, 0.2, 0.2, 0.2, 0.2]
+    household_distribution = [0.37, 0.33, 0.15, 0.1, 0.05]
 
     # read txt file with inputs
     areas = read_txt(
@@ -523,12 +524,15 @@ def run_abm_simulation():
     sim.world.infection_parameters = infection_params
     mapping = create_locations_from_input(
         sim.world, areas, household_distribution)
-    assign_infection_states(sim.world, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
+    assign_infection_states(sim.world, 0.005, 0.001,
+                            0.001, 0.0001, 0.0, 0.0, 0.0)
     assign_locations(sim.world)
-    for m in mapping:
-        print(m.inputId)
-        print(m.modelId)
-    sim.advance(tmax)
+    history = History()
+    # for m in mapping:
+    #     print(m.inputId)
+    #     print(m.modelId)
+    sim.advance(tmax, history)
+    log = history.log
     print('done')
 
 
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 8fdfcba4c8..ff4c951ded 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -22,6 +22,7 @@
 #include "utils/custom_index_array.h"
 #include "utils/parameter_set.h"
 #include "utils/index.h"
+//#include "memilio/utils/history.h"
 #include "abm/abm.h"
 #include "abm/household.h"
 #include "pybind11/attr.h"
@@ -32,6 +33,46 @@
 
 namespace py = pybind11;
 
+//time point logger
+struct LogTimePoint : LogAlways {
+    using Type = double;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        return sim.get_time().hours();
+    }
+};
+
+//LocationId logger
+struct LogLocationIds : LogOnce {
+    using Type = std::vector<std::tuple<mio::abm::LocationType, uint32_t>>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<std::tuple<mio::abm::LocationType, uint32_t>> location_ids{};
+        for (auto&& locations : sim.get_world().get_locations()) {
+            for (auto location : locations) {
+                location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
+            }
+        }
+        return location_ids;
+    }
+};
+
+//agent logger
+struct LogPersonsPerLocationAndInfectionTime : LogAlways {
+    using Type = std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>
+            location_ids_person{};
+        for (auto&& person : sim.get_world().get_persons()) {
+            location_ids_person.push_back(std::make_tuple(person.get_location_id(), person.get_person_id(),
+                                                          person.get_time_since_transmission(),
+                                                          person.get_infection_state()));
+        }
+        return location_ids_person;
+    }
+};
+
 PYBIND11_MODULE(_simulation_abm, m)
 {
     pymio::iterable_enum<mio::abm::InfectionState>(m, "InfectionState", py::module_local{})
@@ -254,7 +295,11 @@ PYBIND11_MODULE(_simulation_abm, m)
     py::class_<mio::abm::Simulation>(m, "Simulation")
         .def(py::init<mio::abm::TimePoint>())
         //.def(py::init<mio::abm::TimePoint, mio::abm::World&&>())
-        .def("advance", &mio::abm::Simulation::advance)
+        .def("advance", &mio::abm::Simulation::advance<History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>)
         .def_property_readonly("result", &mio::abm::Simulation::get_result)
         .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world), py::return_value_policy::reference_internal);
+
+    py::class_<History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>(m, "History")
+        .def(py::init<>())
+        .def_property_readonly("log", &History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>::get_log);
 }

From ca11403450572500961c6cff8cd3fff20f880e0c Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 9 May 2023 12:39:57 +0200
Subject: [PATCH 031/103] [ci skip] bug in python demonstrator

---
 .../examples/simulation/abm_demonstrator.py   | 82 +++++++++++++++++--
 .../memilio/simulation/abm.cpp                |  2 +
 2 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 0fe8b49bfb..eaf49117be 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -433,7 +433,7 @@ def create_locations_from_input(world, input_areas, household_distribution):
             else:
                 locationIds = add_households(
                     world, household_distribution, area.inhabitants)
-        insert_locations_to_map(mapping, area.id, locationIds)
+        insert_locations_to_map(mapping, str(area.id), locationIds)
     return mapping
 
 
@@ -448,7 +448,8 @@ def assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infect
                                            p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
                                                infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
                                                recovered_infected, 0.0])
-        person.infection_state = abm.InfectionState(infection_state)
+        world.set_infection_state(person, abm.InfectionState(infection_state))
+        #person.infection_state = abm.InfectionState(infection_state)
 
 
 def assign_locations(world):
@@ -505,6 +506,67 @@ def assign_locations(world):
                 workplaces[int(work)].index, workplaces[int(work)].type))
 
 
+def convert_loc_id_to_string(loc_id):
+    type = str(int(loc_id[0]))
+    index = str(loc_id[1])
+    if int(int(loc_id[0])) < 10:
+        type = "0" + type
+    if int(loc_id[1]) < 10:
+        index = "0" + index
+
+    return type + index
+
+
+def get_agents_per_location(loc_id, agents):
+    agents_per_loc = []
+    for a in agents:
+        if (int(a[0].type) == int(loc_id[0]) and a[0].index == loc_id[1]):
+            agents_per_loc.append(a)
+    return agents_per_loc
+
+
+def write_results_to_file(path, log):
+    location_ids = log[1][0]
+    time_points = log[0]
+    agents = log[2]
+    with open(path, 'w') as f:
+        for location_id_index in range(len(location_ids)):
+            line = convert_loc_id_to_string(location_ids[location_id_index])
+            for t in range(len(time_points)):
+                agents_per_loc = get_agents_per_location(
+                    location_ids[location_id_index], agents[t])
+                line += " " + str(time_points[t]) + \
+                    " " + str(len(agents_per_loc))
+                for a in agents_per_loc:
+                    if (a[2].days > 1000):
+                        time_since_transmission = -1.0
+                    else:
+                        time_since_transmission = a[2].hours
+                    line += " " + str(a[1]) + " " + \
+                        str(time_since_transmission)
+            f.write(line)
+            f.write('\n')
+    f.close()
+
+
+def write_location_mapping_to_file(path, mapping):
+    with open(path, 'w') as f:
+        for id in mapping:
+            line = id.inputId + " "
+            for modelId in id.modelId:
+                line += modelId + " "
+            f.write(line)
+            f.write('\n')
+        f.close()
+
+
+def set_sim_result_at_start(sim):
+    for locations in sim.world.locations:
+        for location in locations:
+            result = sim.result.get_last_value()
+            result += location.population.get_last_value()
+
+
 def run_abm_simulation():
 
     # set infection parameters
@@ -527,13 +589,21 @@ def run_abm_simulation():
     assign_infection_states(sim.world, 0.005, 0.001,
                             0.001, 0.0001, 0.0, 0.0, 0.0)
     assign_locations(sim.world)
+    set_sim_result_at_start(sim)
     history = History()
-    # for m in mapping:
-    #     print(m.inputId)
-    #     print(m.modelId)
     sim.advance(tmax, history)
     log = history.log
-    print('done')
+    write_results_to_file('output.txt', log)
+    write_location_mapping_to_file('location_mapping.txt', mapping)
+
+    # print compartment values
+    print("t S E C I I_s I_c R_C R_I D")
+    for t in range(sim.result.get_num_time_points()):
+        line = str(sim.result.get_time(t)) + " "
+        comps = sim.result.get_value(t)
+        for c in range(len(comps)):
+            line += str(comps[c]) + " "
+        print(line)
 
 
 if __name__ == "__main__":
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index ff4c951ded..9923bb4cea 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -229,6 +229,7 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("set_capacity", &mio::abm::Location::set_capacity)
         .def_property_readonly("type", &mio::abm::Location::get_type)
         .def_property_readonly("index", &mio::abm::Location::get_index)
+        .def_property_readonly("population", &mio::abm::Location::get_population, py::return_value_policy::reference_internal)
         .def_property("infection_parameters",
                       py::overload_cast<>(&mio::abm::Location::get_infection_parameters, py::const_),
                       [](mio::abm::Location& self, mio::abm::LocalInfectionParameters params) {
@@ -262,6 +263,7 @@ PYBIND11_MODULE(_simulation_abm, m)
              py::return_value_policy::reference_internal)
         .def("add_person", &mio::abm::World::add_person, py::return_value_policy::reference_internal)
         .def("get_individualized_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::World::get_individualized_location, py::const_), py::return_value_policy::reference_internal)
+        .def("set_infection_state", &mio::abm::World::set_infection_state)
         .def_property_readonly("locations", &mio::abm::World::get_locations,
                                py::keep_alive<1, 0>{}) //keep this world alive while contents are referenced in ranges
         .def_property_readonly("persons", &mio::abm::World::get_persons, py::keep_alive<1, 0>{})

From 5c80091fac6ed006d03dea239277d8f0218b2ea1 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 9 May 2023 13:45:02 +0200
Subject: [PATCH 032/103] [ci skip] set time until carrier

---
 cpp/models/abm/person.cpp                   |  4 ++++
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 6df03afd83..24b36ce9b9 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -171,6 +171,10 @@ void Person::set_infection_state(InfectionState inf_state)
     if (is_infected()) {
         m_time_since_transmission = mio::abm::TimeSpan(0);
     }
+    if (m_infection_state == InfectionState::Exposed) {
+        m_time_until_carrier = hours(UniformIntDistribution<int>::get_instance()(0, int(4.0 * 24)));
+        std::cout << "time_until_carrier " << m_time_until_carrier.days();
+    }
 }
 
 uint32_t Person::get_assigned_location_index(LocationType type) const
diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 5022d27a33..0d48eb6eb1 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -39,7 +39,7 @@ struct LocationMapping {
 std::string convert_loc_id_to_string(std::tuple<mio::abm::LocationType, uint32_t> tuple_id)
 {
     std::string locationType  = std::to_string(static_cast<std::uint32_t>(std::get<0>(tuple_id)));
-    std::string locationIndex = std::to_string(std::get<1>(tuple_id));
+    std::string locationIndex = std::to_string(std::get<1>(tuple_id)) + "\"";
     if (static_cast<std::uint32_t>(std::get<0>(tuple_id)) < 10) {
         locationType = "0" + locationType;
     }
@@ -813,9 +813,8 @@ void write_location_mapping_to_file(std::string path, std::vector<LocationMappin
 
 mio::IOResult<void> run(const fs::path& input_dir)
 {
-    auto t0      = mio::abm::TimePoint(0); // Start time per simulation
-    auto tmax    = mio::abm::TimePoint(0) + mio::abm::days(14); // End time per simulation
-    auto results = std::vector<mio::TimeSeries<ScalarType>>{}; // Vector of collected results
+    auto t0   = mio::abm::TimePoint(0); // Start time per simulation
+    auto tmax = mio::abm::TimePoint(0) + mio::abm::days(14); // End time per simulation
 
     //mapping of input areas to abm locations
     std::vector<LocationMapping> LocationIds;
@@ -862,9 +861,8 @@ void print(T& data)
 
 int main()
 {
-    const fs::path input_dir =
-        "/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
-    auto result = run(input_dir);
+    const fs::path input_dir = "H:/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
+    auto result              = run(input_dir);
 
     return 0;
 }
\ No newline at end of file

From b46146ab1e6b6a265b26334e9aeb99297812460f Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 9 May 2023 16:33:40 +0200
Subject: [PATCH 033/103] paths and comments

---
 .../examples/simulation/abm_demonstrator.py   | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index eaf49117be..7a77dbceed 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -41,7 +41,7 @@ def __init__(self):
 def set_infection_parameters():
     infection_params = abm.GlobalInfectionParameters()
 
-    # 0-4
+    # AgeGroup 0-4
     infection_params.IncubationPeriod[AgeGroup.Age0to4,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age0to4,
@@ -67,7 +67,7 @@ def set_infection_parameters():
     infection_params.RecoveredToSusceptible[AgeGroup.Age0to4,
                                             VaccinationState.Unvaccinated] = 0
 
-    # 5-14
+    # AgeGroup 5-14
     infection_params.IncubationPeriod[AgeGroup.Age5to14,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age5to14,
@@ -93,7 +93,7 @@ def set_infection_parameters():
     infection_params.RecoveredToSusceptible[AgeGroup.Age5to14,
                                             VaccinationState.Unvaccinated] = 0.
 
-    # 15-34
+    # AgeGroup 15-34
     infection_params.IncubationPeriod[AgeGroup.Age15to34,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age15to34,
@@ -119,7 +119,7 @@ def set_infection_parameters():
     infection_params.RecoveredToSusceptible[AgeGroup.Age15to34,
                                             VaccinationState.Unvaccinated] = 0.
 
-    # 35-59
+    # AgeGroup 35-59
     infection_params.IncubationPeriod[AgeGroup.Age35to59,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age35to59,
@@ -145,7 +145,7 @@ def set_infection_parameters():
     infection_params.RecoveredToSusceptible[AgeGroup.Age35to59,
                                             VaccinationState.Unvaccinated] = 0.
 
-    # 60-79
+    # AgeGroup 60-79
     infection_params.IncubationPeriod[AgeGroup.Age60to79,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age60to79,
@@ -171,7 +171,7 @@ def set_infection_parameters():
     infection_params.RecoveredToSusceptible[AgeGroup.Age60to79,
                                             VaccinationState.Unvaccinated] = 0.
 
-    # 80+
+    # AgeGroup 80+
     infection_params.IncubationPeriod[AgeGroup.Age80plus,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age80plus,
@@ -202,9 +202,7 @@ def set_infection_parameters():
 
 def read_txt(path):
     # read input file and save it in a pd.Dataframe
-    input = pd.read_csv(path, sep='\t')
-    return input
-
+    return pd.read_csv(path, sep='\t')
 
 def make_one_person_households(number_of_households):
     # one-person household member
@@ -569,19 +567,19 @@ def set_sim_result_at_start(sim):
 
 def run_abm_simulation():
 
+    input_path = 'H:/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt'
+    output_path = 'H:/Documents/INSIDeDemonstrator/'
     # set infection parameters
     infection_params = set_infection_parameters()
-    # create abm world with infection parameters
     # starting time point
     t0 = abm.TimePoint(0)
-    # simulation will run 14 days
+    # end time point: simulation will run 14 days
     tmax = t0 + abm.days(14)
     # distribution to distribute the residential areas to one, two-, three-, four- and five-person households
     household_distribution = [0.37, 0.33, 0.15, 0.1, 0.05]
 
     # read txt file with inputs
-    areas = read_txt(
-        '/home/bick_ju/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt')
+    areas = read_txt(input_path)
     sim = abm.Simulation(t0)
     sim.world.infection_parameters = infection_params
     mapping = create_locations_from_input(
@@ -593,8 +591,8 @@ def run_abm_simulation():
     history = History()
     sim.advance(tmax, history)
     log = history.log
-    write_results_to_file('output.txt', log)
-    write_location_mapping_to_file('location_mapping.txt', mapping)
+    write_results_to_file(output_path + 'output.txt', log)
+    write_location_mapping_to_file(output_path + 'location_mapping.txt', mapping)
 
     # print compartment values
     print("t S E C I I_s I_c R_C R_I D")

From 3b2274eb6c461a683575008119f623b3ed27499b Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 10 May 2023 11:10:31 +0200
Subject: [PATCH 034/103] comments and household distributions

---
 cpp/models/abm/person.cpp                     |  1 -
 .../examples/simulation/abm_demonstrator.py   | 88 +++++++++----------
 2 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 24b36ce9b9..4f364ffd31 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -173,7 +173,6 @@ void Person::set_infection_state(InfectionState inf_state)
     }
     if (m_infection_state == InfectionState::Exposed) {
         m_time_until_carrier = hours(UniformIntDistribution<int>::get_instance()(0, int(4.0 * 24)));
-        std::cout << "time_until_carrier " << m_time_until_carrier.days();
     }
 }
 
diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 7a77dbceed..0a59769bbe 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -26,9 +26,7 @@
 from memilio.simulation.abm import VaccinationState
 from memilio.simulation.abm import History
 
-# class used to map input area ids to abm location ids
-
-
+# class used to map input areas to abm locations
 class LocationMapping:
 
     def __init__(self):
@@ -36,8 +34,6 @@ def __init__(self):
         self.modelId = []
 
 # infection parameters are dependent on age group and vaccination state
-
-
 def set_infection_parameters():
     infection_params = abm.GlobalInfectionParameters()
 
@@ -208,10 +204,10 @@ def make_one_person_households(number_of_households):
     # one-person household member
     one_person_household_member = abm.HouseholdMember()
     # set weights for household member
-    one_person_household_member.set_age_weight(AgeGroup.Age15to34, 5)
-    one_person_household_member.set_age_weight(AgeGroup.Age35to59, 6)
-    one_person_household_member.set_age_weight(AgeGroup.Age60to79, 4)
-    one_person_household_member.set_age_weight(AgeGroup.Age80plus, 2)
+    one_person_household_member.set_age_weight(AgeGroup.Age15to34, 4364)
+    one_person_household_member.set_age_weight(AgeGroup.Age35to59, 7283)
+    one_person_household_member.set_age_weight(AgeGroup.Age60to79, 4100)
+    one_person_household_member.set_age_weight(AgeGroup.Age80plus, 1800)
 
     # create one-person household group
     household_group = abm.HouseholdGroup()
@@ -238,12 +234,12 @@ def make_multiple_person_households(household_size,
     parent.set_age_weight(AgeGroup.Age60to79, 1)
 
     other = abm.HouseholdMember()
-    other.set_age_weight(AgeGroup.Age0to4, 1)
-    other.set_age_weight(AgeGroup.Age5to14, 2)
-    other.set_age_weight(AgeGroup.Age15to34, 3)
-    other.set_age_weight(AgeGroup.Age35to59, 3)
-    other.set_age_weight(AgeGroup.Age60to79, 2)
-    other.set_age_weight(AgeGroup.Age80plus, 2)
+    other.set_age_weight(AgeGroup.Age0to4, 5000)
+    other.set_age_weight(AgeGroup.Age5to14, 6000)
+    other.set_age_weight(AgeGroup.Age15to34, 14943)
+    other.set_age_weight(AgeGroup.Age35to59, 22259)
+    other.set_age_weight(AgeGroup.Age60to79, 11998)
+    other.set_age_weight(AgeGroup.Age80plus, 5038)
 
     household_group = abm.HouseholdGroup()
     # add two parent households
@@ -282,8 +278,8 @@ def add_households(world, distribution, num_inhabitants):
     abm.add_household_group_to_world(world, one_person_household_group)
 
     # two-person households
-    two_person_two_parents = int(0.4 * household_sizes[1])
-    two_person_one_parent = int(0.4 * household_sizes[1])
+    two_person_two_parents = int(0.85 * household_sizes[1])
+    two_person_one_parent = int(0.13 * household_sizes[1])
     two_person_other = int(
         household_sizes[1] - two_person_two_parents - two_person_one_parent)
     two_person_household_group = make_multiple_person_households(2, two_person_two_parents,
@@ -291,8 +287,8 @@ def add_households(world, distribution, num_inhabitants):
     abm.add_household_group_to_world(world, two_person_household_group)
 
     # three-person households
-    three_person_two_parents = int(0.4 * household_sizes[2])
-    three_person_one_parent = int(0.4 * household_sizes[2])
+    three_person_two_parents = int(0.83 * household_sizes[2])
+    three_person_one_parent = int(0.13 * household_sizes[2])
     three_person_other = int(
         household_sizes[2] - three_person_two_parents - three_person_one_parent)
     three_person_household_group = make_multiple_person_households(3, three_person_two_parents,
@@ -300,8 +296,8 @@ def add_households(world, distribution, num_inhabitants):
     abm.add_household_group_to_world(world, three_person_household_group)
 
     # four-person households
-    four_person_two_parents = int(0.5 * household_sizes[3])
-    four_person_one_parent = int(0.2 * household_sizes[3])
+    four_person_two_parents = int(0.93 * household_sizes[3])
+    four_person_one_parent = int(0.03 * household_sizes[3])
     four_person_other = int(
         household_sizes[3] - four_person_two_parents - four_person_one_parent)
     four_person_household_group = make_multiple_person_households(4, four_person_two_parents,
@@ -309,8 +305,8 @@ def add_households(world, distribution, num_inhabitants):
     abm.add_household_group_to_world(world, four_person_household_group)
 
     # five-person households
-    five_person_two_parents = int(0.6 * household_sizes[4])
-    five_person_one_parent = int(0.1 * household_sizes[4])
+    five_person_two_parents = int(0.88 * household_sizes[4])
+    five_person_one_parent = int(0.05 * household_sizes[4])
     five_person_other = int(
         household_sizes[4] - five_person_two_parents - five_person_one_parent)
     five_person_household_group = make_multiple_person_households(5, five_person_two_parents,
@@ -338,15 +334,13 @@ def insert_locations_to_map(mapping, inputId, locationIds):
     mapping.append(map)
     return mapping
 
-
 def create_locations_from_input(world, input_areas, household_distribution):
-    # mapping to map input area ids to abm location ids
+    # map input area ids to corresponding abm location ids
     mapping = []
     # bools to make sure the world has a school and a hospital
     has_school = False
     has_hospital = False
     for index, area in input_areas.iterrows():
-        # locations ids; relevant for the mapping
         locationIds = []
         if ('residential' in area.type):
             # area 'residential' corresponds to location type 'Home'
@@ -438,39 +432,32 @@ def create_locations_from_input(world, input_areas, household_distribution):
 def assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
                             infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
                             recovered_infected):
-    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - \
-        infected_severe_pct - infected_critical_pct - \
-        recovered_infected_no_symptoms - recovered_infected
+    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - infected_severe_pct - infected_critical_pct - recovered_infected_no_symptoms - recovered_infected
     for person in world.persons:
+        #draw infection state from distribution for every agent
         infection_state = np.random.choice(np.arange(0, int(abm.InfectionState.Count)),
                                            p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
                                                infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
                                                recovered_infected, 0.0])
         world.set_infection_state(person, abm.InfectionState(infection_state))
-        #person.infection_state = abm.InfectionState(infection_state)
 
 
 def assign_locations(world):
     # get locations from world
     schools = world.locations[abm.LocationType.School]
     school_weights = [(1/len(schools)) for i in range(len(schools))]
-
     hospitals = world.locations[abm.LocationType.Hospital]
     hospital_weights = [(1/len(hospitals)) for i in range(len(hospitals))]
-
     icus = world.locations[abm.LocationType.ICU]
     icu_weights = [(1/len(icus)) for i in range(len(icus))]
-
     workplaces = world.locations[abm.LocationType.Work]
     workplace_weights = [(1/len(workplaces)) for i in range(len(workplaces))]
-
     basic_shops = world.locations[abm.LocationType.BasicsShop]
     shop_weights = [(1/len(basic_shops)) for i in range(len(basic_shops))]
-
     social_events = world.locations[abm.LocationType.SocialEvent]
     event_weights = [(1/len(social_events)) for i in range(len(social_events))]
 
-    # assign locations to persons
+    # assign locations to agents
     for person in world.persons:
         shop = np.random.choice(np.arange(0, len(basic_shops)), p=shop_weights)
         person.set_assigned_location(abm.LocationId(
@@ -490,13 +477,13 @@ def assign_locations(world):
         person.set_assigned_location(abm.LocationId(
             social_events[int(event)].index, social_events[int(event)].type))
 
-        # assign school for persons between 5 and 14 years
+        # assign school to agents between 5 and 14 years
         if (person.age == AgeGroup.Age5to14):
             school = np.random.choice(
                 np.arange(0, len(schools)), p=school_weights)
             person.set_assigned_location(abm.LocationId(
                 schools[int(school)].index, schools[int(school)].type))
-        # assign work for persons between 15 and 59
+        # assign work to agents between 15 and 59
         if (person.age == AgeGroup.Age15to34 or person.age == AgeGroup.Age35to59):
             work = np.random.choice(
                 np.arange(0, len(workplaces)), p=workplace_weights)
@@ -567,34 +554,45 @@ def set_sim_result_at_start(sim):
 
 def run_abm_simulation():
 
-    input_path = 'H:/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt'
+    input_path = 'H:/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt/'
     output_path = 'H:/Documents/INSIDeDemonstrator/'
-    # set infection parameters
-    infection_params = set_infection_parameters()
     # starting time point
     t0 = abm.TimePoint(0)
     # end time point: simulation will run 14 days
     tmax = t0 + abm.days(14)
-    # distribution to distribute the residential areas to one, two-, three-, four- and five-person households
-    household_distribution = [0.37, 0.33, 0.15, 0.1, 0.05]
+    # distribution used to distribute the residential areas to one-, two-, three-, four- and five-person households
+    household_distribution = [0.4084, 0.3375, 0.1199, 0.0965, 0.0377]
 
     # read txt file with inputs
     areas = read_txt(input_path)
+    #create simulation
     sim = abm.Simulation(t0)
-    sim.world.infection_parameters = infection_params
+    #set infection parameters
+    sim.world.infection_parameters = set_infection_parameters()
+    #as input areas do fit one-to-one to abm location types they have there has to be a mapping
     mapping = create_locations_from_input(
         sim.world, areas, household_distribution)
+    #assign initial infection states according to distribution
     assign_infection_states(sim.world, 0.005, 0.001,
                             0.001, 0.0001, 0.0, 0.0, 0.0)
+    #assign locations to agents
     assign_locations(sim.world)
+    #as the simulation results for t=0 is set in the simulation constructor 
+    #but we assign the infection states afterwars, we have to reset the simulation's result attribute
     set_sim_result_at_start(sim)
+    #output object
     history = History()
+    #advance simulation until tmax
     sim.advance(tmax, history)
+    #results collected during the simulation
     log = history.log
+    #write simulation results to txt file
     write_results_to_file(output_path + 'output.txt', log)
+    #write location mapping to txt file
     write_location_mapping_to_file(output_path + 'location_mapping.txt', mapping)
 
-    # print compartment values
+    # print compartment values 
+    # only used for validation purposes
     print("t S E C I I_s I_c R_C R_I D")
     for t in range(sim.result.get_num_time_points()):
         line = str(sim.result.get_time(t)) + " "

From e394edcba10ffa7bd0f74ec05e5d1d8c2dd392aa Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 10 May 2023 11:34:00 +0200
Subject: [PATCH 035/103] pre commit and fix CI

---
 pycode/memilio-simulation/memilio/simulation/abm.cpp          | 2 +-
 pycode/memilio-simulation/memilio/simulation_test/test_abm.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 9923bb4cea..80aacf2039 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -296,8 +296,8 @@ PYBIND11_MODULE(_simulation_abm, m)
 
     py::class_<mio::abm::Simulation>(m, "Simulation")
         .def(py::init<mio::abm::TimePoint>())
-        //.def(py::init<mio::abm::TimePoint, mio::abm::World&&>())
         .def("advance", &mio::abm::Simulation::advance<History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>)
+        //.def("advance", &mio::abm::Simulation::advance)
         .def_property_readonly("result", &mio::abm::Simulation::get_result)
         .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world), py::return_value_policy::reference_internal);
 
diff --git a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
index 6732a2b43f..dbc6c3beaf 100644
--- a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
+++ b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
@@ -123,7 +123,8 @@ def test_simulation(self):
 
         # run
         t1 = t0 + abm.days(1)
-        sim.advance(t1)
+        history = abm.History()
+        sim.advance(t1, history)
         self.assertEqual(sim.result.get_num_time_points(), 25)
 
         # check effect of trips

From 9534c3bdbe69ee076f0424a218a93e1114d8ee3f Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 15 May 2023 17:19:57 +0200
Subject: [PATCH 036/103] [ci skip] set seeds

---
 cpp/models/abm/person.cpp                      | 1 +
 pycode/examples/simulation/abm_demonstrator.py | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 4f364ffd31..5ca816ef6c 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -171,6 +171,7 @@ void Person::set_infection_state(InfectionState inf_state)
     if (is_infected()) {
         m_time_since_transmission = mio::abm::TimeSpan(0);
     }
+    //TODO
     if (m_infection_state == InfectionState::Exposed) {
         m_time_until_carrier = hours(UniformIntDistribution<int>::get_instance()(0, int(4.0 * 24)));
     }
diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 0a59769bbe..2a7b2106ca 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -553,16 +553,17 @@ def set_sim_result_at_start(sim):
 
 
 def run_abm_simulation():
-
-    input_path = 'H:/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt/'
-    output_path = 'H:/Documents/INSIDeDemonstrator/'
+    
+    input_path = 'input/AreaList.txt'
+    output_path = 'output/'
+    #set seed for fixed model initialization (locations and initial infection states)
+    np.random.seed(0)
     # starting time point
     t0 = abm.TimePoint(0)
     # end time point: simulation will run 14 days
     tmax = t0 + abm.days(14)
     # distribution used to distribute the residential areas to one-, two-, three-, four- and five-person households
     household_distribution = [0.4084, 0.3375, 0.1199, 0.0965, 0.0377]
-
     # read txt file with inputs
     areas = read_txt(input_path)
     #create simulation

From 8abd5c28d5dbdbab60ad3b0488bfee8950a96d29 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 27 Jun 2023 10:36:22 +0200
Subject: [PATCH 037/103] fix cpp demonstrator

---
 cpp/models/abm/location.h                   |   9 +
 cpp/models/abm/person.cpp                   |  33 +-
 cpp/models/abm/person.h                     |   3 +-
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 569 +++++++++++++-------
 4 files changed, 403 insertions(+), 211 deletions(-)

diff --git a/cpp/models/abm/location.h b/cpp/models/abm/location.h
index 86c57ff28b..8eaed98085 100644
--- a/cpp/models/abm/location.h
+++ b/cpp/models/abm/location.h
@@ -130,6 +130,15 @@ class Location
         return m_id.type;
     }
 
+    /**
+     * @brief Get the id of this Location.
+     * @return The #LocationId of the Location.
+     */
+    LocationId get_id() const
+    {
+        return m_id;
+    }
+
     /**
      * @brief Get the index of this Location.
      * @return The index of the Location.
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 1ab5f416b1..24e193941e 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -53,13 +53,12 @@ Person::Person(Location& location, AgeGroup age, uint32_t person_id)
 
 void Person::interact(TimePoint t, TimeSpan dt, const GlobalInfectionParameters& params)
 {
+    auto old_infection_state = get_infection_state(t);
     if (get_infection_state(t) == InfectionState::Susceptible) { // Susceptible
         m_location->interact(*this, t, dt, params);
     }
     m_time_at_location += dt;
-    if (is_infected()) {
-        m_time_since_transmission = mio::abm::TimeSpan(0);
-    }
+    change_time_since_transmission(old_infection_state, get_infection_state(t), dt, t);
 }
 
 void Person::migrate_to(Location& loc_new, const std::vector<uint32_t>& cells)
@@ -94,27 +93,19 @@ InfectionState Person::get_infection_state(TimePoint t) const
     else {
         return m_infections.back().get_infection_state(t);
     }
-
-    change_time_since_transmission(m_infection_state, new_infection_state, dt);
 }
 
 void Person::add_new_infection(Infection&& inf)
 {
     m_infections.push_back(std::move(inf));
-}
-
-bool Person::is_infected()
-{
-    return m_infection_state == InfectionState::Exposed || m_infection_state == InfectionState::Carrier ||
-           m_infection_state == InfectionState::Infected || m_infection_state == InfectionState::Infected_Severe ||
-           m_infection_state == InfectionState::Infected_Critical;
+    m_time_since_transmission = mio::abm::TimeSpan(0);
 }
 
 void Person::change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
-                                            const TimeSpan dt)
+                                            const TimeSpan dt, TimePoint t)
 {
     if (curr_inf_state != new_inf_state) {
-        if (new_inf_state == InfectionState::Recovered_Carrier || new_inf_state == InfectionState::Recovered_Infected ||
+        if (new_inf_state == InfectionState::Recovered ||
             new_inf_state == InfectionState::Dead) {
             m_time_since_transmission = mio::abm::TimeSpan(std::numeric_limits<int>::max() / 2);
         }
@@ -126,7 +117,7 @@ void Person::change_time_since_transmission(const InfectionState curr_inf_state,
         }
     }
     else {
-        if (is_infected()) {
+        if (is_infected(t)) {
             if (m_time_since_transmission > mio::abm::TimeSpan(std::numeric_limits<int>::max() / 4)) {
                 m_time_since_transmission = mio::abm::TimeSpan(0);
             }
@@ -161,18 +152,6 @@ void Person::set_assigned_location(LocationId id)
     m_assigned_locations[(uint32_t)id.type] = id.index;
 }
 
-void Person::set_infection_state(InfectionState inf_state)
-{
-    m_infection_state = inf_state;
-    if (is_infected()) {
-        m_time_since_transmission = mio::abm::TimeSpan(0);
-    }
-    //TODO
-    if (m_infection_state == InfectionState::Exposed) {
-        m_time_until_carrier = hours(UniformIntDistribution<int>::get_instance()(0, int(4.0 * 24)));
-    }
-}
-
 uint32_t Person::get_assigned_location_index(LocationType type) const
 {
     return m_assigned_locations[(uint32_t)type];
diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index af279990bc..81ebc1ca59 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -369,7 +369,6 @@ class Person
         return 1.; // put implementation in .cpp
     }
 
-    bool is_infected();
     TimeSpan get_time_since_transmission()
     {
         return m_time_since_transmission;
@@ -377,7 +376,7 @@ class Person
 
 private:
     void change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
-                                        const TimeSpan dt);
+                                        const TimeSpan dt, TimePoint t);
 
     observer_ptr<Location> m_location; ///< Current Location of the Person.
     std::vector<uint32_t> m_assigned_locations; /**! Vector with the indices of the assigned Locations so that the 
diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 0d48eb6eb1..d5d8b4ebc6 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -19,11 +19,12 @@
 */
 
 #include "abm/household.h"
-#include "abm/state.h"
+#include "abm/infection_state.h"
 #include "abm/location.h"
 #include "memilio/io/result_io.h"
 #include "memilio/utils/uncertain_value.h"
 #include "memilio/io/io.h"
+#include "memilio/io/history.h"
 #include "memilio/utils/random_number_generator.h"
 #include "boost/filesystem.hpp"
 #include <fstream>
@@ -218,7 +219,7 @@ std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::ve
     size_t household_size;
     std::vector<mio::abm::LocationId> locations;
     //index of the first new household
-    int new_index = (int)world.get_locations()[(uint32_t)mio::abm::LocationType::Home].size();
+    size_t new_index = world.get_locations().size();
     while (num_inhabitants > 0) {
         //draw household size from the given distribution
         household_size = mio::DiscreteDistribution<size_t>::get_instance()(distribution);
@@ -394,186 +395,380 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
 */
 void set_infection_parameters(mio::abm::GlobalInfectionParameters infection_params)
 {
-    infection_params.set<mio::abm::IncubationPeriod>(
-        {{mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 4.});
+     infection_params.set<mio::abm::IncubationPeriod>(
+        {{mio::abm::VirusVariant::Count, mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 4.});
 
     //0-4
-    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age0to4,
-                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.05;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age0to4,
-                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.05;
-    infection_params
-        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.05;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+        0.05;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
         0.276;
-    infection_params
-        .get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
         0.092;
-    infection_params
-        .get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
         0.142;
-    infection_params
-        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
         0.001;
-    infection_params
-        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.186;
-    infection_params
-        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.015;
-    infection_params
-        .get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
+                                                         mio::abm::VaccinationState::Unvaccinated}] = 0.186;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
+                                                        mio::abm::VaccinationState::Unvaccinated}]  = 0.015;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
         0.143;
-    infection_params
-        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.001;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age0to4,
-                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.001;
 
     //5-14
-    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age5to14,
-                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.1;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age5to14,
-                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.1;
-    infection_params
-        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.1;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.1;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
         0.276;
-    infection_params
-        .get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
         0.092;
-    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age5to14,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.142;
-    infection_params
-        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.001;
-    infection_params
-        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.186;
-    infection_params
-        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.015;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age5to14,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.143;
-    infection_params
-        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.142;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
         0.001;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age5to14,
-                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
+                                                         mio::abm::VaccinationState::Unvaccinated}] = 0.186;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
+                                                        mio::abm::VaccinationState::Unvaccinated}]  = 0.015;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+        0.143;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.001;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] = 0.;
 
     //15-34
-    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age15to34,
-                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.13;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age15to34,
-                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.13;
-    infection_params
-        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.13;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.13;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
-    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age15to34,
-                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
-    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age15to34,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.139;
-    infection_params
-        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.079;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.139;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
         0.003;
-    infection_params
-        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
         0.157;
-    infection_params
-        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.013;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age15to34,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.126;
-    infection_params
-        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.021;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age15to34,
-                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
+                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.013;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+        0.126;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.021;
 
     //35-59
-    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age35to59,
-                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.11;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age35to59,
-                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.11;
-    infection_params
-        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.11;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.11;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
-    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age35to59,
-                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
-    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age35to59,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.136;
-    infection_params
-        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.079;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.136;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
         0.009;
-    infection_params
-        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
         0.113;
-    infection_params
-        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.02;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age35to59,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.05;
-    infection_params
-        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.008;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age35to59,
-                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
+                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.02;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.05;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.008;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+        0.;
 
     //60-79
-    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age60to79,
-                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.04;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age60to79,
-                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.04;
-    infection_params
-        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.04;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.04;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
-    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age60to79,
-                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
-    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age60to79,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.123;
-    infection_params
-        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.079;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.123;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
         0.024;
-    infection_params
-        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
         0.083;
-    infection_params
-        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
+                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.035;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
         0.035;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age60to79,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.035;
-    infection_params
-        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.023;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age60to79,
-                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.023;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+        0.;
 
     //80+
-    infection_params.get<mio::abm::SusceptibleToExposedByCarrier>()[{mio::abm::AgeGroup::Age80plus,
-                                                                     mio::abm::VaccinationState::Unvaccinated}]  = 0.07;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfected>()[{mio::abm::AgeGroup::Age80plus,
-                                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.07;
-    infection_params
-        .get<mio::abm::CarrierToInfected>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.07;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.07;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
-    infection_params.get<mio::abm::CarrierToRecovered>()[{mio::abm::AgeGroup::Age80plus,
-                                                          mio::abm::VaccinationState::Unvaccinated}]  = 0.079;
-    infection_params.get<mio::abm::InfectedToRecovered>()[{mio::abm::AgeGroup::Age80plus,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.115;
-    infection_params
-        .get<mio::abm::InfectedToSevere>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.079;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.115;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
         0.033;
-    infection_params
-        .get<mio::abm::SevereToRecovered>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
         0.055;
-    infection_params
-        .get<mio::abm::SevereToCritical>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.036;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::AgeGroup::Age80plus,
-                                                           mio::abm::VaccinationState::Unvaccinated}] = 0.035;
-    infection_params
-        .get<mio::abm::CriticalToDead>()[{mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.052;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::AgeGroup::Age80plus,
-                                                              mio::abm::VaccinationState::Unvaccinated}] = 0.;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
+                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.036;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.035;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.052;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
+        0.;
+
+    // Set each parameter for vaccinated people
+
+    //0-4
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.01;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.01;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.161;
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.132;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.143;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.001;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
+                                                         mio::abm::VaccinationState::Vaccinated}]               = 0.186;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
+                                                        mio::abm::VaccinationState::Vaccinated}]                = 0.015;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.143;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
+                                                      mio::abm::VaccinationState::Vaccinated}]                  = 0.001;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.0;
+
+    //5-14
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] = 0.03;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] = 0.03;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
+        0.161;
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
+        0.132;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
+        0.143;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
+        0.001;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
+                                                         mio::abm::VaccinationState::Vaccinated}] = 0.186;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
+                                                        mio::abm::VaccinationState::Vaccinated}]  = 0.015;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
+        0.143;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
+                                                      mio::abm::VaccinationState::Vaccinated}] = 0.001;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] = 0.0;
+
+    //15-34
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.03;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.03;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.179;
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.126;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.142;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.001;
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.157;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
+                                                        mio::abm::VaccinationState::Vaccinated}] = 0.013;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
+        0.126;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
+                                                      mio::abm::VaccinationState::Vaccinated}] = 0.021;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] = 0.0;
+
+    //35-59
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.03;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.03;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.179;
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.126;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.141;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.003;
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.113;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
+                                                        mio::abm::VaccinationState::Vaccinated}] = 0.02;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
+        0.05;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
+                                                      mio::abm::VaccinationState::Vaccinated}] = 0.008;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] = 0.0;
+
+    //60-79
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.01;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.01;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.179;
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.126;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.136;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.009;
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.083;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
+                                                        mio::abm::VaccinationState::Vaccinated}] = 0.035;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
+        0.035;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
+                                                      mio::abm::VaccinationState::Vaccinated}] = 0.023;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] = 0.0;
+
+    //80+
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.02;
+    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.02;
+    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.179;
+    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.126;
+    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.133;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.012;
+    infection_params.get<mio::abm::SevereToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.055;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
+                                                        mio::abm::VaccinationState::Vaccinated}] = 0.036;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
+        0.035;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
+                                                      mio::abm::VaccinationState::Vaccinated}] = 0.052;
+    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] = 0.0;
 }
 
 /**
@@ -589,14 +784,13 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters infection_para
 */
 mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infected_no_symptoms,
                                              ScalarType infected_symptoms, ScalarType infected_severe,
-                                             ScalarType infected_critical, ScalarType recovered_infected_no_symptoms,
-                                             ScalarType recovered_infected)
+                                             ScalarType infected_critical, ScalarType recovered)
 {
     ScalarType susceptible = 1 - exposed - infected_no_symptoms - infected_symptoms - infected_severe -
-                             infected_critical - recovered_infected_no_symptoms - recovered_infected;
+                             infected_critical - recovered;
     std::vector<ScalarType> weights = {
         susceptible,     exposed,           infected_no_symptoms,           infected_symptoms,
-        infected_severe, infected_critical, recovered_infected_no_symptoms, recovered_infected};
+        infected_severe, infected_critical, recovered};
     if (weights.size() != (size_t)mio::abm::InfectionState::Count - 1) {
         mio::log_error("Initialization in ABM wrong, please correct vector length.");
     }
@@ -607,51 +801,65 @@ mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infe
 /**
  * Assign an infection state to each person.
  * @param[in, out] world
+ * @param[in] t0 starting time point
  * @param[in] exposed percentage of infection state 'exposed'
  * @param[in] infected_no_symptoms percentage of infection state 'infected no symptoms'
  * @param[in] infected_symptoms percentage of of infection state 'infected symptoms'
  * @param[in] infected_severe percentage of infection state 'infected severe'
  * @param[in] infected_critical percentage of infection state 'infected critical'
- * @param[in] recovered_infected_no_symptoms percentage of infection state 'recovered of state infected no symptoms'
- * @param[in] recovered_infected percentage of infection state 'recovered of other infection state'
+ * @param[in] recovered percentage of infection state 'recovered'
 */
-void assign_infection_states(mio::abm::World& world, ScalarType exposed, ScalarType infected_no_symptoms,
+void assign_infection_states(mio::abm::World& world, mio::abm::TimePoint t0, ScalarType exposed, ScalarType infected_no_symptoms,
                              ScalarType infected_symptoms, ScalarType infected_severe, ScalarType infected_critical,
-                             ScalarType recovered_infected_no_symptoms, ScalarType recovered_infected)
+                             ScalarType recovered)
 {
     auto persons = world.get_persons();
     for (auto& person : persons) {
-        world.set_infection_state(person, get_infection_state(exposed, infected_no_symptoms, infected_symptoms,
+        auto infection_state = get_infection_state(exposed, infected_no_symptoms, infected_symptoms,
                                                               infected_severe, infected_critical,
-                                                              recovered_infected_no_symptoms, recovered_infected));
+                                                              recovered);
+        if(infection_state != mio::abm::InfectionState::Susceptible){
+            person.add_new_infection(mio::abm::Infection(mio::abm::VirusVariant::Wildtype, person.get_age(),
+                                                         world.get_global_infection_parameters(), t0, infection_state));
+        }
     }
 }
 
+std::vector<mio::abm::LocationId> find_all_locations_of_type(mio::abm::World& world, mio::abm::LocationType type)
+{
+    std::vector<mio::abm::LocationId> locations;
+    for(auto& loc : world.get_locations()){
+        if(loc.get_type() == type){
+            locations.push_back(mio::abm::LocationId{loc.get_index(), type});
+        }
+    }
+    return locations;
+}
+
 /**
  * Assign locations to persons.
  * @param[in, out] world
 */
 void assign_locations(mio::abm::World& world)
 {
-    //get locations from word
+    //get locations from world
     //schools
-    std::vector<mio::abm::Location> schools = world.get_locations()[(uint32_t)mio::abm::LocationType::School];
+    std::vector<mio::abm::LocationId> schools =  find_all_locations_of_type(world, mio::abm::LocationType::School);
     std::vector<ScalarType> school_weights(schools.size(), 1);
     //hispitals
-    std::vector<mio::abm::Location> hospitals = world.get_locations()[(uint32_t)mio::abm::LocationType::Hospital];
+    std::vector<mio::abm::LocationId> hospitals = find_all_locations_of_type(world, mio::abm::LocationType::Hospital);
     std::vector<ScalarType> hospital_weights(hospitals.size(), 1);
     //icu
-    std::vector<mio::abm::Location> icus = world.get_locations()[(uint32_t)mio::abm::LocationType::ICU];
+    std::vector<mio::abm::LocationId> icus = find_all_locations_of_type(world, mio::abm::LocationType::ICU);
     std::vector<ScalarType> icu_weights(icus.size(), 1);
     //workplaces
-    std::vector<mio::abm::Location> workplaces = world.get_locations()[(uint32_t)mio::abm::LocationType::Work];
+    std::vector<mio::abm::LocationId> workplaces = find_all_locations_of_type(world, mio::abm::LocationType::Work);
     std::vector<ScalarType> workplaces_weights(workplaces.size(), 1);
     //shops
-    std::vector<mio::abm::Location> basic_shops = world.get_locations()[(uint32_t)mio::abm::LocationType::BasicsShop];
+    std::vector<mio::abm::LocationId> basic_shops = find_all_locations_of_type(world, mio::abm::LocationType::BasicsShop);
     std::vector<ScalarType> basic_shops_weights(basic_shops.size(), 1);
     //social events
-    std::vector<mio::abm::Location> social_events =
-        world.get_locations()[(uint32_t)mio::abm::LocationType::SocialEvent];
+    std::vector<mio::abm::LocationId> social_events =find_all_locations_of_type(world, mio::abm::LocationType::SocialEvent);
     std::vector<ScalarType> social_event_weights(social_events.size(), 1);
 
     auto persons = world.get_persons();
@@ -700,8 +908,7 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
                five_person_hh_pct = 0.05;
     // Assumed percentage of infection state at the beginning of the simulation.
     ScalarType exposed_pct = 0.005, infected_no_symptoms_pct = 0.001, infected_symptoms_pct = 0.001,
-               infected_severe_pct = 0.0001, infected_critical_pct = 0.0, recovered_infected_no_symptoms_pct = 0.0,
-               recovered_infected_symptoms_pct = 0.0;
+               infected_severe_pct = 0.0001, infected_critical_pct = 0.0, recovered_pct = 0.0;
     //Set global infection parameters
     mio::abm::GlobalInfectionParameters infection_params;
     set_infection_parameters(infection_params);
@@ -714,8 +921,8 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
                                 three_person_hh_pct, four_person_hh_pct, five_person_hh_pct);
 
     //Assign an infection state to every person
-    assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct, infected_severe_pct,
-                            infected_critical_pct, recovered_infected_no_symptoms_pct, recovered_infected_symptoms_pct);
+    assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct, infected_severe_pct,
+                            infected_critical_pct, recovered_pct);
     //Assign the locations to persons
     assign_locations(world);
 
@@ -726,7 +933,7 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
 //Loggers used for output object
 
 //time point logger
-struct LogTimePoint : LogAlways {
+struct LogTimePoint : mio::LogAlways {
     using Type = double;
     static Type log(const mio::abm::Simulation& sim)
     {
@@ -735,31 +942,29 @@ struct LogTimePoint : LogAlways {
 };
 
 //LocationId logger
-struct LogLocationIds : LogOnce {
+struct LogLocationIds : mio::LogOnce {
     using Type = std::vector<std::tuple<mio::abm::LocationType, uint32_t>>;
     static Type log(const mio::abm::Simulation& sim)
     {
         std::vector<std::tuple<mio::abm::LocationType, uint32_t>> location_ids{};
-        for (auto&& locations : sim.get_world().get_locations()) {
-            for (auto location : locations) {
-                location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
-            }
+        for (auto&& location : sim.get_world().get_locations()) {
+            location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
         }
         return location_ids;
     }
 };
 
 //agent logger
-struct LogPersonsPerLocationAndInfectionTime : LogAlways {
+struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
     using Type = std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>;
     static Type log(const mio::abm::Simulation& sim)
     {
         std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>
             location_ids_person{};
         for (auto&& person : sim.get_world().get_persons()) {
-            location_ids_person.push_back(std::make_tuple(person.get_location_id(), person.get_person_id(),
+            location_ids_person.push_back(std::make_tuple(person.get_location().get_id(), person.get_person_id(),
                                                           person.get_time_since_transmission(),
-                                                          person.get_infection_state()));
+                                                          person.get_infection_state(sim.get_time())));
         }
         return location_ids_person;
     }
@@ -767,7 +972,7 @@ struct LogPersonsPerLocationAndInfectionTime : LogAlways {
 
 void write_results_to_file(
     std::string path,
-    History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>::Wri::Data& logg)
+    mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>::WriteWrapper::Data& logg)
 {
     auto location_ids = std::get<1>(logg);
     auto agents       = std::get<2>(logg);
@@ -822,7 +1027,7 @@ mio::IOResult<void> run(const fs::path& input_dir)
     auto sim = create_sampled_simulation(t0, input_dir, LocationIds);
 
     //output object
-    History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime> history;
+    mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime> history;
 
     //advance until tmax
     sim.advance(tmax, history);

From 62324fcb45a66bb5aa90354fd6934f7039060479 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 27 Jun 2023 11:27:21 +0200
Subject: [PATCH 038/103] format

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 50 ++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index d5d8b4ebc6..084cf5d40a 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -40,7 +40,7 @@ struct LocationMapping {
 std::string convert_loc_id_to_string(std::tuple<mio::abm::LocationType, uint32_t> tuple_id)
 {
     std::string locationType  = std::to_string(static_cast<std::uint32_t>(std::get<0>(tuple_id)));
-    std::string locationIndex = std::to_string(std::get<1>(tuple_id)) + "\"";
+    std::string locationIndex = std::to_string(std::get<1>(tuple_id));
     if (static_cast<std::uint32_t>(std::get<0>(tuple_id)) < 10) {
         locationType = "0" + locationType;
     }
@@ -48,7 +48,7 @@ std::string convert_loc_id_to_string(std::tuple<mio::abm::LocationType, uint32_t
         locationIndex = "0" + locationIndex;
     }
 
-    return locationType + locationIndex;
+    return "I" + locationType + locationIndex;
 }
 
 std::vector<std::tuple<uint32_t, mio::abm::TimeSpan>> get_agents_per_location(
@@ -299,7 +299,7 @@ std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::ve
     id.type = mio::abm::LocationType::Home;
     //add LocationIds for Mapping
     for (int hh = 0; hh < std::accumulate(households.begin(), households.end(), 0); ++hh) {
-        id.index = new_index;
+        id.index = (int)new_index;
         locations.emplace_back(id);
         ++new_index;
     }
@@ -395,7 +395,7 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
 */
 void set_infection_parameters(mio::abm::GlobalInfectionParameters infection_params)
 {
-     infection_params.set<mio::abm::IncubationPeriod>(
+    infection_params.set<mio::abm::IncubationPeriod>(
         {{mio::abm::VirusVariant::Count, mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 4.});
 
     //0-4
@@ -786,11 +786,10 @@ mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infe
                                              ScalarType infected_symptoms, ScalarType infected_severe,
                                              ScalarType infected_critical, ScalarType recovered)
 {
-    ScalarType susceptible = 1 - exposed - infected_no_symptoms - infected_symptoms - infected_severe -
-                             infected_critical - recovered;
+    ScalarType susceptible =
+        1 - exposed - infected_no_symptoms - infected_symptoms - infected_severe - infected_critical - recovered;
     std::vector<ScalarType> weights = {
-        susceptible,     exposed,           infected_no_symptoms,           infected_symptoms,
-        infected_severe, infected_critical, recovered};
+        susceptible, exposed, infected_no_symptoms, infected_symptoms, infected_severe, infected_critical, recovered};
     if (weights.size() != (size_t)mio::abm::InfectionState::Count - 1) {
         mio::log_error("Initialization in ABM wrong, please correct vector length.");
     }
@@ -809,16 +808,15 @@ mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infe
  * @param[in] infected_critical percentage of infection state 'infected critical'
  * @param[in] recovered percentage of infection state 'recovered'
 */
-void assign_infection_states(mio::abm::World& world, mio::abm::TimePoint t0, ScalarType exposed, ScalarType infected_no_symptoms,
-                             ScalarType infected_symptoms, ScalarType infected_severe, ScalarType infected_critical,
-                             ScalarType recovered)
+void assign_infection_states(mio::abm::World& world, mio::abm::TimePoint t0, ScalarType exposed,
+                             ScalarType infected_no_symptoms, ScalarType infected_symptoms, ScalarType infected_severe,
+                             ScalarType infected_critical, ScalarType recovered)
 {
     auto persons = world.get_persons();
     for (auto& person : persons) {
-        auto infection_state = get_infection_state(exposed, infected_no_symptoms, infected_symptoms,
-                                                              infected_severe, infected_critical,
-                                                              recovered);
-        if(infection_state != mio::abm::InfectionState::Susceptible){
+        auto infection_state = get_infection_state(exposed, infected_no_symptoms, infected_symptoms, infected_severe,
+                                                   infected_critical, recovered);
+        if (infection_state != mio::abm::InfectionState::Susceptible) {
             person.add_new_infection(mio::abm::Infection(mio::abm::VirusVariant::Wildtype, person.get_age(),
                                                          world.get_global_infection_parameters(), t0, infection_state));
         }
@@ -828,8 +826,8 @@ void assign_infection_states(mio::abm::World& world, mio::abm::TimePoint t0, Sca
 std::vector<mio::abm::LocationId> find_all_locations_of_type(mio::abm::World& world, mio::abm::LocationType type)
 {
     std::vector<mio::abm::LocationId> locations;
-    for(auto& loc : world.get_locations()){
-        if(loc.get_type() == type){
+    for (auto& loc : world.get_locations()) {
+        if (loc.get_type() == type) {
             locations.push_back(mio::abm::LocationId{loc.get_index(), type});
         }
     }
@@ -844,7 +842,7 @@ void assign_locations(mio::abm::World& world)
 {
     //get locations from world
     //schools
-    std::vector<mio::abm::LocationId> schools =  find_all_locations_of_type(world, mio::abm::LocationType::School);
+    std::vector<mio::abm::LocationId> schools = find_all_locations_of_type(world, mio::abm::LocationType::School);
     std::vector<ScalarType> school_weights(schools.size(), 1);
     //hispitals
     std::vector<mio::abm::LocationId> hospitals = find_all_locations_of_type(world, mio::abm::LocationType::Hospital);
@@ -856,10 +854,12 @@ void assign_locations(mio::abm::World& world)
     std::vector<mio::abm::LocationId> workplaces = find_all_locations_of_type(world, mio::abm::LocationType::Work);
     std::vector<ScalarType> workplaces_weights(workplaces.size(), 1);
     //shops
-    std::vector<mio::abm::LocationId> basic_shops = find_all_locations_of_type(world, mio::abm::LocationType::BasicsShop);
+    std::vector<mio::abm::LocationId> basic_shops =
+        find_all_locations_of_type(world, mio::abm::LocationType::BasicsShop);
     std::vector<ScalarType> basic_shops_weights(basic_shops.size(), 1);
     //social events
-    std::vector<mio::abm::LocationId> social_events =find_all_locations_of_type(world, mio::abm::LocationType::SocialEvent);
+    std::vector<mio::abm::LocationId> social_events =
+        find_all_locations_of_type(world, mio::abm::LocationType::SocialEvent);
     std::vector<ScalarType> social_event_weights(social_events.size(), 1);
 
     auto persons = world.get_persons();
@@ -921,8 +921,8 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
                                 three_person_hh_pct, four_person_hh_pct, five_person_hh_pct);
 
     //Assign an infection state to every person
-    assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct, infected_severe_pct,
-                            infected_critical_pct, recovered_pct);
+    assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
+                            infected_severe_pct, infected_critical_pct, recovered_pct);
     //Assign the locations to persons
     assign_locations(world);
 
@@ -970,9 +970,9 @@ struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
     }
 };
 
-void write_results_to_file(
-    std::string path,
-    mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>::WriteWrapper::Data& logg)
+void write_results_to_file(std::string path,
+                           mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
+                                        LogPersonsPerLocationAndInfectionTime>::WriteWrapper::Data& logg)
 {
     auto location_ids = std::get<1>(logg);
     auto agents       = std::get<2>(logg);

From b3671d230658bb1ae9581f27a76cc643e78df321 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 27 Jun 2023 15:17:50 +0200
Subject: [PATCH 039/103] fix bindings

---
 .../examples/simulation/abm_demonstrator.py   | 202 +++++++++---------
 .../memilio/simulation/abm.cpp                |  31 +--
 2 files changed, 121 insertions(+), 112 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 2a7b2106ca..4135982614 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -24,7 +24,9 @@
 from memilio.simulation import abm
 from memilio.simulation.abm import AgeGroup
 from memilio.simulation.abm import VaccinationState
+from memilio.simulation.abm import VirusVariant
 from memilio.simulation.abm import History
+from memilio.simulation.abm import Infection
 
 # class used to map input areas to abm locations
 class LocationMapping:
@@ -38,159 +40,159 @@ def set_infection_parameters():
     infection_params = abm.GlobalInfectionParameters()
 
     # AgeGroup 0-4
-    infection_params.IncubationPeriod[AgeGroup.Age0to4,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age0to4,
+    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                                    VaccinationState.Unvaccinated] = 0.05
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age0to4,
+    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                                     VaccinationState.Unvaccinated] = 0.05
-    infection_params.CarrierToInfected[AgeGroup.Age0to4,
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                        VaccinationState.Unvaccinated] = 0.276
-    infection_params.CarrierToRecovered[AgeGroup.Age0to4,
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                         VaccinationState.Unvaccinated] = 0.092
-    infection_params.InfectedToRecovered[AgeGroup.Age0to4,
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                          VaccinationState.Unvaccinated] = 0.142
-    infection_params.InfectedToSevere[AgeGroup.Age0to4,
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                       VaccinationState.Unvaccinated] = 0.001
-    infection_params.SevereToRecovered[AgeGroup.Age0to4,
+    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                        VaccinationState.Unvaccinated] = 0.186
-    infection_params.SevereToCritical[AgeGroup.Age0to4,
+    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                       VaccinationState.Unvaccinated] = 0.015
-    infection_params.CriticalToRecovered[AgeGroup.Age0to4,
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                          VaccinationState.Unvaccinated] = 0.143
-    infection_params.CriticalToDead[AgeGroup.Age0to4,
+    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                     VaccinationState.Unvaccinated] = 0.001
-    infection_params.RecoveredToSusceptible[AgeGroup.Age0to4,
+    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                             VaccinationState.Unvaccinated] = 0
 
     # AgeGroup 5-14
-    infection_params.IncubationPeriod[AgeGroup.Age5to14,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age5to14,
+    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                                    VaccinationState.Unvaccinated] = 0.1
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age5to14,
+    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                                     VaccinationState.Unvaccinated] = 0.1
-    infection_params.CarrierToInfected[AgeGroup.Age5to14,
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                        VaccinationState.Unvaccinated] = 0.276
-    infection_params.CarrierToRecovered[AgeGroup.Age5to14,
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                         VaccinationState.Unvaccinated] = 0.092
-    infection_params.InfectedToRecovered[AgeGroup.Age5to14,
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                          VaccinationState.Unvaccinated] = 0.142
-    infection_params.InfectedToSevere[AgeGroup.Age5to14,
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                       VaccinationState.Unvaccinated] = 0.001
-    infection_params.SevereToRecovered[AgeGroup.Age5to14,
+    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                        VaccinationState.Unvaccinated] = 0.186
-    infection_params.SevereToCritical[AgeGroup.Age5to14,
+    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                       VaccinationState.Unvaccinated] = 0.015
-    infection_params.CriticalToRecovered[AgeGroup.Age5to14,
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                          VaccinationState.Unvaccinated] = 0.143
-    infection_params.CriticalToDead[AgeGroup.Age5to14,
+    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                     VaccinationState.Unvaccinated] = 0.001
-    infection_params.RecoveredToSusceptible[AgeGroup.Age5to14,
+    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                             VaccinationState.Unvaccinated] = 0.
 
     # AgeGroup 15-34
-    infection_params.IncubationPeriod[AgeGroup.Age15to34,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age15to34,
+    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                                    VaccinationState.Unvaccinated] = 0.13
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age15to34,
+    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                                     VaccinationState.Unvaccinated] = 0.13
-    infection_params.CarrierToInfected[AgeGroup.Age15to34,
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                        VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age15to34,
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                         VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age15to34,
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                          VaccinationState.Unvaccinated] = 0.139
-    infection_params.InfectedToSevere[AgeGroup.Age15to34,
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                       VaccinationState.Unvaccinated] = 0.003
-    infection_params.SevereToRecovered[AgeGroup.Age15to34,
+    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                        VaccinationState.Unvaccinated] = 0.157
-    infection_params.SevereToCritical[AgeGroup.Age15to34,
+    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                       VaccinationState.Unvaccinated] = 0.013
-    infection_params.CriticalToRecovered[AgeGroup.Age15to34,
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                          VaccinationState.Unvaccinated] = 0.126
-    infection_params.CriticalToDead[AgeGroup.Age15to34,
+    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                     VaccinationState.Unvaccinated] = 0.021
-    infection_params.RecoveredToSusceptible[AgeGroup.Age15to34,
+    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                             VaccinationState.Unvaccinated] = 0.
 
     # AgeGroup 35-59
-    infection_params.IncubationPeriod[AgeGroup.Age35to59,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age35to59,
+    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                                    VaccinationState.Unvaccinated] = 0.11
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age35to59,
+    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                                     VaccinationState.Unvaccinated] = 0.11
-    infection_params.CarrierToInfected[AgeGroup.Age35to59,
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                        VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age35to59,
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                         VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age35to59,
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                          VaccinationState.Unvaccinated] = 0.136
-    infection_params.InfectedToSevere[AgeGroup.Age35to59,
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                       VaccinationState.Unvaccinated] = 0.009
-    infection_params.SevereToRecovered[AgeGroup.Age35to59,
+    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                        VaccinationState.Unvaccinated] = 0.113
-    infection_params.SevereToCritical[AgeGroup.Age35to59,
+    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                       VaccinationState.Unvaccinated] = 0.02
-    infection_params.CriticalToRecovered[AgeGroup.Age35to59,
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                          VaccinationState.Unvaccinated] = 0.05
-    infection_params.CriticalToDead[AgeGroup.Age35to59,
+    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                     VaccinationState.Unvaccinated] = 0.008
-    infection_params.RecoveredToSusceptible[AgeGroup.Age35to59,
+    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                             VaccinationState.Unvaccinated] = 0.
 
     # AgeGroup 60-79
-    infection_params.IncubationPeriod[AgeGroup.Age60to79,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age60to79,
+    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                                    VaccinationState.Unvaccinated] = 0.04
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age60to79,
+    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                                     VaccinationState.Unvaccinated] = 0.04
-    infection_params.CarrierToInfected[AgeGroup.Age60to79,
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                        VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age60to79,
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                         VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age60to79,
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                          VaccinationState.Unvaccinated] = 0.123
-    infection_params.InfectedToSevere[AgeGroup.Age60to79,
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                       VaccinationState.Unvaccinated] = 0.024
-    infection_params.SevereToRecovered[AgeGroup.Age60to79,
+    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                        VaccinationState.Unvaccinated] = 0.083
-    infection_params.SevereToCritical[AgeGroup.Age60to79,
+    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                       VaccinationState.Unvaccinated] = 0.035
-    infection_params.CriticalToRecovered[AgeGroup.Age60to79,
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                          VaccinationState.Unvaccinated] = 0.035
-    infection_params.CriticalToDead[AgeGroup.Age60to79,
+    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                     VaccinationState.Unvaccinated] = 0.023
-    infection_params.RecoveredToSusceptible[AgeGroup.Age60to79,
+    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                             VaccinationState.Unvaccinated] = 0.
 
     # AgeGroup 80+
-    infection_params.IncubationPeriod[AgeGroup.Age80plus,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByCarrier[AgeGroup.Age80plus,
+    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                                    VaccinationState.Unvaccinated] = 0.07
-    infection_params.SusceptibleToExposedByInfected[AgeGroup.Age80plus,
+    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                                     VaccinationState.Unvaccinated] = 0.07
-    infection_params.CarrierToInfected[AgeGroup.Age80plus,
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                        VaccinationState.Unvaccinated] = 0.315
-    infection_params.CarrierToRecovered[AgeGroup.Age80plus,
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                         VaccinationState.Unvaccinated] = 0.079
-    infection_params.InfectedToRecovered[AgeGroup.Age80plus,
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                          VaccinationState.Unvaccinated] = 0.115
-    infection_params.InfectedToSevere[AgeGroup.Age80plus,
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                       VaccinationState.Unvaccinated] = 0.033
-    infection_params.SevereToRecovered[AgeGroup.Age80plus,
+    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                        VaccinationState.Unvaccinated] = 0.055
-    infection_params.SevereToCritical[AgeGroup.Age80plus,
+    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                       VaccinationState.Unvaccinated] = 0.036
-    infection_params.CriticalToRecovered[AgeGroup.Age80plus,
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                          VaccinationState.Unvaccinated] = 0.035
-    infection_params.CriticalToDead[AgeGroup.Age80plus,
+    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                     VaccinationState.Unvaccinated] = 0.052
-    infection_params.RecoveredToSusceptible[AgeGroup.Age80plus,
+    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                             VaccinationState.Unvaccinated] = 0.
 
     return infection_params
@@ -265,7 +267,7 @@ def make_multiple_person_households(household_size,
 def add_households(world, distribution, num_inhabitants):
     household_sizes = np.zeros(len(distribution))
     locationIds = []
-    new_index = len(world.locations[int(abm.LocationType.Home)])
+    new_index = len(world.locations)
     # distribute inhabintants to households
     while num_inhabitants > 0:
         size = np.random.choice(
@@ -352,7 +354,7 @@ def create_locations_from_input(world, input_areas, household_distribution):
             # set maximum contacts and capacity for social events
             world.get_individualized_location(
                 location).infection_parameters.MaximumContacts = 30.
-            world.get_individualized_location(location).set_capacity(30, 40)
+            world.get_individualized_location(location).set_capacity(30, 40, 0)
             locationIds.append(location)
         elif (area.type == 'shopping_business'):
             # area 'shopping_business' corresponds to location type School, Hospital, BasicsShops, Work
@@ -363,7 +365,7 @@ def create_locations_from_input(world, input_areas, household_distribution):
                 world.get_individualized_location(
                     location).infection_parameters.MaximumContacts = 40.
                 world.get_individualized_location(
-                    location).set_capacity(500, 2000)
+                    location).set_capacity(500, 2000, 0)
                 locationIds.append(location)
                 has_school = True
             elif (not has_hospital):
@@ -373,13 +375,13 @@ def create_locations_from_input(world, input_areas, household_distribution):
                 world.get_individualized_location(
                     locHosp).infection_parameters.MaximumContacts = 5.
                 world.get_individualized_location(
-                    locHosp).set_capacity(300, 10000)
+                    locHosp).set_capacity(300, 10000, 0)
                 locICU = world.add_location(abm.LocationType.ICU)
                 # set maximum contacts and capacity for icu
                 world.get_individualized_location(
                     locICU).infection_parameters.MaximumContacts = 5.
                 world.get_individualized_location(
-                    locICU).set_capacity(30, 1000)
+                    locICU).set_capacity(30, 1000, 0)
                 locationIds.append(locHosp)
                 locationIds.append(locICU)
                 has_hospital = True
@@ -393,7 +395,7 @@ def create_locations_from_input(world, input_areas, household_distribution):
                     world.get_individualized_location(
                         location).infection_parameters.MaximumContacts = 20.
                     world.get_individualized_location(
-                        location).set_capacity(100, 1000)
+                        location).set_capacity(100, 1000, 0)
                     locationIds.append(location)
                 else:
                     location = world.add_location(abm.LocationType.Work)
@@ -401,7 +403,7 @@ def create_locations_from_input(world, input_areas, household_distribution):
                     world.get_individualized_location(
                         location).infection_parameters.MaximumContacts = 40.
                     world.get_individualized_location(
-                        location).set_capacity(300, 2000)
+                        location).set_capacity(300, 2000, 0)
                     locationIds.append(location)
         elif (area.type == 'university'):
             # area 'university' corresponds to location type 'Work'
@@ -409,7 +411,7 @@ def create_locations_from_input(world, input_areas, household_distribution):
             # set maximum contacts and capacity for work
             world.get_individualized_location(
                 location).infection_parameters.MaximumContacts = 50.
-            world.get_individualized_location(location).set_capacity(200, 4000)
+            world.get_individualized_location(location).set_capacity(200, 4000, 0)
             locationIds.append(location)
         elif (area.type == 'mixed'):
             # area 'mixed' corresponds either to location type 'Work' or location type 'Home' with same probability
@@ -420,7 +422,7 @@ def create_locations_from_input(world, input_areas, household_distribution):
                 world.get_individualized_location(
                     location).infection_parameters.MaximumContacts = 40.
                 world.get_individualized_location(
-                    location).set_capacity(100, 2000)
+                    location).set_capacity(100, 2000, 0)
                 locationIds.append(location)
             else:
                 locationIds = add_households(
@@ -429,32 +431,38 @@ def create_locations_from_input(world, input_areas, household_distribution):
     return mapping
 
 
-def assign_infection_states(world, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
-                            infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
-                            recovered_infected):
-    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - infected_severe_pct - infected_critical_pct - recovered_infected_no_symptoms - recovered_infected
+def assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
+                            infected_severe_pct, infected_critical_pct, recovered_pct):
+    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - infected_severe_pct - infected_critical_pct - recovered_pct
     for person in world.persons:
         #draw infection state from distribution for every agent
         infection_state = np.random.choice(np.arange(0, int(abm.InfectionState.Count)),
                                            p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
-                                               infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_infected_no_symptoms,
-                                               recovered_infected, 0.0])
-        world.set_infection_state(person, abm.InfectionState(infection_state))
+                                               infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_pct, 0.0])
+        if(infection_state != abm.InfectionState.Susceptible):
+            person.add_new_infection(Infection(VirusVariant.Wildtype, person.age, world.infection_parameters, t0, abm.InfectionState(infection_state), False))
+
+def find_all_locations_of_type(world, type):
+    locations = []
+    for loc in world.locations:
+        if(loc.type == type):
+            locations.append(abm.LocationId(loc.index, type))
+    return locations
 
 
 def assign_locations(world):
     # get locations from world
-    schools = world.locations[abm.LocationType.School]
+    schools = find_all_locations_of_type(world, abm.LocationType.School)
     school_weights = [(1/len(schools)) for i in range(len(schools))]
-    hospitals = world.locations[abm.LocationType.Hospital]
+    hospitals = find_all_locations_of_type(world, abm.LocationType.Hospital)
     hospital_weights = [(1/len(hospitals)) for i in range(len(hospitals))]
-    icus = world.locations[abm.LocationType.ICU]
+    icus = find_all_locations_of_type(world, abm.LocationType.ICU)
     icu_weights = [(1/len(icus)) for i in range(len(icus))]
-    workplaces = world.locations[abm.LocationType.Work]
+    workplaces = find_all_locations_of_type(world, abm.LocationType.Work)
     workplace_weights = [(1/len(workplaces)) for i in range(len(workplaces))]
-    basic_shops = world.locations[abm.LocationType.BasicsShop]
+    basic_shops = find_all_locations_of_type(world, abm.LocationType.BasicsShop)
     shop_weights = [(1/len(basic_shops)) for i in range(len(basic_shops))]
-    social_events = world.locations[abm.LocationType.SocialEvent]
+    social_events = find_all_locations_of_type(world, abm.LocationType.SocialEvent)
     event_weights = [(1/len(social_events)) for i in range(len(social_events))]
 
     # assign locations to agents
@@ -554,7 +562,7 @@ def set_sim_result_at_start(sim):
 
 def run_abm_simulation():
     
-    input_path = 'input/AreaList.txt'
+    input_path = '~/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt'
     output_path = 'output/'
     #set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
@@ -574,8 +582,8 @@ def run_abm_simulation():
     mapping = create_locations_from_input(
         sim.world, areas, household_distribution)
     #assign initial infection states according to distribution
-    assign_infection_states(sim.world, 0.005, 0.001,
-                            0.001, 0.0001, 0.0, 0.0, 0.0)
+    assign_infection_states(sim.world, t0, 0.005, 0.001,
+                            0.001, 0.0001, 0.0, 0.0)
     #assign locations to agents
     assign_locations(sim.world)
     #as the simulation results for t=0 is set in the simulation constructor 
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 969d96cc99..27f3b0834e 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -34,7 +34,7 @@
 namespace py = pybind11;
 
 //time point logger
-struct LogTimePoint : LogAlways {
+struct LogTimePoint : mio::LogAlways {
     using Type = double;
     static Type log(const mio::abm::Simulation& sim)
     {
@@ -43,31 +43,29 @@ struct LogTimePoint : LogAlways {
 };
 
 //LocationId logger
-struct LogLocationIds : LogOnce {
+struct LogLocationIds : mio::LogOnce {
     using Type = std::vector<std::tuple<mio::abm::LocationType, uint32_t>>;
     static Type log(const mio::abm::Simulation& sim)
     {
         std::vector<std::tuple<mio::abm::LocationType, uint32_t>> location_ids{};
-        for (auto&& locations : sim.get_world().get_locations()) {
-            for (auto location : locations) {
-                location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
-            }
+        for (auto&& location : sim.get_world().get_locations()) {
+            location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
         }
         return location_ids;
     }
-};
+};            
 
 //agent logger
-struct LogPersonsPerLocationAndInfectionTime : LogAlways {
+struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
     using Type = std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>;
     static Type log(const mio::abm::Simulation& sim)
     {
         std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>
             location_ids_person{};
         for (auto&& person : sim.get_world().get_persons()) {
-            location_ids_person.push_back(std::make_tuple(person.get_location_id(), person.get_person_id(),
+            location_ids_person.push_back(std::make_tuple(person.get_location().get_id(), person.get_person_id(),
                                                           person.get_time_since_transmission(),
-                                                          person.get_infection_state()));
+                                                          person.get_infection_state(sim.get_time())));
         }
         return location_ids_person;
     }
@@ -181,6 +179,7 @@ PYBIND11_MODULE(_simulation_abm, m)
 
     py::class_<mio::abm::Person>(m, "Person")
         .def("set_assigned_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::Person::set_assigned_location))
+        .def("add_new_infection", [](mio::abm::Person& self, mio::abm::Infection& infection){self.add_new_infection(std::move(infection));})
         .def_property_readonly("location", py::overload_cast<>(&mio::abm::Person::get_location, py::const_))
         .def_property_readonly("age", &mio::abm::Person::get_age)
         .def_property_readonly("is_in_quarantine", &mio::abm::Person::is_in_quarantine);
@@ -218,11 +217,14 @@ PYBIND11_MODULE(_simulation_abm, m)
     py::class_<mio::abm::TestingStrategy>(m, "TestingStrategy")
         .def(py::init<const std::vector<mio::abm::TestingScheme>&>());
 
+    py::class_<mio::abm::Infection>(m, "Infection")
+        .def(py::init<mio::abm::VirusVariant, mio::abm::AgeGroup, const mio::abm::GlobalInfectionParameters&, mio::abm::TimePoint, mio::abm::InfectionState, bool>());
+
     py::class_<mio::abm::Location>(m, "Location")
         .def("set_capacity", &mio::abm::Location::set_capacity)
         .def_property_readonly("type", &mio::abm::Location::get_type)
         .def_property_readonly("index", &mio::abm::Location::get_index)
-        .def_property_readonly("population", &mio::abm::Location::get_population, py::return_value_policy::reference_internal)
+        .def_property_readonly("population", &mio::abm::Location::get_subpopulations, py::return_value_policy::reference_internal)
         .def_property("infection_parameters",
                       py::overload_cast<>(&mio::abm::Location::get_infection_parameters, py::const_),
                       [](mio::abm::Location& self, mio::abm::LocalInfectionParameters params) {
@@ -256,7 +258,6 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("add_person", &mio::abm::World::add_person, py::arg("location_id"), py::arg("age_group"),
              py::return_value_policy::reference_internal)
         .def("get_individualized_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::World::get_individualized_location, py::const_), py::return_value_policy::reference_internal)
-        .def("set_infection_state", &mio::abm::World::set_infection_state)
         .def_property_readonly("locations", &mio::abm::World::get_locations,
                                py::keep_alive<1, 0>{}) //keep this world alive while contents are referenced in ranges
         .def_property_readonly("persons", &mio::abm::World::get_persons, py::keep_alive<1, 0>{})
@@ -289,12 +290,12 @@ PYBIND11_MODULE(_simulation_abm, m)
 
     py::class_<mio::abm::Simulation>(m, "Simulation")
         .def(py::init<mio::abm::TimePoint>())
-        .def("advance", &mio::abm::Simulation::advance<History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>)
+        .def("advance", &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>)
         //.def("advance", &mio::abm::Simulation::advance)
         .def_property_readonly("result", &mio::abm::Simulation::get_result)
         .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world), py::return_value_policy::reference_internal);
 
-    py::class_<History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>(m, "History")
+    py::class_<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>(m, "History")
         .def(py::init<>())
-        .def_property_readonly("log", &History<DataWriterToBuffer, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>::get_log);
+        .def_property_readonly("log", [](mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>& self){return self.get_log();});
 }

From 46f4360c365e55c03d1740911d8f653772056f11 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 27 Jun 2023 15:40:35 +0200
Subject: [PATCH 040/103] assign_infection_state

---
 pycode/examples/simulation/abm_demonstrator.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 4135982614..5270595aad 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -439,7 +439,7 @@ def assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, in
         infection_state = np.random.choice(np.arange(0, int(abm.InfectionState.Count)),
                                            p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
                                                infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_pct, 0.0])
-        if(infection_state != abm.InfectionState.Susceptible):
+        if(abm.InfectionState(infection_state) != abm.InfectionState.Susceptible):
             person.add_new_infection(Infection(VirusVariant.Wildtype, person.age, world.infection_parameters, t0, abm.InfectionState(infection_state), False))
 
 def find_all_locations_of_type(world, type):
@@ -554,15 +554,14 @@ def write_location_mapping_to_file(path, mapping):
 
 
 def set_sim_result_at_start(sim):
-    for locations in sim.world.locations:
-        for location in locations:
-            result = sim.result.get_last_value()
-            result += location.population.get_last_value()
+    for location in sim.world.locations:
+        result = sim.result.get_last_value()
+        result += location.population.get_last_value()
 
 
 def run_abm_simulation():
     
-    input_path = '~/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.txt'
+    input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList_modified.txt'
     output_path = 'output/'
     #set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)

From fd1078f77013b947d64ee6e0715eaca8785b241c Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 27 Jun 2023 15:48:30 +0200
Subject: [PATCH 041/103] add cemetery

---
 pycode/memilio-simulation/memilio/simulation/abm.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 27f3b0834e..a24564b307 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -108,7 +108,8 @@ PYBIND11_MODULE(_simulation_abm, m)
         .value("ICU", mio::abm::LocationType::ICU)
         .value("Car", mio::abm::LocationType::Car)
         .value("PublicTransport", mio::abm::LocationType::PublicTransport)
-        .value("TransportWithoutContact", mio::abm::LocationType::TransportWithoutContact);
+        .value("TransportWithoutContact", mio::abm::LocationType::TransportWithoutContact)
+        .value("Cemetery", mio::abm::LocationType::Cemetery);
 
     py::class_<mio::abm::TestParameters>(m, "TestParameters")
         .def(py::init<double, double>())

From 5ae1e3124730a0be2dec2ff6d728ef415680a88d Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 28 Jun 2023 08:59:08 +0200
Subject: [PATCH 042/103] rename infection states

---
 .../examples/simulation/abm_demonstrator.py   | 140 ++++++++++--------
 1 file changed, 76 insertions(+), 64 deletions(-)

diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/abm_demonstrator.py
index 5270595aad..00156f3487 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/abm_demonstrator.py
@@ -29,6 +29,8 @@
 from memilio.simulation.abm import Infection
 
 # class used to map input areas to abm locations
+
+
 class LocationMapping:
 
     def __init__(self):
@@ -36,6 +38,8 @@ def __init__(self):
         self.modelId = []
 
 # infection parameters are dependent on age group and vaccination state
+
+
 def set_infection_parameters():
     infection_params = abm.GlobalInfectionParameters()
 
@@ -43,17 +47,17 @@ def set_infection_parameters():
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                   VaccinationState.Unvaccinated] = 0.05
+                                                              VaccinationState.Unvaccinated] = 0.05
     infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                    VaccinationState.Unvaccinated] = 0.05
+                                                            VaccinationState.Unvaccinated] = 0.05
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                       VaccinationState.Unvaccinated] = 0.276
+                                                  VaccinationState.Unvaccinated] = 0.276
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                        VaccinationState.Unvaccinated] = 0.092
+                                                   VaccinationState.Unvaccinated] = 0.092
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                         VaccinationState.Unvaccinated] = 0.142
+                                                 VaccinationState.Unvaccinated] = 0.142
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated] = 0.001
+                                              VaccinationState.Unvaccinated] = 0.001
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                        VaccinationState.Unvaccinated] = 0.186
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age0to4,
@@ -69,17 +73,17 @@ def set_infection_parameters():
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                   VaccinationState.Unvaccinated] = 0.1
+                                                              VaccinationState.Unvaccinated] = 0.1
     infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                    VaccinationState.Unvaccinated] = 0.1
+                                                            VaccinationState.Unvaccinated] = 0.1
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                       VaccinationState.Unvaccinated] = 0.276
+                                                  VaccinationState.Unvaccinated] = 0.276
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                        VaccinationState.Unvaccinated] = 0.092
+                                                   VaccinationState.Unvaccinated] = 0.092
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                         VaccinationState.Unvaccinated] = 0.142
+                                                 VaccinationState.Unvaccinated] = 0.142
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated] = 0.001
+                                              VaccinationState.Unvaccinated] = 0.001
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                        VaccinationState.Unvaccinated] = 0.186
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age5to14,
@@ -95,17 +99,17 @@ def set_infection_parameters():
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                   VaccinationState.Unvaccinated] = 0.13
+                                                              VaccinationState.Unvaccinated] = 0.13
     infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                    VaccinationState.Unvaccinated] = 0.13
+                                                            VaccinationState.Unvaccinated] = 0.13
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                       VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                        VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 0.079
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                         VaccinationState.Unvaccinated] = 0.139
+                                                 VaccinationState.Unvaccinated] = 0.139
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated] = 0.003
+                                              VaccinationState.Unvaccinated] = 0.003
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                        VaccinationState.Unvaccinated] = 0.157
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age15to34,
@@ -121,17 +125,17 @@ def set_infection_parameters():
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                   VaccinationState.Unvaccinated] = 0.11
+                                                              VaccinationState.Unvaccinated] = 0.11
     infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                    VaccinationState.Unvaccinated] = 0.11
+                                                            VaccinationState.Unvaccinated] = 0.11
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                       VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                        VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 0.079
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                         VaccinationState.Unvaccinated] = 0.136
+                                                 VaccinationState.Unvaccinated] = 0.136
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated] = 0.009
+                                              VaccinationState.Unvaccinated] = 0.009
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                        VaccinationState.Unvaccinated] = 0.113
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age35to59,
@@ -147,17 +151,17 @@ def set_infection_parameters():
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                   VaccinationState.Unvaccinated] = 0.04
+                                                              VaccinationState.Unvaccinated] = 0.04
     infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                    VaccinationState.Unvaccinated] = 0.04
+                                                            VaccinationState.Unvaccinated] = 0.04
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                       VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                        VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 0.079
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                         VaccinationState.Unvaccinated] = 0.123
+                                                 VaccinationState.Unvaccinated] = 0.123
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated] = 0.024
+                                              VaccinationState.Unvaccinated] = 0.024
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                        VaccinationState.Unvaccinated] = 0.083
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age60to79,
@@ -173,17 +177,17 @@ def set_infection_parameters():
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                       VaccinationState.Unvaccinated] = 4
     infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                   VaccinationState.Unvaccinated] = 0.07
+                                                              VaccinationState.Unvaccinated] = 0.07
     infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                    VaccinationState.Unvaccinated] = 0.07
+                                                            VaccinationState.Unvaccinated] = 0.07
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                       VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                        VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 0.079
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                         VaccinationState.Unvaccinated] = 0.115
+                                                 VaccinationState.Unvaccinated] = 0.115
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated] = 0.033
+                                              VaccinationState.Unvaccinated] = 0.033
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                        VaccinationState.Unvaccinated] = 0.055
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age80plus,
@@ -202,6 +206,7 @@ def read_txt(path):
     # read input file and save it in a pd.Dataframe
     return pd.read_csv(path, sep='\t')
 
+
 def make_one_person_households(number_of_households):
     # one-person household member
     one_person_household_member = abm.HouseholdMember()
@@ -336,6 +341,7 @@ def insert_locations_to_map(mapping, inputId, locationIds):
     mapping.append(map)
     return mapping
 
+
 def create_locations_from_input(world, input_areas, household_distribution):
     # map input area ids to corresponding abm location ids
     mapping = []
@@ -411,7 +417,8 @@ def create_locations_from_input(world, input_areas, household_distribution):
             # set maximum contacts and capacity for work
             world.get_individualized_location(
                 location).infection_parameters.MaximumContacts = 50.
-            world.get_individualized_location(location).set_capacity(200, 4000, 0)
+            world.get_individualized_location(
+                location).set_capacity(200, 4000, 0)
             locationIds.append(location)
         elif (area.type == 'mixed'):
             # area 'mixed' corresponds either to location type 'Work' or location type 'Home' with same probability
@@ -433,19 +440,23 @@ def create_locations_from_input(world, input_areas, household_distribution):
 
 def assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
                             infected_severe_pct, infected_critical_pct, recovered_pct):
-    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - infected_symptoms_pct - infected_severe_pct - infected_critical_pct - recovered_pct
+    susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - \
+        infected_symptoms_pct - infected_severe_pct - \
+        infected_critical_pct - recovered_pct
     for person in world.persons:
-        #draw infection state from distribution for every agent
+        # draw infection state from distribution for every agent
         infection_state = np.random.choice(np.arange(0, int(abm.InfectionState.Count)),
                                            p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
                                                infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_pct, 0.0])
-        if(abm.InfectionState(infection_state) != abm.InfectionState.Susceptible):
-            person.add_new_infection(Infection(VirusVariant.Wildtype, person.age, world.infection_parameters, t0, abm.InfectionState(infection_state), False))
+        if (abm.InfectionState(infection_state) != abm.InfectionState.Susceptible):
+            person.add_new_infection(Infection(VirusVariant.Wildtype, person.age,
+                                     world.infection_parameters, t0, abm.InfectionState(infection_state), False))
+
 
 def find_all_locations_of_type(world, type):
     locations = []
     for loc in world.locations:
-        if(loc.type == type):
+        if (loc.type == type):
             locations.append(abm.LocationId(loc.index, type))
     return locations
 
@@ -460,9 +471,11 @@ def assign_locations(world):
     icu_weights = [(1/len(icus)) for i in range(len(icus))]
     workplaces = find_all_locations_of_type(world, abm.LocationType.Work)
     workplace_weights = [(1/len(workplaces)) for i in range(len(workplaces))]
-    basic_shops = find_all_locations_of_type(world, abm.LocationType.BasicsShop)
+    basic_shops = find_all_locations_of_type(
+        world, abm.LocationType.BasicsShop)
     shop_weights = [(1/len(basic_shops)) for i in range(len(basic_shops))]
-    social_events = find_all_locations_of_type(world, abm.LocationType.SocialEvent)
+    social_events = find_all_locations_of_type(
+        world, abm.LocationType.SocialEvent)
     event_weights = [(1/len(social_events)) for i in range(len(social_events))]
 
     # assign locations to agents
@@ -507,7 +520,7 @@ def convert_loc_id_to_string(loc_id):
     if int(loc_id[1]) < 10:
         index = "0" + index
 
-    return type + index
+    return "I" + type + index
 
 
 def get_agents_per_location(loc_id, agents):
@@ -524,7 +537,8 @@ def write_results_to_file(path, log):
     agents = log[2]
     with open(path, 'w') as f:
         for location_id_index in range(len(location_ids)):
-            line = convert_loc_id_to_string(location_ids[location_id_index])
+            line = convert_loc_id_to_string(
+                location_ids[location_id_index]) + " " + str(len(time_points))
             for t in range(len(time_points)):
                 agents_per_loc = get_agents_per_location(
                     location_ids[location_id_index], agents[t])
@@ -560,10 +574,10 @@ def set_sim_result_at_start(sim):
 
 
 def run_abm_simulation():
-    
-    input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList_modified.txt'
+
+    input_path = 'AreaList.txt'
     output_path = 'output/'
-    #set seed for fixed model initialization (locations and initial infection states)
+    # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
     t0 = abm.TimePoint(0)
@@ -573,33 +587,31 @@ def run_abm_simulation():
     household_distribution = [0.4084, 0.3375, 0.1199, 0.0965, 0.0377]
     # read txt file with inputs
     areas = read_txt(input_path)
-    #create simulation
+    # create simulation
     sim = abm.Simulation(t0)
-    #set infection parameters
+    # set infection parameters
     sim.world.infection_parameters = set_infection_parameters()
-    #as input areas do fit one-to-one to abm location types they have there has to be a mapping
+    # as input areas do fit one-to-one to abm location types they have there has to be a mapping
     mapping = create_locations_from_input(
         sim.world, areas, household_distribution)
-    #assign initial infection states according to distribution
+    # assign initial infection states according to distribution
     assign_infection_states(sim.world, t0, 0.005, 0.001,
                             0.001, 0.0001, 0.0, 0.0)
-    #assign locations to agents
+    # assign locations to agents
     assign_locations(sim.world)
-    #as the simulation results for t=0 is set in the simulation constructor 
-    #but we assign the infection states afterwars, we have to reset the simulation's result attribute
-    set_sim_result_at_start(sim)
-    #output object
+    # output object
     history = History()
-    #advance simulation until tmax
+    # advance simulation until tmax
     sim.advance(tmax, history)
-    #results collected during the simulation
+    # results collected during the simulation
     log = history.log
-    #write simulation results to txt file
+    # write simulation results to txt file
     write_results_to_file(output_path + 'output.txt', log)
-    #write location mapping to txt file
-    write_location_mapping_to_file(output_path + 'location_mapping.txt', mapping)
+    # write location mapping to txt file
+    write_location_mapping_to_file(
+        output_path + 'location_mapping.txt', mapping)
 
-    # print compartment values 
+    # print compartment values
     # only used for validation purposes
     print("t S E C I I_s I_c R_C R_I D")
     for t in range(sim.result.get_num_time_points()):

From 73f65dbbfea38a15b5cadf34c233424383f93594 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 28 Jun 2023 11:33:07 +0200
Subject: [PATCH 043/103] delete old files

---
 cpp/memilio/utils/history.h           |  97 -------------
 cpp/memilio/utils/history_example.cpp | 187 --------------------------
 2 files changed, 284 deletions(-)
 delete mode 100644 cpp/memilio/utils/history.h
 delete mode 100644 cpp/memilio/utils/history_example.cpp

diff --git a/cpp/memilio/utils/history.h b/cpp/memilio/utils/history.h
deleted file mode 100644
index 3b8a53bfae..0000000000
--- a/cpp/memilio/utils/history.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* 
-* Copyright (C) 2020-2021 German Aerospace Center (DLR-SC)
-*
-* Authors: Sascha Korf, Rene Schmieding 
-*
-* Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#include <vector>
-#include <tuple>
-#include <iostream>
-
-//TODO: Maybe rename Log... something like Reader or something similar
-struct LogOnce {
-};
-
-struct LogAlways {
-};
-
-template <typename T, typename U = void, typename... Types>
-constexpr size_t indexte()
-{
-    return std::is_same<T, U>::value ? 0 : 1 + indexte<T, Types...>();
-}
-
-template <class... Loggers>
-struct DataWriterToBuffer {
-    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
-    template <class Logger>
-    static void write_this(const typename Logger::Type& t, Data& data)
-    {
-        std::get<indexte<Logger, Loggers...>()>(data).push_back(t);
-    }
-};
-
-template <template <class...> class Writer, class... Loggers>
-class History
-{
-public:
-    using Wri = Writer<Loggers...>;
-    template <class T>
-    void log(const T& t)
-    {
-        log_impl<T, Loggers...>(t);
-    }
-
-    const typename Wri::Data& get_log() const
-    {
-        return m_data;
-    }
-
-private:
-    bool logged          = false;
-    bool first_recursion = true;
-
-    int index_counter = sizeof...(Loggers);
-
-    typename Wri::Data m_data;
-
-    template <class T, class logger, class... loggers>
-    std::enable_if_t<std::is_base_of<LogOnce, logger>::value> log_impl(const T& t)
-    {
-        if (!logged) {
-            Wri::template write_this<logger>(logger::log(t), m_data);
-        }
-        log_impl<T, loggers...>(t);
-    }
-
-    template <class T, class logger, class... loggers>
-    std::enable_if_t<std::is_base_of<LogAlways, logger>::value> log_impl(const T& t)
-    {
-        log_impl<T, loggers...>(t);
-        Wri::template write_this<logger>(logger::log(t), m_data);
-    }
-
-    template <class T>
-    void log_impl(const T&)
-    {
-
-        if (first_recursion) { //need this to make sure every "once" logger is written just once
-            logged          = true;
-            first_recursion = false;
-        }
-        index_counter = sizeof...(Loggers) - 1;
-    }
-};
diff --git a/cpp/memilio/utils/history_example.cpp b/cpp/memilio/utils/history_example.cpp
deleted file mode 100644
index caa13ace6d..0000000000
--- a/cpp/memilio/utils/history_example.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/* 
-* Copyright (C) 2020-2021 German Aerospace Center (DLR-SC)
-*
-* Authors: Sascha Korf, Rene Schmieding 
-*
-* Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-#include <vector>
-#include <tuple>
-#include <iostream>
-#include "memilio/utils/index.h"
-
-//TODO: Maybe rename Log... something like Reader or something similar.
-class example
-{
-public:
-    int a = 1;
-    int b = 2;
-};
-struct LogOnce {
-};
-
-struct LogAlways {
-};
-
-struct LogA : LogOnce {
-    using Type = int;
-    static Type log(const example& ex)
-    {
-        return 90;
-    }
-};
-
-struct LogB : LogAlways {
-    using Type = int;
-    static Type log(const example& ex)
-    {
-        return 85;
-    }
-};
-
-struct LogC : LogAlways {
-    using Type = std::pair<int, int>;
-    static Type log(const example& ex)
-    {
-        return {ex.a, ex.b};
-    }
-};
-
-struct LogD : LogOnce {
-    using Type = int;
-    static Type log(const example& ex)
-    {
-        return 99;
-    }
-};
-
-template <class... Loggers>
-struct WriterConsoleInt {
-    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
-    template <class Logger>
-    static void write_this(const typename Logger::Type& t, const Data& data)
-    {
-        std::cout << t << std::endl;
-    }
-};
-
-template <class... Loggers>
-struct WriterConsoleList {
-    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
-    template <class Logger>
-    static void write_this(const typename Logger::Type& t, const Data& data)
-    {
-        std::cout << t.first << " " << t.second << std::endl;
-    }
-};
-
-template <typename T, typename U = void, typename... Types>
-constexpr size_t indexte()
-{
-    return std::is_same<T, U>::value ? 0 : 1 + indexte<T, Types...>();
-}
-
-template <class... Loggers>
-struct DataWriterToBuffer {
-    using Data = std::tuple<std::vector<typename Loggers::Type>...>;
-    template <class Logger>
-    static void write_this(const typename Logger::Type& t, Data& data)
-    {
-        std::get<indexte<Logger, Loggers...>()>(data).push_back(t);
-    }
-};
-
-void write_data_to_file(const std::vector<std::pair<int, int>>& data)
-{
-    for (const auto& d : data) {
-        std::cout << d.first << " " << d.second << std::endl;
-    }
-}
-
-template <template <class...> class Writer, class... Loggers>
-class History
-{
-public:
-    using Wri = Writer<Loggers...>;
-    template <class T>
-    void log(const T& t)
-    {
-        log_impl<T, Loggers...>(t);
-    }
-
-    const typename Wri::Data& get_log() const
-    {
-        return m_data;
-    }
-
-private:
-    bool logged          = false;
-    bool first_recursion = true;
-
-    int index_counter = sizeof...(Loggers);
-
-    typename Wri::Data m_data;
-
-    template <class T, class logger, class... loggers>
-    std::enable_if_t<std::is_base_of<LogOnce, logger>::value> log_impl(const T& t)
-    {
-        if (!logged) {
-            Wri::template write_this<logger>(logger::log(t), m_data);
-        }
-        log_impl<T, loggers...>(t);
-    }
-
-    template <class T, class logger, class... loggers>
-    std::enable_if_t<std::is_base_of<LogAlways, logger>::value> log_impl(const T& t)
-    {
-        log_impl<T, loggers...>(t);
-        Wri::template write_this<logger>(logger::log(t), m_data);
-    }
-
-    template <class T>
-    void log_impl(const T&)
-    {
-
-        if (first_recursion) { //need this to make sure every "once" logger is written just once
-            logged          = true;
-            first_recursion = false;
-        }
-        index_counter = sizeof...(Loggers) - 1;
-    }
-};
-
-int main()
-{
-    History<WriterConsoleInt, LogA, LogB, LogD> history;
-    History<WriterConsoleList, LogC> history2;
-    History<DataWriterToBuffer, LogA, LogB, LogD> history3;
-
-    example ex;
-
-    int step = 0;
-    while (step < 10) {
-        ex.a = step;
-        ex.b = -step;
-
-        history.log(ex);
-        history2.log(ex);
-        history3.log(ex);
-
-        step++;
-    }
-
-    auto logData = history3.get_log();
-    std::cout << "EndFile and debug." << std::endl;
-}
\ No newline at end of file

From 26c2692d3553706b3d361221b925dc1797bee8bf Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 28 Jun 2023 14:25:14 +0200
Subject: [PATCH 044/103] fix merge with main

---
 cpp/memilio/CMakeLists.txt                                    | 3 ---
 pycode/memilio-simulation/memilio/simulation_test/test_abm.py | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/cpp/memilio/CMakeLists.txt b/cpp/memilio/CMakeLists.txt
index fbc838c623..c6e851e550 100644
--- a/cpp/memilio/CMakeLists.txt
+++ b/cpp/memilio/CMakeLists.txt
@@ -108,9 +108,6 @@ if(MEMILIO_HAS_JSONCPP)
     target_link_libraries(memilio PUBLIC JsonCpp::JsonCpp)
 endif()
 
-add_executable(hist utils/history_example.cpp)
-target_link_libraries(hist memilio)
-
 if(MEMILIO_ENABLE_MPI)
     target_link_libraries(memilio PUBLIC MPI::MPI_CXX)
 endif()
diff --git a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
index 857af3efe0..80d3f9c3bc 100644
--- a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
+++ b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
@@ -119,8 +119,7 @@ def test_simulation(self):
 
         # run
         t1 = t0 + abm.days(1)
-        history = abm.History()
-        sim.advance(t1, history)
+        sim.advance(t1)
         self.assertEqual(sim.result.get_num_time_points(), 25)
 
 

From 4fa83e1be740f1324e8b7c48869c117aa74dc3ad Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 28 Jun 2023 14:55:41 +0200
Subject: [PATCH 045/103] add history object to test_abm

---
 pycode/memilio-simulation/memilio/simulation_test/test_abm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
index 80d3f9c3bc..857af3efe0 100644
--- a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
+++ b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
@@ -119,7 +119,8 @@ def test_simulation(self):
 
         # run
         t1 = t0 + abm.days(1)
-        sim.advance(t1)
+        history = abm.History()
+        sim.advance(t1, history)
         self.assertEqual(sim.result.get_num_time_points(), 25)
 
 

From 909dbc31f729f431e17b1093f427e4ddda9a6bd5 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 30 Jun 2023 15:31:18 +0200
Subject: [PATCH 046/103] set time since transmission to -1 for recovered

---
 cpp/models/abm/person.cpp                     |  9 +++---
 .../simulation/ABM Demonstrator/README.rst    | 22 ++++++++++++++
 .../abm_demonstrator.py                       | 30 ++-----------------
 3 files changed, 29 insertions(+), 32 deletions(-)
 create mode 100644 pycode/examples/simulation/ABM Demonstrator/README.rst
 rename pycode/examples/simulation/{ => ABM Demonstrator}/abm_demonstrator.py (92%)

diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 24e193941e..92126044d3 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -104,12 +104,11 @@ void Person::add_new_infection(Infection&& inf)
 void Person::change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
                                             const TimeSpan dt, TimePoint t)
 {
+    if (new_inf_state == InfectionState::Recovered || new_inf_state == InfectionState::Dead) {
+        m_time_since_transmission = mio::abm::TimeSpan(std::numeric_limits<int>::max() / 2);
+    }
     if (curr_inf_state != new_inf_state) {
-        if (new_inf_state == InfectionState::Recovered ||
-            new_inf_state == InfectionState::Dead) {
-            m_time_since_transmission = mio::abm::TimeSpan(std::numeric_limits<int>::max() / 2);
-        }
-        else if (new_inf_state == InfectionState::Exposed) {
+        if (new_inf_state == InfectionState::Exposed) {
             m_time_since_transmission = mio::abm::TimeSpan(0);
         }
         else {
diff --git a/pycode/examples/simulation/ABM Demonstrator/README.rst b/pycode/examples/simulation/ABM Demonstrator/README.rst
new file mode 100644
index 0000000000..6d390ac408
--- /dev/null
+++ b/pycode/examples/simulation/ABM Demonstrator/README.rst	
@@ -0,0 +1,22 @@
+MEmilio INSIDe Demonstrator
+===========================
+
+Input
+------
+
+As input for the demonstrator an area list should be provided as txt file. The txt file should contain the following columns
+
+- id: the area ids
+- inhabitants: inhabitants per area
+- type: area type
+
+Possible area types are 
+
+- recreational
+- shopping_business
+- university
+- residential
+- mixed
+
+Output
+------
\ No newline at end of file
diff --git a/pycode/examples/simulation/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
similarity index 92%
rename from pycode/examples/simulation/abm_demonstrator.py
rename to pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 00156f3487..f503d5ac57 100644
--- a/pycode/examples/simulation/abm_demonstrator.py
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -46,10 +46,6 @@ def set_infection_parameters():
     # AgeGroup 0-4
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                              VaccinationState.Unvaccinated] = 0.05
-    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                            VaccinationState.Unvaccinated] = 0.05
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                                   VaccinationState.Unvaccinated] = 0.276
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
@@ -72,10 +68,6 @@ def set_infection_parameters():
     # AgeGroup 5-14
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                              VaccinationState.Unvaccinated] = 0.1
-    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                            VaccinationState.Unvaccinated] = 0.1
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                                   VaccinationState.Unvaccinated] = 0.276
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
@@ -98,10 +90,6 @@ def set_infection_parameters():
     # AgeGroup 15-34
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                              VaccinationState.Unvaccinated] = 0.13
-    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                            VaccinationState.Unvaccinated] = 0.13
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                                   VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
@@ -124,10 +112,6 @@ def set_infection_parameters():
     # AgeGroup 35-59
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                              VaccinationState.Unvaccinated] = 0.11
-    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                            VaccinationState.Unvaccinated] = 0.11
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                                   VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
@@ -150,10 +134,6 @@ def set_infection_parameters():
     # AgeGroup 60-79
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                              VaccinationState.Unvaccinated] = 0.04
-    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                            VaccinationState.Unvaccinated] = 0.04
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                                   VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
@@ -176,10 +156,6 @@ def set_infection_parameters():
     # AgeGroup 80+
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                       VaccinationState.Unvaccinated] = 4
-    infection_params.SusceptibleToExposedByInfectedNoSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                              VaccinationState.Unvaccinated] = 0.07
-    infection_params.SusceptibleToExposedByInfectedSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                            VaccinationState.Unvaccinated] = 0.07
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                                   VaccinationState.Unvaccinated] = 0.315
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
@@ -520,7 +496,7 @@ def convert_loc_id_to_string(loc_id):
     if int(loc_id[1]) < 10:
         index = "0" + index
 
-    return "I" + type + index
+    return type + index
 
 
 def get_agents_per_location(loc_id, agents):
@@ -575,8 +551,8 @@ def set_sim_result_at_start(sim):
 
 def run_abm_simulation():
 
-    input_path = 'AreaList.txt'
-    output_path = 'output/'
+    input_path = '/INSIDe_Demonstrator_AreaList_modified.txt'
+    output_path = 'output'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point

From 02e7d91d24e658c627e7d0f1043dcee2eca32eb6 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 30 Jun 2023 16:07:23 +0200
Subject: [PATCH 047/103] Change recovered compartment in print

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index f503d5ac57..c578501a94 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -589,7 +589,7 @@ def run_abm_simulation():
 
     # print compartment values
     # only used for validation purposes
-    print("t S E C I I_s I_c R_C R_I D")
+    print("t S E C I I_s I_c R D")
     for t in range(sim.result.get_num_time_points()):
         line = str(sim.result.get_time(t)) + " "
         comps = sim.result.get_value(t)

From 062044475c2484569057b385d7363b783fdd1c50 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Sun, 2 Jul 2023 14:50:32 +0200
Subject: [PATCH 048/103] bug fix: dead people are not infectious

---
 cpp/models/abm/person.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 92126044d3..11b78ddad9 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -107,7 +107,7 @@ void Person::change_time_since_transmission(const InfectionState curr_inf_state,
     if (new_inf_state == InfectionState::Recovered || new_inf_state == InfectionState::Dead) {
         m_time_since_transmission = mio::abm::TimeSpan(std::numeric_limits<int>::max() / 2);
     }
-    if (curr_inf_state != new_inf_state) {
+    else if (curr_inf_state != new_inf_state) {
         if (new_inf_state == InfectionState::Exposed) {
             m_time_since_transmission = mio::abm::TimeSpan(0);
         }

From e08189da73eb00a42522195f7eb09fbc403d9c15 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 6 Jul 2023 09:35:22 +0200
Subject: [PATCH 049/103] read me

---
 .../simulation/ABM Demonstrator/README.rst    | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/README.rst b/pycode/examples/simulation/ABM Demonstrator/README.rst
index 6d390ac408..be16c553dd 100644
--- a/pycode/examples/simulation/ABM Demonstrator/README.rst	
+++ b/pycode/examples/simulation/ABM Demonstrator/README.rst	
@@ -19,4 +19,69 @@ Possible area types are
 - mixed
 
 Output
-------
\ No newline at end of file
+------
+
+The demonstrator returns two txt files as output. 
+
+The text file location_mapping.txt contains a table that maps the input area ids to the corresponding abm location ids. 
+The abm location ids have the form xxyyy where the first two digits xx specify the location's type and the following number yyy 
+specifies the location's index which is a consecutive number for all locations.
+The digits xx for the location types can be the following
+
+- 00 - Home
+- 01 - School
+- 02 - Work
+- 03 - SocialEvent
+- 04 - BasicsShop
+- 05 - Hospital
+- 06 - ICU
+- 10 - Cemetery
+
+It should be remarked that there is no one-to-one mapping from the input areas to the abm locations and one input area can be mapped to multiple abm locations.
+
+The text file output.txt contains an agent level output for every location and time point. One row represents one location and the table has the following columns
+
+- LocationId
+- Number of output timesteps (tn)
+- Timestep 1 (t1)
+- Number of agents at location at t1 (am-t1)
+- Agent id 1 (a1-t1)
+- Time since transmission for a1-t1
+- Agent id 2 (a2-t1)
+- Time since transmission for a2-t1
+- ...
+- Agent id m (am-t1)
+- Time since transmission for am-t1
+- Timestep 2 (t2)
+- Number of agents at location at t2 (am-t2)
+- Agent id 1 (a1-t2)
+- Time since transmission for a1-t2
+- Agent id 2 (a2-t2)
+- Time since transmission for a2-t2
+- ...
+- Agent id m (am-t2)
+- Time since transmission for am-t2
+- ...
+- Timestep n (tn)
+- Number of agents at location at tn (am-tn)
+- Agent id 1 (a1-tn)
+- Time since transmission for a1-tn
+- Agent id 2 (a2-tn)
+- Time since transmission for a2-tn
+- ...
+- Agent id m (am-tn)
+- Time since transmission for am-tn
+
+The time since transmission as well as the timesteps are given in hours. If an agent is not susceptible, recovered or dead, his time since transmission is set to -1.
+
+Additionally to the txt output, there is a console output. The console output is a table with the number of agents per timestep and infection state.
+The timesteps are given in days here instead of hours. The infection states are
+
+- Susceptible
+- Exposed
+- InfectedNoSymptoms (Carrier)
+- InfectedSymptoms
+- InfectedSevere
+- InfectedCritical
+- Recovered
+- Dead

From 9c0b649ef645a730f18e64edaad5c9273342f5a1 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 10 Jul 2023 08:41:13 +0200
Subject: [PATCH 050/103] correct readMe and print console output to csv

---
 .../simulation/ABM Demonstrator/README.rst    |  2 +-
 .../ABM Demonstrator/abm_demonstrator.py      | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/README.rst b/pycode/examples/simulation/ABM Demonstrator/README.rst
index be16c553dd..fbff0e3993 100644
--- a/pycode/examples/simulation/ABM Demonstrator/README.rst	
+++ b/pycode/examples/simulation/ABM Demonstrator/README.rst	
@@ -72,7 +72,7 @@ The text file output.txt contains an agent level output for every location and t
 - Agent id m (am-tn)
 - Time since transmission for am-tn
 
-The time since transmission as well as the timesteps are given in hours. If an agent is not susceptible, recovered or dead, his time since transmission is set to -1.
+The time since transmission as well as the timesteps are given in hours. If an agent is susceptible, recovered or dead, his time since transmission is set to -1.
 
 Additionally to the txt output, there is a console output. The console output is a table with the number of agents per timestep and infection state.
 The timesteps are given in days here instead of hours. The infection states are
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index c578501a94..b492109c39 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -552,7 +552,7 @@ def set_sim_result_at_start(sim):
 def run_abm_simulation():
 
     input_path = '/INSIDe_Demonstrator_AreaList_modified.txt'
-    output_path = 'output'
+    output_path = '/output/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -587,15 +587,17 @@ def run_abm_simulation():
     write_location_mapping_to_file(
         output_path + 'location_mapping.txt', mapping)
 
-    # print compartment values
+    # print compartment values to csv
     # only used for validation purposes
-    print("t S E C I I_s I_c R D")
-    for t in range(sim.result.get_num_time_points()):
-        line = str(sim.result.get_time(t)) + " "
-        comps = sim.result.get_value(t)
-        for c in range(len(comps)):
-            line += str(comps[c]) + " "
-        print(line)
+    with open(output_path + 'console_output.csv', 'w') as f:
+        f.write("t S E C I I_s I_c R D\n")
+        for t in range(sim.result.get_num_time_points()):
+            line = str(sim.result.get_time(t)) + " "
+            comps = sim.result.get_value(t)
+            for c in range(len(comps)):
+                line += str(comps[c]) + " "
+            f.write(line + "\n")
+    print('done')
 
 
 if __name__ == "__main__":

From fc4e054ebe83dc0240c83551f0eb935936c08316 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 11 Jul 2023 13:37:31 +0200
Subject: [PATCH 051/103] set correct time since transmission at beginning

---
 cpp/models/abm/infection.cpp                | 10 +++++++++-
 cpp/models/abm/infection.h                  |  6 ++++++
 cpp/models/abm/person.cpp                   |  2 +-
 cpp/simulations/abm_INSIDe_demonstrator.cpp |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 2223f06dfd..0097053dd3 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -93,6 +93,15 @@ InfectionState Infection::get_infection_state(TimePoint t) const
         .second;
 }
 
+TimePoint Infection::get_infection_start() const
+{
+    return (*std::find_if(m_infection_course.begin(), m_infection_course.end(),
+                          [](const std::pair<TimePoint, InfectionState>& inf) {
+                              return (inf.second == InfectionState::Exposed);
+                          }))
+        .first;
+}
+
 void Infection::set_detected()
 {
     m_detected = true;
@@ -196,7 +205,6 @@ void Infection::draw_infection_course_forward(AgeGroup age, const GlobalInfectio
 TimePoint Infection::draw_infection_course_backward(AgeGroup age, const GlobalInfectionParameters& params,
                                                     TimePoint init_date, InfectionState init_state)
 {
-
     auto start_date = init_date;
     TimeSpan time_period{}; // time period for current infection state
     InfectionState previous_state{init_state}; // next state to enter
diff --git a/cpp/models/abm/infection.h b/cpp/models/abm/infection.h
index 018c16b41f..9794bb6751 100644
--- a/cpp/models/abm/infection.h
+++ b/cpp/models/abm/infection.h
@@ -86,6 +86,12 @@ class Infection
      */
     InfectionState get_infection_state(TimePoint t) const;
 
+    /**
+     * @brief Get the starting time  of the Infection.
+     * @return starting time point of the Infection.
+     */
+    TimePoint get_infection_start() const;
+
     /**
      * @brief Set the Infection to detected.
      */
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 11b78ddad9..abead7a1e6 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -97,8 +97,8 @@ InfectionState Person::get_infection_state(TimePoint t) const
 
 void Person::add_new_infection(Infection&& inf)
 {
+    m_time_since_transmission = TimePoint(0) - inf.get_infection_start();
     m_infections.push_back(std::move(inf));
-    m_time_since_transmission = mio::abm::TimeSpan(0);
 }
 
 void Person::change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 084cf5d40a..8486d8d53d 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -393,7 +393,7 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
  * Set infection parameters
  * @param[in, out] infection_params infection parameters 
 */
-void set_infection_parameters(mio::abm::GlobalInfectionParameters infection_params)
+void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_params)
 {
     infection_params.set<mio::abm::IncubationPeriod>(
         {{mio::abm::VirusVariant::Count, mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 4.});

From fdc6687de10d617980370180e861050c45a59733 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 13 Jul 2023 08:27:29 +0200
Subject: [PATCH 052/103] remove wrong parameters

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 68 ---------------------
 1 file changed, 68 deletions(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 8486d8d53d..200770d2a0 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -399,12 +399,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         {{mio::abm::VirusVariant::Count, mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 4.});
 
     //0-4
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.05;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.05;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
         0.276;
@@ -428,12 +422,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
                                                       mio::abm::VaccinationState::Unvaccinated}] = 0.001;
 
     //5-14
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.1;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.1;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
         0.276;
@@ -459,12 +447,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] = 0.;
 
     //15-34
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.13;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.13;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
@@ -489,12 +471,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
                                                       mio::abm::VaccinationState::Unvaccinated}] = 0.021;
 
     //35-59
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.11;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.11;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
@@ -522,12 +498,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         0.;
 
     //60-79
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.04;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.04;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
@@ -555,12 +525,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         0.;
 
     //80+
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.07;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.07;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
         0.315;
@@ -590,10 +554,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
     // Set each parameter for vaccinated people
 
     //0-4
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.01;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.01;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.161;
     infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
@@ -614,10 +574,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.0;
 
     //5-14
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] = 0.03;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] = 0.03;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
         0.161;
@@ -643,12 +599,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] = 0.0;
 
     //15-34
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.03;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.03;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
         0.179;
@@ -675,12 +625,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] = 0.0;
 
     //35-59
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.03;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.03;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
         0.179;
@@ -707,12 +651,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] = 0.0;
 
     //60-79
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.01;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.01;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
         0.179;
@@ -739,12 +677,6 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] = 0.0;
 
     //80+
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedNoSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.02;
-    infection_params.get<mio::abm::SusceptibleToExposedByInfectedSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.02;
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
         0.179;

From 9c3da564719b3f325e20ef4721f38efd0e01abab Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 14 Jul 2023 12:31:41 +0200
Subject: [PATCH 053/103] set seeds for location distribution

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index b492109c39..36098d6412 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -319,6 +319,8 @@ def insert_locations_to_map(mapping, inputId, locationIds):
 
 
 def create_locations_from_input(world, input_areas, household_distribution):
+    #set seeds to have fixed locations for given input
+    np.random.seed(0)
     # map input area ids to corresponding abm location ids
     mapping = []
     # bools to make sure the world has a school and a hospital

From eaaf781d1223d11c070ebe2864a7f32c476a6daf Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 14 Jul 2023 12:38:44 +0200
Subject: [PATCH 054/103] autopep

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 36098d6412..73926550d8 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -319,7 +319,7 @@ def insert_locations_to_map(mapping, inputId, locationIds):
 
 
 def create_locations_from_input(world, input_areas, household_distribution):
-    #set seeds to have fixed locations for given input
+    # set seeds to have fixed locations for given input
     np.random.seed(0)
     # map input area ids to corresponding abm location ids
     mapping = []

From 46eb63f97481a11fc092280d3c1bdc45d4952f58 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 17 Jul 2023 12:36:48 +0200
Subject: [PATCH 055/103] scale infectivity function

---
 cpp/models/abm/infection.cpp | 6 +++++-
 cpp/models/abm/infection.h   | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 17e35656cb..bba1ff19ad 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -48,6 +48,8 @@ Infection::Infection(VirusVariant virus, AgeGroup age, const GlobalInfectionPara
     auto inf_params  = params.get<InfectivityDistributions>()[{virus, age}];
     m_log_norm_alpha = inf_params.infectivity_alpha.get_distribution_instance()(inf_params.infectivity_alpha.params);
     m_log_norm_beta  = inf_params.infectivity_beta.get_distribution_instance()(inf_params.infectivity_beta.params);
+
+    m_time_is_infected = m_infection_course.back().first - m_infection_course[0].first;
 }
 
 ScalarType Infection::get_viral_load(TimePoint t) const
@@ -70,7 +72,9 @@ ScalarType Infection::get_infectivity(TimePoint t) const
 {
     if (m_viral_load.start_date >= t || get_infection_state(t) == InfectionState::Exposed)
         return 0;
-    return 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(t))));
+    auto scaled_time = TimePoint(0) + days((m_viral_load.end_date - m_viral_load.start_date).days() /
+                                           m_time_is_infected.days() * t.days());
+    return 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(scaled_time))));
 }
 
 VirusVariant Infection::get_virus_variant() const
diff --git a/cpp/models/abm/infection.h b/cpp/models/abm/infection.h
index 6bc5beabe2..0cf954623d 100644
--- a/cpp/models/abm/infection.h
+++ b/cpp/models/abm/infection.h
@@ -143,12 +143,18 @@ class Infection
     TimePoint draw_infection_course_backward(AgeGroup age, const GlobalInfectionParameters& params, TimePoint init_date,
                                              InfectionState init_state);
 
+    /**
+     * @return the time a person is infected.
+    */
+    void get_time_infected();
+
     std::vector<std::pair<TimePoint, InfectionState>> m_infection_course; ///< Start date of each #InfectionState.
     VirusVariant m_virus_variant; ///< Variant of the Infection.
     ViralLoad m_viral_load; ///< ViralLoad of the Infection.
     ScalarType m_log_norm_alpha,
         m_log_norm_beta; ///< Parameters for the infectivity mapping, which is modelled through an invlogit function.
     bool m_detected; ///< Whether an Infection is detected or not.
+    TimeSpan m_time_is_infected;
 };
 
 } // namespace abm

From 0823538b7ffb246aa1c209ee6577f26d32dd8b25 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 17 Jul 2023 15:26:03 +0200
Subject: [PATCH 056/103] bindings and new default values

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp   | 276 ++++--------------
 .../ABM Demonstrator/abm_demonstrator.py      | 143 ++++-----
 .../memilio/simulation/abm.cpp                |  63 +++-
 3 files changed, 176 insertions(+), 306 deletions(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 200770d2a0..4f7a2b0260 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -396,311 +396,133 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
 void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_params)
 {
     infection_params.set<mio::abm::IncubationPeriod>(
-        {{mio::abm::VirusVariant::Count, mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 4.});
+        {{mio::abm::VirusVariant::Count, mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 3.});
 
     //0-4
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.276;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 2.2;
     infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.092;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 9.2;
     infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.142;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.001;
+        10.5;
     infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                         mio::abm::VaccinationState::Unvaccinated}] = 0.186;
+                                                         mio::abm::VaccinationState::Unvaccinated}]               = 5;
     infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                        mio::abm::VaccinationState::Unvaccinated}]  = 0.015;
+                                                        mio::abm::VaccinationState::Unvaccinated}]                = 5;
     infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
-        0.143;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.001;
+                                                      mio::abm::VaccinationState::Unvaccinated}]                  = 6;
 
     //5-14
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.276;
+        2.2;
     infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.092;
+        9.2;
     infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.142;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.001;
+        10.5;
     infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                         mio::abm::VaccinationState::Unvaccinated}] = 0.186;
+                                                         mio::abm::VaccinationState::Unvaccinated}]                = 5;
     infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                        mio::abm::VaccinationState::Unvaccinated}]  = 0.015;
+                                                        mio::abm::VaccinationState::Unvaccinated}]                 = 5;
     infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        0.143;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.001;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] = 0.;
+                                                      mio::abm::VaccinationState::Unvaccinated}]                   = 6;
 
     //15-34
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.315;
+        2.2;
     infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.079;
+        9.2;
     infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.139;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.003;
+        10.5;
     infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.157;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] = 6;
     infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
-                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.013;
+                                                        mio::abm::VaccinationState::Unvaccinated}]                  = 5;
     infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        0.126;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.021;
+                                                      mio::abm::VaccinationState::Unvaccinated}]                    = 6;
 
     //35-59
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.315;
+        2.2;
     infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.079;
+        9.2;
     infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.136;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.009;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] = 6;
     infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.113;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] = 8;
     infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
-                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.02;
+                                                        mio::abm::VaccinationState::Unvaccinated}]                  = 5;
     infection_params.get<mio::abm::CriticalToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.05;
+        17.5;
     infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.008;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        0.;
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 16.5;
 
     //60-79
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.315;
+        2.2;
     infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.079;
+        9.2;
     infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.123;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.024;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] = 6;
     infection_params.get<mio::abm::SevereToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.083;
+        10;
     infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
-                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.035;
+                                                        mio::abm::VaccinationState::Unvaccinated}] = 5;
     infection_params.get<mio::abm::CriticalToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.035;
+        17.5;
     infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.023;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        0.;
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 16.5;
 
     //80+
     infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.315;
+        2.2;
     infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.079;
+        9.2;
     infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.115;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] = 7;
     infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.033;
+        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] = 6;
     infection_params.get<mio::abm::SevereToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.055;
+        15;
     infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
-                                                        mio::abm::VaccinationState::Unvaccinated}] = 0.036;
+                                                        mio::abm::VaccinationState::Unvaccinated}] = 5;
     infection_params.get<mio::abm::CriticalToRecovered>()[{
         mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.035;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 0.052;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        0.;
-
-    // Set each parameter for vaccinated people
-
-    //0-4
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.161;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.132;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.143;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.001;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                         mio::abm::VaccinationState::Vaccinated}]               = 0.186;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                        mio::abm::VaccinationState::Vaccinated}]                = 0.015;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.143;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                      mio::abm::VaccinationState::Vaccinated}]                  = 0.001;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Vaccinated}] = 0.0;
-
-    //5-14
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
-        0.161;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
-        0.132;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
-        0.143;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
-        0.001;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                         mio::abm::VaccinationState::Vaccinated}] = 0.186;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                        mio::abm::VaccinationState::Vaccinated}]  = 0.015;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] =
-        0.143;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                      mio::abm::VaccinationState::Vaccinated}] = 0.001;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Vaccinated}] = 0.0;
-
-    //15-34
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.179;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.126;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.142;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.001;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.157;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
-                                                        mio::abm::VaccinationState::Vaccinated}] = 0.013;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] =
-        0.126;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
-                                                      mio::abm::VaccinationState::Vaccinated}] = 0.021;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Vaccinated}] = 0.0;
-
-    //35-59
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.179;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.126;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.141;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.003;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.113;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
-                                                        mio::abm::VaccinationState::Vaccinated}] = 0.02;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] =
-        0.05;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
-                                                      mio::abm::VaccinationState::Vaccinated}] = 0.008;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Vaccinated}] = 0.0;
-
-    //60-79
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.179;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.126;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.136;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.009;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.083;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
-                                                        mio::abm::VaccinationState::Vaccinated}] = 0.035;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] =
-        0.035;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
-                                                      mio::abm::VaccinationState::Vaccinated}] = 0.023;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Vaccinated}] = 0.0;
-
-    //80+
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.179;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.126;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.133;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.012;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.055;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
-                                                        mio::abm::VaccinationState::Vaccinated}] = 0.036;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] =
-        0.035;
+        12.5;
     infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
-                                                      mio::abm::VaccinationState::Vaccinated}] = 0.052;
-    infection_params.get<mio::abm::RecoveredToSusceptible>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Vaccinated}] = 0.0;
+                                                      mio::abm::VaccinationState::Unvaccinated}] = 11;
 }
 
 /**
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 73926550d8..e0353028e4 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -45,135 +45,142 @@ def set_infection_parameters():
 
     # AgeGroup 0-4
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated] = 4
+                                      VaccinationState.Unvaccinated] = 3
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                  VaccinationState.Unvaccinated] = 0.276
+                                                  VaccinationState.Unvaccinated] = 2.2
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                   VaccinationState.Unvaccinated] = 0.092
+                                                   VaccinationState.Unvaccinated] = 9.2
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                 VaccinationState.Unvaccinated] = 0.142
+                                                 VaccinationState.Unvaccinated] = 7
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                              VaccinationState.Unvaccinated] = 0.001
+                                              VaccinationState.Unvaccinated] = 10.5
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                       VaccinationState.Unvaccinated] = 0.186
+                                       VaccinationState.Unvaccinated] = 5
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated] = 0.015
+                                      VaccinationState.Unvaccinated] = 5
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                         VaccinationState.Unvaccinated] = 0.143
+                                         VaccinationState.Unvaccinated] = 7
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                    VaccinationState.Unvaccinated] = 0.001
-    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                            VaccinationState.Unvaccinated] = 0
+                                    VaccinationState.Unvaccinated] = 6
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4,
+                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
+    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 5-14
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated] = 4
+                                      VaccinationState.Unvaccinated] = 3
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                  VaccinationState.Unvaccinated] = 0.276
+                                                  VaccinationState.Unvaccinated] = 2.2
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                   VaccinationState.Unvaccinated] = 0.092
+                                                   VaccinationState.Unvaccinated] = 9.2
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                 VaccinationState.Unvaccinated] = 0.142
+                                                 VaccinationState.Unvaccinated] = 7
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                              VaccinationState.Unvaccinated] = 0.001
+                                              VaccinationState.Unvaccinated] = 10.5
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                       VaccinationState.Unvaccinated] = 0.186
+                                       VaccinationState.Unvaccinated] = 5
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated] = 0.015
+                                      VaccinationState.Unvaccinated] = 5
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                         VaccinationState.Unvaccinated] = 0.143
+                                         VaccinationState.Unvaccinated] = 7
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                    VaccinationState.Unvaccinated] = 0.001
-    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                            VaccinationState.Unvaccinated] = 0.
+                                    VaccinationState.Unvaccinated] = 6
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14,
+                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
+    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 15-34
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated] = 4
+                                      VaccinationState.Unvaccinated] = 3
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                  VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 2.2
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                   VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 9.2
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                 VaccinationState.Unvaccinated] = 0.139
+                                                 VaccinationState.Unvaccinated] = 7
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                              VaccinationState.Unvaccinated] = 0.003
+                                              VaccinationState.Unvaccinated] = 10.5
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                       VaccinationState.Unvaccinated] = 0.157
+                                       VaccinationState.Unvaccinated] = 6
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated] = 0.013
+                                      VaccinationState.Unvaccinated] = 5
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                         VaccinationState.Unvaccinated] = 0.126
+                                         VaccinationState.Unvaccinated] = 7
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                    VaccinationState.Unvaccinated] = 0.021
-    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                            VaccinationState.Unvaccinated] = 0.
+                                    VaccinationState.Unvaccinated] = 6
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34,
+                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
+    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 35-59
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated] = 4
+                                      VaccinationState.Unvaccinated] = 3
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                  VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 2.2
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                   VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 9.2
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                 VaccinationState.Unvaccinated] = 0.136
+                                                 VaccinationState.Unvaccinated] = 7
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                              VaccinationState.Unvaccinated] = 0.009
+                                              VaccinationState.Unvaccinated] = 6
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                       VaccinationState.Unvaccinated] = 0.113
+                                       VaccinationState.Unvaccinated] = 8
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated] = 0.02
+                                      VaccinationState.Unvaccinated] = 5
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                         VaccinationState.Unvaccinated] = 0.05
+                                         VaccinationState.Unvaccinated] = 17.5
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                    VaccinationState.Unvaccinated] = 0.008
-    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                            VaccinationState.Unvaccinated] = 0.
+                                    VaccinationState.Unvaccinated] = 16.5
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59,
+                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
+    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 60-79
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated] = 4
+                                      VaccinationState.Unvaccinated] = 3
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                  VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 2.2
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                   VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 9.2
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                 VaccinationState.Unvaccinated] = 0.123
+                                                 VaccinationState.Unvaccinated] = 7.0
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                              VaccinationState.Unvaccinated] = 0.024
+                                              VaccinationState.Unvaccinated] = 6.0
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                       VaccinationState.Unvaccinated] = 0.083
+                                       VaccinationState.Unvaccinated] = 10.0
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated] = 0.035
+                                      VaccinationState.Unvaccinated] = 5
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                         VaccinationState.Unvaccinated] = 0.035
+                                         VaccinationState.Unvaccinated] = 17.5
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                    VaccinationState.Unvaccinated] = 0.023
-    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                            VaccinationState.Unvaccinated] = 0.
+                                    VaccinationState.Unvaccinated] = 16.5
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79,
+                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)    
+    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to70, -7.0, -7.0, 1.0, 1.0)
+    
 
     # AgeGroup 80+
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated] = 4
+                                      VaccinationState.Unvaccinated] = 3
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                  VaccinationState.Unvaccinated] = 0.315
+                                                  VaccinationState.Unvaccinated] = 2.2
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                   VaccinationState.Unvaccinated] = 0.079
+                                                   VaccinationState.Unvaccinated] = 9.2
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                 VaccinationState.Unvaccinated] = 0.115
+                                                 VaccinationState.Unvaccinated] = 7.0
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                              VaccinationState.Unvaccinated] = 0.033
+                                              VaccinationState.Unvaccinated] = 6.0
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                       VaccinationState.Unvaccinated] = 0.055
+                                       VaccinationState.Unvaccinated] = 15.0
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated] = 0.036
+                                      VaccinationState.Unvaccinated] = 5
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                         VaccinationState.Unvaccinated] = 0.035
+                                         VaccinationState.Unvaccinated] = 12.5
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                    VaccinationState.Unvaccinated] = 0.052
-    infection_params.RecoveredToSusceptible[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                            VaccinationState.Unvaccinated] = 0.
+                                    VaccinationState.Unvaccinated] = 11    
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus,
+                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)    
+    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus, -7.0, -7.0, 1.0, 1.0)
 
     return infection_params
 
@@ -553,8 +560,8 @@ def set_sim_result_at_start(sim):
 
 def run_abm_simulation():
 
-    input_path = '/INSIDe_Demonstrator_AreaList_modified.txt'
-    output_path = '/output/'
+    input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList_modified.txt'
+    output_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/output/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index a24564b307..0f8957439b 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -53,7 +53,7 @@ struct LogLocationIds : mio::LogOnce {
         }
         return location_ids;
     }
-};            
+};
 
 //agent logger
 struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
@@ -180,7 +180,10 @@ PYBIND11_MODULE(_simulation_abm, m)
 
     py::class_<mio::abm::Person>(m, "Person")
         .def("set_assigned_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::Person::set_assigned_location))
-        .def("add_new_infection", [](mio::abm::Person& self, mio::abm::Infection& infection){self.add_new_infection(std::move(infection));})
+        .def("add_new_infection",
+             [](mio::abm::Person& self, mio::abm::Infection& infection) {
+                 self.add_new_infection(std::move(infection));
+             })
         .def_property_readonly("location", py::overload_cast<>(&mio::abm::Person::get_location, py::const_))
         .def_property_readonly("age", &mio::abm::Person::get_age)
         .def_property_readonly("is_in_quarantine", &mio::abm::Person::is_in_quarantine);
@@ -188,13 +191,13 @@ PYBIND11_MODULE(_simulation_abm, m)
     py::class_<mio::abm::HouseholdMember>(m, "HouseholdMember")
         .def(py::init<>())
         .def("set_age_weight", &mio::abm::HouseholdMember::set_age_weight);
-    
+
     py::class_<mio::abm::Household>(m, "Household")
         .def(py::init<>())
         .def("add_members", &mio::abm::Household::add_members);
 
     m.def("add_household_group_to_world", &mio::abm::add_household_group_to_world);
-    
+
     py::class_<mio::abm::HouseholdGroup>(m, "HouseholdGroup")
         .def(py::init<>())
         .def("add_households", &mio::abm::HouseholdGroup::add_households);
@@ -219,13 +222,15 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def(py::init<const std::vector<mio::abm::TestingScheme>&>());
 
     py::class_<mio::abm::Infection>(m, "Infection")
-        .def(py::init<mio::abm::VirusVariant, mio::abm::AgeGroup, const mio::abm::GlobalInfectionParameters&, mio::abm::TimePoint, mio::abm::InfectionState, bool>());
+        .def(py::init<mio::abm::VirusVariant, mio::abm::AgeGroup, const mio::abm::GlobalInfectionParameters&,
+                      mio::abm::TimePoint, mio::abm::InfectionState, bool>());
 
     py::class_<mio::abm::Location>(m, "Location")
         .def("set_capacity", &mio::abm::Location::set_capacity)
         .def_property_readonly("type", &mio::abm::Location::get_type)
         .def_property_readonly("index", &mio::abm::Location::get_index)
-        .def_property_readonly("population", &mio::abm::Location::get_subpopulations, py::return_value_policy::reference_internal)
+        .def_property_readonly("population", &mio::abm::Location::get_subpopulations,
+                               py::return_value_policy::reference_internal)
         .def_property("infection_parameters",
                       py::overload_cast<>(&mio::abm::Location::get_infection_parameters, py::const_),
                       [](mio::abm::Location& self, mio::abm::LocalInfectionParameters params) {
@@ -258,7 +263,9 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("add_location", &mio::abm::World::add_location, py::arg("location_type"), py::arg("num_cells") = 1)
         .def("add_person", &mio::abm::World::add_person, py::arg("location_id"), py::arg("age_group"),
              py::return_value_policy::reference_internal)
-        .def("get_individualized_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::World::get_individualized_location, py::const_), py::return_value_policy::reference_internal)
+        .def("get_individualized_location",
+             py::overload_cast<mio::abm::LocationId>(&mio::abm::World::get_individualized_location, py::const_),
+             py::return_value_policy::reference_internal)
         .def_property_readonly("locations", &mio::abm::World::get_locations,
                                py::keep_alive<1, 0>{}) //keep this world alive while contents are referenced in ranges
         .def_property_readonly("persons", &mio::abm::World::get_persons, py::keep_alive<1, 0>{})
@@ -289,14 +296,48 @@ PYBIND11_MODULE(_simulation_abm, m)
             },
             py::return_value_policy::reference_internal);
 
+    m.def(
+        "set_viral_load_parameters",
+        [](mio::abm::GlobalInfectionParameters& infection_params, mio::abm::VirusVariant variant,
+           mio::abm::AgeGroup age, mio::abm::VaccinationState state, double min_peak, double max_peak,
+           double min_incline, double max_incline, double min_decline, double max_decline) {
+            infection_params.get<mio::abm::ViralLoadDistributions>()[{variant, age, state}] =
+                mio::abm::ViralLoadDistributionsParameters{
+                    {min_peak, max_peak}, {min_incline, max_incline}, {min_decline, max_decline}};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_infectivity_parameters",
+        [](mio::abm::GlobalInfectionParameters& infection_params, mio::abm::VirusVariant variant,
+           mio::abm::AgeGroup age, double min_alpha, double max_alpha, double min_beta, double max_beta) {
+            infection_params.get<mio::abm::InfectivityDistributions>()[{variant, age}] =
+                mio::abm::InfectivityDistributionsParameters{{min_alpha, max_alpha}, {min_beta, max_beta}};
+        },
+        py::return_value_policy::reference_internal);
+
+    // m.def("get_instance", [](mio::abm::GlobalInfectionParameters& params) {
+    //     auto inf_params = params.get<mio::abm::InfectivityDistributions>()[{mio::abm::VirusVariant::Wildtype,
+    //                                                                         mio::abm::AgeGroup::Age80plus}];
+    //     return inf_params.infectivity_alpha.get_distribution_instance()(inf_params.infectivity_alpha.params);
+    // });
+
     py::class_<mio::abm::Simulation>(m, "Simulation")
         .def(py::init<mio::abm::TimePoint>())
-        .def("advance", &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>)
+        .def("advance",
+             &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
+                                                         LogPersonsPerLocationAndInfectionTime>>)
         //.def("advance", &mio::abm::Simulation::advance)
         .def_property_readonly("result", &mio::abm::Simulation::get_result)
-        .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world), py::return_value_policy::reference_internal);
+        .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world),
+                               py::return_value_policy::reference_internal);
 
-    py::class_<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>(m, "History")
+    py::class_<
+        mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>(
+        m, "History")
         .def(py::init<>())
-        .def_property_readonly("log", [](mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>& self){return self.get_log();});
+        .def_property_readonly("log", [](mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
+                                                      LogPersonsPerLocationAndInfectionTime>& self) {
+            return self.get_log();
+        });
 }

From 5179fb60fbacf5a0586564b5b313a9ac6f34221f Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 17 Jul 2023 15:29:01 +0200
Subject: [PATCH 057/103] new probabilities for infection course

---
 cpp/models/abm/infection.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index bba1ff19ad..d52203ed4c 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -141,7 +141,7 @@ void Infection::draw_infection_course_forward(AgeGroup age, const GlobalInfectio
         case InfectionState::InfectedNoSymptoms:
             // roll out next infection step
             v = uniform_dist();
-            if (v < 0.5) { // TODO: subject to change
+            if (v < 0.79) { // TODO: subject to change
                 time_period = days(params.get<InfectedNoSymptomsToSymptoms>()[{
                     m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
                 next_state  = InfectionState::InfectedSymptoms;
@@ -156,7 +156,7 @@ void Infection::draw_infection_course_forward(AgeGroup age, const GlobalInfectio
         case InfectionState::InfectedSymptoms:
             // roll out next infection step
             v = uniform_dist();
-            if (v < 0.5) { // TODO: subject to change
+            if (v < 0.08) { // TODO: subject to change
                 time_period = days(params.get<InfectedSymptomsToSevere>()[{
                     m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
                 next_state  = InfectionState::InfectedSevere;
@@ -170,7 +170,7 @@ void Infection::draw_infection_course_forward(AgeGroup age, const GlobalInfectio
         case InfectionState::InfectedSevere:
             // roll out next infection step
             v = uniform_dist();
-            if (v < 0.5) { // TODO: subject to change
+            if (v < 0.18) { // TODO: subject to change
                 time_period = days(params.get<SevereToCritical>()[{
                     m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
                 next_state  = InfectionState::InfectedCritical;
@@ -184,7 +184,7 @@ void Infection::draw_infection_course_forward(AgeGroup age, const GlobalInfectio
         case InfectionState::InfectedCritical:
             // roll out next infection step
             v = uniform_dist();
-            if (v < 0.5) { // TODO: subject to change
+            if (v < 0.22) { // TODO: subject to change
                 time_period = days(params.get<CriticalToDead>()[{
                     m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
                 next_state  = InfectionState::Dead;

From 00cf25073883bf1c1782195b2e60b7c961b95cdb Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 18 Jul 2023 09:17:51 +0200
Subject: [PATCH 058/103] write infection paths to file

---
 .../ABM Demonstrator/abm_demonstrator.py      | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index e0353028e4..bc345cca26 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -156,7 +156,7 @@ def set_infection_parameters():
                                     VaccinationState.Unvaccinated] = 16.5
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79,
                                       VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)    
-    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to70, -7.0, -7.0, 1.0, 1.0)
+    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79, -7.0, -7.0, 1.0, 1.0)
     
 
     # AgeGroup 80+
@@ -540,6 +540,36 @@ def write_results_to_file(path, log):
             f.write('\n')
     f.close()
 
+def convert_infection_state_to_string(infection_state):
+    if(infection_state == abm.InfectionState.Susceptible):
+        return "S"
+    elif(infection_state == abm.InfectionState.Exposed):
+        return "E"
+    elif(infection_state == abm.InfectionState.InfectedNoSymptoms):
+        return "I_ns"
+    elif(infection_state == abm.InfectionState.InfectedSymptoms):
+        return "I_sy"
+    elif(infection_state == abm.InfectionState.InfectedSevere):
+        return "I_sev"
+    elif(infection_state == abm.InfectionState.InfectedCritical):
+        return "I_cri"
+    elif(infection_state == abm.InfectionState.Recovered):
+        return "R"
+    elif(infection_state == abm.InfectionState.Dead):
+        return "D"
+    else:
+        raise Exception("Infection state not found")
+
+def write_infection_paths_to_file(path, log):
+    agent_ids = [log[2][0][i][1] for i in range(len(log[2][0]))]
+    with open(path, 'w') as f:
+        for id in agent_ids:
+            line = str(id) + " "
+            for t in range(len(log[2])):
+                line += convert_infection_state_to_string(log[2][t][id][3]) + " "
+            f.write(line)
+            f.write('\n')
+    f.close()
 
 def write_location_mapping_to_file(path, mapping):
     with open(path, 'w') as f:
@@ -560,8 +590,8 @@ def set_sim_result_at_start(sim):
 
 def run_abm_simulation():
 
-    input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList_modified.txt'
-    output_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/output/'
+    input_path = '/INSIDe_Demonstrator_AreaList_modified.txt'
+    output_path = '/output/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -595,6 +625,8 @@ def run_abm_simulation():
     # write location mapping to txt file
     write_location_mapping_to_file(
         output_path + 'location_mapping.txt', mapping)
+    # write infection paths per agent to file
+    write_infection_paths_to_file(output_path + 'infection_paths.txt', log)
 
     # print compartment values to csv
     # only used for validation purposes

From af8ce7af4f72d35e92f244139451e6b439454dc3 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 18 Jul 2023 10:06:32 +0200
Subject: [PATCH 059/103] pre-commit

---
 .../ABM Demonstrator/abm_demonstrator.py      | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index bc345cca26..ba05c81827 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -63,8 +63,9 @@ def set_infection_parameters():
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age0to4,
                                     VaccinationState.Unvaccinated] = 6
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
-    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4, -7.0, -7.0, 1.0, 1.0)
+                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+    abm.set_infectivity_parameters(
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 5-14
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age5to14,
@@ -86,8 +87,9 @@ def set_infection_parameters():
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age5to14,
                                     VaccinationState.Unvaccinated] = 6
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
-    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14, -7.0, -7.0, 1.0, 1.0)
+                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+    abm.set_infectivity_parameters(
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 15-34
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age15to34,
@@ -109,8 +111,9 @@ def set_infection_parameters():
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age15to34,
                                     VaccinationState.Unvaccinated] = 6
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
-    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34, -7.0, -7.0, 1.0, 1.0)
+                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+    abm.set_infectivity_parameters(
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 35-59
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age35to59,
@@ -132,8 +135,9 @@ def set_infection_parameters():
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age35to59,
                                     VaccinationState.Unvaccinated] = 16.5
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)   
-    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59, -7.0, -7.0, 1.0, 1.0)
+                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+    abm.set_infectivity_parameters(
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 60-79
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age60to79,
@@ -155,9 +159,9 @@ def set_infection_parameters():
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age60to79,
                                     VaccinationState.Unvaccinated] = 16.5
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)    
-    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79, -7.0, -7.0, 1.0, 1.0)
-    
+                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+    abm.set_infectivity_parameters(
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79, -7.0, -7.0, 1.0, 1.0)
 
     # AgeGroup 80+
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age80plus,
@@ -177,10 +181,11 @@ def set_infection_parameters():
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
                                          VaccinationState.Unvaccinated] = 12.5
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                    VaccinationState.Unvaccinated] = 11    
+                                    VaccinationState.Unvaccinated] = 11
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)    
-    abm.set_infectivity_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus, -7.0, -7.0, 1.0, 1.0)
+                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+    abm.set_infectivity_parameters(
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus, -7.0, -7.0, 1.0, 1.0)
 
     return infection_params
 
@@ -540,37 +545,41 @@ def write_results_to_file(path, log):
             f.write('\n')
     f.close()
 
+
 def convert_infection_state_to_string(infection_state):
-    if(infection_state == abm.InfectionState.Susceptible):
+    if (infection_state == abm.InfectionState.Susceptible):
         return "S"
-    elif(infection_state == abm.InfectionState.Exposed):
+    elif (infection_state == abm.InfectionState.Exposed):
         return "E"
-    elif(infection_state == abm.InfectionState.InfectedNoSymptoms):
+    elif (infection_state == abm.InfectionState.InfectedNoSymptoms):
         return "I_ns"
-    elif(infection_state == abm.InfectionState.InfectedSymptoms):
+    elif (infection_state == abm.InfectionState.InfectedSymptoms):
         return "I_sy"
-    elif(infection_state == abm.InfectionState.InfectedSevere):
+    elif (infection_state == abm.InfectionState.InfectedSevere):
         return "I_sev"
-    elif(infection_state == abm.InfectionState.InfectedCritical):
+    elif (infection_state == abm.InfectionState.InfectedCritical):
         return "I_cri"
-    elif(infection_state == abm.InfectionState.Recovered):
+    elif (infection_state == abm.InfectionState.Recovered):
         return "R"
-    elif(infection_state == abm.InfectionState.Dead):
+    elif (infection_state == abm.InfectionState.Dead):
         return "D"
     else:
         raise Exception("Infection state not found")
 
+
 def write_infection_paths_to_file(path, log):
     agent_ids = [log[2][0][i][1] for i in range(len(log[2][0]))]
     with open(path, 'w') as f:
         for id in agent_ids:
             line = str(id) + " "
             for t in range(len(log[2])):
-                line += convert_infection_state_to_string(log[2][t][id][3]) + " "
+                line += convert_infection_state_to_string(
+                    log[2][t][id][3]) + " "
             f.write(line)
             f.write('\n')
     f.close()
 
+
 def write_location_mapping_to_file(path, mapping):
     with open(path, 'w') as f:
         for id in mapping:

From 48033fc446023f1528585a8872c98a59f2b25a90 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 26 Jul 2023 08:35:37 +0200
Subject: [PATCH 060/103] scale infectiousness

---
 cpp/models/abm/infection.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index d52203ed4c..6b4173a8f2 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -70,11 +70,19 @@ ScalarType Infection::get_viral_load(TimePoint t) const
 
 ScalarType Infection::get_infectivity(TimePoint t) const
 {
-    if (m_viral_load.start_date >= t || get_infection_state(t) == InfectionState::Exposed)
+    auto time_shift = (m_infection_course[1].first - m_infection_course[0].first) - minutes(1872);
+    if (m_viral_load.start_date >= t || get_infection_state(TimePoint(0) + time_shift) == InfectionState::Exposed)
         return 0;
-    auto scaled_time = TimePoint(0) + days((m_viral_load.end_date - m_viral_load.start_date).days() /
-                                           m_time_is_infected.days() * t.days());
-    return 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(scaled_time))));
+    auto scaled_time       = TimePoint(0) + seconds((m_viral_load.end_date - m_viral_load.start_date).seconds() /
+                                                        m_time_is_infected.seconds() * t.seconds() -
+                                                    time_shift.seconds());
+    ScalarType infectivity = 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(scaled_time))));
+    if (m_infection_course[3].second == InfectionState::InfectedSevere) {
+        return infectivity;
+    }
+    else {
+        return 0.75 * infectivity;
+    }
 }
 
 VirusVariant Infection::get_virus_variant() const

From 9d4cac2f9bb142ebd158e02cbb3f26b006dfb864 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 27 Jul 2023 14:26:36 +0200
Subject: [PATCH 061/103] scaling infectivity curve

---
 cpp/models/abm/infection.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 6b4173a8f2..5d89c68257 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -71,13 +71,14 @@ ScalarType Infection::get_viral_load(TimePoint t) const
 ScalarType Infection::get_infectivity(TimePoint t) const
 {
     auto time_shift = (m_infection_course[1].first - m_infection_course[0].first) - minutes(1872);
-    if (m_viral_load.start_date >= t || get_infection_state(TimePoint(0) + time_shift) == InfectionState::Exposed)
+    if (m_viral_load.start_date + time_shift >= t)
         return 0;
-    auto scaled_time       = TimePoint(0) + seconds((m_viral_load.end_date - m_viral_load.start_date).seconds() /
-                                                        m_time_is_infected.seconds() * t.seconds() -
-                                                    time_shift.seconds());
+    ScalarType scaling_factor =
+        double((m_viral_load.end_date - m_viral_load.start_date).seconds()) / double(m_time_is_infected.seconds());
+    auto scaled_time       = TimePoint(0) + seconds(int(scaling_factor * (t.seconds() - time_shift.seconds()) -
+                                                  (scaling_factor - 1) * m_viral_load.start_date.seconds()));
     ScalarType infectivity = 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(scaled_time))));
-    if (m_infection_course[3].second == InfectionState::InfectedSevere) {
+    if (m_infection_course.size() > 3 && m_infection_course[3].second == InfectionState::InfectedSevere) {
         return infectivity;
     }
     else {

From dccb1410df79f0b4e7f99a8e31bac7eb133c717b Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 2 Aug 2023 13:33:59 +0200
Subject: [PATCH 062/103] new output & bugfix

---
 cpp/models/abm/location.cpp                   |  4 ++--
 cpp/models/abm/person.cpp                     |  6 ++---
 cpp/models/abm/person.h                       |  2 +-
 cpp/simulations/abm.cpp                       |  3 ++-
 cpp/simulations/abm_INSIDe_demonstrator.cpp   |  5 ++--
 cpp/tests/abm_helpers.cpp                     |  5 ++--
 cpp/tests/test_abm_location.cpp               |  4 ++--
 .../ABM Demonstrator/abm_demonstrator.py      | 23 ++++++++++++++++---
 .../memilio/simulation/abm.cpp                |  4 ++--
 9 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/cpp/models/abm/location.cpp b/cpp/models/abm/location.cpp
index ecfeee942e..3554580427 100644
--- a/cpp/models/abm/location.cpp
+++ b/cpp/models/abm/location.cpp
@@ -79,8 +79,8 @@ void Location::interact(Person& person, TimePoint t, TimeSpan dt, const GlobalIn
             random_transition(VirusVariant::Count, dt,
                               local_indiv_trans_prob); // use VirusVariant::Count for no virus submission
         if (virus != VirusVariant::Count) {
-            person.add_new_infection(
-                Infection(virus, age_receiver, global_params, t + dt / 2)); // Starting time in first approximation
+            person.add_new_infection(Infection(virus, age_receiver, global_params, t + dt / 2),
+                                     t + dt); // Starting time in first approximation
         }
     }
 }
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index abead7a1e6..357ae699bd 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -58,7 +58,7 @@ void Person::interact(TimePoint t, TimeSpan dt, const GlobalInfectionParameters&
         m_location->interact(*this, t, dt, params);
     }
     m_time_at_location += dt;
-    change_time_since_transmission(old_infection_state, get_infection_state(t), dt, t);
+    change_time_since_transmission(old_infection_state, get_infection_state(t + dt), dt, t);
 }
 
 void Person::migrate_to(Location& loc_new, const std::vector<uint32_t>& cells)
@@ -95,9 +95,9 @@ InfectionState Person::get_infection_state(TimePoint t) const
     }
 }
 
-void Person::add_new_infection(Infection&& inf)
+void Person::add_new_infection(Infection&& inf, TimePoint current_time)
 {
-    m_time_since_transmission = TimePoint(0) - inf.get_infection_start();
+    m_time_since_transmission = current_time - inf.get_infection_start();
     m_infections.push_back(std::move(inf));
 }
 
diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index 81ebc1ca59..c9a15430c4 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -126,7 +126,7 @@ class Person
      * @brief Adds a new Infection to the list of Infection%s.
      * @param[in] inf The new Infection.
      */
-    void add_new_infection(Infection&& inf);
+    void add_new_infection(Infection&& inf, TimePoint current_time = TimePoint(0));
 
     /**
      * @brief Get the AgeGroup of this Person.
diff --git a/cpp/simulations/abm.cpp b/cpp/simulations/abm.cpp
index fee91e6616..d5329278ff 100644
--- a/cpp/simulations/abm.cpp
+++ b/cpp/simulations/abm.cpp
@@ -443,7 +443,8 @@ void assign_infection_state(mio::abm::World& world, mio::abm::TimePoint t, doubl
             determine_infection_state(exposed_prob, infected_no_symptoms_prob, infected_symptoms_prob, recovered_prob);
         if (infection_state != mio::abm::InfectionState::Susceptible)
             person.add_new_infection(mio::abm::Infection(mio::abm::VirusVariant::Wildtype, person.get_age(),
-                                                         world.get_global_infection_parameters(), t, infection_state));
+                                                         world.get_global_infection_parameters(), t, infection_state),
+                                     t);
     }
 }
 
diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 4f7a2b0260..109c6da355 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -572,7 +572,8 @@ void assign_infection_states(mio::abm::World& world, mio::abm::TimePoint t0, Sca
                                                    infected_critical, recovered);
         if (infection_state != mio::abm::InfectionState::Susceptible) {
             person.add_new_infection(mio::abm::Infection(mio::abm::VirusVariant::Wildtype, person.get_age(),
-                                                         world.get_global_infection_parameters(), t0, infection_state));
+                                                         world.get_global_infection_parameters(), t0, infection_state),
+                                     t0);
         }
     }
 }
@@ -820,7 +821,7 @@ void print(T& data)
 
 int main()
 {
-    const fs::path input_dir = "H:/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
+    const fs::path input_dir = "~/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
     auto result              = run(input_dir);
 
     return 0;
diff --git a/cpp/tests/abm_helpers.cpp b/cpp/tests/abm_helpers.cpp
index 8c6889bc37..9d2a9992a5 100644
--- a/cpp/tests/abm_helpers.cpp
+++ b/cpp/tests/abm_helpers.cpp
@@ -26,7 +26,7 @@ mio::abm::Person make_test_person(mio::abm::Location& location, mio::abm::AgeGro
     mio::abm::Person p = mio::abm::Person(location, age);
     if (infection_state != mio::abm::InfectionState::Susceptible) {
         p.add_new_infection(
-            mio::abm::Infection(static_cast<mio::abm::VirusVariant>(0), age, params, t, infection_state));
+            mio::abm::Infection(static_cast<mio::abm::VirusVariant>(0), age, params, t, infection_state), t);
     }
     return p;
 }
@@ -37,7 +37,8 @@ mio::abm::Person& add_test_person(mio::abm::World& world, mio::abm::LocationId l
     mio::abm::Person& p = world.add_person(loc_id, age);
     if (infection_state != mio::abm::InfectionState::Susceptible) {
         p.add_new_infection(mio::abm::Infection(static_cast<mio::abm::VirusVariant>(0), age,
-                                                world.get_global_infection_parameters(), t, infection_state));
+                                                world.get_global_infection_parameters(), t, infection_state),
+                            t);
     }
     return p;
 }
\ No newline at end of file
diff --git a/cpp/tests/test_abm_location.cpp b/cpp/tests/test_abm_location.cpp
index 7a31e3c7e1..7dd456ce93 100644
--- a/cpp/tests/test_abm_location.cpp
+++ b/cpp/tests/test_abm_location.cpp
@@ -101,11 +101,11 @@ TEST(TestLocation, CacheExposureRate)
         auto location  = mio::abm::Location(mio::abm::LocationType::PublicTransport, 0, 3);
         auto infected1 = mio::abm::Person(home, age);
         infected1.add_new_infection(
-            mio::abm::Infection(variant, age, params, t, mio::abm::InfectionState::InfectedNoSymptoms));
+            mio::abm::Infection(variant, age, params, t, mio::abm::InfectionState::InfectedNoSymptoms), t);
         infected1.migrate_to(location, {0});
         auto infected2 = mio::abm::Person(home, age);
         infected2.add_new_infection(
-            mio::abm::Infection(variant, age, params, t, mio::abm::InfectionState::InfectedNoSymptoms));
+            mio::abm::Infection(variant, age, params, t, mio::abm::InfectionState::InfectedNoSymptoms), t);
         infected2.migrate_to(location, {0, 1});
 
         //cache precomputed results
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index ba05c81827..979afae6ff 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -440,7 +440,7 @@ def assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, in
                                                infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_pct, 0.0])
         if (abm.InfectionState(infection_state) != abm.InfectionState.Susceptible):
             person.add_new_infection(Infection(VirusVariant.Wildtype, person.age,
-                                     world.infection_parameters, t0, abm.InfectionState(infection_state), False))
+                                     world.infection_parameters, t0, abm.InfectionState(infection_state), False), t0)
 
 
 def find_all_locations_of_type(world, type):
@@ -510,7 +510,7 @@ def convert_loc_id_to_string(loc_id):
     if int(loc_id[1]) < 10:
         index = "0" + index
 
-    return type + index
+    return "I" + type + index
 
 
 def get_agents_per_location(loc_id, agents):
@@ -567,7 +567,7 @@ def convert_infection_state_to_string(infection_state):
         raise Exception("Infection state not found")
 
 
-def write_infection_paths_to_file(path, log):
+def write_infection_paths_to_file_states(path, log):
     agent_ids = [log[2][0][i][1] for i in range(len(log[2][0]))]
     with open(path, 'w') as f:
         for id in agent_ids:
@@ -580,6 +580,23 @@ def write_infection_paths_to_file(path, log):
     f.close()
 
 
+def write_infection_paths_to_file(path, log):
+    agent_ids = [log[2][0][i][1] for i in range(len(log[2][0]))]
+    with open(path, 'w') as f:
+        f.write("Agent_id S E I_ns I_sy I_sev I_cri R D\n")
+        for id in agent_ids:
+            line = str(id) + " "
+            # times_per_state is number of time points per compartment: [S, E, I_ns, I_sy, I_sev, I_cri, R, D]
+            times_per_state = [0 for comp in range(8)]
+            for t in range(len(log[2])):
+                times_per_state[int(log[2][t][id][3])] += 1
+            for state in range(len(times_per_state)):
+                line += str(times_per_state[state]) + " "
+            f.write(line)
+            f.write('\n')
+    f.close()
+
+
 def write_location_mapping_to_file(path, mapping):
     with open(path, 'w') as f:
         for id in mapping:
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 0f8957439b..d0160e15ae 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -181,8 +181,8 @@ PYBIND11_MODULE(_simulation_abm, m)
     py::class_<mio::abm::Person>(m, "Person")
         .def("set_assigned_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::Person::set_assigned_location))
         .def("add_new_infection",
-             [](mio::abm::Person& self, mio::abm::Infection& infection) {
-                 self.add_new_infection(std::move(infection));
+             [](mio::abm::Person& self, mio::abm::Infection& infection, mio::abm::TimePoint t) {
+                 self.add_new_infection(std::move(infection), t);
              })
         .def_property_readonly("location", py::overload_cast<>(&mio::abm::Person::get_location, py::const_))
         .def_property_readonly("age", &mio::abm::Person::get_age)

From 17c0fbde79ec740861fb269ef9a122e83c197f59 Mon Sep 17 00:00:00 2001
From: Nina Schmid <nina.schmid@uni-bonn.de>
Date: Fri, 6 Oct 2023 11:11:20 +0200
Subject: [PATCH 063/103] add abm checks to anaylsis section

---
 analysis/Manifest.toml                        | 1075 +++++++
 analysis/Project.toml                         |    4 +
 analysis/basic_plots_memilio.jl               |   40 +
 analysis/basic_plots_systems.jl               |   12 +
 analysis/plots/concentration.png              |  Bin 0 -> 22212 bytes
 analysis/plots/concentration_MW043.png        |  Bin 0 -> 22501 bytes
 analysis/plots/infections.png                 |  Bin 0 -> 20513 bytes
 analysis/plots/infections_recovered.png       |  Bin 0 -> 17940 bytes
 analysis/preprocess_systems_data.ipynb        |  428 +++
 output/infections.png                         |  Bin 0 -> 20513 bytes
 output/infections_recovered.png               |  Bin 0 -> 17940 bytes
 .../abm_checks-checkpoint.ipynb               | 2860 +++++++++++++++++
 12 files changed, 4419 insertions(+)
 create mode 100644 analysis/Manifest.toml
 create mode 100644 analysis/Project.toml
 create mode 100644 analysis/basic_plots_memilio.jl
 create mode 100644 analysis/basic_plots_systems.jl
 create mode 100644 analysis/plots/concentration.png
 create mode 100644 analysis/plots/concentration_MW043.png
 create mode 100644 analysis/plots/infections.png
 create mode 100644 analysis/plots/infections_recovered.png
 create mode 100644 analysis/preprocess_systems_data.ipynb
 create mode 100644 output/infections.png
 create mode 100644 output/infections_recovered.png
 create mode 100644 pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb

diff --git a/analysis/Manifest.toml b/analysis/Manifest.toml
new file mode 100644
index 0000000000..0eede58385
--- /dev/null
+++ b/analysis/Manifest.toml
@@ -0,0 +1,1075 @@
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.9.3"
+manifest_format = "2.0"
+project_hash = "d75f718fd92673dfa9f9c7e5bf6ec39a7fc7f277"
+
+[[deps.ArgTools]]
+uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
+version = "1.1.1"
+
+[[deps.Artifacts]]
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+
+[[deps.Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[deps.BitFlags]]
+git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d"
+uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35"
+version = "0.1.7"
+
+[[deps.Bzip2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "19a35467a82e236ff51bc17a3a44b69ef35185a2"
+uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
+version = "1.0.8+0"
+
+[[deps.CSV]]
+deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"]
+git-tree-sha1 = "44dbf560808d49041989b8a96cae4cffbeb7966a"
+uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+version = "0.10.11"
+
+[[deps.Cairo_jll]]
+deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
+git-tree-sha1 = "4b859a208b2397a7a623a03449e4636bdb17bcf2"
+uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a"
+version = "1.16.1+1"
+
+[[deps.CodecZlib]]
+deps = ["TranscodingStreams", "Zlib_jll"]
+git-tree-sha1 = "02aa26a4cf76381be7f66e020a3eddeb27b0a092"
+uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
+version = "0.7.2"
+
+[[deps.ColorSchemes]]
+deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"]
+git-tree-sha1 = "d9a8f86737b665e15a9641ecbac64deef9ce6724"
+uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
+version = "3.23.0"
+
+[[deps.ColorTypes]]
+deps = ["FixedPointNumbers", "Random"]
+git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
+uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+version = "0.11.4"
+
+[[deps.ColorVectorSpace]]
+deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"]
+git-tree-sha1 = "a1f44953f2382ebb937d60dafbe2deea4bd23249"
+uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4"
+version = "0.10.0"
+
+    [deps.ColorVectorSpace.extensions]
+    SpecialFunctionsExt = "SpecialFunctions"
+
+    [deps.ColorVectorSpace.weakdeps]
+    SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
+
+[[deps.Colors]]
+deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
+git-tree-sha1 = "fc08e5930ee9a4e03f84bfb5211cb54e7769758a"
+uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
+version = "0.12.10"
+
+[[deps.Compat]]
+deps = ["UUIDs"]
+git-tree-sha1 = "e460f044ca8b99be31d35fe54fc33a5c33dd8ed7"
+uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
+version = "4.9.0"
+weakdeps = ["Dates", "LinearAlgebra"]
+
+    [deps.Compat.extensions]
+    CompatLinearAlgebraExt = "LinearAlgebra"
+
+[[deps.CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+version = "1.0.5+0"
+
+[[deps.ConcurrentUtilities]]
+deps = ["Serialization", "Sockets"]
+git-tree-sha1 = "5372dbbf8f0bdb8c700db5367132925c0771ef7e"
+uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb"
+version = "2.2.1"
+
+[[deps.Contour]]
+git-tree-sha1 = "d05d9e7b7aedff4e5b51a029dced05cfb6125781"
+uuid = "d38c429a-6771-53c6-b99e-75d170b6e991"
+version = "0.6.2"
+
+[[deps.Crayons]]
+git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15"
+uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
+version = "4.1.1"
+
+[[deps.DataAPI]]
+git-tree-sha1 = "8da84edb865b0b5b0100c0666a9bc9a0b71c553c"
+uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
+version = "1.15.0"
+
+[[deps.DataFrames]]
+deps = ["Compat", "DataAPI", "DataStructures", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrecompileTools", "PrettyTables", "Printf", "REPL", "Random", "Reexport", "SentinelArrays", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"]
+git-tree-sha1 = "04c738083f29f86e62c8afc341f0967d8717bdb8"
+uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+version = "1.6.1"
+
+[[deps.DataStructures]]
+deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
+git-tree-sha1 = "3dbd312d370723b6bb43ba9d02fc36abade4518d"
+uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+version = "0.18.15"
+
+[[deps.DataValueInterfaces]]
+git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
+uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464"
+version = "1.0.0"
+
+[[deps.Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[deps.DelimitedFiles]]
+deps = ["Mmap"]
+git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae"
+uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+version = "1.9.1"
+
+[[deps.DocStringExtensions]]
+deps = ["LibGit2"]
+git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
+uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
+version = "0.9.3"
+
+[[deps.Downloads]]
+deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
+uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+version = "1.6.0"
+
+[[deps.ExceptionUnwrapping]]
+deps = ["Test"]
+git-tree-sha1 = "e90caa41f5a86296e014e148ee061bd6c3edec96"
+uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4"
+version = "0.1.9"
+
+[[deps.Expat_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "4558ab818dcceaab612d1bb8c19cee87eda2b83c"
+uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
+version = "2.5.0+0"
+
+[[deps.FFMPEG]]
+deps = ["FFMPEG_jll"]
+git-tree-sha1 = "b57e3acbe22f8484b4b5ff66a7499717fe1a9cc8"
+uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
+version = "0.4.1"
+
+[[deps.FFMPEG_jll]]
+deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "PCRE2_jll", "Pkg", "Zlib_jll", "libaom_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"]
+git-tree-sha1 = "74faea50c1d007c85837327f6775bea60b5492dd"
+uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"
+version = "4.4.2+2"
+
+[[deps.FilePathsBase]]
+deps = ["Compat", "Dates", "Mmap", "Printf", "Test", "UUIDs"]
+git-tree-sha1 = "e27c4ebe80e8699540f2d6c805cc12203b614f12"
+uuid = "48062228-2e41-5def-b9a4-89aafe57970f"
+version = "0.9.20"
+
+[[deps.FileWatching]]
+uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
+
+[[deps.FixedPointNumbers]]
+deps = ["Statistics"]
+git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
+uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
+version = "0.8.4"
+
+[[deps.Fontconfig_jll]]
+deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "21efd19106a55620a188615da6d3d06cd7f6ee03"
+uuid = "a3f928ae-7b40-5064-980b-68af3947d34b"
+version = "2.13.93+0"
+
+[[deps.Formatting]]
+deps = ["Printf"]
+git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8"
+uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
+version = "0.4.2"
+
+[[deps.FreeType2_jll]]
+deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Zlib_jll"]
+git-tree-sha1 = "d8db6a5a2fe1381c1ea4ef2cab7c69c2de7f9ea0"
+uuid = "d7e528f0-a631-5988-bf34-fe36492bcfd7"
+version = "2.13.1+0"
+
+[[deps.FriBidi_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91"
+uuid = "559328eb-81f9-559d-9380-de523a88c83c"
+version = "1.0.10+0"
+
+[[deps.Future]]
+deps = ["Random"]
+uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"
+
+[[deps.GLFW_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"]
+git-tree-sha1 = "d972031d28c8c8d9d7b41a536ad7bb0c2579caca"
+uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
+version = "3.3.8+0"
+
+[[deps.GR]]
+deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "UUIDs", "p7zip_jll"]
+git-tree-sha1 = "d73afa4a2bb9de56077242d98cf763074ab9a970"
+uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
+version = "0.72.9"
+
+[[deps.GR_jll]]
+deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"]
+git-tree-sha1 = "1596bab77f4f073a14c62424283e7ebff3072eca"
+uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
+version = "0.72.9+1"
+
+[[deps.Gettext_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"]
+git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046"
+uuid = "78b55507-aeef-58d4-861c-77aaff3498b1"
+version = "0.21.0+0"
+
+[[deps.Glib_jll]]
+deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE2_jll", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "d3b3624125c1474292d0d8ed0f65554ac37ddb23"
+uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
+version = "2.74.0+2"
+
+[[deps.Graphite2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011"
+uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472"
+version = "1.3.14+0"
+
+[[deps.Grisu]]
+git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2"
+uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe"
+version = "1.0.2"
+
+[[deps.HTTP]]
+deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
+git-tree-sha1 = "cb56ccdd481c0dd7f975ad2b3b62d9eda088f7e2"
+uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+version = "1.9.14"
+
+[[deps.HarfBuzz_jll]]
+deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
+git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3"
+uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566"
+version = "2.8.1+1"
+
+[[deps.InlineStrings]]
+deps = ["Parsers"]
+git-tree-sha1 = "9cc2baf75c6d09f9da536ddf58eb2f29dedaf461"
+uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48"
+version = "1.4.0"
+
+[[deps.InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[deps.InvertedIndices]]
+git-tree-sha1 = "0dc7b50b8d436461be01300fd8cd45aa0274b038"
+uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
+version = "1.3.0"
+
+[[deps.IrrationalConstants]]
+git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
+uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
+version = "0.2.2"
+
+[[deps.IteratorInterfaceExtensions]]
+git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856"
+uuid = "82899510-4779-5014-852e-03e436cf321d"
+version = "1.0.0"
+
+[[deps.JLFzf]]
+deps = ["Pipe", "REPL", "Random", "fzf_jll"]
+git-tree-sha1 = "f377670cda23b6b7c1c0b3893e37451c5c1a2185"
+uuid = "1019f520-868f-41f5-a6de-eb00f4b6a39c"
+version = "0.1.5"
+
+[[deps.JLLWrappers]]
+deps = ["Artifacts", "Preferences"]
+git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca"
+uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
+version = "1.5.0"
+
+[[deps.JSON]]
+deps = ["Dates", "Mmap", "Parsers", "Unicode"]
+git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
+uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.21.4"
+
+[[deps.JpegTurbo_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "6f2675ef130a300a112286de91973805fcc5ffbc"
+uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
+version = "2.1.91+0"
+
+[[deps.LAME_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c"
+uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d"
+version = "3.100.1+0"
+
+[[deps.LERC_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434"
+uuid = "88015f11-f218-50d7-93a8-a6af411a945d"
+version = "3.0.0+1"
+
+[[deps.LLVMOpenMP_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "f689897ccbe049adb19a065c495e75f372ecd42b"
+uuid = "1d63c593-3942-5779-bab2-d838dc0a180e"
+version = "15.0.4+0"
+
+[[deps.LZO_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6"
+uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac"
+version = "2.10.1+0"
+
+[[deps.LaTeXStrings]]
+git-tree-sha1 = "f2355693d6778a178ade15952b7ac47a4ff97996"
+uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
+version = "1.3.0"
+
+[[deps.Latexify]]
+deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Printf", "Requires"]
+git-tree-sha1 = "f428ae552340899a935973270b8d98e5a31c49fe"
+uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
+version = "0.16.1"
+
+    [deps.Latexify.extensions]
+    DataFramesExt = "DataFrames"
+    SymEngineExt = "SymEngine"
+
+    [deps.Latexify.weakdeps]
+    DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+    SymEngine = "123dc426-2d89-5057-bbad-38513e3affd8"
+
+[[deps.LibCURL]]
+deps = ["LibCURL_jll", "MozillaCACerts_jll"]
+uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
+version = "0.6.3"
+
+[[deps.LibCURL_jll]]
+deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
+uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
+version = "7.84.0+0"
+
+[[deps.LibGit2]]
+deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[deps.LibSSH2_jll]]
+deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
+uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
+version = "1.10.2+0"
+
+[[deps.Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[deps.Libffi_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "0b4a5d71f3e5200a7dff793393e09dfc2d874290"
+uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490"
+version = "3.2.2+1"
+
+[[deps.Libgcrypt_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"]
+git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae"
+uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4"
+version = "1.8.7+0"
+
+[[deps.Libglvnd_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"]
+git-tree-sha1 = "6f73d1dd803986947b2c750138528a999a6c7733"
+uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29"
+version = "1.6.0+0"
+
+[[deps.Libgpg_error_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9"
+uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8"
+version = "1.42.0+0"
+
+[[deps.Libiconv_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "f9557a255370125b405568f9767d6d195822a175"
+uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
+version = "1.17.0+0"
+
+[[deps.Libmount_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "9c30530bf0effd46e15e0fdcf2b8636e78cbbd73"
+uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9"
+version = "2.35.0+0"
+
+[[deps.Libtiff_jll]]
+deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"]
+git-tree-sha1 = "2da088d113af58221c52828a80378e16be7d037a"
+uuid = "89763e89-9b03-5906-acba-b20f662cd828"
+version = "4.5.1+1"
+
+[[deps.Libuuid_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066"
+uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700"
+version = "2.36.0+0"
+
+[[deps.LinearAlgebra]]
+deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[deps.LogExpFunctions]]
+deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
+git-tree-sha1 = "7d6dd4e9212aebaeed356de34ccf262a3cd415aa"
+uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
+version = "0.3.26"
+
+    [deps.LogExpFunctions.extensions]
+    LogExpFunctionsChainRulesCoreExt = "ChainRulesCore"
+    LogExpFunctionsChangesOfVariablesExt = "ChangesOfVariables"
+    LogExpFunctionsInverseFunctionsExt = "InverseFunctions"
+
+    [deps.LogExpFunctions.weakdeps]
+    ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
+    ChangesOfVariables = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
+    InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112"
+
+[[deps.Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[deps.LoggingExtras]]
+deps = ["Dates", "Logging"]
+git-tree-sha1 = "0d097476b6c381ab7906460ef1ef1638fbce1d91"
+uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
+version = "1.0.2"
+
+[[deps.MacroTools]]
+deps = ["Markdown", "Random"]
+git-tree-sha1 = "9ee1618cbf5240e6d4e0371d6f24065083f60c48"
+uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+version = "0.5.11"
+
+[[deps.Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[deps.MbedTLS]]
+deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"]
+git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b"
+uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
+version = "1.1.7"
+
+[[deps.MbedTLS_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+version = "2.28.2+0"
+
+[[deps.Measures]]
+git-tree-sha1 = "c13304c81eec1ed3af7fc20e75fb6b26092a1102"
+uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
+version = "0.3.2"
+
+[[deps.Missings]]
+deps = ["DataAPI"]
+git-tree-sha1 = "f66bdc5de519e8f8ae43bdc598782d35a25b1272"
+uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
+version = "1.1.0"
+
+[[deps.Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[deps.MozillaCACerts_jll]]
+uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
+version = "2022.10.11"
+
+[[deps.NaNMath]]
+deps = ["OpenLibm_jll"]
+git-tree-sha1 = "0877504529a3e5c3343c6f8b4c0381e57e4387e4"
+uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
+version = "1.0.2"
+
+[[deps.NetworkOptions]]
+uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
+version = "1.2.0"
+
+[[deps.Ogg_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f"
+uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051"
+version = "1.3.5+1"
+
+[[deps.OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+version = "0.3.21+4"
+
+[[deps.OpenLibm_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
+version = "0.8.1+0"
+
+[[deps.OpenSSL]]
+deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"]
+git-tree-sha1 = "51901a49222b09e3743c65b8847687ae5fc78eb2"
+uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c"
+version = "1.4.1"
+
+[[deps.OpenSSL_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "bbb5c2115d63c2f1451cb70e5ef75e8fe4707019"
+uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
+version = "1.1.22+0"
+
+[[deps.Opus_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720"
+uuid = "91d4177d-7536-5919-b921-800302f37372"
+version = "1.3.2+0"
+
+[[deps.OrderedCollections]]
+git-tree-sha1 = "2e73fe17cac3c62ad1aebe70d44c963c3cfdc3e3"
+uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
+version = "1.6.2"
+
+[[deps.PCRE2_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15"
+version = "10.42.0+0"
+
+[[deps.Parsers]]
+deps = ["Dates", "PrecompileTools", "UUIDs"]
+git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851"
+uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
+version = "2.7.2"
+
+[[deps.Pipe]]
+git-tree-sha1 = "6842804e7867b115ca9de748a0cf6b364523c16d"
+uuid = "b98c9c47-44ae-5843-9183-064241ee97a0"
+version = "1.3.0"
+
+[[deps.Pixman_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "Libdl"]
+git-tree-sha1 = "64779bc4c9784fee475689a1752ef4d5747c5e87"
+uuid = "30392449-352a-5448-841d-b1acce4e97dc"
+version = "0.42.2+0"
+
+[[deps.Pkg]]
+deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+version = "1.9.2"
+
+[[deps.PlotThemes]]
+deps = ["PlotUtils", "Statistics"]
+git-tree-sha1 = "1f03a2d339f42dca4a4da149c7e15e9b896ad899"
+uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
+version = "3.1.0"
+
+[[deps.PlotUtils]]
+deps = ["ColorSchemes", "Colors", "Dates", "PrecompileTools", "Printf", "Random", "Reexport", "Statistics"]
+git-tree-sha1 = "f92e1315dadf8c46561fb9396e525f7200cdc227"
+uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
+version = "1.3.5"
+
+[[deps.Plots]]
+deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Preferences", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"]
+git-tree-sha1 = "ccee59c6e48e6f2edf8a5b64dc817b6729f99eb5"
+uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+version = "1.39.0"
+
+    [deps.Plots.extensions]
+    FileIOExt = "FileIO"
+    GeometryBasicsExt = "GeometryBasics"
+    IJuliaExt = "IJulia"
+    ImageInTerminalExt = "ImageInTerminal"
+    UnitfulExt = "Unitful"
+
+    [deps.Plots.weakdeps]
+    FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
+    GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
+    IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
+    ImageInTerminal = "d8c32880-2388-543b-8c61-d9f865259254"
+    Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
+
+[[deps.PooledArrays]]
+deps = ["DataAPI", "Future"]
+git-tree-sha1 = "a6062fe4063cdafe78f4a0a81cfffb89721b30e7"
+uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
+version = "1.4.2"
+
+[[deps.PrecompileTools]]
+deps = ["Preferences"]
+git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f"
+uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
+version = "1.2.0"
+
+[[deps.Preferences]]
+deps = ["TOML"]
+git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
+uuid = "21216c6a-2e73-6563-6e65-726566657250"
+version = "1.4.0"
+
+[[deps.PrettyTables]]
+deps = ["Crayons", "LaTeXStrings", "Markdown", "Printf", "Reexport", "StringManipulation", "Tables"]
+git-tree-sha1 = "ee094908d720185ddbdc58dbe0c1cbe35453ec7a"
+uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
+version = "2.2.7"
+
+[[deps.Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[deps.Qt6Base_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"]
+git-tree-sha1 = "364898e8f13f7eaaceec55fd3d08680498c0aa6e"
+uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56"
+version = "6.4.2+3"
+
+[[deps.REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[deps.Random]]
+deps = ["SHA", "Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[deps.RecipesBase]]
+deps = ["PrecompileTools"]
+git-tree-sha1 = "5c3d09cc4f31f5fc6af001c250bf1278733100ff"
+uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
+version = "1.3.4"
+
+[[deps.RecipesPipeline]]
+deps = ["Dates", "NaNMath", "PlotUtils", "PrecompileTools", "RecipesBase"]
+git-tree-sha1 = "45cf9fd0ca5839d06ef333c8201714e888486342"
+uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c"
+version = "0.6.12"
+
+[[deps.Reexport]]
+git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
+uuid = "189a3867-3050-52da-a836-e630ba90ab69"
+version = "1.2.2"
+
+[[deps.RelocatableFolders]]
+deps = ["SHA", "Scratch"]
+git-tree-sha1 = "90bc7a7c96410424509e4263e277e43250c05691"
+uuid = "05181044-ff0b-4ac5-8273-598c1e38db00"
+version = "1.0.0"
+
+[[deps.Requires]]
+deps = ["UUIDs"]
+git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
+uuid = "ae029012-a4dd-5104-9daa-d747884805df"
+version = "1.3.0"
+
+[[deps.SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+version = "0.7.0"
+
+[[deps.Scratch]]
+deps = ["Dates"]
+git-tree-sha1 = "30449ee12237627992a99d5e30ae63e4d78cd24a"
+uuid = "6c6a2e73-6563-6170-7368-637461726353"
+version = "1.2.0"
+
+[[deps.SentinelArrays]]
+deps = ["Dates", "Random"]
+git-tree-sha1 = "04bdff0b09c65ff3e06a05e3eb7b120223da3d39"
+uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
+version = "1.4.0"
+
+[[deps.Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[deps.Showoff]]
+deps = ["Dates", "Grisu"]
+git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de"
+uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
+version = "1.0.3"
+
+[[deps.SimpleBufferStream]]
+git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1"
+uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
+version = "1.1.0"
+
+[[deps.Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[deps.SortingAlgorithms]]
+deps = ["DataStructures"]
+git-tree-sha1 = "c60ec5c62180f27efea3ba2908480f8055e17cee"
+uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
+version = "1.1.1"
+
+[[deps.SparseArrays]]
+deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[deps.Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+version = "1.9.0"
+
+[[deps.StatsAPI]]
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "45a7769a04a3cf80da1c1c7c60caf932e6f4c9f7"
+uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
+version = "1.6.0"
+
+[[deps.StatsBase]]
+deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
+git-tree-sha1 = "75ebe04c5bed70b91614d684259b661c9e6274a4"
+uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
+version = "0.34.0"
+
+[[deps.StringManipulation]]
+git-tree-sha1 = "46da2434b41f41ac3594ee9816ce5541c6096123"
+uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e"
+version = "0.3.0"
+
+[[deps.SuiteSparse_jll]]
+deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"]
+uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
+version = "5.10.1+6"
+
+[[deps.TOML]]
+deps = ["Dates"]
+uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
+version = "1.0.3"
+
+[[deps.TableTraits]]
+deps = ["IteratorInterfaceExtensions"]
+git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39"
+uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
+version = "1.0.1"
+
+[[deps.Tables]]
+deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"]
+git-tree-sha1 = "1544b926975372da01227b382066ab70e574a3ec"
+uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
+version = "1.10.1"
+
+[[deps.Tar]]
+deps = ["ArgTools", "SHA"]
+uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
+version = "1.10.0"
+
+[[deps.TensorCore]]
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6"
+uuid = "62fd8b95-f654-4bbd-a8a5-9c27f68ccd50"
+version = "0.1.1"
+
+[[deps.Test]]
+deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[deps.TranscodingStreams]]
+deps = ["Random", "Test"]
+git-tree-sha1 = "9a6ae7ed916312b41236fcef7e0af564ef934769"
+uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
+version = "0.9.13"
+
+[[deps.URIs]]
+git-tree-sha1 = "b7a5e99f24892b6824a954199a45e9ffcc1c70f0"
+uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
+version = "1.5.0"
+
+[[deps.UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[deps.Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[deps.UnicodeFun]]
+deps = ["REPL"]
+git-tree-sha1 = "53915e50200959667e78a92a418594b428dffddf"
+uuid = "1cfade01-22cf-5700-b092-accc4b62d6e1"
+version = "0.4.1"
+
+[[deps.Unitful]]
+deps = ["Dates", "LinearAlgebra", "Random"]
+git-tree-sha1 = "a72d22c7e13fe2de562feda8645aa134712a87ee"
+uuid = "1986cc42-f94f-5a68-af5c-568840ba703d"
+version = "1.17.0"
+
+    [deps.Unitful.extensions]
+    ConstructionBaseUnitfulExt = "ConstructionBase"
+    InverseFunctionsUnitfulExt = "InverseFunctions"
+
+    [deps.Unitful.weakdeps]
+    ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
+    InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112"
+
+[[deps.UnitfulLatexify]]
+deps = ["LaTeXStrings", "Latexify", "Unitful"]
+git-tree-sha1 = "e2d817cc500e960fdbafcf988ac8436ba3208bfd"
+uuid = "45397f5d-5981-4c77-b2b3-fc36d6e9b728"
+version = "1.6.3"
+
+[[deps.Unzip]]
+git-tree-sha1 = "ca0969166a028236229f63514992fc073799bb78"
+uuid = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d"
+version = "0.2.0"
+
+[[deps.Wayland_jll]]
+deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"]
+git-tree-sha1 = "ed8d92d9774b077c53e1da50fd81a36af3744c1c"
+uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89"
+version = "1.21.0+0"
+
+[[deps.Wayland_protocols_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "4528479aa01ee1b3b4cd0e6faef0e04cf16466da"
+uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91"
+version = "1.25.0+0"
+
+[[deps.WeakRefStrings]]
+deps = ["DataAPI", "InlineStrings", "Parsers"]
+git-tree-sha1 = "b1be2855ed9ed8eac54e5caff2afcdb442d52c23"
+uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
+version = "1.4.2"
+
+[[deps.WorkerUtilities]]
+git-tree-sha1 = "cd1659ba0d57b71a464a29e64dbc67cfe83d54e7"
+uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60"
+version = "1.6.1"
+
+[[deps.XML2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"]
+git-tree-sha1 = "04a51d15436a572301b5abbb9d099713327e9fc4"
+uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
+version = "2.10.4+0"
+
+[[deps.XSLT_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"]
+git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a"
+uuid = "aed1982a-8fda-507f-9586-7b0439959a61"
+version = "1.1.34+0"
+
+[[deps.XZ_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "cf2c7de82431ca6f39250d2fc4aacd0daa1675c0"
+uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
+version = "5.4.4+0"
+
+[[deps.Xorg_libX11_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"]
+git-tree-sha1 = "afead5aba5aa507ad5a3bf01f58f82c8d1403495"
+uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc"
+version = "1.8.6+0"
+
+[[deps.Xorg_libXau_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "6035850dcc70518ca32f012e46015b9beeda49d8"
+uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec"
+version = "1.0.11+0"
+
+[[deps.Xorg_libXcursor_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXfixes_jll", "Xorg_libXrender_jll"]
+git-tree-sha1 = "12e0eb3bc634fa2080c1c37fccf56f7c22989afd"
+uuid = "935fb764-8cf2-53bf-bb30-45bb1f8bf724"
+version = "1.2.0+4"
+
+[[deps.Xorg_libXdmcp_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "34d526d318358a859d7de23da945578e8e8727b7"
+uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05"
+version = "1.1.4+0"
+
+[[deps.Xorg_libXext_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
+git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3"
+uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3"
+version = "1.3.4+4"
+
+[[deps.Xorg_libXfixes_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
+git-tree-sha1 = "0e0dc7431e7a0587559f9294aeec269471c991a4"
+uuid = "d091e8ba-531a-589c-9de9-94069b037ed8"
+version = "5.0.3+4"
+
+[[deps.Xorg_libXi_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXfixes_jll"]
+git-tree-sha1 = "89b52bc2160aadc84d707093930ef0bffa641246"
+uuid = "a51aa0fd-4e3c-5386-b890-e753decda492"
+version = "1.7.10+4"
+
+[[deps.Xorg_libXinerama_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll"]
+git-tree-sha1 = "26be8b1c342929259317d8b9f7b53bf2bb73b123"
+uuid = "d1454406-59df-5ea1-beac-c340f2130bc3"
+version = "1.1.4+4"
+
+[[deps.Xorg_libXrandr_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll"]
+git-tree-sha1 = "34cea83cb726fb58f325887bf0612c6b3fb17631"
+uuid = "ec84b674-ba8e-5d96-8ba1-2a689ba10484"
+version = "1.5.2+4"
+
+[[deps.Xorg_libXrender_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
+git-tree-sha1 = "19560f30fd49f4d4efbe7002a1037f8c43d43b96"
+uuid = "ea2f1a96-1ddc-540d-b46f-429655e07cfa"
+version = "0.9.10+4"
+
+[[deps.Xorg_libpthread_stubs_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "8fdda4c692503d44d04a0603d9ac0982054635f9"
+uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74"
+version = "0.1.1+0"
+
+[[deps.Xorg_libxcb_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"]
+git-tree-sha1 = "b4bfde5d5b652e22b9c790ad00af08b6d042b97d"
+uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b"
+version = "1.15.0+0"
+
+[[deps.Xorg_libxkbfile_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"]
+git-tree-sha1 = "730eeca102434283c50ccf7d1ecdadf521a765a4"
+uuid = "cc61e674-0454-545c-8b26-ed2c68acab7a"
+version = "1.1.2+0"
+
+[[deps.Xorg_xcb_util_image_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "0fab0a40349ba1cba2c1da699243396ff8e94b97"
+uuid = "12413925-8142-5f55-bb0e-6d7ca50bb09b"
+version = "0.4.0+1"
+
+[[deps.Xorg_xcb_util_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll"]
+git-tree-sha1 = "e7fd7b2881fa2eaa72717420894d3938177862d1"
+uuid = "2def613f-5ad1-5310-b15b-b15d46f528f5"
+version = "0.4.0+1"
+
+[[deps.Xorg_xcb_util_keysyms_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "d1151e2c45a544f32441a567d1690e701ec89b00"
+uuid = "975044d2-76e6-5fbe-bf08-97ce7c6574c7"
+version = "0.4.0+1"
+
+[[deps.Xorg_xcb_util_renderutil_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "dfd7a8f38d4613b6a575253b3174dd991ca6183e"
+uuid = "0d47668e-0667-5a69-a72c-f761630bfb7e"
+version = "0.3.9+1"
+
+[[deps.Xorg_xcb_util_wm_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
+git-tree-sha1 = "e78d10aab01a4a154142c5006ed44fd9e8e31b67"
+uuid = "c22f9ab0-d5fe-5066-847c-f4bb1cd4e361"
+version = "0.4.1+1"
+
+[[deps.Xorg_xkbcomp_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxkbfile_jll"]
+git-tree-sha1 = "330f955bc41bb8f5270a369c473fc4a5a4e4d3cb"
+uuid = "35661453-b289-5fab-8a00-3d9160c6a3a4"
+version = "1.4.6+0"
+
+[[deps.Xorg_xkeyboard_config_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_xkbcomp_jll"]
+git-tree-sha1 = "691634e5453ad362044e2ad653e79f3ee3bb98c3"
+uuid = "33bec58e-1273-512f-9401-5d533626f822"
+version = "2.39.0+0"
+
+[[deps.Xorg_xtrans_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "e92a1a012a10506618f10b7047e478403a046c77"
+uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10"
+version = "1.5.0+0"
+
+[[deps.Zlib_jll]]
+deps = ["Libdl"]
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+version = "1.2.13+0"
+
+[[deps.Zstd_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "49ce682769cd5de6c72dcf1b94ed7790cd08974c"
+uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
+version = "1.5.5+0"
+
+[[deps.fzf_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "868e669ccb12ba16eaf50cb2957ee2ff61261c56"
+uuid = "214eeab7-80f7-51ab-84ad-2988db7cef09"
+version = "0.29.0+0"
+
+[[deps.libaom_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "3a2ea60308f0996d26f1e5354e10c24e9ef905d4"
+uuid = "a4ae2306-e953-59d6-aa16-d00cac43593b"
+version = "3.4.0+0"
+
+[[deps.libass_jll]]
+deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "5982a94fcba20f02f42ace44b9894ee2b140fe47"
+uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0"
+version = "0.15.1+0"
+
+[[deps.libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+version = "5.8.0+0"
+
+[[deps.libfdk_aac_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "daacc84a041563f965be61859a36e17c4e4fcd55"
+uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280"
+version = "2.0.2+0"
+
+[[deps.libpng_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
+git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c"
+uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f"
+version = "1.6.38+0"
+
+[[deps.libvorbis_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"]
+git-tree-sha1 = "b910cb81ef3fe6e78bf6acee440bda86fd6ae00c"
+uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a"
+version = "1.3.7+1"
+
+[[deps.nghttp2_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+version = "1.48.0+0"
+
+[[deps.p7zip_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
+version = "17.4.0+0"
+
+[[deps.x264_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "4fea590b89e6ec504593146bf8b988b2c00922b2"
+uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a"
+version = "2021.5.5+0"
+
+[[deps.x265_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "ee567a171cce03570d77ad3a43e90218e38937a9"
+uuid = "dfaa095f-4041-5dcd-9319-2fabd8486b76"
+version = "3.5.0+0"
+
+[[deps.xkbcommon_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll", "Wayland_protocols_jll", "Xorg_libxcb_jll", "Xorg_xkeyboard_config_jll"]
+git-tree-sha1 = "9ebfc140cc56e8c2156a15ceac2f0302e327ac0a"
+uuid = "d8fb68d0-12a3-5cfd-a85a-d49703b185fd"
+version = "1.4.1+0"
diff --git a/analysis/Project.toml b/analysis/Project.toml
new file mode 100644
index 0000000000..9c9938ba2a
--- /dev/null
+++ b/analysis/Project.toml
@@ -0,0 +1,4 @@
+[deps]
+CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
diff --git a/analysis/basic_plots_memilio.jl b/analysis/basic_plots_memilio.jl
new file mode 100644
index 0000000000..95ee7de60c
--- /dev/null
+++ b/analysis/basic_plots_memilio.jl
@@ -0,0 +1,40 @@
+using CSV, DataFrames, Plots
+
+df = CSV.read("output/console_output.csv", DataFrame, delim=" ")[:,1:9]
+
+#####################
+# Memilio
+#####################
+
+first(df, 3)
+
+plot(df.t, df.S, label="S", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.E, label="E", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.C, label="C", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I, label="I", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I_s, label="I_s", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I_c, label="I_c", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.R, label="R", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.R, label="D", legend=:outertopright, thickness_scaling = 1.8)
+
+
+plot(df.t, df.E, label="E", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.C, label="C", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I, label="I", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I_s, label="I_s", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I_c, label="I_c", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.R, label="R", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.R, label="D", legend=:outertopright, thickness_scaling = 1.8)
+
+
+plot(df.t, df.I, label="I", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I_s, label="I_s", legend=:outertopright, thickness_scaling = 1.8)
+plot!(df.t, df.I_c, label="I_c", legend=:outertopright, thickness_scaling = 1.8)
+
+
+p1 = plot(df.t, sum.(eachrow(df[:,[:I, :I_s, :I_c]])), xlabel="t (days)", ylabel="Infections", label=missing, thickness_scaling = 1.8)
+savefig(p1, joinpath("analysis/plots", "infections.png"))
+
+p1 = plot(df.t, sum.(eachrow(df[:,[:I, :I_s, :I_c]])), xlabel="t (days)", ylabel="N", label="I", thickness_scaling = 1.8)
+plot!(df.t, df.R, label="R", legend=:outertopright, thickness_scaling = 1.8)
+savefig(p1, joinpath("analysis/plots/", "infections_recovered.png"))
diff --git a/analysis/basic_plots_systems.jl b/analysis/basic_plots_systems.jl
new file mode 100644
index 0000000000..68e3abd2f3
--- /dev/null
+++ b/analysis/basic_plots_systems.jl
@@ -0,0 +1,12 @@
+using CSV, DataFrames, Plots
+
+output_directory = "/home/nina/PycharmProjects/memilio/analysis/systems_files"
+df = CSV.read(joinpath(output_directory, "concentration_curves.csv"), DataFrame, delim=",")
+
+
+location = "MW043"
+df_sub = df[(df.location.==location),:]
+t = df_sub.time 
+c = df_sub[!,"COV19"] 
+p1 = plot(t/60, c, xlabel="t (h)", label=missing, ylabel="RNA concentration", thickness_scaling = 1.8)
+savefig(p1, joinpath("analysis/plots/", "concentration_$location.png"))
\ No newline at end of file
diff --git a/analysis/plots/concentration.png b/analysis/plots/concentration.png
new file mode 100644
index 0000000000000000000000000000000000000000..efa9f439099b2a053e1ec317f9449cd655993773
GIT binary patch
literal 22212
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

literal 0
HcmV?d00001

diff --git a/analysis/plots/concentration_MW043.png b/analysis/plots/concentration_MW043.png
new file mode 100644
index 0000000000000000000000000000000000000000..6215e41d0a297c331697ec00e14e977e346d1f33
GIT binary patch
literal 22501
zcmb@ucRZHuA3uB=)kO$NlB}#Gp^PNs3L#mMkrAP+lB{GUBO#*@rLt#Mc2-FgWkyS=
z>{X#b_`R?0@9*{e_dNeRzOV1=?!LQR*LfZ1aeO}S^*O`!bdE66bJ7z8!KkUBYCsUw
zCImqhL!!oiSuqapz(3a896h2+tWo~=pf39+LGTiqsw#%wcc%xulsErcmis1rRlwOU
zhk@lu`1R|Tjmm~995+^7IPviP_pa#2eU2qJmM*yGmZgb!IF*|m+4Asuj+(2HzN%~B
zw8W!1@dhQG`B%{_amsxomsUdNYUgGT&|La)uf;$#K9HGAGTmK~OQTHU3)ZIF%tt2i
z<%fnd^99EkHK|@>Cb#BU^Q)5hY~M(*@CP%OI^HI+;5VeTgYo(TP9btIGx-GL|3AN$
z(-0IC)ZVTgu9`MDY*Qk)d-v3<JF)_rj)j+ge0}loWaXsS7JOWC$t|tS+|v@*?#Q0E
ztn-oHxih`C*8FgJ$i}Vpzdl{Ax%YQrqGz{pq3_?{lEgRf+LF^P=LYKsnwk!`HJu-*
zS$tz`Wl`-G!b>8GD=T^AT!)66!glP~;Z!jA*lX_VSKA<76R{I1!ono7XuQ0f+*v<a
zZDr<QRsP%=rI=ieIJSu96W;y&v8^v&yy(5cu|-WkK0Y4*Wy_W=uV23ot!M7<+$vFD
zR#w*9+IrAy_U!RXy*c_dLQe<%mt7`%b7f>?HVf-4{P<DhHuAD7{m9LmH_s2&&&<wR
zjt!TTl<Yh6IzvQMg7Tv$z?zwzegDwq69TMneuk^-v#IHug&xtrMNaJ;_UBN^HS8V~
zEx2xwTlV@F=iGZAj<Ld|1d>&Q{|+uLb3MHWqIkQmPKD3&f8<lFMA*d5tC$J@wUu8i
zJJkt7Gj6kxww(Xp-+4y)Y3b?GJpN;^Q{Fu~vynFF>V{1>w(V0lx|fj9m!rQkg<pll
z*UNibM!o9XfV})hCJu?AzklY>f2xgrVf*xb6pxZ+_WaynLql1aJHDwqJ1xN!_Q>Uf
zjCkVq?b}bDIFa?|n_2`r3vG#A8~dUdiJ19Nxs^mKuNK5i&QX!r!}7ePg+}?lq8}?O
zYbeu>$>HJDS5?VBU#A@0Kzw-~b$su_&!4kh>0##L4ek?hp{IL#dWx(XW<P(Hx;Wat
zo`H@pSkF%)&&g2e=E&F>O(QPN#o3wRLU_R1%2tA!nmX^6*Yw-(qp$94;!*rNo*wOZ
z@aOw-CxV%c?b(Q%Zi>9e%zNn&a#xMVRB^F{uCDH3)d*aePNY__xp-pR2rKRI%#6#m
z`I`bsckXN?3JVL3EYpsbK6)h0wYo5IocQ+b8;OZYM_b!4e(%YO>FoRdPwn~1q$JvO
zR=%*N@ALCVb#;yJi}eIPvyrTO|E#$=^W{-@{(^#nURQ4ihg}5M0k`0$;pw*}rx(V%
z4089&$av0=zTye^TXO%tm8+|3)P{QR@6^QG>9whr)#*naX=!PW1!9S9%{G#WZ8=^Q
zI`koA0anuw7Mp4HO-*yH#=>sfdK_%)V3GCK^KsiMGRKf8JNl+BIilW)JNis;PWuMU
zIPBJiv{?D<{cdtx2M<18GQZ})!*x?w*Yc75F<)O_RaMoi_s!$4=XLaEkNw7L7{hwf
z<K3!#u|;rg=^JIweKavO{nMkXq^73!CV}MQ;zISnslPBU?&r*h{-58o4Mi#Upm(41
z>w<5EreX=7y!PBuxxv9Xf2-cU`13+Mi9WMH;Xq}$-$4A-#r}kdSN11|EsnEgzOu-d
zWnE}0Q?2s;{<$e^6OX+6SseYQP)4V>H$S|4SMtvJdRj2q`lisaUMp7m5aPk5Z3kCG
z6WbnkZ<P0%{dnJhX<}({idLofZI;9PvWa}-A_D`1vZUWl_K!5<$|?@za507PlAInp
z1@V4$tM>Ogrg@8aHqL(c?Um&Ex@|2%0zbxDZpAfiC6&FGA`9I#{c!nMT!x`&dBx)_
zk?S2}+lLF2WSn|GeOkpfyK?0UkMFl9*SGAJl9J;5_En5MAN!opGc+_D5v+OE(V^Qk
zypVtI-aVrwS+fdfI>N2GHX|d0DqT&3W)~fC%4tb}^i7<>VaG{Eep?Z3Cl+y&V#>)f
z$TdvWbN*O$0lS}xiAh{sygZ8A<y~p!OEc1|8qb+z)SKkw_YDC7i*7zU?}%H}oRyOi
z5g~ml-|=S4)~z%|M006{UsnuWm+6sH+&l!ec5rJ(`<J-~!(Ye7&e+@MB^sVM;dr~r
zKwm$#=a16wp{uy{+zQ^`9(5=l-=gUKZD=rH&BN2P&?P3i@3GhUO`D=We*B0lulHNd
zd%4%ViXe8#yFX~5W|5+%qxvRJlf-quiJG9xr9Inf)If3wcL+!IDt<j<(d*D~T*l>T
zFr8ChLABrVPaMKTaSM8aoa*{>`W^ADd8<`U$GPM~mpz@Gr-RmQtT;cYlUV$2dduz;
zzCYicx$pZ!)7Q5)I(ifFvHIdzeo;Mj;JS_M<7{-~#qSkrXSu^W6E+gO<u$KtVyjP?
z@n_t;KK$*^-@{={A)%q-Co7yg?j5qUw9L)TwX?H(^5n_x69sxjn#{B+%tqWLWv8A5
zP4yS?9P})(c<hOL=~n$0jeu4~J9)pu?8oZ$QCxf;1_pEl^$pXq#$qS7B=#PmHVzdO
zDud(4vvpELV>M<69`~2pwMA{0wXAYYeQA?;@6hGYkdWM>O9UZv$M0)vtd;+t%%h3o
z9ru+wUc8tXY*@QOv*GjS&zzpS<%0L`%V*~kBHNnb)^i@YBjfUOZm_8OHFm&Q$9=21
zyUjMQ?j5=_drYm>u-!2-hUsunICB!Ig2Ym)em+t6c8jdFx#AV=HicCt2IW+}y9$?n
zbSSN9YijNi5sA^tym8~kr%#{iF8{i>-@#z+Q{Ay0yyPrfON(@KcA~Yl=9lr|R_5DD
zq_x%Mxrv_a2H!shb;YHnQnIqL2M+uR<MAia(Y<@@RdnU&sCw()BxC-J$LbgQM5I{O
zdq&-p_YmE`-!OjNAK!Wusg@f%{Cs^4Pj*|>xaWG!eKL{~B==ptC+*lK9kI*ot@L&6
z2#4@*=;X(<v{Pl9Z(O@p<-g)%XE%cH$)o7|`^QLIX=&-{mK$CB4qS9|%hFD=ne=9n
zV%+D<V#BYR^%T{>W9me##xt7|lov0o>gvjJ{`tbup&@2=_Jq546<pr$Cp5IRwKX&(
zEQ(1<k(UI?J}QT>wEWsfgU`IaOBLwQlhu`5sLsW7roYf);paPdzu<zX1LF4^CGjGZ
zdacYKSaw3f`YG)z>2=gkP>!jF&<>wpW8m9&+FtkmDXI!m?1Y3Ui<SVZk9+69K;7$?
z?kPWhxLpkkiTNYhmaRMVgU*%{Z{_LfxuAH)h+A1dy`VshaP{zz_BJ6U@qBb*<J+Px
zNG8TVR_`OG-<KcF?Om8DeehuD>x-LtOC;0n^PD@sQg3Xbe9j&g>?0~=GWqG){Q$Hf
zr-I`qCUWOKR>j4!vPUcqhw*UADhIa*nMSdc65d?SEc`dE&G^lWPf@MhZQ$|$or)cb
z1E8s+BQ7Q;wr9_)SFh@TH@Y*AeyDJ{bL$o@ffq0`FzokeB_##kqGj4xWj{}KDgry~
z#-+%3SxQ?_TKjvk^MMLV{KUk>(FC#FhxQHrE1t6-9opYAOYyKiHTV3OMJM-rfzDRS
zem<ml*d2Wqx5nDqnoH-^ilUB=4(e~c@1N3?l$6-hhg-EZG%s%B&7i9i+jZrUdaT3k
z9<QgNUnV9lq5CE7wYmqigsvYF5@J*G_T9U8EiKu`MV33&BVFCy_j^Q=lHzU|Ccn6)
zpBzXN@|Is!=xMvEhErEsbM2*h?H%jLqZ(R4n>%_{a-QIxk{PBs)ktqN$+u1WMK)*%
ziijL<xl+IixLUxJNqfM~Gn|<iYvb){RJ|7SMl%11Zs#Y(K<fV9oyUu(C7%{rJZ48B
zRYoPZwG|-R@5s(gzkBrlzV-6YnW`*q)9sJUj_E!cDJE{AK%7!P?i~|fJgs^=CB?$f
zkd^=tbl0@D9!7O3S2}EGm#M;kxHYnF;B2n~x2|r}jCw4csVD#RhsyJm{_lP1QkNj5
zo*qw6NS1c8k7;F=I&ELxCBle}KzX5p-;#TLoX1pOk^pP480iKJe+H9q8?UWLyIUkP
z@mM`J+{81YGZ+xJ4nQ(8lHrPSCxGmMi=$`f_YXxzMgndc?yW2-F)ceAOZ8MWXTANR
zp(Q8YXR}ncQb=gA`$TtJ;@%?DNA^G<$xfkRVQ1{@9-=7Xq}5p3^<*6bn9dM+`QnA9
z(9IOQFRFuFz^X4w`F@_;2?-Uxe|}7kVB6m&#dh5u=HUC+4PJAqWi^(m-cCwNii;x`
z<#tX3>^e9&yzede{JA*-wb<3u6Q}=MXX;@=)))O&0d<$=N73^#Gc)OEgXB9TY+GYQ
zqnmSF0$hU`o-nkKTrNa1Co%P~rm_^6K2py$#A&!N-kFL<>hu`Dce3&vuGwX<-tYbN
zxygx%ZLF*|zcpC$-hCL^Y+o@UbE+TJYbr(TaM9!9^71zmIn&eA_#J#!?(ytAdQ-8!
zy9X{3L*rfPjN1jsp{GLkkkL4U3(C}f15yM9Q4^i^p%FD82$=@&(2hhqq^5haqbH5n
z^Jn+IKXBl{rAwDU0Q~*^ohugocc=(ihn^0uy1|?j(=7ZHs11vlvznBW!bpHP{QUV-
zy00iF2PERpOy!_P9MA}Qki3QX&Yd(wvW$ya=3UF%R;H!^ol_GNxqk#MT)2SUmmc7G
z;X)Efg0Yofrqc&DzPdUKMQfdal`3EAq?iLMyT(UQ%~@DjjOYVa|DblPR=+;o)YN2Q
zZth-VZfd%XsH(0u+Ew}J(WCP6cnyJ(k&)!he9<k~tM`kF_J%cS9zFUP_u+Ze_9F9Y
zw?98dL?3EzsoCoF`tE_e3VRcix65-4R;TTL>`0ky>o)ytapu<UN+s%2Ze6=<5v|lA
zaE%U$OT32EM6_D$Vzuwp&yT2x8)xE7M?4g+ho^~D-`&e>(q5bV&c$@VeCjgm(Z7sE
zO4rlMs-4&)j5_?KBXon8hUfoa%YLl)dtA6dl#QOqx!@?0Lb8)e3T?XlYc}Q1o&0-#
z$B!QeI`qeioNri>5f#mQo=(4UBh?VLkx~4u#6+~Ay5}$5s?EjNPoDJ3C#N!pt0s8#
zU+($+_+Ib)yDBk)JMi9%f>;B?6ZYaf1v+eZ*8R+FjxjSIn<*xK`wW(UH_{qW^1RtM
zFCd_qkeGO}x^FT3n7-kqOVv?PQKOFL;{7jP<SK40{k_)5v_sy!)?0tE183Bt!Qbyi
zoZ#V5hTIwEty>d4XWqZ*``aBk+bFhcSFVAMKHGqayQ^!btM?+`iw6%LfYj<FNeRlx
zR8**r&&}PBi;KH^SG$sQNx^ce@1fJlY`(;{KfeAzg5{6-LiI%06u3J|XU!ZAQ|ldE
zzTi_eb>Q+%0nJ#AjKL#;yLo(fq%1xz<f|Q{?%=<b`J=`uPQcXEbYj|B{Yk&jkqoYj
zu>uEtw{G=Qbm@&1cwzs@W9CVzJDVC+Aj|Cg&zr5&)uVb7`O%p+Qg{<Xnc@}h9c=U=
zMlX*ZJ*pXJTVhi4x}GXf<?4DWWt?_w_b47m_ruvZMDMkmR1$)?H*Ivc_PE$H?;=PN
zspPXT=lF4QcrN2j6f^Cu3!28p8>^=5D+ogBqJu}enW=$soQ%x*PZUxiUm4$ZQdyZG
z6arRjwGLQ(9vR7O>A%Q5=dyOYoRKg&u+O|HkduAo!S3954A0WuoA^c)(<><{UA@<U
z4grk3ZQC|rJ*R=1^1Q!*iUcz!XI{$zP*ge!VT<CFcFd8B{d4(o=oN>6pz*a@i_JEY
zJw63nd(47Eg_ucz9MptWz)E?Zgp$%4C>(VldVfBB+sl`ufNlY+f6?fThH<m<?n*$F
zXjog>O9Y37o$kmsdcw~4WmudlA?StGkrB5)=|`fkU%x&+vO#(hZxO-1$6bB~WqtMc
zmuT?n>#Awsi{0JbE*~nku(4_1k$H%ko#)6Odlt(;e1kNRyL9w0nOs{}w}FXk{L7c7
zVOQ=$KIp8HN!oqDn&nRYlOBn!26dO&S^bx-#h5lazr9V`L+sl;yt4c&JuU6?moL(L
z?TNs*Z{N1IYNY6VLa_t_RZ~~Lr|6gLFC~%KmV$58_weMDf{cX3H<XA=OAEPq&z?WG
ze|c*cK!ZbfM!1eO@6li9nsm`M8D1n@4ez9ukYKqdcfkfPF>vtPI(xPgY~btHugkyY
zKq-EB*8&S04>~<>YPxzZJWuz&rk0lI-o0zT1_L6lU$>Pq1!DtsG3(eO(Mr}VcIu@k
zRZ%Xxht>MTi4(TA;8-K`fA-n8j{_s4-1c;LCx}~ca&Vx3T$=rOz{l++_`!N6uD6fQ
z=++gzLHz|(=>I7i(VTZ77aGb<pG~5rW(zyRe%~f-JJx8eNxCcTID1>h)E@BErsQ_p
z$UUV1ipBx1leP8d;#B{65KG__9W5>S%RdVuBHHi`z*^mR@T%sdYG@8!42(J)94XXT
zsDBiF>^CY4RU?F@t5>f&<?ln^0)WDC0<%d=<NvZQEQWK}AJ1%uXQ%MBsMA?f4RU>d
zPH!U^xD~2i9%T(zUAa%Qo`FN&Jx5REnJ|g}cx;TEa;t9zgqp?oW;?b~;a5z=grEt6
zD&~r2{Bp^yKX?{+i{O=%?7Bw9zYvfS9QWxGtt5xIU>ONG6D?#R>+Pg2--9vR6LZuf
zu5v_7V&a)+1j~}rTWLo|*NfXC8go=h1ZV&egQ_W-DoZ}9qf=-w|K#e1Z{j=nZG8=<
zIm@Z3na;^NQr%7<0g-GXz?SmjfZ}KxvBp@EY*A2(1O9)j@)XJH>e1V+`E3<WiW8nu
z$%nE8pHj4>Mu-)uqT8fwH6RXbp>J-yLeud3bHt8=o&Zio0c)!ZXFvb`{^c0^?oyko
z<WE{d9I0xj-Ultk?mSXzQh<^^P<7$zJ*K8F-%%~4?b~nv`0)e3oMU`X+KJs_1K-Yc
z<DL&vGjp4aLQV&>Uvbz&K7amvDrzD9V~?pUQ7%cFXSmc}uPbPge|~;ApPrt6jAbV|
zFN#7~nye!_`6a$>cZkwm+(<`P?KNk4?%XVtLv;W5We!(+Y-8xG`*Y%pn^n)!aoi?J
z<9y;r!h?-8+(de~Zf(sz%4TZNS2EA(R+@<7{SKQFu-G$`Cd}QmEu@FEH(1PQ0qT>q
zg%aDSPBjKnW!+fEcdS_Ltf1?kV6{_*{AK0knZIIFe<iB4IuCQC#y7r@V!xsf`02AS
zPDSY6Q;_uFB{>8=Qh!J*M2?{BwC^oEG|JlAkt+A~qV*1Soerkv+G#7VP5J8Ku77`j
zM|1RD{d);2je|pOZj(xmy_`Bet~3&>D%-tb6F17r4CvPP@84HfSHHAG&!G|l#bI+h
z77V5y-e9hGC2|ukK6p>!IzsBB`-fV|JuHPMD`%gDZ(isCIj5X0ui0KbC5V+$Qr#k{
zd<y~N?0kx$;oos|`6V8L%0vWOq@Vcg(k~)Jo_}7(K8&&(#;`5TZ$;5>i9?(t*m0-e
zEh11i=Zu0gmIzy=vs3SQSfJj(zqL`RQ^Uau)+TTn&pxp8z2=lY4;l>d0ZoyYm$$K}
z=lDf@hx6A}`RmR^jeh+K{Xs(@uEOPm=R~(!(W%th+PeapGIwUCrwazR#e_U%PmO=@
zOFL$$K>y$6K+Yo{KD@RxRV459I$3)6{{0I;oi&zZG4_sR>9&@ZGwrt}A%TuV3&ait
ztIwOdgu)E+4}RXAdtBHeS}j2*XyfEV8p=J+5+v`ut?1_imI<Z~#Wb4xkUS9Rty{M`
zJ3F5~CC})RnV*$8^xV?=d+%)Kzb_ft$!~I=UjS$Nt@FU@2I!kNb{rfX9;OI8(Mqdw
z3JQNg{cwW<R+c;r4R8G%dsk|A)XnWjoZwOSjhvFrk0r@>rC+*ovA-?85ZU?B)Pdhn
zG#-7IP*!?KzI^%TG*w`S;&OX)vzpQG#eOTAMx5I%^dU0BsOS?|f#=aYO7`s>DTOyU
zz6@l2$htwZ?Ox#3J>-jLqQYa+a-f#wrlnC6fB*h<m;VWFNJu!pl~{a=V_5F|uC%Od
z0sG*+xgWF|1@7~}Bk~rUl62=v><`gGU_L)9=3l&uPkdzm%3x*RzI~gCzCw%TFVRYU
zCJm*fKXCWl*`eK1h{?}>QBl#f4b=JBx&Z-e5I-T0%NvhFqWu*f9xf><36%^8`n}Z-
zNxA{!=Pjyd*U@q%u$_rYmIWe&-nDDjE+cxYTBw4}8((d3tNysQG8e#ggNaA&&!0cU
zsne&wjE|d)2pSt36CxraoxY)4_gWTM)<M4a#!|euN)*r}G&D7>OFl8}DtGzN_vDGn
z^1cV5MyY`dr9OUT@h`7*P{}Z{m{FY+C#l647#3M^To1ZVf8$a7v7&Sl!Cm%`tGE3n
zv)?B{TgSp?EurbzYifoAGp8gu_Cl+J45zBDK3Q{4MU0(B8BofQPIKihp$AQN*frDO
zz?s)vaRLE<MiM8_bOxRq?e5^p0@Hm{kyK?azBQuReYTAIpOU+6rtpmLhm_a3e=Z5V
zcWOV*zGcgsF$P){a8W%rqYe$RjVjDQ?d<!%ByVEk59(PlToG=6OJg!nu$^7ba)+4n
zT*gG=$LG(p?j0@JqsRifZt7<X5nvjJ8_lXK_eG{4cl3t2ZtE@lu_WTRZ+&PJ(6S#^
z_ShYna>qAX*;6ur08sOB-`$r$Ot3?<kDvE&tG?Uv<;_pg<Ga}Cq3ov*cu1;HHMYx$
z)t&JxB|bSl&pXpdtKurh<#f4-F6h*wckJ%{+kKu+7%v|Cpp|JLbQ4r-J>3ffk$5fP
z825S4K80%!jz3OQ$ExO&7#PHM@6Nw?a@$I$mAoo{thP{o+<Y)OHIE#Hc95{=WFL?Z
z<kbnUf${OPE}zc7K3HSfoTkra*Zw#mPKy}XOH-9K^8x4M#Ba-!A1$Jtsdk?1{Y63V
z2`|kp9y%!pr-`KMoonfFIoH6AX4kMZxw|O^+QBIG6=l)*(Xp}R-@kJjZc#*j&SW3Z
zR;)70GX)Lh#aOo8zIpTT-sj#6<1C7TZ}~MexrPs4JAn6LyxuhIKKJPmHu0`qnul0U
z7#b@0{*GxH&e`<ENZ(HErVwlRJ%vk8N8BbHa@ZFH`(J8me%!mAZ?sW0=T32P@v~>o
z#>dC$HVfs@qYmZkiLBqmJv}>HC<^#s3h|(_Qr3clgTurx-rCL04Ja4oC+`)ts;#1c
zfH;*ZuA%zDD&P#{_Z<q}#nI8x5$Z>7aCJ?zQ#^#q%3txjjj?<}>=E%=6mDqz(5%`1
z(Zq_KVV3TFZZ<Y|Q0UNFNn7rWVAlJ&5zMD0iq$x_Zk0X%Nx_HnOp2{kl8!Lw;z7Tq
zg=;K30oZF{?cny8n6!_$Rh}PIJk?0leO602q7`%y+N2FVN<F?4KB;Hw1)4013oM1{
znHi`2xv8oADM5IA+={+cXFBeIIP7A(e&V6otJ{+4OFQYdikm~?l6&>8>%)i3sF80H
z$9C=uI~`1tr0ZcF4rSb~K_MZKR7U`W_h&RNxq5k7)%#YD%A+L~%qwtnbGIezaeD9|
zCRRj*H(pNt8uLXcY48ZQ5d1rL_CGvH>D&8;{oj!!8PbK?t~J~EoOOkYfSxVMUT0OY
zr>Fifzik~yJjKz#kIJuX2L6mXuV~h1rs*U}ilr0LJo&zSH-)Ht>@DGa9%s`pLT-Ob
zfmu+i=?I``v(C|l*3uykJ~9K03^}`(x2|2gh82ORZSvuZL(GN${Z+$gdwV-}G+e9m
z@5^@a@mY_yC!z25eRCIhr7NzQBM%Adnl-i<gchIA&*+xMC{4LK?2NOsGZ6Fe7jpX*
z7`36+X1In>p(m6}+z3VknYHViSjHq4nqe!0jet+2USpZkj$qK8)nuSyr%7h!CTsi-
z!&QrP(!}~iUEXIBuywl`2l$_5<6k(mr#K&`Wn_E>ZonaMmbv_G=t&mS21zQ<DE?;>
z?b^X?YB2HUK$L2{=D6z$?zMc$Rl4f+CeH}_a|(a6)ymhpMj}=%j#Z0j6z<*mj01Yy
zp541QGBTz}JDqTJbac7X_WSp5u7jSD{@$svO@|YhPU1c@^sw@&=|c*x^Zg@5{9azB
zh!D8sH~Fv`@hRX;0)m3u4yoI|bB+A>)%hbMB9@^^Pz}v@C<Or0gFHC-8u+3B`z%hb
zBd~T-Zo#eH))D`Ec~sQ8Ky+*nunX16>dIJB2156~qO^hSwOs;L54id4A*9y&Ez1z?
zN&CW@^G=H&26rJI6c=}LSo5t1-NSv&Q59j2P~&HzTw*@GQ`<H711ikV!x<%?|7+RT
znGZuLrl+N53Zo(1<$J{r9^6ito0~Imv)iywd^lElY{v$2&K10-^quqGy?ed;RkZR;
z)HL+j4js#ah^4-9lO)Z#l2B&fpDsuLZx)~lFQ-;MdsYPfdcGrhdkEkz$f@z0BN~?%
zdW6Ay{yThdNMNC0Z(-X((9g+L^M>sVb(=={)TyBdDp$3c1xsxWSbuY!`ohdd)_zi^
z`WCfSS80Wfczy5C2eh~5h^_bKJ?M#BS|j)y|G(c`hK7cKTEbQNw{O4mPgHu5DIKRF
zfTF`lBEhBn_VeeB$jJ8A*3Qw!;NW0b@n{}BZEbC^T?PjOT4VT7AIoO~ueQhBdiG|4
zBpDHRffRIG@^t9vV|EfPKx^;ZU;fx@{y&TI^QXQIH_=d26OB)v@Ete+0c$5eKM~k5
zw!E|i@Yg&rkaFY9vuiB$A!!xq<8AtEna8}PlC(wGCS8>xc@x{BJo_y-Y<czh>+|Xa
zd%UQs>TRz+#~pI2h^VNP2itRX=HM-#q&4Hve$}g(abSqXVOJX)n;YDR-a`uH+|95<
zem~Tj=R3}neFq~K6c*mZA;AmY4-pu!&kPz5+=~p&o0H~|lIRa$k*NB%c6I}Gmt`R!
zfF**Qp}?&Glr2VV*p_rl@AHihC}T%+4U^^9AJ!L*hY||pgKEkWt_lG|QBe`{z`3rp
zkWXU;IXP$Fm*pCY`u+H-iE3}SbrL>~qvIq9)40ri9Tdz(Xofeo%gzEmN}m|VF?Dm3
zQqzC${`KXETdW4)$Z3nF;<NbfrKR0+UNgnIT_3N+v)eB{v?B$H?A=>gA*f8Naw|T*
zx~3*so;jUg6JW3R{cJL&MUIb-+K+EcT8)0^iW~$~nE{V?dg7L~BC#5vEU7Pp7D9w{
z?%qyL_E}nRIK;|V_w}kJRd_oO1m$NEIOfth&;)3d;j`r5+OTdNRU<qo_d|S|aV^n2
z8v^+bhwfJmY%OMEi_tPiz9e0uTJ0<eDixtum#dT5S=6`d(4iHeN?H}D3tWo6a)N?(
z-5Hu5I^R@A3FDrf&lKS4pgTc7-y6|f6R_s*a?_4DwX(E`#$X353TxhD@+L4QZQ$gg
zMR)93J`#EU_+DZN2RdTw-mC!o5)&vQE2DSL@8^oA^!tGtkK^$`Z?BW~W&cwR`D5WD
z)|?Mjf&As~<#*_Q`6PE(x6gyS4~Rg!CjMrd>cW0US6USf0oD=|=Sk(rm-2JT0-C#P
zo&IT=Oku}6bQM4uYVKTsgTh(LOSD4-!p8u-_ZL}hVq)rB{kss<Fj;-vDDBntMiiuh
z$6jqCKOkrAfZPKj4Q%Y?>#MM$969;b?Evwy?y|AR!;c@$;{==vwCmFc7$t*0dHL;1
zykk)CflW_*yHAbY=r^Uvx$?#0*D$MJ%6YviQw3gDBRCHEl#M#RN|wG1xZQyc1M--{
zntJsr4Z*f`tMRVvqrZI>qg(Rl1rUZX7@5e)$pJ1wbw(LLJm$gkr9Eb46jbfsCvxYN
zr@MQ>BcYpM-|P{YEfzPOSp#e2uP<BfOX*IHD%>hX8^nuvPI+BFt%@F-or~A8F&fzI
z*VC|)EVIcDH|;DN{28T>+2@KQ;bLTU8R~@IW&RASH+0c0A8Ie{Bksywp#GI835dW;
zzNR0p#~*tuA%QyZ(W8qg@!O>xY3D)*%lb=BA0dFn^y7d0i+Sw-)zTNLbDuRFEKxPO
zN#C#ba@B*}FUq7OCiLw49oa3DNDZXKPsrSrIg~Vsn90jwS7@z2=I7tEQC6DZIN+9{
zb0!^UohA?hLixiW*$pt6NRpx~dH0TZV|&T(78Vi;noUWXot>pvDk5xFzTZRggy-QE
zqRTjTXS@ie+iWO3_p!R?;Yry=s@A7ZpJGpj-1EwFgB*>zOf=#ZZ=KcacCf3E34(N6
z=EM!=ZmJ$dBIxSXUvq<NlpY4-o0HRoj*hPK+yHeT{NhQU@VWZs*~vHgki2ztb+LP1
zzkIm_qV?AKCls2A-2G+1$i2OWi#qQiKEk09Gb_tMA3;@NQ>*j-9%Olyhl8Wax@o<|
zPL;)9vlr&8yhO--5e~;<P&;UpRaBnj=%?d791AWk|8((bagmj+lsx@>+$Y@rRq_Dt
z3P1m6*f#)dD=WVSAG=Su4L=P*t}4&?QDx<MXbT{RMuO+gox}P1`Ri8$M4cB9+EU~f
zhn`%8X^X%PMRDw_h<K0$%Qcu%bs>k5Hf>V!oHjv3Ls_|z(ry{HeV&_}8yeCxF!+Jr
z#9Kgf4D#2020tR@?%jo|>xqf|D1#6bVeF&FJKnw1gYuiLdp|Ex?!W=0B-Rlk*I#yY
zAi0D41ew}rK*W)Q0tIc%_-O-Ci$+IBg@l9>Zr%Dj7qGTGxVCCs#}v_QR_!(drF8Nl
zpW^+Z!K-3#oh!n^j`)d3ab6E5#J5*zPi<2nO$1)yAyC?3R#KueE)gOW^#JJOh??5A
z0}{5O83HmJSV}z^oLQ&?qoQ6>Os%tBX~Ds?KDk#7MLpczL90igk1a1wh0X6{VZ5Ik
z%xq)Np8@WR5CO%|%3`8T+Pf?F*{*bw=>caBzI-7*R~9~UAJb;OQpbN^<42-(5HE@x
zn(G#NH5U(GKfeo9_ur)5;?1UDBBz#iRSq5=9QDD$stbpqEEjGAT;I0M;ciY$^%FJZ
z_D)$+bcBst#s9(~I<|vUN>D<5jkT)YLyc7O8zIU;!+|T<4CCl|R$oib`gQBJNy^(=
z3IwwfwB~oEug4gjM%?1jgOrp3+~+W+9gdT(F{VvX>Uf)C({!y&DQW2~ME&p28{30&
zbPxexrVbS(=NfA1GQasUtkp`dNl6oO{7Vi^tf-laaV@HN-28m}5(}B(XfPphwv(5r
z3RtVprBPvrMD*|C5DBtDu<YWP4yELp#8jtm=Ho%|urJCXycjCub{Xf^moGUFdOBNM
zr$QF9KSma%B4h{DTVG1Lcz=cZ19y&(j}OWK<t_kwP}9(0(ale;z|tr`H}L*83;+BT
zKw`=Qq2B%q-z+?SUyZ*Da_J^+g`8A>XJ;`Xa(>87J7%mF<g2o<sejkTJ`6if8jNXX
z%4@vyiR%;IegFF#RZzFHlgu&A|8_kr$WnVLR$LPap~@55WZeV`p2Rn>NH@yJ&K4FH
z-nw<`Q2|!`Vej4|bbVQe?q|Ih_#OrR`^;Wd4gFr6c+f5gCYB?DhyozLQDjywDkoQ^
zm>BcIHsJ5~BaV)F+Co!rOTNIUeTxL23zGopGjK7!1Xk$tcW>xB%R^T;A=NXvnW1|V
zI(KkjY<O{6n$3SseBpPaOoK}k-I;)LM)@cF=3mJ!S@0h^<Oj_RlvqDr%&Pt`j8YFF
zaH>lG<(bOn=H|%|oHp18f4<(-UD&vOf)RlJe_M^mZ-FIc-2txGIMev?^Yeoi`OM~m
znb~{PA7nss3`JpG03ol=-(MT|q02Rt2i90vSitTA1?YbL`W%H>{EO>M<8FXa?&rFU
zQdMH2fD|BdJC!(RIXNQY;<NCR5iIfY@QAv0t#kQ#EcZWDPfKXoAMjZa@v~A<Q2~g{
zD|rp9hfn;6GG%3r`;YqK%n+TG=dI!dj6&Qm&r*~u-)TTudV2c2|KgJr3*&?SA)f_;
zK%=MAg{Bcgc5##nhadQ*Ff8SG<K7?C;e7m3>qE%;=H||mB9X^Z_1Ly-Ns^~Oy_58m
z9w^}j#KN6O+&xnNHS=Ku0l(O|(43A$$|-q`JqZNfHsZE>_ijjcg;Rp?7HJ9enRRzo
z0@g0OxBWn~fvee60*CQ}msgR2oKv3|@f$WvyjEu6lLt%x_L;=_KdLr1{DhcAO)p&g
z!{wmBQCtUD2~-$FzA_CaknNx$j6!Kp(Pw66EX>T7z6~F?I6dlCO*D?pf4}rp9p*J|
zp9w#jIXEEE2_hiBn}X+*EiLcqBzmv@J)jw<z+L3i^!mex?L=P3@rRr1_WZ^j_Bh1+
z=4LQ~NJ-?<PG!<Wr2afDM6QTt#Ep}eg&m}l7zj{U_nKfm5n967xPNkQSBU$%89_lo
zzh47h=Hgz9lW)r3r1D7BI`jzDyl5SERgdN#sBk%%BL2)fgY~CE=JgDDuDIR$@1-X9
z5_}n()cqJ-t3PHPyE8g6A}AoRFgIv*aRh!lp$s79Q4?$^x{lbeAq=0BQUWVx`O(Pe
zs7~_!aNcXcIyg`LCuX3a5XCml^hPi6CjbDaf&v&dHYGAv>u#&2>Iu~9zxLN_T24y}
z3q*I3Rn<^eW>$qfLr#_O;8j;+R#j75r^1}Y^ejgsPK<)Efx+_1%5Dj0zIx-Wa4$6M
zwc}Na>Q5$<p)XgQ8{lMN>4Js!K99nrVJQ&baFVCo{jb0Vb>HB;1u+OpvLSyY7smGC
z!-pYs9Dost<LHnxF*UV}h2DAOM$UQ`ih%;%nR7SxO{|7tht<Z2bUhI{J67WMcn9}b
zev_Wl$usAUCnm26zv5A0uBfP3U^_dd!W^v3n^R&O`UKg7`9FQ0{cLLQ-oE9qZeW3c
z12VW!Iq1K8?_M5>Q;oPfG~)KL`8T^sAy4<<jDM=#M&JyhD`)ronXq~WC^fm)VO;uQ
ziQCz;<M2RnFMc*{QaW3xJxKQUmV2GmrL0v-Jh-!ccda1P5?`=8j1E|N9c!z<8V3D-
zSzNgA9o=^o?fB>9o3{S`{wGgTGcp7~1%MvhD^t--iyBt*{Ah0U<r(c3Pu!i@Hvi)X
zFm={yH~K%Jd?)oWLS)uWp##W8ets4Xaa`Xj^vZ%zrb*y&WfpP`8WwFJ6i$echzukM
zyudZ1P8b(`nVsd{ym>Pm<Ea<0-GS8bZzwua7e1>RT{1H>J9n-yBH}0#fBWyN2(U&$
z_eVkwU+!Z=fKu4i`yUw(YZ1iI*R8=Zg&c3$txHS*h7iE{)WQ=mjp)WI>z!AWqGV{;
z3nBGL6ldn(pKOZZj3m}^o~Hw)b{h%p+Y(nS*)$HK=plR5yVdZTY8qe;pt9fZZ^P(5
zhDDK+nn<Js$5?VKt9%6f^|7=A-a@PUhbvGj-I3TFOM<QO9feCsSU6yz>j-i^*}piW
z!ox3kcp&qh>GKN5SkeEl90CVe3-=cQT}764FURITlsi=d>xrJR#LGtgh?w<N^4xqG
zJkN#5TQ*UCqSq@RCvp(g7Gk#!{1ULgn$8a&mQj&_#ge06y?8-IBx%E;shBK64mbNY
zX;CPhAZWSn>IO4+GtO^L<tsbe^%?SkriO-wj*bwCpO^PkZ;n3thEd+kV1tzaD=tsR
zsMK%S(<fdn>RWE`;&;z4dVizTNfU@DZ)XkviVG$>vvqlVIv#NjR9_T^XbfQjZGFk&
zTH6T9B}LEVoOH)M&<YPVn$NjM0Yw=+*wjePz%v6%gt%mIxE#qSH25EXAW;5Yist0M
z`0eL#5CsUy+q^H(Un<dp4CT_B6C3J?Je@T#uAS67NUGKaoiWy3d&s_7tYi&ia8aar
z2)!|C74GOG{iy(S9K@L@{@?{@MCfXRwU=lJ^vJ?Tr40>AwRfI}a}3QC=!+vAMVbix
z$8I_|8F$;K%C8VvpFi6mO&A&U$%&29J1xLH-oJa-r5pC3a-}!&-m&ycA}ppcm2JWl
z@Z|oCB04UlCmK$DblRENHgQP9=yE;pQQ>qGgj*1Fi@5>mFpP2gdZJ<F=Sdrzv`|Mt
zqzCsskM<v7;1yJ9T*t+yN}9M1QxRYuWr0>Dl2ck#T>M5_j_4NnHBgN!(C>)xPj!@P
zbBsmE(c2&{ga(&(NWw*>E<1Y+m|h9}9w!gYw9v9{38?e@o4okCIzI=82?P@MTGnbP
zS$*p2x`6)uJLlx{m^iuP>rt{nj)~i{=kJ+_Syni2Q(?vnDc1g?Jb(@4YdS;|{k>b2
zZQ1r$JSmbU@uf&Ubh=f6CJ(_5chPW=^caD){1Xp-z746Yt*#tn-7dvU2LYPwV|^+j
zrVoxV%46%u51d4HHnz@=oePVLMgi=!HmnDlStWk<Z{xF7W?1_=^xeD8XA!bc>yWL0
zo)&_X!3$5?3-xVXT%`|@HO^y0Y#xGk!&e8yru|KZg(Bqe4N(3ika8S9;a&()n(qJp
z1UUEKFKJM2(n3f$v*eXq1kt!|5vz6zzs39CkpLv_PBIdH3N&hKYkOOszL)s7QDvR9
zgQb!v;{d3l=b)&99QnPznUIhW8>_;sN)sBk5J>6Fb*9GrFy{Y23aqQG<>%)|K<jW^
zhW{A!B#N(>pYNostc+7|N7|_Zaa)&e6pE<mXo@3xB$^vde+Cm2r=K&d*eFkqOOj7=
z?ZjqyEvk3`XorbQt{4RjuggtbUS6(*Db)Xng;o;YJh+UKQp5KzEp4`?RaI4c8~*-y
zlW&Yg22=w1Q~W(dv&f1(k`wVyza~vYy$FvHc!6fDdgKU1MXgl5oR>(Wfg5M(q`WV(
zQaW@`k7x7dn=vt+Ae6x4IG|LG0RVz<g5iv4-V|cwlGAG{0q>&ZL$KvQj8VMV;qbNi
zrB41^=jZLJzmYKjXn)?^47`$?DC^iejuy6E%9fOvzZSKI01m;tWsBMw6#`<VWesLY
z1dl@6Jn|~M7$y+p$%PJNAADK@^BSR~^VLZ@MiwK$D=%LIc^Gx&ZK+*^=tfEc87@ES
z{n!0A&#o=mK7q#pUQSONgyxf*7`@{lJAqLfWqrd#v&6*247*eNU&}CNDX~z2r!b4L
zFMTdudX;kU7ruylD*PFE8QncS=Ra1d2tQp)KeBD*?_Zd5K9{h!y%j9g)S6Mmw|^yT
z2vcZO_Z_={kQ1WugTC{xfF5x03`3Cg2EgtD2KaP&?vTvmEBpLBJ!Ochnwk><FW$V7
zMx<L<INPo*f$_4wnWiS)p|lqxZWwrCyg=8)vYEH%;`PE4FTeidfIcPDs=x#2tK;|I
zIeVhY!#5E=mi%>S=+uMV*PCsKv*4(UiNMWn7ccG>73KV!=ALZaQ4gH;0jgtE{D@n%
ziP*Vs=ZVD&vy5llSnnHf{w332P}|o3Em3m&KO56kt}lL#j-o>rbr4~K{F>c>#c4T+
zSb?X$dQ)Xyi1Ohl{w!wg1o$4prO=`JZ>MoGr=02?dyv-|68igCd1d8Zd^!xTybNqp
zqa}MI6ESwpxbiwj)(L)@%;3i7LqZaU34okYa;gW7xjQ232@bBXrr5R-`$fy`RAEhs
z83Oez@RXMiNJBgQ=&{o9Yo7p1oIthz$`VRnaA>Hyx;h;Dir0HtmQt4mLde#OiR0wM
z?q={uzmBveLiOpkFWGSCm5`<ZFY|tH4xgPS0z`R<u$TA6!>=Zx5XHy42_J0oXOxnq
zRcRe@d*o9T7063U(zb^#_J8L}Hm4$eSK6R-vHBwvQp^w)V9OJ{H(%gHZw5#NF2bgP
zWFhl=%f$DFw6rwQ5s0_9Zsmybda(NLrzN*WA|^~5h^>iT^c}uCiVDM~P1)OnfKKJ*
zeXw7#e}CiTZ+8_s10Yjneh#Utc=ch3j+$|pMRP<H=CDPCq^p)Nx%IB8FMq}bxw|nj
zF{nY9KC*!qhpwL4#-rq4i;e&b|Ip>1`&&bhtK087q<lS%3G~>Kd+XK>b0;?E#R%m7
z^32ly;Tg+AX+x$q8vKUe7Z%JboZmsvVconLiG0oIx3L0A_wR2as;jHfTOYd)ll^}5
zV3vkB1*H<jC-W$%&||QD?r3m3{>9{f(^y#<897_){a56XH`urD=B(Ajf`WG6uw31e
zMpWL`f?eB=@yBu<^4TvSknwW=W+X77hM70`r=*D-(m6Utmbo(k)Y;gmObofo;mjN5
zb@kU=9J}FT4WZrf@?PjFPPOLXhlFyQ9wMiDBE4U-7{=0%(*EV|5bYmpFguFy!N=M6
zBsO}r3l~aq(<Nj;^`QQP>P7LApa91SY}~jp%9Srv_Y^aUcKF{9njgYdR$x6kI!v|O
zRU>g`BO>l7Tq-ThUO{9DXchPPHFh%AeUs8(*RC`*NRIgil!-w-m&Fy-wuw;(k41C(
z(-kmkp~8G5vGLj7Fwx4~vPU^fWD-LZklmG#(^BQ9`d|3(c#BaOCQ^U}DWg?C=&H@d
zS;HCX?imR4oe2+?ec7$C{mi{oaYU&^ckg~RSr`>)X@<Ev8|c~BdEp(Ea(a2$NW=*s
z{`qjGaMyJVTmf=o!m;N$N&57ocR*eE%mAEyaHy+6LE1ZFjsCU51E;<F&$>`{2W~ZP
zK&!3P@s_8)tgI%40%dUYk*&p^r;`OPZTvT5Sb2x2Z!q%*x8E!mCfm{)ux>@)Y)`cF
zib8mGgsQs6tj68p?Af!2o3A<w2!4O}oy0e9_byy7*AO*4SMkgPV>#ZdaWOBS|9j_s
zAr|SaLm2`(+tf%&d)v;j;BIl=zn1X?EDO#z=B6AU#OQfQu{!Tr-pa`L%$9xaPsR%8
zBu*YBn}M^D_KSJQt-1#g6IngJ^uxS6uNc_CJhZJBQ)F@c0(PjcuaBLRXYmj@O%OSF
zM#4So?HL8ClDYY8KXKe6MMOk2EYChhhD{^WphiGIz!n2+IBK#kr}}6r<5fsW2LP*M
zH5LHW&%G^9EhvZ-pXf?&fy4bNV9gJ2<}$vc(&a*nOK?oJ%_;s{Z6gRepM>IQX~}KT
z4TgZEG2APMM-I}CCKQ!A>43T*`FfhpUAYp}ON`LgWT2-}oO0mhYIF60+;y0W2#!fQ
zt>aS#We;K)kAk=ITF;v|9*8Sb96e=T371nRC@w7DzLsEBZ=88J)|8{Onq617@-$?l
zae>M3^tAK)M&{b1lwdobZH3tKe0W+88lOe2ckHV0{f;$=KPL*!CuV2Qy>E=Uev9~b
zEF)1-4DD3Vg+MHOTUy4TSM;wkTwTxTh{&#W+F^oV#iW(*NB8Y~wuNE`S@OU<G00k1
zc%=FHa~uBsIh7Xa|GwvLykr}@P6A~Oad%7KO+z>B8)JZ|!?=YZuj_*(xouVLFiA4W
zE<my5-88x$q?Zi3LZF+Z12EJ>ks-u43=3!8mJn%39rzEdx5qCEk*m$QckFm*=68ib
zHHh+>dHbkvy;QwvOtxa845t$_G;h8zKu`s7gY-O!J))}m46^t{*oxx>@^7eavmo=u
z)=hmyR#pZEX-60ms3~Ni{jP_fzOe`!gwiFrP8b(lP}Brzf^Uj9!4%cw$CnZN0{%g}
z@%;VGnkjp>V;Pn$yo8(0HkW*S=tG`DuSGO_3I|==;`OzE-=Zak-5T0GswUvfX8@7u
z>5mvU10dVFWlOH8Nc>A+;Ii|B{wVKxVsehXIWX3yd>-yPo`tEB{R#>Sa4WH+q3J<@
zqD%vWw@)g_2npFE0*FSUtEu_o^=ola(PX6nf6z1&6AsO|8g(0%Vzq0`QeIkZzc6w}
z0U8bELdTMkd%>{;+GgNUG&g!}Q=%Tl8GrX~K}-4g!@5HX3W)XONl=90yD2HnHYK5_
zcU^bvN?S*uM5r5SFstJ95ko+}<vZS{AK64a5Yf6riT$GnXJuXRbq^1;`f562wysFF
z8vV=5h3o&z+l^_iBmtuUYF>|s$Zs&z(~|(;P1WPz;_^kNm^f8pf(EyWDG7w80bvVU
zMsR|t2>AWz1IM>ea&Q2f7#>W{{zRETM9&93!9<eY7B{)O+xFQLjX=VS*INE|>E>)5
z+C0fZ9)0<F^Ds;sC~oTr_-1dR)#5`e5naRQga*TGh64wfd=({!Mp;jfBCH`DzG=mP
zch7+X+X$auvlf}PfSh^8(mWqPiP)#s+UOVFt%`4`8zG3TL6qkL{2Ak^OP4xB@dKnT
zvMZSiDJpUkTswAPn(w@ol~qkKawXWb2n2n@+e7uEBH)a^ue)3+bJKKxddt>37z)gU
zyp~1zl%xHI{RO7`2=6~Xpl21Al;oZX9$in7-R)n0-pse6v4qKJBX$ZV!27~iVkAJb
znRo1XWiP8dUs+JVK;&)Gtf{W1QpS8l=;;aLiR8)gNBV3=rl#+p7EEqHvW<Y*lfCxh
z%XcB|+Yb~c>4*b1CMoo+)FN7%alYHPhlp3&DLZ5~QlHYNUuV~tFY-xpNV<KK3bS|r
ziJ<?-S!IuC9_ibiNI@t^HbAp5UdaUP=~2=~<x_#p+Ic=4vX+5PVykVbd^95E(%c&<
zbGOfFCR8;x>2||03#6jyo%;B4<oTiOjwYE(?(;mCGjj}VJCDNB#E@a_&oX;jm20Z}
zn3kqA!uqMnfFtedaT&-AsOj^^<}8i5Y(Xv-ru|}djGZt!PGI8Wm*HXk6(b|QL&lF(
zFuG=hu$~pQ?wIJ2BS&7fP%FDo{y&$ASxGG|Ep_!!N7oXRXCuW0;r*ejdv3YW!yGjc
z!};p_nZVF-tkJDhaym?UAm9A-<>V)%AV3vNY&*+*fI}~!$sR#*RdwTKpIV&s<TtGU
z(2@Ca;ihPahkt4(T&Y)J?uNNXL(bhk!LxS!NQ0SQP`+q*UWcmD5!o}~7LK*Yww%Ar
zPH-u$wm|;?)zj;!r*8X!-N}u+3Ulhj8wEhc1|%Y&RC0ck{rK0S-uDvxd<0I)SL!6X
zv8C#<(?IW?Rx4gfXliOAsQU@J8>%9M58wRc;e7#AR8)FB85}jLZ?@(4lmP#vN58o{
zRz^{0FxNfy^=t2%Av*@lb^`PGVc+G_Nao?3!0t;^{2*YO2C0lPn)+WpT73~78_44%
z29u>Bw|XGc34a>O=e8v>gJv-9N=9;bw*g~Ox8wGN{8ur2hlwGCH6}x(lEnD<R2Cgw
zkg97RcEwyT<|uP4b?zUVFR3w@Ed90X^pM5LO|?!_*1?bMHTdsBk~k`j%9m}Gg0%0V
zu>-hW-vk*GRTyVPQ9O!4|1IaxwLpGhI!*3*iW1v?_rN}Rc{8KWqoXniuvMGa<4Fld
z!{`TCL4ZCa?Ft9$b_O%&ZQ9ML?#K)j1u4d)_|y|D0HpYNL^^P+_6P|*htq*3Fe$wT
zYYuEyE3+H;DTiLx<-PmJ%XsKdl1fSe(9AF&dC+s3IieZrCmdJVr2$?%o#UHot4#?4
zJSXn&>#fqvwTHlYro;r~`!CwgcpNAvvf#oZA~~;5V=Ew#j4RVoDyAlo&w~Mj&Ye4)
z1Jdg)Yo~q`9H_Tm>U0_6vb}t_5gvMwdsyPi()1>~YM4o9CYiNQAs6P+_YNUSaOs75
z+BW%vDO0+l@j&SiiXj_gB)@t|VJnWvyBX=%pM2ri+uLWs%GcA=OWA!2l^I}W^vjp@
zW2Y8|a*B%1U)8QFVT1IIGKAKB!lNI>7v55ReLZ8jb{{_?E10fCIJrA-wx+hW7NM;E
z{>s%4r%hvEd?WD2zQ^qBJ(`ZO`9v{ODOk&OdxQUbmdT^EB11f}M9+hw@cq9(zvR*M
zx<!o?4FP#j8v_HRoE+cey+P6@sjjyM^EHrirR(=&P#7lN&X&`>uq}{IMqZSFR8BB%
ze+;Gm4_=OJ4-U*WoGI9FXRDoFXBbT2j&dvcYcmHoG^}AuTh+ZrI&++HD*r4vkgIF)
zlf%wu$*JD}+Thh8ys<8<$pHrsf)~YOEx4PQh;~vBJvc_-9nb<omieBy%ETZT0ntGg
zdHM2XoK_}mfAlB}aOaltR^{Z3Q&K|rtbqX-zui_Bv<XHw3>&U%Zr959mSI;wSjWjK
zhHIZ(v(+(2m35<#>RC&R@jLJH*zVGO0-A2fB~H#M5)4p<($b!`O7;(8)8TOo1@(bG
z819$uyDRVE7&V8-Ve~|CU0iu+Sy!`^e1Scp-1Y_QQj+gvp?NjV0onM0*A|TO!mx|f
z<S&ZG0p@Hd4h;>3ww2efeeBr7nP>|Uwmv0RXBH_c%{Yqcs;>SVvIat@)02~&JUmJe
zogoI`c^;Dc_xJWvaq1!OiKAhdsW*R>Zx7`xNbTE4(T5-sp*lEtf9u4aKW$?JjhA9m
z!cjeAYl|$-6w(wp9D@x34U(q|8?br6WMq+##&6k_P)5>|r}kRa*S?$$#ok*V*&zYY
z2EP=0TGscstCiIt_AWZC%ct5ukLT*=fBvLAo5N6gBR#$1()i9)z2C272mg*Ktqr@%
z0a;i=_(t>tx!1F%zwX_<34;cUx*360W@a#baeR_Z^L6NFpiA=zY8y>@P4+s#1~a0E
zP`91;*3y`Pt(*HMYd|FQio9=$R{m6hz!*sq5?9ks1_S=WdeVb*XE+$4gbT>YR1;wh
zA8$$cRPT4v$i&2Ce0sXw{t*bgbB62oYbIjw!m|QaQDIXH*;558g7c1QYQ}118qrU*
z^p>3)FspOLECL|`4`lJ_zvK$=4<q;4t3F62W57H9DWZQ=c+!Ny3a7|mISEvVfsIZl
z!8!=#kZ1&=>%DA@vAWOW<KEyd5F~DkNf~ZJBm*Dpabg+$MGKRr;Q2r}MyYr1oP<lH
zrjKSIZ5zqh(bw09cmq;<Cs8OCuM}RpMk4-m9P`LajF?}m_c^w79|+30$YIs2+!21>
ziA-1M99U6=4-Op~I2(J4-!=$aL8UxpVjVTb@+F3F_p<2POfn1{?CnR<vu>TJz97D`
zdLlraA|VeC%&n(5gGlyc$p83;?#2v*U4)#RT+VYpm`&irDCNBk3xqPhk%ff?XkJv3
z0t0g8OP403{Ws#lK&S#pctK~wv`$f4TF`3w*}ekP_(X+6ho}On0=9E1_$*MK8#FjL
z*w&U0_=N#M(LH;lJ@nMoI_@rf`$mB-y>dlynm|cI7`sOrW_<iNbUjLxFzZInlfP)q
z|Hd?o=vFGHKYxDu<$JGFsfpP0+5vcUV&dXI7Z#>*ui_ISv|#RjWn~4(8=nvME65to
z`87?>^!aB@RCFmB22}7LD%Uo;5^IL-348VO<z+m1B0DSV+=q%8)F1>Dk0tMy^f;?d
z7WQANJ8{HIUUJ##3e-70y_m{MFPL_~0Lb<zI=?N3K;(ys<1D6!^_Uv@g=fRSX@h5H
zW~8yUr~fyb(bCq&?!no+ckk*d{-GrxW998##p7|DU>7`mI0IE?7Cr-Vjg+xv#Ngfl
zh3&&K!egf*@PL;ef-J<i@Q&^sV(oD3R_7Yl^7fWt4{b-_!^dX{S!Au~J7zRBJRmHE
zS_cl@xsi*SC1zS`ivpUrU6}Ow&iQ&%lm=8v*r~{uYHzpnL+C>Hj?6I(lMmKg_>G9H
zv{<gxg?a@{yRX}b<$|t`(tx<59EihWBBC~sMBir}+ivs%e7+@e+ePdfG%65<{CkPd
z3-u$8tQj#=9>ilhBABX2VwA3X`}ggK55}hFFweY<M?f(Wcr)t>tElobPEH%8rPtkF
znWa(2vF<%io!ABtFoW=`W?W=cl(hA!#RZfpBqrI|*)g7V4$Tx6_OFv)<|;B92HdJ~
zUlq`L_V361L7kDM%g3q`A9mV6wA5~k7WAG)-8Bp&-iwIXI1r}1CYY0c^y9$5G3JDD
z%Io2p324F!eA`>XLASDsJe1+C%BNmD6o;A^LZTvzNmUp3mKzVqf&vY#)6DM`*UGsQ
zYezS140w!DS0H=b>8&7BlfAq4cwMJsVjBJKjS%lAuUth57BdCK`-7NgB68}rgH~5M
zi+63^*=2Pd^GU#ZtTmg8mlO}WhkMj7yL**1zv$@Tk+N;2I0(zrk0w8;63SQ#<WG^4
zjaN@4r?#SA?dI6k7mCtJaXTQWA@rrR`aAvkjX}=b=T|4!T5g2L&;jQ$5EvxT+uPpJ
z(SUS%bj#(rx?kFCiFAM|p{uG78n{eomIm-FDONT8$&rP*!%>gjrA!c@H5q+u1&WC0
z-%#9c2xmCv(tQ`)-GL;9)$~!r4EJInvj+NhPgYd(jGR^+tedZB!e|<P2vq{@&qVwE
z{e8jCP7sfN`u;ulJlA@&oajj0Bsv1!193y65K5YZh~!cF6ntfyA?)RN7Y@Wd@E9H%
ziqrNuH%*F}@nBnwfMz8P(tY`&+B!O;u5zFoZ@gxUc{x23uvXB%^9;O)pRTJhp21;P
zrz?KKhEa~`w=9G`#MQWr&}8^zw1EJs(E4kF1vHo1Iw3DbvN~VoBiSG(Pjo^kfY!$-
zoqs+CmmyDyT#*<V9|j1BWf~Q#*x$qB%V;(*m4QCuDF7(kSZ=76=YT!k+)5qyoeRYm
zkJc06QuOsk7e<@fCnbe8k0BLj7Z*xsC*OGQ@eL+cfNu+iZba3kd3!J%Jw4_+#!964
z;1e54<6%M)ZeLs1`ah+FsQy{Gz@;>ruqT;OD`C`@qasPLnpVi>lAY)+);+=Au>uCc
zvb$LIyU6wyWfrtToT*;Pe|c3;nv0rW-?fKSuG-f1GNPL`<&Oo|?S=r4=bAk8*<&j;
zKK7#ugJTTszrVL%yf-E%FHd=Rjg-_66fOj`XQrmmXAa`=a?=a`oWKs3eSCtM5lA|F
z?%dD$`G{-RV)nk!EoVlxvcZ|bEk)PBUo0;zI$=Hpk7sxXMOWwE#a}&|+S-_4y6EYt
zqoEP=tBZRE;fREr0Vp-Gv9ZUF9qa1qLU+K6fr%*(W&l{_<m4RfvrWQ)%%49v@H+xl
zbm2I-yO(`rqNjKB^n^q_|Ld36#fz8MR{hX)&z~=XP-J0|QZ6mO+PLtDZEYRWR4}d5
z`^8~~9`o~CasK7B9vRl?wVN#L?Ej~ktN%*!48w1Y5YshEP8v89+=)5SaWJ&C%EYF#
zl<GK@)l9bI#4p-OF{bF~gH|1-^<|lW=JBNE_ld+z&vfdEjIxYU@$+P}rj}<$S{m6d
z|AT%UKkx&*=kUHf&wW4lb=}u}&7h32OcwZ|S0DExnL(qiEuDgRDo*e%Jf)E7i}Lnv
zAI|6d2fww=>Qg*ws@$yQ_yM7?6LxNr`u7py*_?o4EP9u^v9WQKdY{GPrG{y~dW=HP
zZzw%5@ZhCUm6sik8?%_3@W3fpW!;Jxh>00Q-guRnEt9<(h&j<Ige6CEQqmmmrlsXT
zS(yage@r5z$hZ1JVAy^2zQvMZvs{Gz#rXI*#`VFn7~9*!ezi<%@l~R9?r?K+^Js(=
zx*>9qLZOI_ErLL2Pt7L|4w~ITtQ>HSjOZ+MpEGT&aQrgbH+7bjq1qo0H(eOfTCvho
zdYw1WLU0ieI7f>4U$}#~x;`9}6&DxNed+?Ki;1&0D|ZqH9#8}y_I7i~U`JFUu5m&`
z9DzKSGui<Vd~13;T9cUGf5G9yB5B7CcNN;&7|OcmC|g<U97t*LNl#Blttn4U1=BP5
z&$Ej1@)N5Ad{i)zGXzl38NF>XVFQZbZ~>&6Enn0)W&WId4+QHzT%T$&csj!hfGyN=
zHFuF5fwK!_&v95ILBOdel^-KEP*p7(UV|0^8o+CeRGjMtm6cZOTD5*boq-mv-lEOR
zyA&BNUWx}k13m9)D$CQeqo*gj?J6*U;244(HCU2p<r@zY^FZi#(b4tSu2GoFR&T15
zj`sG7E>r@DbQ^f$fHfw<8YPjGbtTx)u*ib#z;*Foko8Pkt@^aRIboh?^8qV|GBkIe
zBCoE+Anx?^nCu3WSE%Ze)y^Ezf_f7e6*6zE;UffO;XFY%$LSQr`#{8u-=A+W<T*o|
zoqBQ<H5YXRpxMa}9#S_rqS)A9xGum48=h_kCm&qWwd)<ix+5M-q3!D@l^!n&KA5qs
z%)Ep|LMgCilj9pDO2ir3m8z;w>GTzXUYFibZ*OlvX|9VSa1*$F9JCPX(gb*BqtW<B
zZf@B1=!AsJa7>|&fbHAg?7KNauWKjbyNiR4{(U|hXTZ`%i9})=)Mzy96!EI%7?!}9
z-`LbN5Xb8{-`C&oeSQc?W4MorzkiJi?PtStiY+{svZ(i^Z8nXmDk*sa;x(n-)y?fU
zK;*2fCd74Ca7_=?pr)gM!`=HG?d_KfT+}xW2EV&=ANQ)=N#bpCc|Elic8DE`ryJ5?
z7vYjU!A}Hl51pj5U@f2jeSa5E65{6Y#)MTiU=(*L6NMmKnkW@sK}cQdRLR!s2Do%}
z#2Aaak;Eh_?!>1lmCe-F!V7$~p9}uY$k^GAn6=!lk}k{;`g5W)38fQu@fVQOfeW-}
zlF8&XQVv@w6t&Ns2vE+SWh{(Vv@KgqcgN$gjA;mdO+%1~d}!v&J&O{K;l6VmTajPx
z4KO*LCf(0mFN#21sJHQ;3oNZw00dJ<AcY4~d3beq$*m>JaG1k*^2Vz5B=JXqlsjoJ
zKP$=~zw86PWiLoofqs+vCqE53$496jX+V-|j|UNk<p_bYo{7=l)n2nH`D5-llJcA)
zyzLgx^P-A~rw!P`4W|G+3k$1zCQ!>Cp`w|E40L94a$<r(r}yE4$Vk4^U`2KHIR*-0
z-<_-TX&$)Ke)!V-5K>!F;pOlD8nqg70A64v_D8MDe07;R0`{GJIM6zYkL;PPZEYwy
z%QN=1xRIFL_b3``FjogP4bnLf)Vq>LY!wwtcT$a=ZES}5CDUQo*KN<BV`Sti$3T_6
zbnbz+OEK(tk#Cp$I+GxBFxrA-2I9a_SJx36#XqIfWkbP(ZVkK!&`wQ^MATw)h54}A
zA!X)txqKMIBNYXJ0=SnI0_{e{Ia)i1g)2JEW?yJuDf>`bVk9~|X%EIJAyfkB;qxQU
z9BO$;RT0lqAxD9G-$H#^S{gt12$+2rTy<XbEm&tZoZQIWy)J}8?4WymVDkLXB>Vro
bZhpz;2PgSD@?#@>dx_9*gj=cw;zR!dJ7J9{

literal 0
HcmV?d00001

diff --git a/analysis/plots/infections.png b/analysis/plots/infections.png
new file mode 100644
index 0000000000000000000000000000000000000000..632bddf3e80bb0699130140395e4152bc7c86218
GIT binary patch
literal 20513
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

literal 0
HcmV?d00001

diff --git a/analysis/plots/infections_recovered.png b/analysis/plots/infections_recovered.png
new file mode 100644
index 0000000000000000000000000000000000000000..55eb2d7950f296cb277c84a7d52bc8e263e3d922
GIT binary patch
literal 17940
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
T9{s@nX%#gkP4s&Oi=h7n7lo0{

literal 0
HcmV?d00001

diff --git a/analysis/preprocess_systems_data.ipynb b/analysis/preprocess_systems_data.ipynb
new file mode 100644
index 0000000000..f58faea313
--- /dev/null
+++ b/analysis/preprocess_systems_data.ipynb
@@ -0,0 +1,428 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 131,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import pandas as pd\n",
+    "import os"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 132,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "output_directory = \"/home/nina/PycharmProjects/memilio/analysis/systems_files\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 133,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "['INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW046.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW017.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW157.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW048.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW059.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW211.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW126.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW023.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW061.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW054.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW141.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW064.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW043.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW052.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW143.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW155.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW022.txt',\n",
+       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW156.txt']"
+      ]
+     },
+     "execution_count": 133,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "file_directory = \"/home/nina/PycharmProjects/memilio/analysis/systems_files/Euler/\"\n",
+    "sampling_files = [el for el in os.listdir(file_directory) if \"Sampling_COV_INSIDe\" in el]\n",
+    "sampling_curves_files = [el for el in os.listdir(file_directory) if ((\"INSIDe_substances_results\" in el) and (\"Sampling\" not in el))]\n",
+    "sampling_curves_files"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 139,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def tidy_concentration_curve(path):\n",
+    "    # load the complete dataset\n",
+    "    df = pd.read_csv(path, sep=\"\\t\")\n",
+    "    df.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
+    "\n",
+    "    sampling_location = path.split(\"_manhole_\")[1].replace(\".txt\", \"\")\n",
+    "\n",
+    "    # identify positions of new subdatasets\n",
+    "    subdataframes = df.loc[df[\"time\"]==\"time[min]\"]\n",
+    "\n",
+    "    # CSB (Chemischer Sauerstoffbedarf) concentration\n",
+    "    df_1 = df.iloc[:subdataframes.index[0]].copy()\n",
+    "    df_1[\"location\"] = sampling_location\n",
+    "\n",
+    "    # COV(COV19) concentration \n",
+    "    df_2 = df.iloc[subdataframes.index[0]:subdataframes.index[1]].copy()\n",
+    "    df_2.columns = df_2.iloc[0]\n",
+    "    df_2 = df_2.iloc[1:]\n",
+    "    df_2.reset_index(drop=True, inplace=True)\n",
+    "    df_2.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
+    "    df_2[\"location\"] = sampling_location\n",
+    "\n",
+    "    # T(Temperature) concentration\n",
+    "    df_3 = df.iloc[subdataframes.index[1]:subdataframes.index[2]].copy()\n",
+    "    df_3.columns = df_3.iloc[0]\n",
+    "    df_3 = df_3.iloc[1:]\n",
+    "    df_3.reset_index(drop=True, inplace=True)\n",
+    "    df_3.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
+    "    df_3[\"location\"] = sampling_location\n",
+    "\n",
+    "    df_4 = df.iloc[subdataframes.index[2]:].copy()\n",
+    "    df_4.columns = df_4.iloc[0]\n",
+    "    df_4 = df_4.iloc[1:]\n",
+    "    df_4.reset_index(drop=True, inplace=True)\n",
+    "    df_4.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
+    "    df_4[\"location\"] = sampling_location\n",
+    "\n",
+    "    # combine the dataframes\n",
+    "    df_1[df_2.columns[1]] = df_2.iloc[:,1]\n",
+    "    df_1[df_3.columns[1]] = df_3.iloc[:,1]\n",
+    "    df_1[df_4.columns[1]] = df_4.iloc[:,1]\n",
+    "    return df_1\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 140,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df = pd.DataFrame()\n",
+    "for i in range(len(sampling_curves_files)):\n",
+    "    path = f\"{file_directory}{sampling_curves_files[i]}\"\n",
+    "    df_sub = tidy_concentration_curve(path)\n",
+    "    df = pd.concat((df, df_sub))\n",
+    "df.reset_index(inplace=True, drop=True)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 141,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>time</th>\n",
+       "      <th>CSB(Chemischer Sauerstoffbedarf) concentration [umol/l]</th>\n",
+       "      <th>location</th>\n",
+       "      <th>AFS63(Abfiltrierbare Stoffe) concentration [umol/l]</th>\n",
+       "      <th>COV(COV19) concentration [umol/l]</th>\n",
+       "      <th>T(Temperatur) concentration [umol/l]</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>-10</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>MW046</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>-5</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>MW046</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>MW046</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>5</td>\n",
+       "      <td>107.0</td>\n",
+       "      <td>MW046</td>\n",
+       "      <td>728.2</td>\n",
+       "      <td>3.3</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>10</td>\n",
+       "      <td>107.0</td>\n",
+       "      <td>MW046</td>\n",
+       "      <td>727.7</td>\n",
+       "      <td>0.3</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>...</th>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5449</th>\n",
+       "      <td>1480</td>\n",
+       "      <td>107.0</td>\n",
+       "      <td>RW156</td>\n",
+       "      <td>727.5</td>\n",
+       "      <td>0.4</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5450</th>\n",
+       "      <td>1485</td>\n",
+       "      <td>107.0</td>\n",
+       "      <td>RW156</td>\n",
+       "      <td>727.5</td>\n",
+       "      <td>0.4</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5451</th>\n",
+       "      <td>1490</td>\n",
+       "      <td>107.0</td>\n",
+       "      <td>RW156</td>\n",
+       "      <td>727.4</td>\n",
+       "      <td>0.4</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5452</th>\n",
+       "      <td>1495</td>\n",
+       "      <td>107.0</td>\n",
+       "      <td>RW156</td>\n",
+       "      <td>727.4</td>\n",
+       "      <td>0.4</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5453</th>\n",
+       "      <td>1500</td>\n",
+       "      <td>107.0</td>\n",
+       "      <td>RW156</td>\n",
+       "      <td>727.4</td>\n",
+       "      <td>0.4</td>\n",
+       "      <td>0.0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "<p>5454 rows × 6 columns</p>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "      time CSB(Chemischer Sauerstoffbedarf) concentration [umol/l] location  \\\n",
+       "0      -10                                                0.0         MW046   \n",
+       "1       -5                                                0.0         MW046   \n",
+       "2        0                                                0.0         MW046   \n",
+       "3        5                                              107.0         MW046   \n",
+       "4       10                                              107.0         MW046   \n",
+       "...    ...                                                ...           ...   \n",
+       "5449  1480                                              107.0         RW156   \n",
+       "5450  1485                                              107.0         RW156   \n",
+       "5451  1490                                              107.0         RW156   \n",
+       "5452  1495                                              107.0         RW156   \n",
+       "5453  1500                                              107.0         RW156   \n",
+       "\n",
+       "     AFS63(Abfiltrierbare Stoffe) concentration [umol/l]  \\\n",
+       "0                                                   0.0    \n",
+       "1                                                   0.0    \n",
+       "2                                                   0.0    \n",
+       "3                                                 728.2    \n",
+       "4                                                 727.7    \n",
+       "...                                                 ...    \n",
+       "5449                                              727.5    \n",
+       "5450                                              727.5    \n",
+       "5451                                              727.4    \n",
+       "5452                                              727.4    \n",
+       "5453                                              727.4    \n",
+       "\n",
+       "     COV(COV19) concentration [umol/l] T(Temperatur) concentration [umol/l]  \n",
+       "0                                  0.0                                  0.0  \n",
+       "1                                  0.0                                  0.0  \n",
+       "2                                  0.0                                  0.0  \n",
+       "3                                  3.3                                  0.0  \n",
+       "4                                  0.3                                  0.0  \n",
+       "...                                ...                                  ...  \n",
+       "5449                               0.4                                  0.0  \n",
+       "5450                               0.4                                  0.0  \n",
+       "5451                               0.4                                  0.0  \n",
+       "5452                               0.4                                  0.0  \n",
+       "5453                               0.4                                  0.0  \n",
+       "\n",
+       "[5454 rows x 6 columns]"
+      ]
+     },
+     "execution_count": 141,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 146,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "\"\\n['time', 'CSB(Chemischer Sauerstoffbedarf) concentration [umol/l]',\\n       'location', 'AFS63(Abfiltrierbare Stoffe) concentration [umol/l]',\\n       'COV(COV19) concentration [umol/l]',\\n       'T(Temperatur) concentration [umol/l]']\\n\""
+      ]
+     },
+     "execution_count": 146,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df.columns = ['time', 'CSB',\n",
+    "       'location', 'AFS63',\n",
+    "       'COV19',\n",
+    "       'Temperature']\n",
+    "\n",
+    "\"\"\"\n",
+    "['time', 'CSB(Chemischer Sauerstoffbedarf) concentration [umol/l]',\n",
+    "       'location', 'AFS63(Abfiltrierbare Stoffe) concentration [umol/l]',\n",
+    "       'COV(COV19) concentration [umol/l]',\n",
+    "       'T(Temperatur) concentration [umol/l]']\n",
+    "\"\"\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 147,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "array(['MW046', 'MW017', 'RW157', 'MW048', 'MW059', 'RW211', 'RW126',\n",
+       "       'MW023', 'MW061', 'MW054', 'RW141', 'MW064', 'MW043', 'MW052',\n",
+       "       'RW143', 'RW155', 'MW022', 'RW156'], dtype=object)"
+      ]
+     },
+     "execution_count": 147,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df[\"location\"].unique()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 148,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df.to_csv(output_directory+\"/concentration_curves.csv\", index=False)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 149,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'/home/nina/PycharmProjects/memilio/analysis/systems_files/Euler/INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW156.txt'"
+      ]
+     },
+     "execution_count": 149,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "path"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 120,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "memilio",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.15"
+  },
+  "orig_nbformat": 4
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/output/infections.png b/output/infections.png
new file mode 100644
index 0000000000000000000000000000000000000000..632bddf3e80bb0699130140395e4152bc7c86218
GIT binary patch
literal 20513
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

literal 0
HcmV?d00001

diff --git a/output/infections_recovered.png b/output/infections_recovered.png
new file mode 100644
index 0000000000000000000000000000000000000000..55eb2d7950f296cb277c84a7d52bc8e263e3d922
GIT binary patch
literal 17940
zcmd6PWmJ^y_wInS5<`npLrO>rf;2-aDJ=p5A|WAybV$fh0wN&NAWDiz2@(o|l+q#{
zN_RJ$J^uc`bv~UB=gV1V-nD#T=9%ZYW8ZsU``XtgTw7Cxl!So<fk2R|siJie2wWos
z0w<OT7v4EB4DW*f5m??-K_kwv|7F&_i$@?>5Nc?7J<rsYF)v@LnO}tKBF4kzZebr2
za`_|i<CLCI<0J8Ec}Pf5xY;O|9VMmMMH=~PR~(wJksl*ioLEpKC|z0|q%q!5soOpN
z?z-HYm0shr>6DNAL^X!lMUoHvWRK;!MB3DBIJq9o8soLl;~)@u3CfEw7Q~wnG!X((
z@a+H5zeb8FVvet61M2&A5C}O(;wYhfD<ai8pS{zaLGx(k9J3OS8eFTQ4<7`1c-p(3
z9w^AmKNTKVy?5^(8Xdwyq)VuKr@6T~D=W*S*kDo4zVOW(c5d#xf_U!0mk9}WqOT_>
zE%MJjeJ!VCq?pYu++unbC7ANVKl1y#Tb%Lzte#<Q*19bMvSmX>QR0@RMrfUvk|Y8j
zjQ9)+^%uD_pT!d4Amj%APyf2<5+V?pmk0MA^8Ef3a{T+P;U$`p^?`&SnO5hLJSo)>
z1j5X!CRROa;gZ<i9h=@3QHpZ2BhIs#B=hlrvy(52saAsYEiudiM=Mo>`xmi~seP6l
zh1T0!Fs`W~&3&HBX;5TT>NF;qpR@jog$R4Yk6$`x&~J#vR2fxCH%wecDjoUnRKAp?
zt$LH2OG+=8naIIM$%+UZT#wN1Cfqf0(0DDXcIy_*s)|0kWmuNjBpMgtNh*?Xdy-3`
zLLP;OSZA;iCOKs3oh-Z-YvGK8{qT|w8Np?C1q7nx9%l|k2%6sF-_Vpr6LL@&uK$}>
zQ>QX3xAu`{9xe819)gj{Xk?P|IkJDht!sub=!HBb2&X`Nx$$a96`e=)Kc8fZ`vods
zANo83jfoKKW<kPeRGQ^-KB>^#3eJnct@K9OzUB6qw03rO{`le8`$jF8fb@7bI}f`!
zibb!yapRi@M;%J)e&yaw(l0bP*iwqae)OkBTEUcoR1iD5@kcpFc$D`7ze+2hvLopP
zu9}q3uTM42{Y;}$+IXAd#319lpQn=}`syY=V)RK)>4jA!0X@6I;mO{_TJ>CdV`Jlo
z4<8cw@6giGIgi!s9IZ8+O-BldIS#)WT*@V*K;SAiw+h?xQQ2y5bbosEhvfYEFw#p;
z7J74=!pJkEeV(k1*Y))D+^KT9TWT5F--9Ff<x8tDj`|AC)WO!AR=U&`qQ(~-H&H0m
zej}5#ckO!Pc@dk=-<6Id-@>VKqv8Ico09!^E;`nIX)o&Z5a^NAou^>iUp*Mh+C{h0
zvt`G|#=d$*e>9_!BF2Hzq0S{fkHFP#mR6{9W$1V)At3W%Y_Ts1L-w}zJ4gMw++FnV
za=Sj8AFtD71N_fUPsTobRPj$#KjuP?`5&$Hh7urfl)aLa*Pi#)4hFaTC6kOOAFa2I
zz1c<Q_1Grz84J73cdIaYS??|n-K}xEa`o!zcAwVZ`@17KDlrc-{0tTmI4l<2B?Gp3
z&pE4Z``@Ol;8H*_h}w344JK51ep$kM+qND}5n|W(w(j(BiItUA-_d<%Q6I%{-6fNS
z2;Kkw?q{#9*`bmz^diZ(lyiELN{_-D$1%9x&Gc~odu%HXcV8zk!_WQ%_z{~ERSC=|
z6`QX00>3NHqpfX%^fl)qHQ)8wSLmv+I;e)YZO`|FF?n<I^A|tpN@tXG<L2WVt#BAT
zKG=Hv_%WS;*=6d#zU6PGr!7&#6%KS~TfMnAoohFqosdM8Zem}q=HJ%{NqpGaRYPWG
zW+d-^$!Itxq;1e=rce)<u&H}FYl+V)HJnFE`PZ$U{sIBJ!XWM`x*&IHu!Q{bbwOU<
zrJNWU@9A)^{l@I<Y*xi*aDcPT>bxJ%c0Q`P*OACya`*F-nf8RtOcr?xxZ<*bMO5;S
z+16IoiF%v{L5ApdPd3i@E5gFMIN{y)70PHdHw%(7?yCh68QCj`@R=YBnvj+=v$YS$
zhdWCq#bWI2XetIyH4E)aIA_t?H_iQa^bHJtIaZC?bOfQPk;qbuued0aTF=s@i2^W6
zcqNpvAh@Zh)VggInl7Ibv$}`GO11`pd4>y0OQ&I8ym)ark&A<aI7r*nv~vv~7eRpx
z&!*Tnr2g`h@@jEE!5TUvIeFoO6dPNx(Ayr{hjq(12uwJ&cCioc&o^rE1f&f8rB*5d
z^?Aco_Zs|9Ft%VTvd8O9U!I;jP$(NZUMwu3)G0BmQ&3dQjUq?<4G~gi5S7}<N|*Kl
z6YJ{|C;*Gizy0pfpBBIE9+kaupS56encrE8VX$03Qp7W4{Dv(AJ2Pa>!SduZ(Lx^%
zeFAUvrxS(S!Vy$cQ#((0b@ao%re~y=FseB{qwa%uAJ6?<>CKIVqZpVf80QkB{V0}5
z?OmTnnxy+;e|~aua&>jJWZG3$R-7sVoG-*W>^R}tcCkcfw9MF-fIBsU#r#6JcK8Ps
z9K>h~T0Yn(L_HV+<fPcM2<@jXcGQS3cW+q-F^zHg+P1&EGU2-wy`mMZ+y|oo>weBG
zTff=LH6D~9hCn!3&C5*P85$Z|SXjWv$3N}@!#UgR5I9fEH{YGrRO7znyPb`7Vor*C
z#0{?`-R({Oy<k(p;jPx~nZ>tlcZzha+Xd8;`M`r6ZLckQL|+m&`~1XFTU%RR{%e=)
z*>Ysk7bbj!3!T*knyfP=C8cZ5<Ec)am{s@RIdE&L;!i5`0kn}bn=>8g{!ICE=2Eg)
z&pkrll&d34rSzyJ>LLdRhx^j6x<Aiv_-;_n%itg;uW}X?mPRd%E-asETG_;}nJG-X
zQ3_6?y}>v7>5-MPG650}45NhW-{qk)SXW~hkkKoxw=&A$@Lf{cCHox|nsziy;+m7f
zKRmLW2|e0dn`j7VSm^?P=G<_y`~LIlrp^WI+*j{K(Np!mByul(w8Pc#=WGzWQ6a=s
zn7q8a`K>P54B3FwSXM><vy(mW%KOtZ*!VQsM32m0?9J1&w6vt8;^k?6&UoY5vu8h3
zB_2115P$Yq+f}mSSO%0)CCEvM%o@m>(8!RfQ;MVovpe`3ujRXO{O{RFB^0GL^6;*U
z%Q}P^Wi-}1G+S;QZdt|PB0hx~hNy<<(qFUh*AO3jnV2{mnN5M+2I*s_tk(=3tzia*
z8k(A%*~Voy$+yg$nj>0-GtIa*hi12KEpng!;)`N(%<2^wvhrF!Ixjp-r@5dpt3njs
zT?HF&U}m=J){^_3$>-tT>KLs5_vegDqt#_}=G5U7{YyKt-$*ZJ_v;+TJk=2G`Kn9E
z8v6I#FaD2OAvy*fY_OqLT{1_@WnD5$+pKAtRrUis=C$0Eta(X2?HJpkm0|9Sf71_C
zn$Hat^*3e*5B%mXZM}squZ$5>Z7Cb)T$?Rcjw4EdnBCvej=?<p=3q&x8>X<W#Bd|_
z2cN4zgl}%Y0&Y)hB7?*kiRab>{}}C`LJAs_?@05K^x09p?SCAi4Hay>?&j}g=$;Rq
zS7rK~t?sR`M|{7L34do=O@;Fs#*9VR19c(cWamm+pg~T1h&0I}M`46^39GI<%G%v+
z^EZ`#Uk-DY!o8Rv@3umeo(GDLI3z-wcakYfm=zi1z0o3^N5t_R(~irET*Mn?)8ky$
z(H4m7;s``@R|uaMA_+vdUh06WH!a`}S*Vxcy61IR*cJGv;0D;6{^u>WZ0!T_#HleZ
zZ6pubE_Ys1LY$oI!soYxL~q8?s?_u}tTkHPRM-z%Re4iHCY6=)TC(orav&EU+396{
zP?4`Ix~0q&SR)Wki5!UYL-iA(kV0-5+Lwozy%92O9TD1#*WYN{bC6_4XyYd-oBM7w
zV=zSdIW9MKbaYlS(7RzwfnAxXm&D^noM_G!kHWWX%INH<=L~C+k&$fKjw6+7jF<<W
zzpnuXU*r(3-cHNB6yE)&9c^UENdoI}(*R`|QLl0x?Dk!T|Lan@8bf{}g{|2i4qF#K
z%5EckTiXBjdIa^GAt~|EC~A77kdisWfUPJoF|n@7l(YJH4&uG>j3E+*Y)^ikKf{zY
zj9sqqJfay^ZHA8ZQe~xb27T;g{H;rkcGo5XR!6J5ySrz9q*OUinB~l;-~>i!bGGAJ
zTVEul3Rl(CDEe|EmM9!UZ*?<~FImV+SyS`5<GqIumpA@=2k$0u&tmd6%F1NuWr%zM
zv$68&36U3=#RQuk7xoz&y*CBwj#fVdgx8Weunr?*Y;SLeL%X$7HNg<AoUeF}`J?a)
zEo4yK{l5WrFS+E{6=vd2vgUjsZ}8q5^Y}A8{bXf$pg^B@#I<aQZ_*|(J4><d)=NB9
zRR4K{8lemk?(k)D=?R~m0mE?Hjp^oH<5<kLcO4q}G$Ru(#8X$|7F0&x%1Mx<SQkF<
zC0G3eSdmLJ)wVyc$8T?p%bjo1IgjW*O8f1--VL7+*W?d)waU8<Uwt0}&O`S@T&k_D
z#XnCAUhliLaK*!+&C>5om!v#D^!Ge<##)?QKGDIq+IA*m<uvPn`2!;x8&2fH&LJ72
zq-nixwbNKlEmboBsa=3o0(Wc53r0c=3KKA=`+vy&@hfz4l)<_0T1`&k&#TPWZ(Ams
z=Pww2NE}u&JR>&axo6m(D(iMq!^w?tZ4bxgLYiEp%<64D?cNfSaXs*u@S~%n+v^Z$
z7=1G07*z^@G5Vs2&B5l(SdF{SV*a~Sr&q6EtD_<E{takpX-Svz>h;HOF)}kt7k)kR
zcV^~F&dvK~W=vL{yJkg}c;S|snorAh9t}obLr*o|Z%Iw<wKx3P)g_*MOEN9v=Y)f@
zMwsIi?E|&Lt@K<Ealy~O4XoX^_K=~o1)6y0kVv86#F@ESz0&8Vf@R?t^(f^de}mDT
zrNIglM?1Tnqn~FGjHxIoQSQ_q-|nJq9gtfSXQz9WBTj56d5UKjE(%+<L?xMd+f6lw
z>T@(IM>9aYfyL1*9H7*xavICd$yqV9h%zoV2n)q&e<;TLC)$WFaem(R4vJc>-wr>y
zwxY&F`5WF{Z8tZU3SN;GK;XxTL;|z%O4RY$A>*W{W}Y>HC%y?0qVCyuX+xWBctj%~
zxrcn!NR_e|PA-QGvv5V<{OXOyP>Zx@m<!Kh+p`wkB#R9$F);8bnGR^TbUn(@^+82N
zMX{sm%+|V%Y#^iy)NS{MQ*pgFZ(yROH5hot?7x3cTRXPzflbtg$S9%CQA*=@>jVue
zl{<qxr}K}@2WVQ}YMPi`0$Ds|^nDZ?<<WQINbl2=2nXHfj1rR$rRZPxBiVAoG2fmG
zl^0dTJEt@@QU=Rkx_p`59PP`%`S#If+mTmHpvRRdZ$rm&r?J-<ODikJ=aaBrNF+9s
z)_&dkWzYILX}r`LQqr-r@$4^o^{AMjNl1-iaNK=r^%b9&6MsKHS$RElEW0Oh)vQ((
z4M3BVQyISZeV^j0t36*+m{I(nR$)!9pEK3bvVUFg)PF3o+~O)G;hfdys#xp!ReWc{
zd#RW<^8U%;&Tfb7(Xt3?akzrlNtibw0g2>MsJfnZeeg$wptf@Kqp(C{;uE3-)s^sA
z%((XwzdQw}R(h>nA7|N+sewVI>rA`E<5`Lx-jZ6ByW1r1W+C{RTL$@mTv`@H)tt;3
z+&?-7PA4fB(;F*4qJHH0>!<YI=+^Ftvle)W)>u|~dHHN^6F%B#WfA9bsSDyc7I{Qt
zhM#>xG%HE98T{?2_lRgzkYNvs>-MK3VYqkdym!n4PL$B#h#4U<`yoET=WaTws2Z|b
z=x3Eop(L94mBK+i6m0}YpKPuE=zYIV;92WRZ=T$nzE&~hW@5%!S$A2BaKxwAtz5H8
zN_kShb24>ZVc4nygJ>fIp+~D{zDDj+)uJXU$lKM}gm>`mH27fkwqg`mj+~9eZn}$?
zU3twf>4+MY)_3<B|L5~8lv_sMRSJ`*K@~L8yr$Z^sQ$PF3_8l_Eo9}Hy5c+v7ya_v
z#E=FFoeJ*umyDkw;}WPJHBl|IAcNG6FR~5khXk3bB(l1u6NN5b>R6Y-M6@y<_vT>?
zav}iF@^F0j3E3<rN;7m{)eoU@;6a!~^Uy#bq+UhVl(a`^7k+FJ#%*EH$Hv_&dLgU4
z6|tI%@(K0)3hvg(w!gwQ92^S8+>~)NG+F=V1LHN%A2`sE@gPW=O447NpV^ile93|d
z0sIU!6AwpMgtj$%)2whV?VR+qm-pi_Gi5Kfj!cvu6ZQ#S1|jSnQ_43xJMGR0J$M=^
z&l95w?wc~qMBiVp$iI$V)y*OzwZ!lb{nN*s%q3gu1=XVJS(2fqx2Qd36(n|~@k``T
zcnL2YmF8<!!p}Bl1%Fay-GTk?)qRE$?NrYrN+9x~)+3?GN-^EWc$Ae!2|r87YEVi1
zI{3Et--didQDan{f;&FVpHb+>5f$3;<zz-sl>G-Eyu3hlFII}Tv4HS=oe;;pgc0Fv
zVSEmSEK3GX2}aRLQtY055?$n^qq$dcn=;WDb0t??8fn*^Wrjr&xz<L=b_t~9ii**S
zbYp}gO*|2?V$qd&-RIf}@{I^>1O6#5)bdWT(w#AJeye*yUoZtJ7rHO;p^!Qlur8@4
zjWK7xmDnv-m4mR$*)Lm!VIy;u!`GYre#PAO+q}eeRqy(BG+hyf_57P4SnTG8cx!zm
znG?@)HOgpozmi&slZbtvH(I<{aZmKo=E?-W!KaFJZ40*w$0iEz%<5E`8Iw;vMsGQt
z=LQS;CRD?x#?QE4KWkeOBtv6oW)P=p6Tbe{^GEQ8ll~<yFE1n#DVg?d&e`{qi!COi
zUeW1RlV1FE2m1?y%<?Io!%w(GSDyr{x2-d=wwgNfD3lpJTDW9Q<U^pR{;XJ8e)W|q
zn${q`M1x&HqA49G;Ufwe6lO1?C{3A_dao-`Jv<5-XJGI{S$=%K)bidZ(E`!UVUcWZ
zl8UX3@60z(I9UWUQFvO!74zE8w8=~=DW+|_NZkEsOpEYj*6@W=NYs8>4<=SYDwyu{
zA|oRsJ$*IOLhh?JGU%OCIYY799x*&P-VoJqD@sVt<Q8xOi7@1z&Zox*l^iejih|^x
zMo>sKbIn$Od8W!~T(T+i0@NY$;Adxh`}ED}KY!xm<ALwE;%Gs^4R`&H<{fauT!WjQ
zuSIi5OhY<q<~5U0_MmH%<I$r>x8G@|U4LW=k)XU(9w8s*y{;F{HA{2R7~;1tz7gt{
znp!d>J#lO*`x!z)LVa&FjvCI68e(H9?9K%T2H(t?%#Se0N%zQ`6Nz9!wi|q5Z=CQy
z;+K#(08BU?0Ev&x-st1LcUmzK5ii69iL^h7lBCxN9ff=+B-IL$R}FEcL4>aZ;Z$bx
z!=%Aq`s{YepzOvsDwxm1{=B&Ir}A=&N<>Ul4%bPkcodT3-BD5=tD|?E>ndDl)C&jH
z(G1bp=;mCvV*sQ^E*U8<6OY3B%P-#<c4~oq%j#?sMcO=g(6IIM##-H8dXJIN;Lw=I
zgtYT`t!A2}+9i5!f`8Y0S|u}>GTcXp#ND^P`6OIWRyF{_J9t&6M~{Tedttf2`Hy<d
zrS%dJkOadHJfKmVRC%tVjciY?rDV0@6A~)T%nUpmDz*9^aCS5iOh}$6#-q)y7czO}
zsgO>0glb3x+h??GM^Ic`9KT8V{{EjBX$BP^AQt@&w>Oj?W(wvJeZ3vTZQ@{n6h^Tt
zTm%~^H#9Q(bgzj(tE%Asfo+8e?CkmT=h;xGWfiA$Gstiv8dgsQmL48k$RJ{Tsj}D~
zvL%T<{7n(AJye8(=(djGj(7v?<4oK?d$O~$tMGdE`}c1KXDr152yE1~gCDZHLX8U)
z6j)oKS48QtdvPeB)Pbx0>#n5ZyV=G?O3(zX6(QMWZnX=OTK^ekL{Q+(oOYNHcLKT0
zzC~BMbfH19eRt;5{?b6%e+PiwL<h-(+`WM8seU|%wKy5S!>EfQ%8N!{w9qXWRW=r?
zpwF+kBSKn)NkXI*qe>s7d$m}W@|oA0ei_WRw_xCeT}1128zp~F?zRS^^W(FdIpq+9
zAshnx(v`z{>#?gV#`YTq$q@YvGhA-BRT6O00kH8^oApOhBwaW4uJZm>kz{<-S9_sL
z(dlQ6Nw0fsMH!-fFPIURzQ~^b!P{o}enaHdk6Gbp<-#4$ZB4ZgA1&h=`3y=o7c4{>
z01oOqzv)*+Gsu^#x_(%2tC2eh$<5wHdjfC;8qs~ed+J~=W6!p!wpI!?{OJ+fSs5^h
z0`>dZSQf7r`_gp|<zeNhLk55SLY38X8BJ|1mY9^No~mh|SyXiEUEhKmWky3{UjY5t
z@4Fpb$Z)=Kq88b!A!4G&MY*{%WE~yt?WXK0FI*Ypo)*pa>c+>Mb3?JS<Arx$tKe!3
zINi#Cq64qtd&tU}9Df(+7pA7B!dcrQy(I4RP>_E49}N8k(9`)DFY>>|1;D3XsD47@
z@NapT_4)ZPpDmi{BQcm*DP$r;P&9hVgS@1#>=|h>WP!o(3JR*d^eTorWg%`Yd$oTd
zCx`I??wr1%t!-W(X|Ssj$^mVw>gL8c5k|~(+Z}Zbv`E9jYznZ*Z{J{F>!C>k=A7B!
z#lQ|Idw@Mbv9a+wcdT)8!bI97E|7T^>Wo(8(-ekc%8^1fHP=!v>*bsuV7O2-X;JcQ
zhSyuf7*7NMKuiG@YeRRy=HIr3zIQjI^newlBV(2swL^u-g|!G*d@nLUQI^{uFigp&
z*pJ$a5+!lXsPn6QxDAB~(<-O5rbeLhVcUR(f_I|q#q~&AlQHsD4qf)FC|wQIU)dDw
zF*12>@eY_9CV<Cbq2NbZQNdre4_LJ+^+Mngv?xlwK8l<~8dl1zhuCnCg({NfGzr&6
z8jy!;&wh9ym#dBRetO8G0MuQ0|K{zVevCJsSf|Ha#=#+^xwit;!5f{PL5y<VP_9lC
zADhE|I4)0UME7|f9tC#}1-+2=VCi%4#)n-ar9zzwQw9!{BPp)})*oPlk%H1Zes;|v
zQkS1s;qpV*Pza~`I!JX!Wx3mT_J|df^0a@8Wa`q;u>K4j);13FZj@FCZT$B=BOe;Y
zqWt^;ZXN}t|GYDgzv#dh9HAYD9duD1kwbKT$r1Voj{+5CR_%Wy9qkF1y?p3Dih^?Y
zLLPOEmgm#<xA#z}Virt#j8rIiOR{hZJrc%6hZvx;d<2=ZI)NgAW!c8vanBo^?#-k8
z?=p!dKB7`ijFVtjz=AfjF9Ol_dTwpx(f6r|A^85gMSf}NEtoD&n!)`G|9#JxpPdNS
zEX?Rng!VgDQ@>b#8pf}PUF<Rspz;=KxCgRP-`sU1nto!}$H?bac|pM%9=wT0y%ce0
z{5FZpcF3;Z$>YA+y|eV}17FV?(#u>eoOPR$3NH@xQC*G2w77t=P)T2$XhB)&`kvPJ
zzOT0ZcA^Y*;|F#x9IPQky?q}{Z+iV@Q_Hb+@$^@U>;fhdK7#CqhJwazO66?4PJ8`<
zeS0+ZTP|hM6S<kbrvXU@Ua#4o{ZUEsWko84;<6!oVrO5+@iTV)hN2E|?8KIvmB1pe
zue-?Sc?R!074YxqhcJ(2Nx%H_ci7h0I9WM|n2hYbeUq5Z_1}MQ-X#?Jq-}o>-JhSn
z?h^DzDb-=Hb7zTns$KI*Wwp~?`JA@~&t;m6Xjy-=xKsNl&|kfNa-wI-XJ4UU%S~1s
z7&1mcqt1s$XYJeJt(KYSU*i?vrlDlj<DLoEzU$$eY4FNc=T4!HHaojQo^}Mpwr_m2
z^7o_f%f-bKW#Lk?dOj1f%pPXw2t;9LBg_lL72|N_(>t$hIa+{prbdKQ@T^CCAglTH
zG^JmBTI}D=<*Y8Q6Hy&(Z(p}$nS}4*kFwzb+k}@ZhYBH?S0Q4$M^m;rjd>avh9;uf
z$JVjVt$sAY5RGxkK~*{n_iA*Iir#f;>Hpjeh1X@&V?;oW3y*qfqFVBGI}3Q=Y!qJT
zmq8{y?uyLIcv^aTA=hpH^DK6Sbt30$Jhm`8Tqf*HD?Uit3X?efiM|hE4wnU{0q1!V
z>6U@W{UUCTpVQ+B0Wm7-Lb1WfTaA?ceb0QhP2NaV8)P_z)EAc+ikG;ALMy*Zt=e92
zOaz?y+1ceg-UD(J0{s~j+>{!>91}OS2Y!cBd|8xY-G!o0h1qX=z|fq7o&5s6Ad8HQ
z3>VjfKP}M>XQxML9^=(e6Z)BU<0fOKY$g?}=i<MjVQ65OvkYXXOF-8%c~0U)zny-*
z0Bp|LMohpmJo|8aVWi4ANlfbO%f9_&DZs9MGFZOgSLp$#USS*r!BdbTjspGw;=Ple
z3UB5eAr^hekW#_c;bsoxJqEmo1}+U-U8W6yj6_S{lwsf=&jTV))sUYnqt)>kNw@h-
z{qN-Cy1YmoMs@`kX373w9#-y^|7rnrCsVq@3k^#&Gi1_I?_R5zN|<I2IL;be3g-rN
zC@DGYkFV@jW8`CIAw%}-#`75=6v<bQ*X8J*)P%P0>qR!r*{H`lj5@vMc8R0BXxMZ0
zK=gd8WvLX<Ook<9C*NgHh3xzD3Jh*)XmDghDP~jllGsDf>2JhGGzJgm&804DT5s5u
zkLL;{&CDe82ncX<cQ3qj$@@DucRt9%frdkTc5LZ~k62B$Yqgf*qdRKVJ+G1s|NMxI
zhzP<4v*0@V7wo`+ydSXd=(zv!&Z&wj_J!%!X?;yuKUS+s-OQElX?e7}0&d&1%qBY0
zM!2-J6zVdtd4DDf9EZz^$;qqC@5w#h^>i}+z-sYawpcD^jQTRu>|fseqN2{JG5kCz
z-@(xy;%v;`T(ZfYyyMi@pFi6t#t`jYXSOMhvUPWt)MG9_pUus1fdHRf0o7|?0kk8K
zq9N+5YyAY2Qxo)7T~b?}P#GMlaH#S-dJ=XsjSQj^X1<AB_5ulsYmLH4&2pM%XlW@@
zCVZe_+grK;_wxMyr8uboJtYeiQt8Ahs$O1X&|!9FMhR+nnYRWfSln4EatD_xOp0;G
zF_LZDm%g6CV}PWHpy7q^tgEZLI8eytj?R>!FT|H4Q4OJatCdmjxiJkT=+)n)Ir6~-
zx?$(+zujQZjFb$_U`0|Q>o(hYv4rohqM_ZD5da;0?$<L7Xqt@vJSPh@pQ_@j11JC`
zM`98Z@0E(dpZ{uW#z!j7pI5|0KjEI`<q<uyqyEz1(yqUq2K1el?1|fqiiogqzZeIV
zYG@V;FBbfd^x=FCREtX%d%$%D5S%OE%r3nUi09JYv%m2tmkcLxel0xO#Q=AohM@z|
z`V2qE16LJ%lHAo-wye?5^aNMv0*j!+-}-DI=u!yc6dVo<U8lVg3U6H&)CEHyOuBUm
zzMMhr=5LTOKdvOCYmAhvfu@3m34-0+ffKCQuR{KYpoAk6d)}tP()SwTOc8!21^<B^
zAof~(8rHxw?4{?dzR}yv;Qza~@h2fdD)_ts`$2F**VmAnIfzr>(^<~HN@tSefkMwF
zi>0?W!VWt=+%k**{-~g2b+McQfBgmw(2L>#t0}-=7l&VrVaeRR^UvXE!|_CTO^$Ji
zf+XRX6sAkt?T7oHTUsdX5&zFEc@z-&*n0<KN|kZmJjFiwf>kuGDjxO=`?)%9d4&H)
z>LsT{#Dc^=;EQhvLKhSnv4k*ySRxobpWv+~yni45@2f269jN6{F#eB$urmL-p4TRi
zFqQ!O1wFSs6|0Mg2J9k%6GBj8?}v>5u_W-Z6b9;eETpOKG=LH-fi>UW-Ug+^h;xG<
zq(e~cOOS-jwG*zPfy0sA7SAPMQm#r7(h_}XZf@=jGAAJTA<<IN)qT;Q_0)c{mpc&c
zV)s%8%4bkVyXG{y4@F+6v3It$9bmK7jwAtcM#+B5QdLIAJf-FfJFlJ*e_4Z4?L{j{
zJ5kxqk#vw$CSw#76lnR3y1|9Ub7_H>Fk3{(Un|1Sl)+vrB;fSm0n|W22eR65=0BnU
zM4r>=b<`mglHZ&s?GL?Iq=N|0lSVRKcL~JQJXtB|Iqp*FDSM!W8iw+s=)I?h7Q4iV
ze7FLRK_X^xuw?B+E!2n6Zcs0Vf<JL1E{#H%H{9c-h?j>4mF>N=D8V=9$3<@in3W(n
zYx5bf8)#9>Z$#0`Y(xrB&o=j*!at(nGZc7LZysNKyOG>CzULL=Wj=RmGe}?_&m1au
zCcg`BeMqBJR(+W8!=`MglYYz3wEn(W3b=u$omX<!Vkt^GqMu9Gj<qgke9+35MsA)H
z|J0jg<>K;zg(ylWzU{AD)AI7e|KvB1q0|6pbo)$dE4gX;uT0LKVj{sfhMDLq>-}uG
z!4kvIHfn0&pq5y`Jw4{Xa;4OWZ?lt`>B^NWJ@ysZ-0F-NDiB_12K)%t_>!SoLCwIR
zjy^azAnVxL+B)c30d>{8OO;SD6c^vyUg-0#OUHmqqC+C@HQ;_;%37Xvw93x$rK}2=
znVsda@_Y&fkGwqYp;O6UAt4S5Y0S=K^j5(Bfa_w2Zm|&5JLO<-ag$6lD4dz#qHy`A
zj{sRfcl1)~?*0p)Fv7NNni_5a)gKfTl=|KUc!Xq;2k%WPc*Mkhr67;)dV3!}7N|Xj
z%72CZfcm15JqJYb(enZgyTcCPkdh=5O|A$CFw6QMgZzeooQcn!ucDDYMas(+!~reO
z8F}INYv3H=p|{c`^%vzbIjs--emf6WI^Gn2-TC`pkb@kF!H_&f+<E-t{Yc#5v{gU=
zAoT%d%)9=l{l7rHQuT1?qt}*A{<-{O;31rTf4B!_6RhG43il9;u{xMsvTx^QK->@`
zbEt|HjDc+*Z7<{uE@4j#B#6HSCO+OjkHjjoTDm$*ig+?5g0bS3$>`SD7vqs6u<yz$
zD&&{MIxR~(QziN;1+QHLb<BWd+H;RWP?zD~J^~TbYmo<<>gw$vRVgbgWA>bUdNb)N
za2a_Zc9W2(hJ&lC0@up41i}e=zVTEUTdsowG*m+9Qq~PXbs$W4`EsqtnpuNi8Uac#
z1dU!9uDId3J_#}lhz*x6UL1m-Aao9<!1g}?q12Dp*9z@JAvzTm6+z)|>y+kcVQua4
zbaNyK%80k$tI|eth=`QIDbjZjC#KHkwz07R(q9~OE3jR>A|fJEQl>a*kD+>yH@Gx&
zaCDuAho^hw{n2Ycb#w@X-mR7B`ylxHSGoT`E9|;sK5(k5t79DuNCFdIzAS$@<l3L7
zQ#I-ud6e?*&6|g#pM-dMc{w?4Cciu-m)?$Lr#c5!A;+PQGgvg%+1YPj0g@1M*<%-|
zXp9a$fw?89@Ni|r?%!Db)HD)TqYJ8uf%QJ9v$;MtNd*#Z1?pu|0jIv!)_?DMj9v5H
zUoYUK*+~2IJ!Wm}b5(%~K!d?TLjk%JkT0CI#<3+NeQ$0a^I5Ai!<5+DlpR2DREc4_
z#t;pqEoNbBRecAuPcBn`Vq|3=O@}Dw*iF=*0ICFdH9uSU>egG}EiA#MgocI!y}~Tx
z>lwo&UAs+onwXsI1t(*4)D*=a;rgcU>O1hPqqSaJuvJ%0KUoOUOFmiNpU;T_2}FO|
z+!?q-o-TJqY%y<p{svy{twpAjr(B?e0@r-p2LdVdo4y5bvy(q74GMRFG_9IQ#H`jV
zy?^n7(mZTs67-fOqkZNSAy;m{#bg_;%(AIGck{k3z0-f&pJ;p>qCuf#rGR<;@=uXl
z$-+t$ct_H%OT|^QfB)`Fx)NeZzR0cZib1o-bzZKnANxqL9Nt8;shQb0*u~Kh9w;!(
z2HGe5_86JpDdhC5lS{#_0hV8_?S=(~x!49w69uh<7RG0-_yceau*hAfIX7S@W(J;-
zGye>(dLT#-hfUGLEVtm{+$<f@J`s;Xmr?Pr{|LSuJ6{QH&2`0uhaaqdUIRC91ggDC
zhrw0&?MdCiX!T=Rup@(F6TicScc8-3(9i&|xeWP0hR<qs0<YoW9KQ>2bpWWTIB(I5
z+G;~w($xGpmk}TXVaj9Ni|gvu)lfP!mpL^vznuXn;Qkg+Q&nBps2xyMSNHxCEq<96
zPP5_XDPV-gfwP2?8}?a1G*$zg1F{u7iZJNmWX^?8Twsy{=hZ@X{yYf@Xh5~lARhFX
zQ-dGZTqq9Ril_<)Y68wqU%h$-cFHCy>IM|Belcj3BrLySK7Ra&)kP&gNJlC?`Wl3P
zb~xC;<UOAS9F*aW)iw|}g7D52*4l6VD<NbbVEf+7rQc_Nrul6B5Fhb3{?!YvA|fK9
z24W!aLoj)$ki9ERlX(30en(<Fr^X_rJOI4~Oh0{qp@Vy~1&9DXXMUog;YLY?b=wQ9
z1d*dsl)N`ql8W#ZXiuUr!&T1CVkwU2llbo_qouvKUFsY`^6*cn8*sb<wPAQpV^h;L
zh96L1n<>mplW?2Y_VTK3YQ$2v=$Efvf!Wofj;F$yeW}t2J(WDM%2<m#k<IXMD%9cW
z(VF9VpvSxv4nad(OJ_sMZ&v#|O)+vTk0|Nt-NmrHheZYs-rkaDXH^saH}wreq|&rr
zi?;c*%0?9MFM}{s0}ZP&SYlqq|5x@laQ1g&h?nc3CXjrK^E5!_b!K0L%S63jg84>|
z3NuGGgoB1*!zr3604fg5f}Ti*4$oQe4(!=jX@gq;U0;mssi%?A?|Q!@Frzuk5vcBF
zfk+9?KS-87@;~g({HjPU%^oogYCS)?C-<wyy$erh_*dgpm{_wR?=2fz?y`9E(PM2K
zbgDqiUATO`yHb#k?;*$--K@-SMt1G+j4XTs_VmUef{(TXD{8~;#BRqy#=uX(PLFT%
zJvmGL`BrzX+jeK}@9%@l^E=udVA*Vcea&I^=Z7y?0Pm}kk#YUO&(sZd_Q?R%ko2hs
zV_1b?L$`&X+sbeP27I14-N>d2V<ks6puw@-&R$6IxU##uwf6`~8hj62y}iAG9TE8B
zdehk07=AG@NIXhe@2Z8|k<7zypXpJZ_{k)AHIQ!<+<x~wWl*Vld3hP|B?v%{t_o`9
zzI{78JFBduRN*-C%U`0Q;Z<DRlpufQxp!P?EJVKHzM83kD8vWplr|be&({*{+&7)P
z%C108O+$0H&N~6aBkul(t`GF1;CA1=eM^azMO;qY;yBi^D>f<(!Yp^N4Z_-hVs|iG
z2}o7UjkQ`44vyxeo@&?i$*=GREx(DV(<rd|&jcEdUBL<}?zH*FtdDK1H<7EL(Vwc@
zUS7Ek*l+^A-`d)G^=?gTR$lI<IVBJhGWxsB?|6^PH1DXac#BudEF1?4wK%VT4wx<n
zAPtdrV`BphUGdokP`l;{oC{fGMS5p`_z-*ceM-5?G29XV9SI3Zs#8b9`TZQqL-4&o
zW}Hk;PQq8K%lyHBimS#YUH`V?oFnKjzT*M3{yBmRlY8aI0x~lG-I?-i%2D&+zn(nV
z1^@58ySz}IRwI3yY?yuyBXEU>hf=9W1;?<%T6p79@2WW+DH)j)1R1Ol72I-5b2G?b
zv3xyD{G&jV+j&`m)SngKv<T@48wTuW1|0Q2x9zCS5rS?Ks!nzwdjT$a?dKun-*ATM
zC0woHNbGo@06|mZv33f9>`+qEMQJhR<<pQe;en-{1m<ZCn#;qu*XMr~UqbpF%p{R@
z#4z4aM#GwnM-3?E=jYdYO%XEtPX0WElflo=UvXk5oD4oxAJx0y_D(Bf*Z7qtH7#wr
zq<cH7nExMp@Z|5S{3f3gVr-!rMAiYY=V0jG8Pmyfq(D7OHu&)BzLZd*CqT^v1>ufl
z7!<mLvgg?87ij)`X=f))MH8or+Ya~E%nz`-Qpz4Ueudt{5b5d#K#@7S-i@^qTTlm7
zMAZt@Mc==?4C;jI*NsXBKOe9%OL=zJr`^@jK{l-31qti)^z>_$3l+f;-REjODu*6c
zrlpG2?tf@VHaAvPC6YMWSo&Eh;|>EoJvlN5^#DZDjO&lGZ=_($JjW|8-gW-Ka-AIQ
zRT=RCZrn9~qlreN**Q2QzU_i7Q1#H6`|5aU4HeqQ0G~n?2l5}6tCn{}lH2QkrPeIG
zO<A5>0R0wt<>`Sp89uXmEn1h~-8Ziw41mX<;S~&PP^Mo8>f|$!T>P{haPT3lU-b}M
z0P&#TjnC`r>i~vDoyU)X*EmkXQ^gJMJ_kXrR>XP6!O1s#X;u4J$A8zmrg+U1gu+@G
zG7x2MzrB?#@z};OJz~$|5B~ddr_U>u;0|(n<_`%d&pPieYlz3k4&JTxd<1nYK&w^e
z#X`x;aRo9DT>nhc;XR$WkvF6^cLPePm#@26sHwGq)Kn#kUgysoa1ztOLX5Khqdq-P
zAH)(#1Cjwx9L_Bw(l?d0z3qmw?|T~^`NJ!|8XRQU3=GiG?=R#da3oZ<v;tPE=VrSy
z%sU?ZY4|bIP4Uy9vwD@VQFg0f7o(W9paq~Clsb?s7K}EJvk4Ee9Y3yjTX><!4gd@2
zq#%}2w?2)lVskeX47h$~1e{8^Onw1Mcn?lwI9Gb!Oj(<?cs>+iAME4D!r>kgsD*S8
zuDeK0-477PzG|%A?}k;UzeGT#|H+}3tZCB6va+L{B@YlUab@_rf*Dkl_>*0}F4s$X
z)oKlRL`WWkSk{@Z>QDJt!^y5a_#Cb06JixrY+UxNw#Ux}H2Lho(!C(k2Lzpzl(Ysy
zGJh|1^$6|=$T$8dmgtABafZ#Z-@kwVc<8tx1#J8Y2;b&rW*{E7W<9X}(K`1{M<Cx>
zm*5q|)dZ~GXT^C88V!;$%2D+98fIbfpo9q+#_kR@xtLTwR6{!qzOMk=teOyI(6F|)
zc5-^pJYCiH^XF`^X%yp)Upv1q%bp!Wp>GpNs)sk<n^x;e3>V+2+I(67kz6GMZ5j%x
zx+EVspPIRJA50!Zu-%RZaL|AM{&lWDXz^!tF4_PQ&PXEYZy~TjR}MEDThjxb&mVzS
zLlu}e)H`NU5q<~cqp6t={XdRsAYBHD^JN1_OjsHmK0(xBe&!Rr6n7sh3PJ%ODOs_A
z76E8NV9n;ZnfSZp;Bcvgi;HU{U>`gT=(j~hMXy~OsB{^x^+LOSXY}wqOZ)VY@A2Wb
z-MG)9?Abxg64wEs<QMVr4M(dtMqXgeYt}HE8_;wt22xRM2v3;IA^@8dv+w6dLFQos
z#~En2{ogvEoCor_!rT$U30l<Q7vE7R<c_~=MQbA)fldKn{Us#^_>$HJ=OF3*$zU`z
zi$F9ybm1_3Z(3U1CXl?l(D%L48ekkj@IA;Sq0(+z?K%T)9r{cBPd~R$4F)npuSFK9
z^aP+O1QLoW--As+`<rX|K+^y|94WyHmH!p<mg!bUsszAe6%If>9a6wz;AW<R-(#7<
zQ$OZ_KjNuo-V3<}29v=QK!*QL1U!g-*GI}E<q6_$AZ7yQ(ma^_wsrhv!K%mgIrK_i
zU2~w7wej5B1!Om(<2KuQal{_VoX3ZA!0LztxdXiV&O%=pM$%(-nS#mLc&krKc1R#q
z%#i_k&2bpZra;e&-$HKE{=nKfLNd>#=wrx&D_aj#JRlBj$^uw$yc2zv82$YDd*5GC
z4A<IEiN8l(R73-KEOKmvqmq-Io$fgu4k+ng8wFt1gEc|aYiXa#s&S%z1ZCED5QhS?
zcL-nw2lfc!5?P^yMo3gCWDvtutLMqc(r<XYZ?HT|SyFZaC|`Mvm#Z<u|FG?p-vtN?
zP;;#>c)Y(2r^kFIvIh3nwKb?H0-9<@fCD&b?KdfY0tM}HhOfQ1fgY*lUjpS`fyp~p
z)bUbD15edOA^Hp0v6ft#`TR+^8WNhLYe1SloH#OtFae<aa(cHNs@#YVyl1HfxdNK>
zlGygDb`@6hr|)bHtpSw-rsY3iOP`-m8EA&UHdHw~`~Wez?a;^jX1;9N=WvfEj`Szr
z0*r&B3{D@8&gi4>jJxl+lhV@enwT)q(CAA%c=_@r1gs_Ssj%}a0M%!%?)t|jB+OWv
zmP42xRyGDAs~wb?^cQxA8tp5XWc{IEgYCwRJ0*kPzkl~w`t{>S+ga^ZF0MHcyTZOe
zOpXo@U+B+|cTDH=0gnY6KQ%R#AnTIT^T}s#6|g}_Sl9&QG^<)K=G?&*0S*MRr+MrL
z6x&ZrN5pgQMWxC3NnX2ljf*P`^IFudH%EnhFYHae5FMc|WD>l4vRGFOX(YZp7<q70
zKgVe3c{;StLpTdFr7mS3KSGeaZE89Sju7y)x5v-c>}=F&k3Q|ii*`#tL4_<)II!q;
zO`c+TZ3~DfGf=IdP>uey)bVX@`|DGX`fZs@fscAJuZ{BpC}RXdU$GGM{@NhI`M>-3
z!pb>qMd;%AflW-Im7&7HaIb0@B>FJm3j~V%Tw^;i{r&xrLjn^7idy9Yy9gX#QpF;i
z{%@ezf%9<-9Y)R!Agu1_5*dT&d>FI;q=?r6pJd4uKE7M3s;ymJ*rpF=ufNFrCY*I*
zV42;G%WZWa6hK!*0H_d$rMmj_Z!76s7P1UcF&3OeD=Tj<hyhe`5@pCGBmBY@OC*06
zWYY1#(Y$y8Ufuqf9Y(AHVZ)%%?__7N4)`$Xv*RuBTNf{01Q%1^Uy9hr0~+}IzV8ym
zQroebivH4lQ)_GXj3{sLncO7uP<X_Vdi=LF4vsHH4<Nm(?tK1@6LtVR#V35(-1!jW
zVFo#wv>+|`+1~!~nhtb(sCs&STIm6fSlqt9HEqtg)>8-xv33j)?o|WeW=3G$AYJ-l
z^BDGa@@sI)H3x&0c+e#So3aN27hpBu!~ocY<y`5>QJG2302#E~OgjzA9)@^w>5&V-
zJb-Sfnw?*FR#N<EX=tEkwgu@l7%9-R&|MYHaBUG19auMBSv4S2U{#<}RtGL=swvFy
z=qds?%9*pCFgDH5+;5;cToBy1NBXyiVp~O9lfmRQMk{c<oj^r%vgIK9`dzwr!J9YM
zKq#T9FI`&t(6&1E8B1ooD|=sM+cOOblDkm=R9}vJ#K%2z3IqY#L+n>XgFE@i57-03
zpN*}p?F=0yUY7Gjy=I0z_!QqzuusFSi#T}D8ktE8yAmEAE+HWS3^SUVnYpCLcA43I
zPK}I7%E;987B+d#vrhvG%NN+LY;H;&kof?5Gt|`uvuS{yvg!5&-l7Pyo7gC=u1<n%
zZfSuiBql7p370`Q1gHc44>A&L#87^I+3rpN<Pp#U0LFmz{xb=NJV{aL@+T`MW@Iv3
zog$T?5Se@+C}5kW++adLPN3ZY&44R{*a&(x3DOeq1n6({BXvGi-tUQnO;ppuagOaF
z9X$qv?kf2@dv?$jus;h#b$lO<u!u-gV<V>3LeTg0V6JiooC*wwH5)o|T@8@XlW7af
z0_i}7IVh|kCGU!N^Yrut>G??xRIaAJ0{Pl(CkR-FJsUD=EOh@1{!Z$CrSpW0wDj0i
z1$Mq(o7V5N+z&SIpPE4Tz?(iA1TG!)yxiocV%4%i>uGCGy5ZkhsQ@ey78a%a2hyx|
z=HgVMyU=ZUX~G_6w~Ng!yi6E@r<*Cp=E3y|eojXKEDjohj{D4v`0mVHY1h}%M~Y)j
zR;-L8_2qm{W@aX2i0v`2f6T%TrD9+zLQs(iQvuD6&CgWhU^+%Y3prn3DdY*ra&|kG
z1`7AO70Ho3z@&m{|NSuV@qWjCK)U~--H5`IKaE9wDRJ*%1AC*j5OQkRBN&^OrlCKf
zE#-fFy#dDyc$}e$!19X#q@iY7QQ``b7No~;2t;NG#ueruaFRJ_re2T307C%O({d6W
zE$#a|RnIZrd#ip}!Y8rHaU}6<u9?nU3K*A)xZj0$s;&muY;)p;LWO8u&fi}KDZx(|
zK3~#sI(=3>lXxffedgejGbA4c=~5yh*bXXSGo4|pfoFkaYVhnCP|Zjk=*Dj11ZsA+
z1R5WN3kU4)I5}{N_#b;7?Z6qtrXeUv_zk`U-1`x%MgX`b@D2mDk6~B2PcxvDU~fo3
z!~zv9rpY>_`puhZGVLAmA3H84G=KYc{cb&A@D%5IFPL)e`~`Ay=U+v}km}q3FkAij
zff-Vgk=6+Y_s>$HBHmN!0?n0ZJ!l7jOkbj?0saL;-jE3ey`>4zu-#dTR#sNvWU-$V
zG;*TSjlCXTH8@9v?Q3S5+-ob~34iEE?>RyIE|s$kWL@CT6B84m50lTVb{~K=99ZCx
zk03=R2P_3(5a5^oP6(C=LZk7J{O0wk0z=R!1CA%$7FZmD;IH>iz<`1Jdi(Zm{mJeK
zc&R^(B;XH$(g(=_z?nPx>u_Gt)RdHsDb2Xt*is&$CyI}s-`zW-(_m#o$oz*LJ~vbY
zO0j<zAl3D-8+@v#>)pzSL(p-_L%s%(_VxhPv#>B(DA}U7L1?+bDN-4=-+x<6zd}Ef
zmLIY?Y@A3+ssi9oOvSlQkcX{cfHO&RYGnJHfe3s78u6On&n`aJDX+Fjacg^WqkAF8
zSFpEzb8D-w7x*Aq?``gwm8XPEdB?UoI&pnTWmA3%p7F_zjSA^)tF>F2clzk*px6)f
zk1ZhZHe0Tt|GLTbz`-3id%359r%ee0B)XAq%i5vHci8JsGa%=x+spw+2!08@4avwR
zj_qaN-Ju7&8YT|`>Fo!!cXaT|VhNMa>7oTdY=MtOWzTdZl^B=3-Lw^6{RA|qyCkE&
zjvu!A_ub+M4?%qnde}leTG_H?Pxo^OQYHXC9V=({p;g5tS7@lI*}1rGNMXS$M6^C7
zy{OXmf!|Pm8cp7b6;GB3I6ZDS-4Xb>WH~<x0a*Wss_*u^PWoaha4J3xpnI0n-J2&|
zFT|?-3UlBfU=4b($hZvpcmRumrnm9OgL#1F$O_vY1?uMZ7_gp7+n%5dQ>>Dq=@m5l
zLbIb7E316rz^262%gTumLy2N|P$)~lfM8uwrJz-UDPn63+}xNLqG8zMf@~n<sv64n
zp<7DguH$THGDHw6F3r&zcLyh@tL6|ij)4*tgEmhLp8Rh(8Z)HO%g%(d|5cRSZ24#_
z7?+3|MlX4GJSWS0hH`tnOWg7sc!#gzLqHJr(Lj@`(?s?gFy`YIY{)u@wE90}Hh@4M
z{@!#ch!Qx7yY;>jYsYgaq;Shy&9ruLB;HhKvWVv3Bl_XDu2kKyga+e_a6pdvJJY2{
z>d1*%V!@;sK)GQD#{i<UGt3XP6qc6LK)#HQLh7`6C6QAz)o4I+t}7#8e=2MxOz1Pv
z9sBg7;9N9r-CBmG-6qa#?s_0L07{oTqKFira~LYu&GbINXH!y9tvtA05ap4~l3nmt
z*Ag<<ClBFyuoaJA6)O}D?1Ik%Z=qR*?Gy`Feb)!TqD=|@{)W1R{w<Po2>oQpc^X<g
zPmjIm(iWkSUn@=WzHl-SJ`V?P-i5yw05b%vLq<*>6BFYhso|uLr4b?MpblYa3ese%
zpeP2B7_PYrl@<Wf5U2Nza1w-CprGLi^Tu{_La}Z2`#B13tY<ecF?s#+B{r^tuK8Am
z%-uy73<j-p3vx{j4Mzy}P)H+f>3`ooXdWO9zB>4;%VPhPJGa>o9P$8WV?v>$_4Tz#
z%((xN<H!g5-a{xt-oAZ1d>*TawWPI<s@rI}bZi%gFQ2cC#O)8^j(|4(dY~|{jiKdq
zwaoBmF-{=7MU`UThik#&z-~3Pw5qO^=hs1!32ig{+}!hUeW88cqd+;3ZBXPvF!wt1
z)6D7dg@wdwtOeNv<*=d(oD!g70Zjr0e&ZvH94RQxu((_4|K;Bh`TzG>yJtVMaPL~|
T9{s@nX%#gkP4s&Oi=h7n7lo0{

literal 0
HcmV?d00001

diff --git a/pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb b/pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb
new file mode 100644
index 0000000000..354b3a3160
--- /dev/null
+++ b/pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb
@@ -0,0 +1,2860 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "2a784cb8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import pandas as pd\n",
+    "import numpy as np"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "31433af7",
+   "metadata": {},
+   "source": [
+    "### Overview\n",
+    "\n",
+    "Compare output.txt with printed compartement numbers\n",
+    "\n",
+    "\n",
+    "1. number of infected equal for each timepoint -> done (failing)\n",
+    "2. Nobody is in schools/... at unreasonable time points (e.g. 3 o'clock in the morning) -> done (not failing, but sometimes unreasonable)\n",
+    "\n",
+    "3. Infected severe are in hospital (ID 05) -> done (passed)\n",
+    "4. Infected critical are at ICU (ID 06) -> done (passed)\n",
+    "5. Death are at graveyard (ID 10) -> done (passed)\n",
+    "\n",
+    "6. Time since transmission >= 0 for all infected/exposed -> is true if 1. is not failing\n",
+    "7. Search for maximal transmission value -> done\n",
+    "8. Time since transmission is either increasing over time or set to 0 if person is recovered : not systematically checked, but some individual agents passed"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "c348e379",
+   "metadata": {},
+   "source": [
+    "### Import data"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "0de76178",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "output_path = '../../../output/output3.txt'"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "id": "78a2601a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# get number of columns per row to identify max column number\n",
+    "with open(output_path, 'r') as temp_f:\n",
+    "    col_count = [ len(l.split(\" \")) for l in temp_f.readlines() ]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "974e5fe6",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "8462"
+      ]
+     },
+     "execution_count": 4,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "max(col_count)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "id": "b53cb8f6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# create dummy col names\n",
+    "column_names = [i for i in range(0, max(col_count))]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 24,
+   "id": "aa5b3c51",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "output_df = pd.read_csv(output_path, header=None, delimiter=\" \", names=column_names, dtype={0: 'str'})"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 25,
+   "id": "af3ad417",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>0</th>\n",
+       "      <th>1</th>\n",
+       "      <th>2</th>\n",
+       "      <th>3</th>\n",
+       "      <th>4</th>\n",
+       "      <th>5</th>\n",
+       "      <th>6</th>\n",
+       "      <th>7</th>\n",
+       "      <th>8</th>\n",
+       "      <th>9</th>\n",
+       "      <th>...</th>\n",
+       "      <th>8452</th>\n",
+       "      <th>8453</th>\n",
+       "      <th>8454</th>\n",
+       "      <th>8455</th>\n",
+       "      <th>8456</th>\n",
+       "      <th>8457</th>\n",
+       "      <th>8458</th>\n",
+       "      <th>8459</th>\n",
+       "      <th>8460</th>\n",
+       "      <th>8461</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>1000</td>\n",
+       "      <td>337</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>141.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>0301</td>\n",
+       "      <td>337</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>3.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>337</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>3.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>0303</td>\n",
+       "      <td>337</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>3.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>0304</td>\n",
+       "      <td>337</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>3.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "<p>5 rows × 8462 columns</p>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "   0     1     2     3     4     5     6     7      8     9     ...  8452  \\\n",
+       "0  1000   337   0.0     0   1.0   0.0   2.0   1.0  141.0   0.0  ...   NaN   \n",
+       "1  0301   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
+       "2  0302   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
+       "3  0303   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
+       "4  0304   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
+       "\n",
+       "   8453  8454  8455  8456  8457  8458  8459  8460  8461  \n",
+       "0   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
+       "1   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
+       "2   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
+       "3   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
+       "4   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
+       "\n",
+       "[5 rows x 8462 columns]"
+      ]
+     },
+     "execution_count": 25,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "output_df.head()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 26,
+   "id": "cf0a9290",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "883.0"
+      ]
+     },
+     "execution_count": 26,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "output_df.max()[1:].max()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "4abe06ef",
+   "metadata": {},
+   "source": [
+    "### Helper function"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 27,
+   "id": "1d5e99df",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "location_row = output_df.iloc[34]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 72,
+   "id": "29d5c574",
+   "metadata": {
+    "scrolled": true
+   },
+   "outputs": [],
+   "source": [
+    "# do not use death compartement for this test here\n",
+    "output_df_wo_graveyard = output_df.loc[~(output_df.loc[0,]==\"1000\"),].copy()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 73,
+   "id": "7b31060a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def get_number_of_infections_per_timepoint_one_location(location_row):\n",
+    "    \n",
+    "    location_id = location_row[0]\n",
+    "    output_timesteps = int(location_row[1])\n",
+    "    \n",
+    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"n_infected\"])\n",
+    "\n",
+    "    timestep_col_id = 2 # col id for the current timestep\n",
+    "\n",
+    "    for t in range(1,output_timesteps+1):\n",
+    "        # number of agents is in column after timestep\n",
+    "        timepoint = location_row[timestep_col_id]\n",
+    "\n",
+    "        if np.isnan(timepoint):\n",
+    "            #print(\"break\")\n",
+    "            break\n",
+    "        n_agents = int(location_row[timestep_col_id + 1])\n",
+    "\n",
+    "        # timestep_col_id, # agents, agent_ot1, transmission_time\n",
+    "        agent_id = [timestep_col_id + 1 + 1 + i*2 for i in range(0,n_agents)]\n",
+    "        transmission_time_id = [timestep_col_id + 1 + 2 + i*2 for i in range(0,n_agents)]\n",
+    "\n",
+    "        # timepoint n_agents n_infected\n",
+    "        df_res.loc[len(df_res),] = [location_id, timepoint, n_agents, sum([1 for i in location_row[transmission_time_id] if i>=0])]\n",
+    "\n",
+    "        timestep_col_id += 2 + n_agents*2\n",
+    "    \n",
+    "    return df_res"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 74,
+   "id": "64cf0801",
+   "metadata": {
+    "scrolled": true
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>LocationID</th>\n",
+       "      <th>timepoint</th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>2.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>3.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>4.0</td>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>...</th>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>332</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>332.0</td>\n",
+       "      <td>30</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>333</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>333.0</td>\n",
+       "      <td>6</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>334</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>334.0</td>\n",
+       "      <td>11</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>335</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>335.0</td>\n",
+       "      <td>12</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>336</th>\n",
+       "      <td>0302</td>\n",
+       "      <td>336.0</td>\n",
+       "      <td>8</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "<p>337 rows × 4 columns</p>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "    LocationID timepoint n_agents n_infected\n",
+       "0         0302       0.0        0          0\n",
+       "1         0302       1.0        0          0\n",
+       "2         0302       2.0        0          0\n",
+       "3         0302       3.0        0          0\n",
+       "4         0302       4.0        0          0\n",
+       "..         ...       ...      ...        ...\n",
+       "332       0302     332.0       30          0\n",
+       "333       0302     333.0        6          0\n",
+       "334       0302     334.0       11          0\n",
+       "335       0302     335.0       12          0\n",
+       "336       0302     336.0        8          0\n",
+       "\n",
+       "[337 rows x 4 columns]"
+      ]
+     },
+     "execution_count": 74,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "get_number_of_infections_per_timepoint_one_location(output_df_wo_graveyard.iloc[1])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 75,
+   "id": "4d1cf11a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def get_number_of_infection_per_timepoint(output_df):\n",
+    "    \n",
+    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"n_infected\"])\n",
+    "    \n",
+    "    for i in range(0,len(output_df)):\n",
+    "        location_row = output_df.iloc[i]\n",
+    "        df_res_row = get_number_of_infections_per_timepoint_one_location(location_row)\n",
+    "        df_res = pd.concat([df_res, df_res_row])\n",
+    "    \n",
+    "    return df_res"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 76,
+   "id": "5e710e33",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# runtime ~ 1-2 minutes\n",
+    "df_transformed = get_number_of_infection_per_timepoint(output_df_wo_graveyard)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 81,
+   "id": "d23fd306",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_transformed = df_transformed.astype({'n_agents': 'int', \"n_infected\": \"int\"})"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 108,
+   "id": "777019be",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_transformed_w_graveyard = get_number_of_infection_per_timepoint(output_df)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 109,
+   "id": "0339d0ac",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_transformed_w_graveyard = df_transformed_w_graveyard.astype({'n_agents': 'int', \"n_infected\": \"int\"})"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "868807c0",
+   "metadata": {},
+   "source": [
+    "# Evaluation"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "e9a6e0b1",
+   "metadata": {},
+   "source": [
+    "### Number of Infections per timepoint"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 82,
+   "id": "b128003a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "n_days = 14"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 83,
+   "id": "5a649c4b",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Number of infected people over all locations per hour:\n"
+     ]
+    },
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>timepoint</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0.0</th>\n",
+       "      <td>884</td>\n",
+       "      <td>8</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>24.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>48.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>72.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>96.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>120.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>144.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>168.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>192.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>216.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>240.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>264.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>288.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>312.0</th>\n",
+       "      <td>883</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "           n_agents  n_infected\n",
+       "timepoint                      \n",
+       "0.0             884           8\n",
+       "24.0            883           5\n",
+       "48.0            883           5\n",
+       "72.0            883           5\n",
+       "96.0            883           5\n",
+       "120.0           883           0\n",
+       "144.0           883           0\n",
+       "168.0           883           0\n",
+       "192.0           883           0\n",
+       "216.0           883           0\n",
+       "240.0           883           0\n",
+       "264.0           883           0\n",
+       "288.0           883           0\n",
+       "312.0           883           0"
+      ]
+     },
+     "execution_count": 83,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "print(\"Number of infected people over all locations per hour:\")\n",
+    "df_transformed.groupby(\"timepoint\").sum()[['n_agents', 'n_infected']].loc[[i*24 for i in range(0,n_days)],:]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "7628ad39",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "markdown",
+   "id": "c69d73af",
+   "metadata": {},
+   "source": [
+    "### Nobady is in schools/... during unreasonable timepoints"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 84,
+   "id": "5f4d27b2",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# 1 -> School\n",
+    "# 2 -> Work\n",
+    "# 3 -> Social Event\n",
+    "# 4 -> Basic Shop"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 85,
+   "id": "d5d9e967",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_transformed[\"hour_of_day\"] = df_transformed[\"timepoint\"].apply(lambda x: int(x)%24)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 117,
+   "id": "dfd32b9c",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_transformed[\"Location_Type\"] = df_transformed['LocationID'].apply(lambda x: x[0:2])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 118,
+   "id": "7fef2198",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# school\n",
+    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"01\"])].copy()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 119,
+   "id": "ac52b847",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "337"
+      ]
+     },
+     "execution_count": 119,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "len(df_sub[\"timepoint\"].unique())"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 120,
+   "id": "5890def7",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>hour_of_day</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>6</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>7</th>\n",
+       "      <td>153</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>8</th>\n",
+       "      <td>352</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>9</th>\n",
+       "      <td>484</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>10</th>\n",
+       "      <td>484</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>11</th>\n",
+       "      <td>484</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>12</th>\n",
+       "      <td>484</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>13</th>\n",
+       "      <td>484</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>14</th>\n",
+       "      <td>484</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>15</th>\n",
+       "      <td>484</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>16</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>17</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>18</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>19</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>20</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>21</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>22</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>23</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "             n_agents  n_infected\n",
+       "hour_of_day                      \n",
+       "0                   0           0\n",
+       "1                   0           0\n",
+       "2                   0           0\n",
+       "3                   0           0\n",
+       "4                   0           0\n",
+       "5                   0           0\n",
+       "6                   0           0\n",
+       "7                 153           0\n",
+       "8                 352           0\n",
+       "9                 484           0\n",
+       "10                484           0\n",
+       "11                484           0\n",
+       "12                484           0\n",
+       "13                484           0\n",
+       "14                484           0\n",
+       "15                484           0\n",
+       "16                  0           0\n",
+       "17                  0           0\n",
+       "18                  0           0\n",
+       "19                  0           0\n",
+       "20                  0           0\n",
+       "21                  0           0\n",
+       "22                  0           0\n",
+       "23                  0           0"
+      ]
+     },
+     "execution_count": 120,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 121,
+   "id": "ea5b6417",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "337"
+      ]
+     },
+     "execution_count": 121,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# work\n",
+    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"02\"])].copy()\n",
+    "\n",
+    "len(df_sub[\"timepoint\"].unique())"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 122,
+   "id": "1f6c0e3a",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>hour_of_day</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>6</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>7</th>\n",
+       "      <td>1609</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>8</th>\n",
+       "      <td>3403</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>9</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>10</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>11</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>5</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>12</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>4</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>13</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>4</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>14</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>4</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>15</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>4</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>16</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>4</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>17</th>\n",
+       "      <td>5017</td>\n",
+       "      <td>4</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>18</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>19</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>20</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>21</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>22</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>23</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "             n_agents  n_infected\n",
+       "hour_of_day                      \n",
+       "0                   0           0\n",
+       "1                   0           0\n",
+       "2                   0           0\n",
+       "3                   0           0\n",
+       "4                   0           0\n",
+       "5                   0           0\n",
+       "6                   0           0\n",
+       "7                1609           5\n",
+       "8                3403           5\n",
+       "9                5017           5\n",
+       "10               5017           5\n",
+       "11               5017           5\n",
+       "12               5017           4\n",
+       "13               5017           4\n",
+       "14               5017           4\n",
+       "15               5017           4\n",
+       "16               5017           4\n",
+       "17               5017           4\n",
+       "18                  0           0\n",
+       "19                  0           0\n",
+       "20                  0           0\n",
+       "21                  0           0\n",
+       "22                  0           0\n",
+       "23                  0           0"
+      ]
+     },
+     "execution_count": 122,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 123,
+   "id": "53a48610",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "337"
+      ]
+     },
+     "execution_count": 123,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# social event\n",
+    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"03\"])].copy()\n",
+    "\n",
+    "len(df_sub[\"timepoint\"].unique())"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 124,
+   "id": "dfd793ff",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>hour_of_day</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>957</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>881</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>881</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>6</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>7</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>8</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>9</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>10</th>\n",
+       "      <td>881</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>11</th>\n",
+       "      <td>999</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>12</th>\n",
+       "      <td>1124</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>13</th>\n",
+       "      <td>1238</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>14</th>\n",
+       "      <td>1339</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>15</th>\n",
+       "      <td>1440</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>16</th>\n",
+       "      <td>1543</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>17</th>\n",
+       "      <td>1635</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>18</th>\n",
+       "      <td>1729</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>19</th>\n",
+       "      <td>1808</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>20</th>\n",
+       "      <td>2180</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>21</th>\n",
+       "      <td>780</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>22</th>\n",
+       "      <td>836</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>23</th>\n",
+       "      <td>890</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "             n_agents  n_infected\n",
+       "hour_of_day                      \n",
+       "0                 957           1\n",
+       "1                 881           1\n",
+       "2                 881           1\n",
+       "3                 881           0\n",
+       "4                 881           0\n",
+       "5                 881           0\n",
+       "6                 881           0\n",
+       "7                 881           0\n",
+       "8                 881           0\n",
+       "9                 881           0\n",
+       "10                881           0\n",
+       "11                999           0\n",
+       "12               1124           0\n",
+       "13               1238           0\n",
+       "14               1339           0\n",
+       "15               1440           0\n",
+       "16               1543           0\n",
+       "17               1635           0\n",
+       "18               1729           0\n",
+       "19               1808           0\n",
+       "20               2180           0\n",
+       "21                780           1\n",
+       "22                836           1\n",
+       "23                890           0"
+      ]
+     },
+     "execution_count": 124,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 125,
+   "id": "92929c45",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "337"
+      ]
+     },
+     "execution_count": 125,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# basic shop\n",
+    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"04\"])].copy()\n",
+    "\n",
+    "len(df_sub[\"timepoint\"].unique())"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 126,
+   "id": "1e50adca",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>hour_of_day</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>4</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>5</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>6</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>7</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>8</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>9</th>\n",
+       "      <td>158</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>10</th>\n",
+       "      <td>169</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>11</th>\n",
+       "      <td>174</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>12</th>\n",
+       "      <td>178</td>\n",
+       "      <td>2</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>13</th>\n",
+       "      <td>159</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>14</th>\n",
+       "      <td>193</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>15</th>\n",
+       "      <td>156</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>16</th>\n",
+       "      <td>169</td>\n",
+       "      <td>2</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>17</th>\n",
+       "      <td>184</td>\n",
+       "      <td>2</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>18</th>\n",
+       "      <td>185</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>19</th>\n",
+       "      <td>383</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>20</th>\n",
+       "      <td>373</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>21</th>\n",
+       "      <td>371</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>22</th>\n",
+       "      <td>394</td>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>23</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "             n_agents  n_infected\n",
+       "hour_of_day                      \n",
+       "0                   0           0\n",
+       "1                   0           0\n",
+       "2                   0           0\n",
+       "3                   0           0\n",
+       "4                   0           0\n",
+       "5                   0           0\n",
+       "6                   0           0\n",
+       "7                   0           0\n",
+       "8                   0           0\n",
+       "9                 158           0\n",
+       "10                169           0\n",
+       "11                174           1\n",
+       "12                178           2\n",
+       "13                159           1\n",
+       "14                193           0\n",
+       "15                156           1\n",
+       "16                169           2\n",
+       "17                184           2\n",
+       "18                185           1\n",
+       "19                383           1\n",
+       "20                373           1\n",
+       "21                371           0\n",
+       "22                394           1\n",
+       "23                  0           0"
+      ]
+     },
+     "execution_count": 126,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "64f59575",
+   "metadata": {},
+   "source": [
+    "### Infections in hospital == infected severe?"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 127,
+   "id": "530de9ad",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# 5 -> Hospital"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 128,
+   "id": "8901dda9",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"05\"])].copy()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 132,
+   "id": "5b360def",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# calculate numer of infections in hospital\n",
+    "n_inf_hospital = df_sub.groupby(\"timepoint\").sum()[['n_agents', 'n_infected']]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 133,
+   "id": "c502aa2e",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>timepoint</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>24.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>48.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>72.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>96.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>120.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>144.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>168.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>192.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>216.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>240.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>264.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>288.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>312.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "           n_agents  n_infected\n",
+       "timepoint                      \n",
+       "0.0               0           0\n",
+       "24.0              0           0\n",
+       "48.0              0           0\n",
+       "72.0              0           0\n",
+       "96.0              0           0\n",
+       "120.0             0           0\n",
+       "144.0             0           0\n",
+       "168.0             0           0\n",
+       "192.0             0           0\n",
+       "216.0             0           0\n",
+       "240.0             0           0\n",
+       "264.0             0           0\n",
+       "288.0             0           0\n",
+       "312.0             0           0"
+      ]
+     },
+     "execution_count": 133,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# subselect every 24h\n",
+    "n_inf_hospital.loc[[i*24 for i in range(0,n_days)],:]"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "63b7844d",
+   "metadata": {},
+   "source": [
+    "### Infections at ICU == infected critical?"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 134,
+   "id": "1fd4bb9e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# 6 -> Hospital\n",
+    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"06\"])].copy()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 135,
+   "id": "8db63efa",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# calculate numer of infections in ICU\n",
+    "n_inf_ICU = df_sub.groupby(\"timepoint\").sum()[['n_agents', 'n_infected']]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 136,
+   "id": "61d70ca1",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>n_infected</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>timepoint</th>\n",
+       "      <th></th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>24.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>48.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>72.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>96.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>120.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>144.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>168.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>192.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>216.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>240.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>264.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>288.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>312.0</th>\n",
+       "      <td>0</td>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "           n_agents  n_infected\n",
+       "timepoint                      \n",
+       "0.0               0           0\n",
+       "24.0              0           0\n",
+       "48.0              0           0\n",
+       "72.0              0           0\n",
+       "96.0              0           0\n",
+       "120.0             0           0\n",
+       "144.0             0           0\n",
+       "168.0             0           0\n",
+       "192.0             0           0\n",
+       "216.0             0           0\n",
+       "240.0             0           0\n",
+       "264.0             0           0\n",
+       "288.0             0           0\n",
+       "312.0             0           0"
+      ]
+     },
+     "execution_count": 136,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# subselect every 24h\n",
+    "n_inf_ICU.loc[[i*24 for i in range(0,n_days)],:]"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "7691163b",
+   "metadata": {},
+   "source": [
+    "### Persons at graveyard == death?"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 137,
+   "id": "1aae158d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_transformed_w_graveyard[\"Location_Type\"] = df_transformed_w_graveyard['LocationID'].apply(lambda x: x[0:2])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 139,
+   "id": "0393c870",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# 10 -> n_graveyard\n",
+    "df_sub = df_transformed_w_graveyard.loc[df_transformed_w_graveyard[\"Location_Type\"].isin([\"10\"])].copy()\n",
+    "\n",
+    "# calculate numer of infections in ICU\n",
+    "n_graveyard = df_sub.groupby(\"timepoint\").sum()[['n_agents']]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 140,
+   "id": "23902f32",
+   "metadata": {
+    "scrolled": false
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>n_agents</th>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>timepoint</th>\n",
+       "      <th></th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>0.0</th>\n",
+       "      <td>0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>24.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>48.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>72.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>96.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>120.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>144.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>168.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>192.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>216.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>240.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>264.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>288.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>312.0</th>\n",
+       "      <td>1</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "           n_agents\n",
+       "timepoint          \n",
+       "0.0               0\n",
+       "24.0              1\n",
+       "48.0              1\n",
+       "72.0              1\n",
+       "96.0              1\n",
+       "120.0             1\n",
+       "144.0             1\n",
+       "168.0             1\n",
+       "192.0             1\n",
+       "216.0             1\n",
+       "240.0             1\n",
+       "264.0             1\n",
+       "288.0             1\n",
+       "312.0             1"
+      ]
+     },
+     "execution_count": 140,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# subselect every 24h\n",
+    "n_graveyard.loc[[i*24 for i in range(0,n_days)],:]"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "c676217c",
+   "metadata": {},
+   "source": [
+    "## Time since transmission"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 141,
+   "id": "0a33a1dd",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def tidy_row(location_row):\n",
+    "\n",
+    "    location_id = location_row[0]\n",
+    "    output_timesteps = location_row[1]\n",
+    "\n",
+    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"agent_id\", \"time_since_transmission\"])\n",
+    "\n",
+    "    timestep_col_id = 2 # col id for the current timestep\n",
+    "\n",
+    "    for t in range(1,output_timesteps+1):\n",
+    "        # number of agents is in column after timestep\n",
+    "        timepoint = location_row[timestep_col_id]\n",
+    "\n",
+    "        if np.isnan(timepoint):\n",
+    "            #print(\"break\")\n",
+    "            break\n",
+    "        n_agents = int(location_row[timestep_col_id + 1])\n",
+    "\n",
+    "        # timestep_col_id, # agents, agent_ot1, transmission_time\n",
+    "        agent_ids = [timestep_col_id + 1 + 1 + i*2 for i in range(0,n_agents)]\n",
+    "        transmission_time_ids = [timestep_col_id + 1 + 2 + i*2 for i in range(0,n_agents)]\n",
+    "\n",
+    "        for i in range(0,n_agents):\n",
+    "            agent_id = agent_ids[i]\n",
+    "            transmission_time_id = transmission_time_ids[i]\n",
+    "            df_res.loc[len(df_res),] = [location_id, timepoint, n_agents, location_row[agent_id], location_row[transmission_time_id]]\n",
+    "\n",
+    "        timestep_col_id += 2 + n_agents*2\n",
+    "    return df_res"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 142,
+   "id": "b21fe699",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def tidy_output_df(output_df):\n",
+    "    \n",
+    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"agent_id\", \"time_since_transmission\"])\n",
+    "    \n",
+    "    for i in range(0,len(output_df)):\n",
+    "        location_row = output_df.iloc[i]\n",
+    "        df_res_row = tidy_row(location_row)\n",
+    "        df_res = pd.concat([df_res, df_res_row])\n",
+    "    \n",
+    "    return df_res"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 143,
+   "id": "e3c8db3f",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# takes ~3min\n",
+    "tidy_output = tidy_output_df(output_df)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "170cf028",
+   "metadata": {},
+   "source": [
+    "### maximum timecourse value"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 147,
+   "id": "852cbb82",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "107.0"
+      ]
+     },
+     "execution_count": 147,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "tidy_output[\"time_since_transmission\"].max()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 148,
+   "id": "330537f6",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "4.458333333333333"
+      ]
+     },
+     "execution_count": 148,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "tidy_output['time_since_transmission'].max()/24"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 149,
+   "id": "9fe8c73d",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>LocationID</th>\n",
+       "      <th>timepoint</th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>agent_id</th>\n",
+       "      <th>time_since_transmission</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>107</th>\n",
+       "      <td>0419</td>\n",
+       "      <td>140.0</td>\n",
+       "      <td>2</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>121</th>\n",
+       "      <td>0419</td>\n",
+       "      <td>190.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>172</th>\n",
+       "      <td>0419</td>\n",
+       "      <td>277.0</td>\n",
+       "      <td>2</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>105</th>\n",
+       "      <td>0034</td>\n",
+       "      <td>108.0</td>\n",
+       "      <td>1</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>106</th>\n",
+       "      <td>0034</td>\n",
+       "      <td>109.0</td>\n",
+       "      <td>1</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>...</th>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "      <td>...</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>984</th>\n",
+       "      <td>00498</td>\n",
+       "      <td>329.0</td>\n",
+       "      <td>3</td>\n",
+       "      <td>883.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>992</th>\n",
+       "      <td>00498</td>\n",
+       "      <td>333.0</td>\n",
+       "      <td>5</td>\n",
+       "      <td>883.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>997</th>\n",
+       "      <td>00498</td>\n",
+       "      <td>334.0</td>\n",
+       "      <td>5</td>\n",
+       "      <td>883.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1002</th>\n",
+       "      <td>00498</td>\n",
+       "      <td>335.0</td>\n",
+       "      <td>5</td>\n",
+       "      <td>883.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>1007</th>\n",
+       "      <td>00498</td>\n",
+       "      <td>336.0</td>\n",
+       "      <td>5</td>\n",
+       "      <td>883.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "<p>297908 rows × 5 columns</p>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "     LocationID timepoint n_agents agent_id time_since_transmission\n",
+       "107        0419     140.0        2      0.0                    -1.0\n",
+       "121        0419     190.0        4      0.0                    -1.0\n",
+       "172        0419     277.0        2      0.0                    -1.0\n",
+       "105        0034     108.0        1      0.0                    -1.0\n",
+       "106        0034     109.0        1      0.0                    -1.0\n",
+       "...         ...       ...      ...      ...                     ...\n",
+       "984       00498     329.0        3    883.0                    -1.0\n",
+       "992       00498     333.0        5    883.0                    -1.0\n",
+       "997       00498     334.0        5    883.0                    -1.0\n",
+       "1002      00498     335.0        5    883.0                    -1.0\n",
+       "1007      00498     336.0        5    883.0                    -1.0\n",
+       "\n",
+       "[297908 rows x 5 columns]"
+      ]
+     },
+     "execution_count": 149,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "tidy_output.sort_values(['agent_id','time_since_transmission'])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 154,
+   "id": "3e096a6f",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>LocationID</th>\n",
+       "      <th>timepoint</th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>agent_id</th>\n",
+       "      <th>time_since_transmission</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>3</th>\n",
+       "      <td>0306</td>\n",
+       "      <td>21.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>21.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>10</th>\n",
+       "      <td>0306</td>\n",
+       "      <td>22.0</td>\n",
+       "      <td>6</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>22.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>387</th>\n",
+       "      <td>0307</td>\n",
+       "      <td>96.0</td>\n",
+       "      <td>5</td>\n",
+       "      <td>550.0</td>\n",
+       "      <td>96.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>392</th>\n",
+       "      <td>0307</td>\n",
+       "      <td>97.0</td>\n",
+       "      <td>5</td>\n",
+       "      <td>550.0</td>\n",
+       "      <td>97.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>397</th>\n",
+       "      <td>0307</td>\n",
+       "      <td>98.0</td>\n",
+       "      <td>5</td>\n",
+       "      <td>550.0</td>\n",
+       "      <td>98.0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "    LocationID timepoint n_agents agent_id time_since_transmission\n",
+       "3         0306      21.0        4    841.0                    21.0\n",
+       "10        0306      22.0        6    841.0                    22.0\n",
+       "387       0307      96.0        5    550.0                    96.0\n",
+       "392       0307      97.0        5    550.0                    97.0\n",
+       "397       0307      98.0        5    550.0                    98.0"
+      ]
+     },
+     "execution_count": 154,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "tidy_output.loc[(tidy_output[\"time_since_transmission\"]>0),].head()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 160,
+   "id": "a368cfd8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "agent_id = 841.0\n",
+    "df_sub = tidy_output[tidy_output[\"agent_id\"]==agent_id].sort_values(\"timepoint\")\n",
+    "max_time = df_sub[\"time_since_transmission\"].max()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 162,
+   "id": "ddf9ef1c",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "98.0"
+      ]
+     },
+     "execution_count": 162,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "max_time"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 163,
+   "id": "5bae2828",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>LocationID</th>\n",
+       "      <th>timepoint</th>\n",
+       "      <th>n_agents</th>\n",
+       "      <th>agent_id</th>\n",
+       "      <th>time_since_transmission</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>266</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>90.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>90.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>270</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>91.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>91.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>274</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>92.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>92.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>278</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>93.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>93.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>282</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>94.0</td>\n",
+       "      <td>3</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>94.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>285</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>95.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>95.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>289</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>96.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>96.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>293</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>97.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>97.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>297</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>98.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>98.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>301</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>99.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>305</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>100.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>309</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>101.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>313</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>102.0</td>\n",
+       "      <td>4</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>317</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>103.0</td>\n",
+       "      <td>2</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>319</th>\n",
+       "      <td>00482</td>\n",
+       "      <td>104.0</td>\n",
+       "      <td>2</td>\n",
+       "      <td>841.0</td>\n",
+       "      <td>-1.0</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "    LocationID timepoint n_agents agent_id time_since_transmission\n",
+       "266      00482      90.0        4    841.0                    90.0\n",
+       "270      00482      91.0        4    841.0                    91.0\n",
+       "274      00482      92.0        4    841.0                    92.0\n",
+       "278      00482      93.0        4    841.0                    93.0\n",
+       "282      00482      94.0        3    841.0                    94.0\n",
+       "285      00482      95.0        4    841.0                    95.0\n",
+       "289      00482      96.0        4    841.0                    96.0\n",
+       "293      00482      97.0        4    841.0                    97.0\n",
+       "297      00482      98.0        4    841.0                    98.0\n",
+       "301      00482      99.0        4    841.0                    -1.0\n",
+       "305      00482     100.0        4    841.0                    -1.0\n",
+       "309      00482     101.0        4    841.0                    -1.0\n",
+       "313      00482     102.0        4    841.0                    -1.0\n",
+       "317      00482     103.0        2    841.0                    -1.0\n",
+       "319      00482     104.0        2    841.0                    -1.0"
+      ]
+     },
+     "execution_count": 163,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_sub.iloc[90:105]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3e5f2267",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.12"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

From e8259670035b2402d239e2cb70dc2117791ee0bc Mon Sep 17 00:00:00 2001
From: Nina Schmid <nina.schmid@uni-bonn.de>
Date: Fri, 6 Oct 2023 11:17:19 +0200
Subject: [PATCH 064/103] move analysis to extra repo

---
 analysis/Manifest.toml                  | 1075 -----------------------
 analysis/Project.toml                   |    4 -
 analysis/basic_plots_memilio.jl         |   40 -
 analysis/basic_plots_systems.jl         |   12 -
 analysis/plots/concentration.png        |  Bin 22212 -> 0 bytes
 analysis/plots/concentration_MW043.png  |  Bin 22501 -> 0 bytes
 analysis/plots/infections.png           |  Bin 20513 -> 0 bytes
 analysis/plots/infections_recovered.png |  Bin 17940 -> 0 bytes
 analysis/preprocess_systems_data.ipynb  |  428 ---------
 9 files changed, 1559 deletions(-)
 delete mode 100644 analysis/Manifest.toml
 delete mode 100644 analysis/Project.toml
 delete mode 100644 analysis/basic_plots_memilio.jl
 delete mode 100644 analysis/basic_plots_systems.jl
 delete mode 100644 analysis/plots/concentration.png
 delete mode 100644 analysis/plots/concentration_MW043.png
 delete mode 100644 analysis/plots/infections.png
 delete mode 100644 analysis/plots/infections_recovered.png
 delete mode 100644 analysis/preprocess_systems_data.ipynb

diff --git a/analysis/Manifest.toml b/analysis/Manifest.toml
deleted file mode 100644
index 0eede58385..0000000000
--- a/analysis/Manifest.toml
+++ /dev/null
@@ -1,1075 +0,0 @@
-# This file is machine-generated - editing it directly is not advised
-
-julia_version = "1.9.3"
-manifest_format = "2.0"
-project_hash = "d75f718fd92673dfa9f9c7e5bf6ec39a7fc7f277"
-
-[[deps.ArgTools]]
-uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
-version = "1.1.1"
-
-[[deps.Artifacts]]
-uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
-
-[[deps.Base64]]
-uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
-
-[[deps.BitFlags]]
-git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d"
-uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35"
-version = "0.1.7"
-
-[[deps.Bzip2_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "19a35467a82e236ff51bc17a3a44b69ef35185a2"
-uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
-version = "1.0.8+0"
-
-[[deps.CSV]]
-deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"]
-git-tree-sha1 = "44dbf560808d49041989b8a96cae4cffbeb7966a"
-uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
-version = "0.10.11"
-
-[[deps.Cairo_jll]]
-deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "4b859a208b2397a7a623a03449e4636bdb17bcf2"
-uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a"
-version = "1.16.1+1"
-
-[[deps.CodecZlib]]
-deps = ["TranscodingStreams", "Zlib_jll"]
-git-tree-sha1 = "02aa26a4cf76381be7f66e020a3eddeb27b0a092"
-uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
-version = "0.7.2"
-
-[[deps.ColorSchemes]]
-deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"]
-git-tree-sha1 = "d9a8f86737b665e15a9641ecbac64deef9ce6724"
-uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
-version = "3.23.0"
-
-[[deps.ColorTypes]]
-deps = ["FixedPointNumbers", "Random"]
-git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4"
-uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
-version = "0.11.4"
-
-[[deps.ColorVectorSpace]]
-deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"]
-git-tree-sha1 = "a1f44953f2382ebb937d60dafbe2deea4bd23249"
-uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4"
-version = "0.10.0"
-
-    [deps.ColorVectorSpace.extensions]
-    SpecialFunctionsExt = "SpecialFunctions"
-
-    [deps.ColorVectorSpace.weakdeps]
-    SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
-
-[[deps.Colors]]
-deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
-git-tree-sha1 = "fc08e5930ee9a4e03f84bfb5211cb54e7769758a"
-uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
-version = "0.12.10"
-
-[[deps.Compat]]
-deps = ["UUIDs"]
-git-tree-sha1 = "e460f044ca8b99be31d35fe54fc33a5c33dd8ed7"
-uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "4.9.0"
-weakdeps = ["Dates", "LinearAlgebra"]
-
-    [deps.Compat.extensions]
-    CompatLinearAlgebraExt = "LinearAlgebra"
-
-[[deps.CompilerSupportLibraries_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
-version = "1.0.5+0"
-
-[[deps.ConcurrentUtilities]]
-deps = ["Serialization", "Sockets"]
-git-tree-sha1 = "5372dbbf8f0bdb8c700db5367132925c0771ef7e"
-uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb"
-version = "2.2.1"
-
-[[deps.Contour]]
-git-tree-sha1 = "d05d9e7b7aedff4e5b51a029dced05cfb6125781"
-uuid = "d38c429a-6771-53c6-b99e-75d170b6e991"
-version = "0.6.2"
-
-[[deps.Crayons]]
-git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15"
-uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
-version = "4.1.1"
-
-[[deps.DataAPI]]
-git-tree-sha1 = "8da84edb865b0b5b0100c0666a9bc9a0b71c553c"
-uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
-version = "1.15.0"
-
-[[deps.DataFrames]]
-deps = ["Compat", "DataAPI", "DataStructures", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrecompileTools", "PrettyTables", "Printf", "REPL", "Random", "Reexport", "SentinelArrays", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"]
-git-tree-sha1 = "04c738083f29f86e62c8afc341f0967d8717bdb8"
-uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-version = "1.6.1"
-
-[[deps.DataStructures]]
-deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
-git-tree-sha1 = "3dbd312d370723b6bb43ba9d02fc36abade4518d"
-uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.18.15"
-
-[[deps.DataValueInterfaces]]
-git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
-uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464"
-version = "1.0.0"
-
-[[deps.Dates]]
-deps = ["Printf"]
-uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
-
-[[deps.DelimitedFiles]]
-deps = ["Mmap"]
-git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae"
-uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
-version = "1.9.1"
-
-[[deps.DocStringExtensions]]
-deps = ["LibGit2"]
-git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
-uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-version = "0.9.3"
-
-[[deps.Downloads]]
-deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
-uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
-version = "1.6.0"
-
-[[deps.ExceptionUnwrapping]]
-deps = ["Test"]
-git-tree-sha1 = "e90caa41f5a86296e014e148ee061bd6c3edec96"
-uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4"
-version = "0.1.9"
-
-[[deps.Expat_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "4558ab818dcceaab612d1bb8c19cee87eda2b83c"
-uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
-version = "2.5.0+0"
-
-[[deps.FFMPEG]]
-deps = ["FFMPEG_jll"]
-git-tree-sha1 = "b57e3acbe22f8484b4b5ff66a7499717fe1a9cc8"
-uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
-version = "0.4.1"
-
-[[deps.FFMPEG_jll]]
-deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "PCRE2_jll", "Pkg", "Zlib_jll", "libaom_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"]
-git-tree-sha1 = "74faea50c1d007c85837327f6775bea60b5492dd"
-uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"
-version = "4.4.2+2"
-
-[[deps.FilePathsBase]]
-deps = ["Compat", "Dates", "Mmap", "Printf", "Test", "UUIDs"]
-git-tree-sha1 = "e27c4ebe80e8699540f2d6c805cc12203b614f12"
-uuid = "48062228-2e41-5def-b9a4-89aafe57970f"
-version = "0.9.20"
-
-[[deps.FileWatching]]
-uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
-
-[[deps.FixedPointNumbers]]
-deps = ["Statistics"]
-git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc"
-uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
-version = "0.8.4"
-
-[[deps.Fontconfig_jll]]
-deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "21efd19106a55620a188615da6d3d06cd7f6ee03"
-uuid = "a3f928ae-7b40-5064-980b-68af3947d34b"
-version = "2.13.93+0"
-
-[[deps.Formatting]]
-deps = ["Printf"]
-git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8"
-uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
-version = "0.4.2"
-
-[[deps.FreeType2_jll]]
-deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Zlib_jll"]
-git-tree-sha1 = "d8db6a5a2fe1381c1ea4ef2cab7c69c2de7f9ea0"
-uuid = "d7e528f0-a631-5988-bf34-fe36492bcfd7"
-version = "2.13.1+0"
-
-[[deps.FriBidi_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91"
-uuid = "559328eb-81f9-559d-9380-de523a88c83c"
-version = "1.0.10+0"
-
-[[deps.Future]]
-deps = ["Random"]
-uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"
-
-[[deps.GLFW_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"]
-git-tree-sha1 = "d972031d28c8c8d9d7b41a536ad7bb0c2579caca"
-uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
-version = "3.3.8+0"
-
-[[deps.GR]]
-deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "UUIDs", "p7zip_jll"]
-git-tree-sha1 = "d73afa4a2bb9de56077242d98cf763074ab9a970"
-uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.72.9"
-
-[[deps.GR_jll]]
-deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"]
-git-tree-sha1 = "1596bab77f4f073a14c62424283e7ebff3072eca"
-uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
-version = "0.72.9+1"
-
-[[deps.Gettext_jll]]
-deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"]
-git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046"
-uuid = "78b55507-aeef-58d4-861c-77aaff3498b1"
-version = "0.21.0+0"
-
-[[deps.Glib_jll]]
-deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE2_jll", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "d3b3624125c1474292d0d8ed0f65554ac37ddb23"
-uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
-version = "2.74.0+2"
-
-[[deps.Graphite2_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011"
-uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472"
-version = "1.3.14+0"
-
-[[deps.Grisu]]
-git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2"
-uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe"
-version = "1.0.2"
-
-[[deps.HTTP]]
-deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
-git-tree-sha1 = "cb56ccdd481c0dd7f975ad2b3b62d9eda088f7e2"
-uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-version = "1.9.14"
-
-[[deps.HarfBuzz_jll]]
-deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
-git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3"
-uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566"
-version = "2.8.1+1"
-
-[[deps.InlineStrings]]
-deps = ["Parsers"]
-git-tree-sha1 = "9cc2baf75c6d09f9da536ddf58eb2f29dedaf461"
-uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48"
-version = "1.4.0"
-
-[[deps.InteractiveUtils]]
-deps = ["Markdown"]
-uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
-
-[[deps.InvertedIndices]]
-git-tree-sha1 = "0dc7b50b8d436461be01300fd8cd45aa0274b038"
-uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
-version = "1.3.0"
-
-[[deps.IrrationalConstants]]
-git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
-uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
-version = "0.2.2"
-
-[[deps.IteratorInterfaceExtensions]]
-git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856"
-uuid = "82899510-4779-5014-852e-03e436cf321d"
-version = "1.0.0"
-
-[[deps.JLFzf]]
-deps = ["Pipe", "REPL", "Random", "fzf_jll"]
-git-tree-sha1 = "f377670cda23b6b7c1c0b3893e37451c5c1a2185"
-uuid = "1019f520-868f-41f5-a6de-eb00f4b6a39c"
-version = "0.1.5"
-
-[[deps.JLLWrappers]]
-deps = ["Artifacts", "Preferences"]
-git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca"
-uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.5.0"
-
-[[deps.JSON]]
-deps = ["Dates", "Mmap", "Parsers", "Unicode"]
-git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
-uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-version = "0.21.4"
-
-[[deps.JpegTurbo_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "6f2675ef130a300a112286de91973805fcc5ffbc"
-uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
-version = "2.1.91+0"
-
-[[deps.LAME_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c"
-uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d"
-version = "3.100.1+0"
-
-[[deps.LERC_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434"
-uuid = "88015f11-f218-50d7-93a8-a6af411a945d"
-version = "3.0.0+1"
-
-[[deps.LLVMOpenMP_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "f689897ccbe049adb19a065c495e75f372ecd42b"
-uuid = "1d63c593-3942-5779-bab2-d838dc0a180e"
-version = "15.0.4+0"
-
-[[deps.LZO_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6"
-uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac"
-version = "2.10.1+0"
-
-[[deps.LaTeXStrings]]
-git-tree-sha1 = "f2355693d6778a178ade15952b7ac47a4ff97996"
-uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
-version = "1.3.0"
-
-[[deps.Latexify]]
-deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Printf", "Requires"]
-git-tree-sha1 = "f428ae552340899a935973270b8d98e5a31c49fe"
-uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
-version = "0.16.1"
-
-    [deps.Latexify.extensions]
-    DataFramesExt = "DataFrames"
-    SymEngineExt = "SymEngine"
-
-    [deps.Latexify.weakdeps]
-    DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-    SymEngine = "123dc426-2d89-5057-bbad-38513e3affd8"
-
-[[deps.LibCURL]]
-deps = ["LibCURL_jll", "MozillaCACerts_jll"]
-uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
-version = "0.6.3"
-
-[[deps.LibCURL_jll]]
-deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
-uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
-version = "7.84.0+0"
-
-[[deps.LibGit2]]
-deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
-uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
-
-[[deps.LibSSH2_jll]]
-deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
-uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
-version = "1.10.2+0"
-
-[[deps.Libdl]]
-uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-
-[[deps.Libffi_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "0b4a5d71f3e5200a7dff793393e09dfc2d874290"
-uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490"
-version = "3.2.2+1"
-
-[[deps.Libgcrypt_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"]
-git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae"
-uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4"
-version = "1.8.7+0"
-
-[[deps.Libglvnd_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"]
-git-tree-sha1 = "6f73d1dd803986947b2c750138528a999a6c7733"
-uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29"
-version = "1.6.0+0"
-
-[[deps.Libgpg_error_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9"
-uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8"
-version = "1.42.0+0"
-
-[[deps.Libiconv_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "f9557a255370125b405568f9767d6d195822a175"
-uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
-version = "1.17.0+0"
-
-[[deps.Libmount_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "9c30530bf0effd46e15e0fdcf2b8636e78cbbd73"
-uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9"
-version = "2.35.0+0"
-
-[[deps.Libtiff_jll]]
-deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"]
-git-tree-sha1 = "2da088d113af58221c52828a80378e16be7d037a"
-uuid = "89763e89-9b03-5906-acba-b20f662cd828"
-version = "4.5.1+1"
-
-[[deps.Libuuid_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066"
-uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700"
-version = "2.36.0+0"
-
-[[deps.LinearAlgebra]]
-deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
-uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-
-[[deps.LogExpFunctions]]
-deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
-git-tree-sha1 = "7d6dd4e9212aebaeed356de34ccf262a3cd415aa"
-uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
-version = "0.3.26"
-
-    [deps.LogExpFunctions.extensions]
-    LogExpFunctionsChainRulesCoreExt = "ChainRulesCore"
-    LogExpFunctionsChangesOfVariablesExt = "ChangesOfVariables"
-    LogExpFunctionsInverseFunctionsExt = "InverseFunctions"
-
-    [deps.LogExpFunctions.weakdeps]
-    ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-    ChangesOfVariables = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
-    InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112"
-
-[[deps.Logging]]
-uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
-
-[[deps.LoggingExtras]]
-deps = ["Dates", "Logging"]
-git-tree-sha1 = "0d097476b6c381ab7906460ef1ef1638fbce1d91"
-uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
-version = "1.0.2"
-
-[[deps.MacroTools]]
-deps = ["Markdown", "Random"]
-git-tree-sha1 = "9ee1618cbf5240e6d4e0371d6f24065083f60c48"
-uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
-version = "0.5.11"
-
-[[deps.Markdown]]
-deps = ["Base64"]
-uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
-
-[[deps.MbedTLS]]
-deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"]
-git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b"
-uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
-version = "1.1.7"
-
-[[deps.MbedTLS_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
-version = "2.28.2+0"
-
-[[deps.Measures]]
-git-tree-sha1 = "c13304c81eec1ed3af7fc20e75fb6b26092a1102"
-uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
-version = "0.3.2"
-
-[[deps.Missings]]
-deps = ["DataAPI"]
-git-tree-sha1 = "f66bdc5de519e8f8ae43bdc598782d35a25b1272"
-uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
-version = "1.1.0"
-
-[[deps.Mmap]]
-uuid = "a63ad114-7e13-5084-954f-fe012c677804"
-
-[[deps.MozillaCACerts_jll]]
-uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
-version = "2022.10.11"
-
-[[deps.NaNMath]]
-deps = ["OpenLibm_jll"]
-git-tree-sha1 = "0877504529a3e5c3343c6f8b4c0381e57e4387e4"
-uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-version = "1.0.2"
-
-[[deps.NetworkOptions]]
-uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
-version = "1.2.0"
-
-[[deps.Ogg_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f"
-uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051"
-version = "1.3.5+1"
-
-[[deps.OpenBLAS_jll]]
-deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
-uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
-version = "0.3.21+4"
-
-[[deps.OpenLibm_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
-version = "0.8.1+0"
-
-[[deps.OpenSSL]]
-deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"]
-git-tree-sha1 = "51901a49222b09e3743c65b8847687ae5fc78eb2"
-uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c"
-version = "1.4.1"
-
-[[deps.OpenSSL_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "bbb5c2115d63c2f1451cb70e5ef75e8fe4707019"
-uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
-version = "1.1.22+0"
-
-[[deps.Opus_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720"
-uuid = "91d4177d-7536-5919-b921-800302f37372"
-version = "1.3.2+0"
-
-[[deps.OrderedCollections]]
-git-tree-sha1 = "2e73fe17cac3c62ad1aebe70d44c963c3cfdc3e3"
-uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
-version = "1.6.2"
-
-[[deps.PCRE2_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15"
-version = "10.42.0+0"
-
-[[deps.Parsers]]
-deps = ["Dates", "PrecompileTools", "UUIDs"]
-git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851"
-uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.7.2"
-
-[[deps.Pipe]]
-git-tree-sha1 = "6842804e7867b115ca9de748a0cf6b364523c16d"
-uuid = "b98c9c47-44ae-5843-9183-064241ee97a0"
-version = "1.3.0"
-
-[[deps.Pixman_jll]]
-deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "Libdl"]
-git-tree-sha1 = "64779bc4c9784fee475689a1752ef4d5747c5e87"
-uuid = "30392449-352a-5448-841d-b1acce4e97dc"
-version = "0.42.2+0"
-
-[[deps.Pkg]]
-deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
-uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-version = "1.9.2"
-
-[[deps.PlotThemes]]
-deps = ["PlotUtils", "Statistics"]
-git-tree-sha1 = "1f03a2d339f42dca4a4da149c7e15e9b896ad899"
-uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
-version = "3.1.0"
-
-[[deps.PlotUtils]]
-deps = ["ColorSchemes", "Colors", "Dates", "PrecompileTools", "Printf", "Random", "Reexport", "Statistics"]
-git-tree-sha1 = "f92e1315dadf8c46561fb9396e525f7200cdc227"
-uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-version = "1.3.5"
-
-[[deps.Plots]]
-deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Preferences", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"]
-git-tree-sha1 = "ccee59c6e48e6f2edf8a5b64dc817b6729f99eb5"
-uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-version = "1.39.0"
-
-    [deps.Plots.extensions]
-    FileIOExt = "FileIO"
-    GeometryBasicsExt = "GeometryBasics"
-    IJuliaExt = "IJulia"
-    ImageInTerminalExt = "ImageInTerminal"
-    UnitfulExt = "Unitful"
-
-    [deps.Plots.weakdeps]
-    FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-    GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
-    IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
-    ImageInTerminal = "d8c32880-2388-543b-8c61-d9f865259254"
-    Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
-
-[[deps.PooledArrays]]
-deps = ["DataAPI", "Future"]
-git-tree-sha1 = "a6062fe4063cdafe78f4a0a81cfffb89721b30e7"
-uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
-version = "1.4.2"
-
-[[deps.PrecompileTools]]
-deps = ["Preferences"]
-git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f"
-uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
-version = "1.2.0"
-
-[[deps.Preferences]]
-deps = ["TOML"]
-git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
-uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.4.0"
-
-[[deps.PrettyTables]]
-deps = ["Crayons", "LaTeXStrings", "Markdown", "Printf", "Reexport", "StringManipulation", "Tables"]
-git-tree-sha1 = "ee094908d720185ddbdc58dbe0c1cbe35453ec7a"
-uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
-version = "2.2.7"
-
-[[deps.Printf]]
-deps = ["Unicode"]
-uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-
-[[deps.Qt6Base_jll]]
-deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"]
-git-tree-sha1 = "364898e8f13f7eaaceec55fd3d08680498c0aa6e"
-uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56"
-version = "6.4.2+3"
-
-[[deps.REPL]]
-deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
-uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
-
-[[deps.Random]]
-deps = ["SHA", "Serialization"]
-uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-
-[[deps.RecipesBase]]
-deps = ["PrecompileTools"]
-git-tree-sha1 = "5c3d09cc4f31f5fc6af001c250bf1278733100ff"
-uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-version = "1.3.4"
-
-[[deps.RecipesPipeline]]
-deps = ["Dates", "NaNMath", "PlotUtils", "PrecompileTools", "RecipesBase"]
-git-tree-sha1 = "45cf9fd0ca5839d06ef333c8201714e888486342"
-uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c"
-version = "0.6.12"
-
-[[deps.Reexport]]
-git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
-uuid = "189a3867-3050-52da-a836-e630ba90ab69"
-version = "1.2.2"
-
-[[deps.RelocatableFolders]]
-deps = ["SHA", "Scratch"]
-git-tree-sha1 = "90bc7a7c96410424509e4263e277e43250c05691"
-uuid = "05181044-ff0b-4ac5-8273-598c1e38db00"
-version = "1.0.0"
-
-[[deps.Requires]]
-deps = ["UUIDs"]
-git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
-uuid = "ae029012-a4dd-5104-9daa-d747884805df"
-version = "1.3.0"
-
-[[deps.SHA]]
-uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
-version = "0.7.0"
-
-[[deps.Scratch]]
-deps = ["Dates"]
-git-tree-sha1 = "30449ee12237627992a99d5e30ae63e4d78cd24a"
-uuid = "6c6a2e73-6563-6170-7368-637461726353"
-version = "1.2.0"
-
-[[deps.SentinelArrays]]
-deps = ["Dates", "Random"]
-git-tree-sha1 = "04bdff0b09c65ff3e06a05e3eb7b120223da3d39"
-uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
-version = "1.4.0"
-
-[[deps.Serialization]]
-uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
-
-[[deps.Showoff]]
-deps = ["Dates", "Grisu"]
-git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de"
-uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
-version = "1.0.3"
-
-[[deps.SimpleBufferStream]]
-git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1"
-uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
-version = "1.1.0"
-
-[[deps.Sockets]]
-uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
-
-[[deps.SortingAlgorithms]]
-deps = ["DataStructures"]
-git-tree-sha1 = "c60ec5c62180f27efea3ba2908480f8055e17cee"
-uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
-version = "1.1.1"
-
-[[deps.SparseArrays]]
-deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"]
-uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-
-[[deps.Statistics]]
-deps = ["LinearAlgebra", "SparseArrays"]
-uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
-version = "1.9.0"
-
-[[deps.StatsAPI]]
-deps = ["LinearAlgebra"]
-git-tree-sha1 = "45a7769a04a3cf80da1c1c7c60caf932e6f4c9f7"
-uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
-version = "1.6.0"
-
-[[deps.StatsBase]]
-deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
-git-tree-sha1 = "75ebe04c5bed70b91614d684259b661c9e6274a4"
-uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.34.0"
-
-[[deps.StringManipulation]]
-git-tree-sha1 = "46da2434b41f41ac3594ee9816ce5541c6096123"
-uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e"
-version = "0.3.0"
-
-[[deps.SuiteSparse_jll]]
-deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"]
-uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
-version = "5.10.1+6"
-
-[[deps.TOML]]
-deps = ["Dates"]
-uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
-version = "1.0.3"
-
-[[deps.TableTraits]]
-deps = ["IteratorInterfaceExtensions"]
-git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39"
-uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
-version = "1.0.1"
-
-[[deps.Tables]]
-deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"]
-git-tree-sha1 = "1544b926975372da01227b382066ab70e574a3ec"
-uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-version = "1.10.1"
-
-[[deps.Tar]]
-deps = ["ArgTools", "SHA"]
-uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
-version = "1.10.0"
-
-[[deps.TensorCore]]
-deps = ["LinearAlgebra"]
-git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6"
-uuid = "62fd8b95-f654-4bbd-a8a5-9c27f68ccd50"
-version = "0.1.1"
-
-[[deps.Test]]
-deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
-uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
-[[deps.TranscodingStreams]]
-deps = ["Random", "Test"]
-git-tree-sha1 = "9a6ae7ed916312b41236fcef7e0af564ef934769"
-uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
-version = "0.9.13"
-
-[[deps.URIs]]
-git-tree-sha1 = "b7a5e99f24892b6824a954199a45e9ffcc1c70f0"
-uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
-version = "1.5.0"
-
-[[deps.UUIDs]]
-deps = ["Random", "SHA"]
-uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
-
-[[deps.Unicode]]
-uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
-
-[[deps.UnicodeFun]]
-deps = ["REPL"]
-git-tree-sha1 = "53915e50200959667e78a92a418594b428dffddf"
-uuid = "1cfade01-22cf-5700-b092-accc4b62d6e1"
-version = "0.4.1"
-
-[[deps.Unitful]]
-deps = ["Dates", "LinearAlgebra", "Random"]
-git-tree-sha1 = "a72d22c7e13fe2de562feda8645aa134712a87ee"
-uuid = "1986cc42-f94f-5a68-af5c-568840ba703d"
-version = "1.17.0"
-
-    [deps.Unitful.extensions]
-    ConstructionBaseUnitfulExt = "ConstructionBase"
-    InverseFunctionsUnitfulExt = "InverseFunctions"
-
-    [deps.Unitful.weakdeps]
-    ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
-    InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112"
-
-[[deps.UnitfulLatexify]]
-deps = ["LaTeXStrings", "Latexify", "Unitful"]
-git-tree-sha1 = "e2d817cc500e960fdbafcf988ac8436ba3208bfd"
-uuid = "45397f5d-5981-4c77-b2b3-fc36d6e9b728"
-version = "1.6.3"
-
-[[deps.Unzip]]
-git-tree-sha1 = "ca0969166a028236229f63514992fc073799bb78"
-uuid = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d"
-version = "0.2.0"
-
-[[deps.Wayland_jll]]
-deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"]
-git-tree-sha1 = "ed8d92d9774b077c53e1da50fd81a36af3744c1c"
-uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89"
-version = "1.21.0+0"
-
-[[deps.Wayland_protocols_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "4528479aa01ee1b3b4cd0e6faef0e04cf16466da"
-uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91"
-version = "1.25.0+0"
-
-[[deps.WeakRefStrings]]
-deps = ["DataAPI", "InlineStrings", "Parsers"]
-git-tree-sha1 = "b1be2855ed9ed8eac54e5caff2afcdb442d52c23"
-uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
-version = "1.4.2"
-
-[[deps.WorkerUtilities]]
-git-tree-sha1 = "cd1659ba0d57b71a464a29e64dbc67cfe83d54e7"
-uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60"
-version = "1.6.1"
-
-[[deps.XML2_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"]
-git-tree-sha1 = "04a51d15436a572301b5abbb9d099713327e9fc4"
-uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
-version = "2.10.4+0"
-
-[[deps.XSLT_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"]
-git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a"
-uuid = "aed1982a-8fda-507f-9586-7b0439959a61"
-version = "1.1.34+0"
-
-[[deps.XZ_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "cf2c7de82431ca6f39250d2fc4aacd0daa1675c0"
-uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
-version = "5.4.4+0"
-
-[[deps.Xorg_libX11_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"]
-git-tree-sha1 = "afead5aba5aa507ad5a3bf01f58f82c8d1403495"
-uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc"
-version = "1.8.6+0"
-
-[[deps.Xorg_libXau_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "6035850dcc70518ca32f012e46015b9beeda49d8"
-uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec"
-version = "1.0.11+0"
-
-[[deps.Xorg_libXcursor_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXfixes_jll", "Xorg_libXrender_jll"]
-git-tree-sha1 = "12e0eb3bc634fa2080c1c37fccf56f7c22989afd"
-uuid = "935fb764-8cf2-53bf-bb30-45bb1f8bf724"
-version = "1.2.0+4"
-
-[[deps.Xorg_libXdmcp_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "34d526d318358a859d7de23da945578e8e8727b7"
-uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05"
-version = "1.1.4+0"
-
-[[deps.Xorg_libXext_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
-git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3"
-uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3"
-version = "1.3.4+4"
-
-[[deps.Xorg_libXfixes_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
-git-tree-sha1 = "0e0dc7431e7a0587559f9294aeec269471c991a4"
-uuid = "d091e8ba-531a-589c-9de9-94069b037ed8"
-version = "5.0.3+4"
-
-[[deps.Xorg_libXi_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXfixes_jll"]
-git-tree-sha1 = "89b52bc2160aadc84d707093930ef0bffa641246"
-uuid = "a51aa0fd-4e3c-5386-b890-e753decda492"
-version = "1.7.10+4"
-
-[[deps.Xorg_libXinerama_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll"]
-git-tree-sha1 = "26be8b1c342929259317d8b9f7b53bf2bb73b123"
-uuid = "d1454406-59df-5ea1-beac-c340f2130bc3"
-version = "1.1.4+4"
-
-[[deps.Xorg_libXrandr_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll"]
-git-tree-sha1 = "34cea83cb726fb58f325887bf0612c6b3fb17631"
-uuid = "ec84b674-ba8e-5d96-8ba1-2a689ba10484"
-version = "1.5.2+4"
-
-[[deps.Xorg_libXrender_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
-git-tree-sha1 = "19560f30fd49f4d4efbe7002a1037f8c43d43b96"
-uuid = "ea2f1a96-1ddc-540d-b46f-429655e07cfa"
-version = "0.9.10+4"
-
-[[deps.Xorg_libpthread_stubs_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "8fdda4c692503d44d04a0603d9ac0982054635f9"
-uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74"
-version = "0.1.1+0"
-
-[[deps.Xorg_libxcb_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"]
-git-tree-sha1 = "b4bfde5d5b652e22b9c790ad00af08b6d042b97d"
-uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b"
-version = "1.15.0+0"
-
-[[deps.Xorg_libxkbfile_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"]
-git-tree-sha1 = "730eeca102434283c50ccf7d1ecdadf521a765a4"
-uuid = "cc61e674-0454-545c-8b26-ed2c68acab7a"
-version = "1.1.2+0"
-
-[[deps.Xorg_xcb_util_image_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
-git-tree-sha1 = "0fab0a40349ba1cba2c1da699243396ff8e94b97"
-uuid = "12413925-8142-5f55-bb0e-6d7ca50bb09b"
-version = "0.4.0+1"
-
-[[deps.Xorg_xcb_util_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll"]
-git-tree-sha1 = "e7fd7b2881fa2eaa72717420894d3938177862d1"
-uuid = "2def613f-5ad1-5310-b15b-b15d46f528f5"
-version = "0.4.0+1"
-
-[[deps.Xorg_xcb_util_keysyms_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
-git-tree-sha1 = "d1151e2c45a544f32441a567d1690e701ec89b00"
-uuid = "975044d2-76e6-5fbe-bf08-97ce7c6574c7"
-version = "0.4.0+1"
-
-[[deps.Xorg_xcb_util_renderutil_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
-git-tree-sha1 = "dfd7a8f38d4613b6a575253b3174dd991ca6183e"
-uuid = "0d47668e-0667-5a69-a72c-f761630bfb7e"
-version = "0.3.9+1"
-
-[[deps.Xorg_xcb_util_wm_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"]
-git-tree-sha1 = "e78d10aab01a4a154142c5006ed44fd9e8e31b67"
-uuid = "c22f9ab0-d5fe-5066-847c-f4bb1cd4e361"
-version = "0.4.1+1"
-
-[[deps.Xorg_xkbcomp_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxkbfile_jll"]
-git-tree-sha1 = "330f955bc41bb8f5270a369c473fc4a5a4e4d3cb"
-uuid = "35661453-b289-5fab-8a00-3d9160c6a3a4"
-version = "1.4.6+0"
-
-[[deps.Xorg_xkeyboard_config_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_xkbcomp_jll"]
-git-tree-sha1 = "691634e5453ad362044e2ad653e79f3ee3bb98c3"
-uuid = "33bec58e-1273-512f-9401-5d533626f822"
-version = "2.39.0+0"
-
-[[deps.Xorg_xtrans_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "e92a1a012a10506618f10b7047e478403a046c77"
-uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10"
-version = "1.5.0+0"
-
-[[deps.Zlib_jll]]
-deps = ["Libdl"]
-uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
-version = "1.2.13+0"
-
-[[deps.Zstd_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "49ce682769cd5de6c72dcf1b94ed7790cd08974c"
-uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
-version = "1.5.5+0"
-
-[[deps.fzf_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "868e669ccb12ba16eaf50cb2957ee2ff61261c56"
-uuid = "214eeab7-80f7-51ab-84ad-2988db7cef09"
-version = "0.29.0+0"
-
-[[deps.libaom_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "3a2ea60308f0996d26f1e5354e10c24e9ef905d4"
-uuid = "a4ae2306-e953-59d6-aa16-d00cac43593b"
-version = "3.4.0+0"
-
-[[deps.libass_jll]]
-deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "5982a94fcba20f02f42ace44b9894ee2b140fe47"
-uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0"
-version = "0.15.1+0"
-
-[[deps.libblastrampoline_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
-version = "5.8.0+0"
-
-[[deps.libfdk_aac_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "daacc84a041563f965be61859a36e17c4e4fcd55"
-uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280"
-version = "2.0.2+0"
-
-[[deps.libpng_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c"
-uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f"
-version = "1.6.38+0"
-
-[[deps.libvorbis_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"]
-git-tree-sha1 = "b910cb81ef3fe6e78bf6acee440bda86fd6ae00c"
-uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a"
-version = "1.3.7+1"
-
-[[deps.nghttp2_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
-version = "1.48.0+0"
-
-[[deps.p7zip_jll]]
-deps = ["Artifacts", "Libdl"]
-uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
-version = "17.4.0+0"
-
-[[deps.x264_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "4fea590b89e6ec504593146bf8b988b2c00922b2"
-uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a"
-version = "2021.5.5+0"
-
-[[deps.x265_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "ee567a171cce03570d77ad3a43e90218e38937a9"
-uuid = "dfaa095f-4041-5dcd-9319-2fabd8486b76"
-version = "3.5.0+0"
-
-[[deps.xkbcommon_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll", "Wayland_protocols_jll", "Xorg_libxcb_jll", "Xorg_xkeyboard_config_jll"]
-git-tree-sha1 = "9ebfc140cc56e8c2156a15ceac2f0302e327ac0a"
-uuid = "d8fb68d0-12a3-5cfd-a85a-d49703b185fd"
-version = "1.4.1+0"
diff --git a/analysis/Project.toml b/analysis/Project.toml
deleted file mode 100644
index 9c9938ba2a..0000000000
--- a/analysis/Project.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[deps]
-CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
-DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
diff --git a/analysis/basic_plots_memilio.jl b/analysis/basic_plots_memilio.jl
deleted file mode 100644
index 95ee7de60c..0000000000
--- a/analysis/basic_plots_memilio.jl
+++ /dev/null
@@ -1,40 +0,0 @@
-using CSV, DataFrames, Plots
-
-df = CSV.read("output/console_output.csv", DataFrame, delim=" ")[:,1:9]
-
-#####################
-# Memilio
-#####################
-
-first(df, 3)
-
-plot(df.t, df.S, label="S", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.E, label="E", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.C, label="C", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I, label="I", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I_s, label="I_s", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I_c, label="I_c", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.R, label="R", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.R, label="D", legend=:outertopright, thickness_scaling = 1.8)
-
-
-plot(df.t, df.E, label="E", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.C, label="C", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I, label="I", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I_s, label="I_s", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I_c, label="I_c", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.R, label="R", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.R, label="D", legend=:outertopright, thickness_scaling = 1.8)
-
-
-plot(df.t, df.I, label="I", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I_s, label="I_s", legend=:outertopright, thickness_scaling = 1.8)
-plot!(df.t, df.I_c, label="I_c", legend=:outertopright, thickness_scaling = 1.8)
-
-
-p1 = plot(df.t, sum.(eachrow(df[:,[:I, :I_s, :I_c]])), xlabel="t (days)", ylabel="Infections", label=missing, thickness_scaling = 1.8)
-savefig(p1, joinpath("analysis/plots", "infections.png"))
-
-p1 = plot(df.t, sum.(eachrow(df[:,[:I, :I_s, :I_c]])), xlabel="t (days)", ylabel="N", label="I", thickness_scaling = 1.8)
-plot!(df.t, df.R, label="R", legend=:outertopright, thickness_scaling = 1.8)
-savefig(p1, joinpath("analysis/plots/", "infections_recovered.png"))
diff --git a/analysis/basic_plots_systems.jl b/analysis/basic_plots_systems.jl
deleted file mode 100644
index 68e3abd2f3..0000000000
--- a/analysis/basic_plots_systems.jl
+++ /dev/null
@@ -1,12 +0,0 @@
-using CSV, DataFrames, Plots
-
-output_directory = "/home/nina/PycharmProjects/memilio/analysis/systems_files"
-df = CSV.read(joinpath(output_directory, "concentration_curves.csv"), DataFrame, delim=",")
-
-
-location = "MW043"
-df_sub = df[(df.location.==location),:]
-t = df_sub.time 
-c = df_sub[!,"COV19"] 
-p1 = plot(t/60, c, xlabel="t (h)", label=missing, ylabel="RNA concentration", thickness_scaling = 1.8)
-savefig(p1, joinpath("analysis/plots/", "concentration_$location.png"))
\ No newline at end of file
diff --git a/analysis/plots/concentration.png b/analysis/plots/concentration.png
deleted file mode 100644
index efa9f439099b2a053e1ec317f9449cd655993773..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22212
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

diff --git a/analysis/plots/concentration_MW043.png b/analysis/plots/concentration_MW043.png
deleted file mode 100644
index 6215e41d0a297c331697ec00e14e977e346d1f33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22501
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
bZhpz;2PgSD@?#@>dx_9*gj=cw;zR!dJ7J9{

diff --git a/analysis/plots/infections.png b/analysis/plots/infections.png
deleted file mode 100644
index 632bddf3e80bb0699130140395e4152bc7c86218..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20513
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

diff --git a/analysis/plots/infections_recovered.png b/analysis/plots/infections_recovered.png
deleted file mode 100644
index 55eb2d7950f296cb277c84a7d52bc8e263e3d922..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17940
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
T9{s@nX%#gkP4s&Oi=h7n7lo0{

diff --git a/analysis/preprocess_systems_data.ipynb b/analysis/preprocess_systems_data.ipynb
deleted file mode 100644
index f58faea313..0000000000
--- a/analysis/preprocess_systems_data.ipynb
+++ /dev/null
@@ -1,428 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 131,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import pandas as pd\n",
-    "import os"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 132,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "output_directory = \"/home/nina/PycharmProjects/memilio/analysis/systems_files\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 133,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "['INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW046.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW017.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW157.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW048.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW059.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW211.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW126.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW023.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW061.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW054.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW141.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW064.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW043.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW052.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW143.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW155.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_MW022.txt',\n",
-       " 'INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW156.txt']"
-      ]
-     },
-     "execution_count": 133,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "file_directory = \"/home/nina/PycharmProjects/memilio/analysis/systems_files/Euler/\"\n",
-    "sampling_files = [el for el in os.listdir(file_directory) if \"Sampling_COV_INSIDe\" in el]\n",
-    "sampling_curves_files = [el for el in os.listdir(file_directory) if ((\"INSIDe_substances_results\" in el) and (\"Sampling\" not in el))]\n",
-    "sampling_curves_files"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 139,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def tidy_concentration_curve(path):\n",
-    "    # load the complete dataset\n",
-    "    df = pd.read_csv(path, sep=\"\\t\")\n",
-    "    df.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
-    "\n",
-    "    sampling_location = path.split(\"_manhole_\")[1].replace(\".txt\", \"\")\n",
-    "\n",
-    "    # identify positions of new subdatasets\n",
-    "    subdataframes = df.loc[df[\"time\"]==\"time[min]\"]\n",
-    "\n",
-    "    # CSB (Chemischer Sauerstoffbedarf) concentration\n",
-    "    df_1 = df.iloc[:subdataframes.index[0]].copy()\n",
-    "    df_1[\"location\"] = sampling_location\n",
-    "\n",
-    "    # COV(COV19) concentration \n",
-    "    df_2 = df.iloc[subdataframes.index[0]:subdataframes.index[1]].copy()\n",
-    "    df_2.columns = df_2.iloc[0]\n",
-    "    df_2 = df_2.iloc[1:]\n",
-    "    df_2.reset_index(drop=True, inplace=True)\n",
-    "    df_2.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
-    "    df_2[\"location\"] = sampling_location\n",
-    "\n",
-    "    # T(Temperature) concentration\n",
-    "    df_3 = df.iloc[subdataframes.index[1]:subdataframes.index[2]].copy()\n",
-    "    df_3.columns = df_3.iloc[0]\n",
-    "    df_3 = df_3.iloc[1:]\n",
-    "    df_3.reset_index(drop=True, inplace=True)\n",
-    "    df_3.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
-    "    df_3[\"location\"] = sampling_location\n",
-    "\n",
-    "    df_4 = df.iloc[subdataframes.index[2]:].copy()\n",
-    "    df_4.columns = df_4.iloc[0]\n",
-    "    df_4 = df_4.iloc[1:]\n",
-    "    df_4.reset_index(drop=True, inplace=True)\n",
-    "    df_4.rename({\"time[min]\": \"time\"}, axis=1, inplace=True)\n",
-    "    df_4[\"location\"] = sampling_location\n",
-    "\n",
-    "    # combine the dataframes\n",
-    "    df_1[df_2.columns[1]] = df_2.iloc[:,1]\n",
-    "    df_1[df_3.columns[1]] = df_3.iloc[:,1]\n",
-    "    df_1[df_4.columns[1]] = df_4.iloc[:,1]\n",
-    "    return df_1\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 140,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df = pd.DataFrame()\n",
-    "for i in range(len(sampling_curves_files)):\n",
-    "    path = f\"{file_directory}{sampling_curves_files[i]}\"\n",
-    "    df_sub = tidy_concentration_curve(path)\n",
-    "    df = pd.concat((df, df_sub))\n",
-    "df.reset_index(inplace=True, drop=True)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 141,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>time</th>\n",
-       "      <th>CSB(Chemischer Sauerstoffbedarf) concentration [umol/l]</th>\n",
-       "      <th>location</th>\n",
-       "      <th>AFS63(Abfiltrierbare Stoffe) concentration [umol/l]</th>\n",
-       "      <th>COV(COV19) concentration [umol/l]</th>\n",
-       "      <th>T(Temperatur) concentration [umol/l]</th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0</th>\n",
-       "      <td>-10</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>MW046</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1</th>\n",
-       "      <td>-5</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>MW046</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>MW046</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>5</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>MW046</td>\n",
-       "      <td>728.2</td>\n",
-       "      <td>3.3</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>4</th>\n",
-       "      <td>10</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>MW046</td>\n",
-       "      <td>727.7</td>\n",
-       "      <td>0.3</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>...</th>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5449</th>\n",
-       "      <td>1480</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>RW156</td>\n",
-       "      <td>727.5</td>\n",
-       "      <td>0.4</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5450</th>\n",
-       "      <td>1485</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>RW156</td>\n",
-       "      <td>727.5</td>\n",
-       "      <td>0.4</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5451</th>\n",
-       "      <td>1490</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>RW156</td>\n",
-       "      <td>727.4</td>\n",
-       "      <td>0.4</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5452</th>\n",
-       "      <td>1495</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>RW156</td>\n",
-       "      <td>727.4</td>\n",
-       "      <td>0.4</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5453</th>\n",
-       "      <td>1500</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>RW156</td>\n",
-       "      <td>727.4</td>\n",
-       "      <td>0.4</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "<p>5454 rows × 6 columns</p>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "      time CSB(Chemischer Sauerstoffbedarf) concentration [umol/l] location  \\\n",
-       "0      -10                                                0.0         MW046   \n",
-       "1       -5                                                0.0         MW046   \n",
-       "2        0                                                0.0         MW046   \n",
-       "3        5                                              107.0         MW046   \n",
-       "4       10                                              107.0         MW046   \n",
-       "...    ...                                                ...           ...   \n",
-       "5449  1480                                              107.0         RW156   \n",
-       "5450  1485                                              107.0         RW156   \n",
-       "5451  1490                                              107.0         RW156   \n",
-       "5452  1495                                              107.0         RW156   \n",
-       "5453  1500                                              107.0         RW156   \n",
-       "\n",
-       "     AFS63(Abfiltrierbare Stoffe) concentration [umol/l]  \\\n",
-       "0                                                   0.0    \n",
-       "1                                                   0.0    \n",
-       "2                                                   0.0    \n",
-       "3                                                 728.2    \n",
-       "4                                                 727.7    \n",
-       "...                                                 ...    \n",
-       "5449                                              727.5    \n",
-       "5450                                              727.5    \n",
-       "5451                                              727.4    \n",
-       "5452                                              727.4    \n",
-       "5453                                              727.4    \n",
-       "\n",
-       "     COV(COV19) concentration [umol/l] T(Temperatur) concentration [umol/l]  \n",
-       "0                                  0.0                                  0.0  \n",
-       "1                                  0.0                                  0.0  \n",
-       "2                                  0.0                                  0.0  \n",
-       "3                                  3.3                                  0.0  \n",
-       "4                                  0.3                                  0.0  \n",
-       "...                                ...                                  ...  \n",
-       "5449                               0.4                                  0.0  \n",
-       "5450                               0.4                                  0.0  \n",
-       "5451                               0.4                                  0.0  \n",
-       "5452                               0.4                                  0.0  \n",
-       "5453                               0.4                                  0.0  \n",
-       "\n",
-       "[5454 rows x 6 columns]"
-      ]
-     },
-     "execution_count": 141,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 146,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "\"\\n['time', 'CSB(Chemischer Sauerstoffbedarf) concentration [umol/l]',\\n       'location', 'AFS63(Abfiltrierbare Stoffe) concentration [umol/l]',\\n       'COV(COV19) concentration [umol/l]',\\n       'T(Temperatur) concentration [umol/l]']\\n\""
-      ]
-     },
-     "execution_count": 146,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df.columns = ['time', 'CSB',\n",
-    "       'location', 'AFS63',\n",
-    "       'COV19',\n",
-    "       'Temperature']\n",
-    "\n",
-    "\"\"\"\n",
-    "['time', 'CSB(Chemischer Sauerstoffbedarf) concentration [umol/l]',\n",
-    "       'location', 'AFS63(Abfiltrierbare Stoffe) concentration [umol/l]',\n",
-    "       'COV(COV19) concentration [umol/l]',\n",
-    "       'T(Temperatur) concentration [umol/l]']\n",
-    "\"\"\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 147,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "array(['MW046', 'MW017', 'RW157', 'MW048', 'MW059', 'RW211', 'RW126',\n",
-       "       'MW023', 'MW061', 'MW054', 'RW141', 'MW064', 'MW043', 'MW052',\n",
-       "       'RW143', 'RW155', 'MW022', 'RW156'], dtype=object)"
-      ]
-     },
-     "execution_count": 147,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df[\"location\"].unique()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 148,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df.to_csv(output_directory+\"/concentration_curves.csv\", index=False)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 149,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'/home/nina/PycharmProjects/memilio/analysis/systems_files/Euler/INSIDe_substances_results_2023_08_30__11_38_37_manhole_RW156.txt'"
-      ]
-     },
-     "execution_count": 149,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "path"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 120,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "memilio",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.15"
-  },
-  "orig_nbformat": 4
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}

From 3e8ee9fe61c2c8e88469c3e0a4885c27c9b45bea Mon Sep 17 00:00:00 2001
From: Nina Schmid <nina.schmid@uni-bonn.de>
Date: Sun, 8 Oct 2023 14:06:37 +0200
Subject: [PATCH 065/103] delete ipynb checkpoints

---
 .../abm_checks-checkpoint.ipynb               | 2860 -----------------
 1 file changed, 2860 deletions(-)
 delete mode 100644 pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb

diff --git a/pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb b/pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb
deleted file mode 100644
index 354b3a3160..0000000000
--- a/pycode/examples/simulation/.ipynb_checkpoints/abm_checks-checkpoint.ipynb
+++ /dev/null
@@ -1,2860 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "2a784cb8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import pandas as pd\n",
-    "import numpy as np"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "31433af7",
-   "metadata": {},
-   "source": [
-    "### Overview\n",
-    "\n",
-    "Compare output.txt with printed compartement numbers\n",
-    "\n",
-    "\n",
-    "1. number of infected equal for each timepoint -> done (failing)\n",
-    "2. Nobody is in schools/... at unreasonable time points (e.g. 3 o'clock in the morning) -> done (not failing, but sometimes unreasonable)\n",
-    "\n",
-    "3. Infected severe are in hospital (ID 05) -> done (passed)\n",
-    "4. Infected critical are at ICU (ID 06) -> done (passed)\n",
-    "5. Death are at graveyard (ID 10) -> done (passed)\n",
-    "\n",
-    "6. Time since transmission >= 0 for all infected/exposed -> is true if 1. is not failing\n",
-    "7. Search for maximal transmission value -> done\n",
-    "8. Time since transmission is either increasing over time or set to 0 if person is recovered : not systematically checked, but some individual agents passed"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c348e379",
-   "metadata": {},
-   "source": [
-    "### Import data"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "0de76178",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "output_path = '../../../output/output3.txt'"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "id": "78a2601a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# get number of columns per row to identify max column number\n",
-    "with open(output_path, 'r') as temp_f:\n",
-    "    col_count = [ len(l.split(\" \")) for l in temp_f.readlines() ]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "id": "974e5fe6",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "8462"
-      ]
-     },
-     "execution_count": 4,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "max(col_count)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "id": "b53cb8f6",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# create dummy col names\n",
-    "column_names = [i for i in range(0, max(col_count))]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 24,
-   "id": "aa5b3c51",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "output_df = pd.read_csv(output_path, header=None, delimiter=\" \", names=column_names, dtype={0: 'str'})"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 25,
-   "id": "af3ad417",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>0</th>\n",
-       "      <th>1</th>\n",
-       "      <th>2</th>\n",
-       "      <th>3</th>\n",
-       "      <th>4</th>\n",
-       "      <th>5</th>\n",
-       "      <th>6</th>\n",
-       "      <th>7</th>\n",
-       "      <th>8</th>\n",
-       "      <th>9</th>\n",
-       "      <th>...</th>\n",
-       "      <th>8452</th>\n",
-       "      <th>8453</th>\n",
-       "      <th>8454</th>\n",
-       "      <th>8455</th>\n",
-       "      <th>8456</th>\n",
-       "      <th>8457</th>\n",
-       "      <th>8458</th>\n",
-       "      <th>8459</th>\n",
-       "      <th>8460</th>\n",
-       "      <th>8461</th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0</th>\n",
-       "      <td>1000</td>\n",
-       "      <td>337</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>141.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1</th>\n",
-       "      <td>0301</td>\n",
-       "      <td>337</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>3.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>337</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>3.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>0303</td>\n",
-       "      <td>337</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>3.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>4</th>\n",
-       "      <td>0304</td>\n",
-       "      <td>337</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>3.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "<p>5 rows × 8462 columns</p>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "   0     1     2     3     4     5     6     7      8     9     ...  8452  \\\n",
-       "0  1000   337   0.0     0   1.0   0.0   2.0   1.0  141.0   0.0  ...   NaN   \n",
-       "1  0301   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
-       "2  0302   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
-       "3  0303   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
-       "4  0304   337   0.0     0   1.0   0.0   2.0   0.0    3.0   0.0  ...   NaN   \n",
-       "\n",
-       "   8453  8454  8455  8456  8457  8458  8459  8460  8461  \n",
-       "0   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
-       "1   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
-       "2   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
-       "3   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
-       "4   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN   NaN  \n",
-       "\n",
-       "[5 rows x 8462 columns]"
-      ]
-     },
-     "execution_count": 25,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "output_df.head()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 26,
-   "id": "cf0a9290",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "883.0"
-      ]
-     },
-     "execution_count": 26,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "output_df.max()[1:].max()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "4abe06ef",
-   "metadata": {},
-   "source": [
-    "### Helper function"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 27,
-   "id": "1d5e99df",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "location_row = output_df.iloc[34]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 72,
-   "id": "29d5c574",
-   "metadata": {
-    "scrolled": true
-   },
-   "outputs": [],
-   "source": [
-    "# do not use death compartement for this test here\n",
-    "output_df_wo_graveyard = output_df.loc[~(output_df.loc[0,]==\"1000\"),].copy()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 73,
-   "id": "7b31060a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def get_number_of_infections_per_timepoint_one_location(location_row):\n",
-    "    \n",
-    "    location_id = location_row[0]\n",
-    "    output_timesteps = int(location_row[1])\n",
-    "    \n",
-    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"n_infected\"])\n",
-    "\n",
-    "    timestep_col_id = 2 # col id for the current timestep\n",
-    "\n",
-    "    for t in range(1,output_timesteps+1):\n",
-    "        # number of agents is in column after timestep\n",
-    "        timepoint = location_row[timestep_col_id]\n",
-    "\n",
-    "        if np.isnan(timepoint):\n",
-    "            #print(\"break\")\n",
-    "            break\n",
-    "        n_agents = int(location_row[timestep_col_id + 1])\n",
-    "\n",
-    "        # timestep_col_id, # agents, agent_ot1, transmission_time\n",
-    "        agent_id = [timestep_col_id + 1 + 1 + i*2 for i in range(0,n_agents)]\n",
-    "        transmission_time_id = [timestep_col_id + 1 + 2 + i*2 for i in range(0,n_agents)]\n",
-    "\n",
-    "        # timepoint n_agents n_infected\n",
-    "        df_res.loc[len(df_res),] = [location_id, timepoint, n_agents, sum([1 for i in location_row[transmission_time_id] if i>=0])]\n",
-    "\n",
-    "        timestep_col_id += 2 + n_agents*2\n",
-    "    \n",
-    "    return df_res"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 74,
-   "id": "64cf0801",
-   "metadata": {
-    "scrolled": true
-   },
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>LocationID</th>\n",
-       "      <th>timepoint</th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>3.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>4</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>4.0</td>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>...</th>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>332</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>332.0</td>\n",
-       "      <td>30</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>333</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>333.0</td>\n",
-       "      <td>6</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>334</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>334.0</td>\n",
-       "      <td>11</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>335</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>335.0</td>\n",
-       "      <td>12</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>336</th>\n",
-       "      <td>0302</td>\n",
-       "      <td>336.0</td>\n",
-       "      <td>8</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "<p>337 rows × 4 columns</p>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "    LocationID timepoint n_agents n_infected\n",
-       "0         0302       0.0        0          0\n",
-       "1         0302       1.0        0          0\n",
-       "2         0302       2.0        0          0\n",
-       "3         0302       3.0        0          0\n",
-       "4         0302       4.0        0          0\n",
-       "..         ...       ...      ...        ...\n",
-       "332       0302     332.0       30          0\n",
-       "333       0302     333.0        6          0\n",
-       "334       0302     334.0       11          0\n",
-       "335       0302     335.0       12          0\n",
-       "336       0302     336.0        8          0\n",
-       "\n",
-       "[337 rows x 4 columns]"
-      ]
-     },
-     "execution_count": 74,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "get_number_of_infections_per_timepoint_one_location(output_df_wo_graveyard.iloc[1])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 75,
-   "id": "4d1cf11a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def get_number_of_infection_per_timepoint(output_df):\n",
-    "    \n",
-    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"n_infected\"])\n",
-    "    \n",
-    "    for i in range(0,len(output_df)):\n",
-    "        location_row = output_df.iloc[i]\n",
-    "        df_res_row = get_number_of_infections_per_timepoint_one_location(location_row)\n",
-    "        df_res = pd.concat([df_res, df_res_row])\n",
-    "    \n",
-    "    return df_res"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 76,
-   "id": "5e710e33",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# runtime ~ 1-2 minutes\n",
-    "df_transformed = get_number_of_infection_per_timepoint(output_df_wo_graveyard)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 81,
-   "id": "d23fd306",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df_transformed = df_transformed.astype({'n_agents': 'int', \"n_infected\": \"int\"})"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 108,
-   "id": "777019be",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df_transformed_w_graveyard = get_number_of_infection_per_timepoint(output_df)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 109,
-   "id": "0339d0ac",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df_transformed_w_graveyard = df_transformed_w_graveyard.astype({'n_agents': 'int', \"n_infected\": \"int\"})"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "868807c0",
-   "metadata": {},
-   "source": [
-    "# Evaluation"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "e9a6e0b1",
-   "metadata": {},
-   "source": [
-    "### Number of Infections per timepoint"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 82,
-   "id": "b128003a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "n_days = 14"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 83,
-   "id": "5a649c4b",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Number of infected people over all locations per hour:\n"
-     ]
-    },
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>timepoint</th>\n",
-       "      <th></th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0.0</th>\n",
-       "      <td>884</td>\n",
-       "      <td>8</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>24.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>48.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>72.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>96.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>120.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>144.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>168.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>192.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>216.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>240.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>264.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>288.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>312.0</th>\n",
-       "      <td>883</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "           n_agents  n_infected\n",
-       "timepoint                      \n",
-       "0.0             884           8\n",
-       "24.0            883           5\n",
-       "48.0            883           5\n",
-       "72.0            883           5\n",
-       "96.0            883           5\n",
-       "120.0           883           0\n",
-       "144.0           883           0\n",
-       "168.0           883           0\n",
-       "192.0           883           0\n",
-       "216.0           883           0\n",
-       "240.0           883           0\n",
-       "264.0           883           0\n",
-       "288.0           883           0\n",
-       "312.0           883           0"
-      ]
-     },
-     "execution_count": 83,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "print(\"Number of infected people over all locations per hour:\")\n",
-    "df_transformed.groupby(\"timepoint\").sum()[['n_agents', 'n_infected']].loc[[i*24 for i in range(0,n_days)],:]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "7628ad39",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c69d73af",
-   "metadata": {},
-   "source": [
-    "### Nobady is in schools/... during unreasonable timepoints"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 84,
-   "id": "5f4d27b2",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# 1 -> School\n",
-    "# 2 -> Work\n",
-    "# 3 -> Social Event\n",
-    "# 4 -> Basic Shop"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 85,
-   "id": "d5d9e967",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df_transformed[\"hour_of_day\"] = df_transformed[\"timepoint\"].apply(lambda x: int(x)%24)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 117,
-   "id": "dfd32b9c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df_transformed[\"Location_Type\"] = df_transformed['LocationID'].apply(lambda x: x[0:2])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 118,
-   "id": "7fef2198",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# school\n",
-    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"01\"])].copy()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 119,
-   "id": "ac52b847",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "337"
-      ]
-     },
-     "execution_count": 119,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "len(df_sub[\"timepoint\"].unique())"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 120,
-   "id": "5890def7",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>hour_of_day</th>\n",
-       "      <th></th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>4</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>6</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>7</th>\n",
-       "      <td>153</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>8</th>\n",
-       "      <td>352</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>9</th>\n",
-       "      <td>484</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>10</th>\n",
-       "      <td>484</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>11</th>\n",
-       "      <td>484</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>12</th>\n",
-       "      <td>484</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>13</th>\n",
-       "      <td>484</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>14</th>\n",
-       "      <td>484</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>15</th>\n",
-       "      <td>484</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>16</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>17</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>18</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>19</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>20</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>21</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>22</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>23</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "             n_agents  n_infected\n",
-       "hour_of_day                      \n",
-       "0                   0           0\n",
-       "1                   0           0\n",
-       "2                   0           0\n",
-       "3                   0           0\n",
-       "4                   0           0\n",
-       "5                   0           0\n",
-       "6                   0           0\n",
-       "7                 153           0\n",
-       "8                 352           0\n",
-       "9                 484           0\n",
-       "10                484           0\n",
-       "11                484           0\n",
-       "12                484           0\n",
-       "13                484           0\n",
-       "14                484           0\n",
-       "15                484           0\n",
-       "16                  0           0\n",
-       "17                  0           0\n",
-       "18                  0           0\n",
-       "19                  0           0\n",
-       "20                  0           0\n",
-       "21                  0           0\n",
-       "22                  0           0\n",
-       "23                  0           0"
-      ]
-     },
-     "execution_count": 120,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 121,
-   "id": "ea5b6417",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "337"
-      ]
-     },
-     "execution_count": 121,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# work\n",
-    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"02\"])].copy()\n",
-    "\n",
-    "len(df_sub[\"timepoint\"].unique())"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 122,
-   "id": "1f6c0e3a",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>hour_of_day</th>\n",
-       "      <th></th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>4</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>6</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>7</th>\n",
-       "      <td>1609</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>8</th>\n",
-       "      <td>3403</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>9</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>10</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>11</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>5</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>12</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>4</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>13</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>4</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>14</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>4</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>15</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>4</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>16</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>4</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>17</th>\n",
-       "      <td>5017</td>\n",
-       "      <td>4</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>18</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>19</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>20</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>21</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>22</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>23</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "             n_agents  n_infected\n",
-       "hour_of_day                      \n",
-       "0                   0           0\n",
-       "1                   0           0\n",
-       "2                   0           0\n",
-       "3                   0           0\n",
-       "4                   0           0\n",
-       "5                   0           0\n",
-       "6                   0           0\n",
-       "7                1609           5\n",
-       "8                3403           5\n",
-       "9                5017           5\n",
-       "10               5017           5\n",
-       "11               5017           5\n",
-       "12               5017           4\n",
-       "13               5017           4\n",
-       "14               5017           4\n",
-       "15               5017           4\n",
-       "16               5017           4\n",
-       "17               5017           4\n",
-       "18                  0           0\n",
-       "19                  0           0\n",
-       "20                  0           0\n",
-       "21                  0           0\n",
-       "22                  0           0\n",
-       "23                  0           0"
-      ]
-     },
-     "execution_count": 122,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 123,
-   "id": "53a48610",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "337"
-      ]
-     },
-     "execution_count": 123,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# social event\n",
-    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"03\"])].copy()\n",
-    "\n",
-    "len(df_sub[\"timepoint\"].unique())"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 124,
-   "id": "dfd793ff",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>hour_of_day</th>\n",
-       "      <th></th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0</th>\n",
-       "      <td>957</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1</th>\n",
-       "      <td>881</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2</th>\n",
-       "      <td>881</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>4</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>6</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>7</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>8</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>9</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>10</th>\n",
-       "      <td>881</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>11</th>\n",
-       "      <td>999</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>12</th>\n",
-       "      <td>1124</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>13</th>\n",
-       "      <td>1238</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>14</th>\n",
-       "      <td>1339</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>15</th>\n",
-       "      <td>1440</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>16</th>\n",
-       "      <td>1543</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>17</th>\n",
-       "      <td>1635</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>18</th>\n",
-       "      <td>1729</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>19</th>\n",
-       "      <td>1808</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>20</th>\n",
-       "      <td>2180</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>21</th>\n",
-       "      <td>780</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>22</th>\n",
-       "      <td>836</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>23</th>\n",
-       "      <td>890</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "             n_agents  n_infected\n",
-       "hour_of_day                      \n",
-       "0                 957           1\n",
-       "1                 881           1\n",
-       "2                 881           1\n",
-       "3                 881           0\n",
-       "4                 881           0\n",
-       "5                 881           0\n",
-       "6                 881           0\n",
-       "7                 881           0\n",
-       "8                 881           0\n",
-       "9                 881           0\n",
-       "10                881           0\n",
-       "11                999           0\n",
-       "12               1124           0\n",
-       "13               1238           0\n",
-       "14               1339           0\n",
-       "15               1440           0\n",
-       "16               1543           0\n",
-       "17               1635           0\n",
-       "18               1729           0\n",
-       "19               1808           0\n",
-       "20               2180           0\n",
-       "21                780           1\n",
-       "22                836           1\n",
-       "23                890           0"
-      ]
-     },
-     "execution_count": 124,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 125,
-   "id": "92929c45",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "337"
-      ]
-     },
-     "execution_count": 125,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# basic shop\n",
-    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"04\"])].copy()\n",
-    "\n",
-    "len(df_sub[\"timepoint\"].unique())"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 126,
-   "id": "1e50adca",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>hour_of_day</th>\n",
-       "      <th></th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>4</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>5</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>6</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>7</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>8</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>9</th>\n",
-       "      <td>158</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>10</th>\n",
-       "      <td>169</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>11</th>\n",
-       "      <td>174</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>12</th>\n",
-       "      <td>178</td>\n",
-       "      <td>2</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>13</th>\n",
-       "      <td>159</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>14</th>\n",
-       "      <td>193</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>15</th>\n",
-       "      <td>156</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>16</th>\n",
-       "      <td>169</td>\n",
-       "      <td>2</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>17</th>\n",
-       "      <td>184</td>\n",
-       "      <td>2</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>18</th>\n",
-       "      <td>185</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>19</th>\n",
-       "      <td>383</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>20</th>\n",
-       "      <td>373</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>21</th>\n",
-       "      <td>371</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>22</th>\n",
-       "      <td>394</td>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>23</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "             n_agents  n_infected\n",
-       "hour_of_day                      \n",
-       "0                   0           0\n",
-       "1                   0           0\n",
-       "2                   0           0\n",
-       "3                   0           0\n",
-       "4                   0           0\n",
-       "5                   0           0\n",
-       "6                   0           0\n",
-       "7                   0           0\n",
-       "8                   0           0\n",
-       "9                 158           0\n",
-       "10                169           0\n",
-       "11                174           1\n",
-       "12                178           2\n",
-       "13                159           1\n",
-       "14                193           0\n",
-       "15                156           1\n",
-       "16                169           2\n",
-       "17                184           2\n",
-       "18                185           1\n",
-       "19                383           1\n",
-       "20                373           1\n",
-       "21                371           0\n",
-       "22                394           1\n",
-       "23                  0           0"
-      ]
-     },
-     "execution_count": 126,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df_sub.groupby(\"hour_of_day\").sum()[[\"n_agents\", \"n_infected\"]]"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "64f59575",
-   "metadata": {},
-   "source": [
-    "### Infections in hospital == infected severe?"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 127,
-   "id": "530de9ad",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# 5 -> Hospital"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 128,
-   "id": "8901dda9",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"05\"])].copy()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 132,
-   "id": "5b360def",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# calculate numer of infections in hospital\n",
-    "n_inf_hospital = df_sub.groupby(\"timepoint\").sum()[['n_agents', 'n_infected']]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 133,
-   "id": "c502aa2e",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>timepoint</th>\n",
-       "      <th></th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>24.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>48.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>72.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>96.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>120.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>144.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>168.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>192.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>216.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>240.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>264.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>288.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>312.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "           n_agents  n_infected\n",
-       "timepoint                      \n",
-       "0.0               0           0\n",
-       "24.0              0           0\n",
-       "48.0              0           0\n",
-       "72.0              0           0\n",
-       "96.0              0           0\n",
-       "120.0             0           0\n",
-       "144.0             0           0\n",
-       "168.0             0           0\n",
-       "192.0             0           0\n",
-       "216.0             0           0\n",
-       "240.0             0           0\n",
-       "264.0             0           0\n",
-       "288.0             0           0\n",
-       "312.0             0           0"
-      ]
-     },
-     "execution_count": 133,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# subselect every 24h\n",
-    "n_inf_hospital.loc[[i*24 for i in range(0,n_days)],:]"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "63b7844d",
-   "metadata": {},
-   "source": [
-    "### Infections at ICU == infected critical?"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 134,
-   "id": "1fd4bb9e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# 6 -> Hospital\n",
-    "df_sub = df_transformed.loc[df_transformed[\"Location_Type\"].isin([\"06\"])].copy()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 135,
-   "id": "8db63efa",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# calculate numer of infections in ICU\n",
-    "n_inf_ICU = df_sub.groupby(\"timepoint\").sum()[['n_agents', 'n_infected']]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 136,
-   "id": "61d70ca1",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>n_infected</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>timepoint</th>\n",
-       "      <th></th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>24.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>48.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>72.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>96.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>120.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>144.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>168.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>192.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>216.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>240.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>264.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>288.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>312.0</th>\n",
-       "      <td>0</td>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "           n_agents  n_infected\n",
-       "timepoint                      \n",
-       "0.0               0           0\n",
-       "24.0              0           0\n",
-       "48.0              0           0\n",
-       "72.0              0           0\n",
-       "96.0              0           0\n",
-       "120.0             0           0\n",
-       "144.0             0           0\n",
-       "168.0             0           0\n",
-       "192.0             0           0\n",
-       "216.0             0           0\n",
-       "240.0             0           0\n",
-       "264.0             0           0\n",
-       "288.0             0           0\n",
-       "312.0             0           0"
-      ]
-     },
-     "execution_count": 136,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# subselect every 24h\n",
-    "n_inf_ICU.loc[[i*24 for i in range(0,n_days)],:]"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "7691163b",
-   "metadata": {},
-   "source": [
-    "### Persons at graveyard == death?"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 137,
-   "id": "1aae158d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df_transformed_w_graveyard[\"Location_Type\"] = df_transformed_w_graveyard['LocationID'].apply(lambda x: x[0:2])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 139,
-   "id": "0393c870",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# 10 -> n_graveyard\n",
-    "df_sub = df_transformed_w_graveyard.loc[df_transformed_w_graveyard[\"Location_Type\"].isin([\"10\"])].copy()\n",
-    "\n",
-    "# calculate numer of infections in ICU\n",
-    "n_graveyard = df_sub.groupby(\"timepoint\").sum()[['n_agents']]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 140,
-   "id": "23902f32",
-   "metadata": {
-    "scrolled": false
-   },
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>n_agents</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>timepoint</th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>0.0</th>\n",
-       "      <td>0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>24.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>48.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>72.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>96.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>120.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>144.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>168.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>192.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>216.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>240.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>264.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>288.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>312.0</th>\n",
-       "      <td>1</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "           n_agents\n",
-       "timepoint          \n",
-       "0.0               0\n",
-       "24.0              1\n",
-       "48.0              1\n",
-       "72.0              1\n",
-       "96.0              1\n",
-       "120.0             1\n",
-       "144.0             1\n",
-       "168.0             1\n",
-       "192.0             1\n",
-       "216.0             1\n",
-       "240.0             1\n",
-       "264.0             1\n",
-       "288.0             1\n",
-       "312.0             1"
-      ]
-     },
-     "execution_count": 140,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# subselect every 24h\n",
-    "n_graveyard.loc[[i*24 for i in range(0,n_days)],:]"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c676217c",
-   "metadata": {},
-   "source": [
-    "## Time since transmission"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 141,
-   "id": "0a33a1dd",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def tidy_row(location_row):\n",
-    "\n",
-    "    location_id = location_row[0]\n",
-    "    output_timesteps = location_row[1]\n",
-    "\n",
-    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"agent_id\", \"time_since_transmission\"])\n",
-    "\n",
-    "    timestep_col_id = 2 # col id for the current timestep\n",
-    "\n",
-    "    for t in range(1,output_timesteps+1):\n",
-    "        # number of agents is in column after timestep\n",
-    "        timepoint = location_row[timestep_col_id]\n",
-    "\n",
-    "        if np.isnan(timepoint):\n",
-    "            #print(\"break\")\n",
-    "            break\n",
-    "        n_agents = int(location_row[timestep_col_id + 1])\n",
-    "\n",
-    "        # timestep_col_id, # agents, agent_ot1, transmission_time\n",
-    "        agent_ids = [timestep_col_id + 1 + 1 + i*2 for i in range(0,n_agents)]\n",
-    "        transmission_time_ids = [timestep_col_id + 1 + 2 + i*2 for i in range(0,n_agents)]\n",
-    "\n",
-    "        for i in range(0,n_agents):\n",
-    "            agent_id = agent_ids[i]\n",
-    "            transmission_time_id = transmission_time_ids[i]\n",
-    "            df_res.loc[len(df_res),] = [location_id, timepoint, n_agents, location_row[agent_id], location_row[transmission_time_id]]\n",
-    "\n",
-    "        timestep_col_id += 2 + n_agents*2\n",
-    "    return df_res"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 142,
-   "id": "b21fe699",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def tidy_output_df(output_df):\n",
-    "    \n",
-    "    df_res = pd.DataFrame(columns=[\"LocationID\", \"timepoint\", \"n_agents\", \"agent_id\", \"time_since_transmission\"])\n",
-    "    \n",
-    "    for i in range(0,len(output_df)):\n",
-    "        location_row = output_df.iloc[i]\n",
-    "        df_res_row = tidy_row(location_row)\n",
-    "        df_res = pd.concat([df_res, df_res_row])\n",
-    "    \n",
-    "    return df_res"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 143,
-   "id": "e3c8db3f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# takes ~3min\n",
-    "tidy_output = tidy_output_df(output_df)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "170cf028",
-   "metadata": {},
-   "source": [
-    "### maximum timecourse value"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 147,
-   "id": "852cbb82",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "107.0"
-      ]
-     },
-     "execution_count": 147,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "tidy_output[\"time_since_transmission\"].max()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 148,
-   "id": "330537f6",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "4.458333333333333"
-      ]
-     },
-     "execution_count": 148,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "tidy_output['time_since_transmission'].max()/24"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 149,
-   "id": "9fe8c73d",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>LocationID</th>\n",
-       "      <th>timepoint</th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>agent_id</th>\n",
-       "      <th>time_since_transmission</th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>107</th>\n",
-       "      <td>0419</td>\n",
-       "      <td>140.0</td>\n",
-       "      <td>2</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>121</th>\n",
-       "      <td>0419</td>\n",
-       "      <td>190.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>172</th>\n",
-       "      <td>0419</td>\n",
-       "      <td>277.0</td>\n",
-       "      <td>2</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>105</th>\n",
-       "      <td>0034</td>\n",
-       "      <td>108.0</td>\n",
-       "      <td>1</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>106</th>\n",
-       "      <td>0034</td>\n",
-       "      <td>109.0</td>\n",
-       "      <td>1</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>...</th>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>984</th>\n",
-       "      <td>00498</td>\n",
-       "      <td>329.0</td>\n",
-       "      <td>3</td>\n",
-       "      <td>883.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>992</th>\n",
-       "      <td>00498</td>\n",
-       "      <td>333.0</td>\n",
-       "      <td>5</td>\n",
-       "      <td>883.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>997</th>\n",
-       "      <td>00498</td>\n",
-       "      <td>334.0</td>\n",
-       "      <td>5</td>\n",
-       "      <td>883.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1002</th>\n",
-       "      <td>00498</td>\n",
-       "      <td>335.0</td>\n",
-       "      <td>5</td>\n",
-       "      <td>883.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>1007</th>\n",
-       "      <td>00498</td>\n",
-       "      <td>336.0</td>\n",
-       "      <td>5</td>\n",
-       "      <td>883.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "<p>297908 rows × 5 columns</p>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "     LocationID timepoint n_agents agent_id time_since_transmission\n",
-       "107        0419     140.0        2      0.0                    -1.0\n",
-       "121        0419     190.0        4      0.0                    -1.0\n",
-       "172        0419     277.0        2      0.0                    -1.0\n",
-       "105        0034     108.0        1      0.0                    -1.0\n",
-       "106        0034     109.0        1      0.0                    -1.0\n",
-       "...         ...       ...      ...      ...                     ...\n",
-       "984       00498     329.0        3    883.0                    -1.0\n",
-       "992       00498     333.0        5    883.0                    -1.0\n",
-       "997       00498     334.0        5    883.0                    -1.0\n",
-       "1002      00498     335.0        5    883.0                    -1.0\n",
-       "1007      00498     336.0        5    883.0                    -1.0\n",
-       "\n",
-       "[297908 rows x 5 columns]"
-      ]
-     },
-     "execution_count": 149,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "tidy_output.sort_values(['agent_id','time_since_transmission'])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 154,
-   "id": "3e096a6f",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>LocationID</th>\n",
-       "      <th>timepoint</th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>agent_id</th>\n",
-       "      <th>time_since_transmission</th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>3</th>\n",
-       "      <td>0306</td>\n",
-       "      <td>21.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>21.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>10</th>\n",
-       "      <td>0306</td>\n",
-       "      <td>22.0</td>\n",
-       "      <td>6</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>22.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>387</th>\n",
-       "      <td>0307</td>\n",
-       "      <td>96.0</td>\n",
-       "      <td>5</td>\n",
-       "      <td>550.0</td>\n",
-       "      <td>96.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>392</th>\n",
-       "      <td>0307</td>\n",
-       "      <td>97.0</td>\n",
-       "      <td>5</td>\n",
-       "      <td>550.0</td>\n",
-       "      <td>97.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>397</th>\n",
-       "      <td>0307</td>\n",
-       "      <td>98.0</td>\n",
-       "      <td>5</td>\n",
-       "      <td>550.0</td>\n",
-       "      <td>98.0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "    LocationID timepoint n_agents agent_id time_since_transmission\n",
-       "3         0306      21.0        4    841.0                    21.0\n",
-       "10        0306      22.0        6    841.0                    22.0\n",
-       "387       0307      96.0        5    550.0                    96.0\n",
-       "392       0307      97.0        5    550.0                    97.0\n",
-       "397       0307      98.0        5    550.0                    98.0"
-      ]
-     },
-     "execution_count": 154,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "tidy_output.loc[(tidy_output[\"time_since_transmission\"]>0),].head()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 160,
-   "id": "a368cfd8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "agent_id = 841.0\n",
-    "df_sub = tidy_output[tidy_output[\"agent_id\"]==agent_id].sort_values(\"timepoint\")\n",
-    "max_time = df_sub[\"time_since_transmission\"].max()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 162,
-   "id": "ddf9ef1c",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "98.0"
-      ]
-     },
-     "execution_count": 162,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "max_time"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 163,
-   "id": "5bae2828",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>LocationID</th>\n",
-       "      <th>timepoint</th>\n",
-       "      <th>n_agents</th>\n",
-       "      <th>agent_id</th>\n",
-       "      <th>time_since_transmission</th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>266</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>90.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>90.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>270</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>91.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>91.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>274</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>92.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>92.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>278</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>93.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>93.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>282</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>94.0</td>\n",
-       "      <td>3</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>94.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>285</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>95.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>95.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>289</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>96.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>96.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>293</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>97.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>97.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>297</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>98.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>98.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>301</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>99.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>305</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>100.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>309</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>101.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>313</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>102.0</td>\n",
-       "      <td>4</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>317</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>103.0</td>\n",
-       "      <td>2</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>319</th>\n",
-       "      <td>00482</td>\n",
-       "      <td>104.0</td>\n",
-       "      <td>2</td>\n",
-       "      <td>841.0</td>\n",
-       "      <td>-1.0</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "    LocationID timepoint n_agents agent_id time_since_transmission\n",
-       "266      00482      90.0        4    841.0                    90.0\n",
-       "270      00482      91.0        4    841.0                    91.0\n",
-       "274      00482      92.0        4    841.0                    92.0\n",
-       "278      00482      93.0        4    841.0                    93.0\n",
-       "282      00482      94.0        3    841.0                    94.0\n",
-       "285      00482      95.0        4    841.0                    95.0\n",
-       "289      00482      96.0        4    841.0                    96.0\n",
-       "293      00482      97.0        4    841.0                    97.0\n",
-       "297      00482      98.0        4    841.0                    98.0\n",
-       "301      00482      99.0        4    841.0                    -1.0\n",
-       "305      00482     100.0        4    841.0                    -1.0\n",
-       "309      00482     101.0        4    841.0                    -1.0\n",
-       "313      00482     102.0        4    841.0                    -1.0\n",
-       "317      00482     103.0        2    841.0                    -1.0\n",
-       "319      00482     104.0        2    841.0                    -1.0"
-      ]
-     },
-     "execution_count": 163,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "df_sub.iloc[90:105]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3e5f2267",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.12"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}

From 246587ab5d34b74384e49f0bfb488356ce34bf2d Mon Sep 17 00:00:00 2001
From: Nina Schmid <nina.schmid@uni-bonn.de>
Date: Sun, 8 Oct 2023 14:21:59 +0200
Subject: [PATCH 066/103] delete png files

---
 output/infections.png           | Bin 20513 -> 0 bytes
 output/infections_recovered.png | Bin 17940 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 output/infections.png
 delete mode 100644 output/infections_recovered.png

diff --git a/output/infections.png b/output/infections.png
deleted file mode 100644
index 632bddf3e80bb0699130140395e4152bc7c86218..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20513
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

diff --git a/output/infections_recovered.png b/output/infections_recovered.png
deleted file mode 100644
index 55eb2d7950f296cb277c84a7d52bc8e263e3d922..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17940
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
T9{s@nX%#gkP4s&Oi=h7n7lo0{


From 1f10b334957a0919bc438524b5fd358c0875a4bc Mon Sep 17 00:00:00 2001
From: Nina Schmid <nina.schmid@uni-bonn.de>
Date: Mon, 9 Oct 2023 15:21:00 +0200
Subject: [PATCH 067/103] load parameter values from file

---
 .../ABM Demonstrator/abm_demonstrator.py      | 224 ++++++++++++------
 1 file changed, 151 insertions(+), 73 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 979afae6ff..7827ad9f42 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -18,7 +18,6 @@
 # limitations under the License.
 #############################################################################
 import argparse
-import pandas as pd
 import numpy as np
 
 from memilio.simulation import abm
@@ -28,6 +27,7 @@
 from memilio.simulation.abm import History
 from memilio.simulation.abm import Infection
 
+import pandas as pd
 # class used to map input areas to abm locations
 
 
@@ -40,152 +40,230 @@ def __init__(self):
 # infection parameters are dependent on age group and vaccination state
 
 
-def set_infection_parameters():
+def set_infection_parameters(parameters):
     infection_params = abm.GlobalInfectionParameters()
 
     # AgeGroup 0-4
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated] = 3
+                                      VaccinationState.Unvaccinated] = parameters.loc["Age0to4_IncubationPeriod"].value
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                  VaccinationState.Unvaccinated] = 2.2
+                                                  VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_InfectedNoSymptomsToSymptoms"].value)
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                   VaccinationState.Unvaccinated] = 9.2
+                                                   VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_InfectedNoSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                 VaccinationState.Unvaccinated] = 7
+                                                 VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_InfectedSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                              VaccinationState.Unvaccinated] = 10.5
+                                              VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_InfectedSymptomsToSevere"].value)
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                       VaccinationState.Unvaccinated] = 5
+                                       VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_SevereToRecovered"].value)
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated] = 5
+                                      VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_SevereToCritical"].value)
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                         VaccinationState.Unvaccinated] = 7
+                                         VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_CriticalToRecovered"].value)
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                    VaccinationState.Unvaccinated] = 6
+                                    VaccinationState.Unvaccinated] = (
+        parameters.loc["Age0to4_CriticalToDead"].value)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+                                  VaccinationState.Unvaccinated,
+                                  parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
+                                  parameters.loc["incline"].value, parameters.loc["incline"].value,
+                                  parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4, -7.0, -7.0, 1.0, 1.0)
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4,
+        parameters.loc["alpha"].value, parameters.loc["alpha"].value,
+        parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 5-14
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated] = 3
+                                      VaccinationState.Unvaccinated] = parameters.loc["Age5to14_IncubationPeriod"].value
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                  VaccinationState.Unvaccinated] = 2.2
+                                                  VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_InfectedNoSymptomsToSymptoms"].value)
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                   VaccinationState.Unvaccinated] = 9.2
+                                                   VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_InfectedNoSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                 VaccinationState.Unvaccinated] = 7
+                                                 VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_InfectedSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                              VaccinationState.Unvaccinated] = 10.5
+                                              VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_InfectedSymptomsToSevere"].value)
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                       VaccinationState.Unvaccinated] = 5
+                                       VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_SevereToRecovered"].value)
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated] = 5
+                                      VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_SevereToCritical"].value)
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                         VaccinationState.Unvaccinated] = 7
+                                         VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_CriticalToRecovered"].value)
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                    VaccinationState.Unvaccinated] = 6
+                                    VaccinationState.Unvaccinated] = (
+        parameters.loc["Age5to14_CriticalToDead"].value)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+                                  VaccinationState.Unvaccinated,
+                                  parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
+                                  parameters.loc["incline"].value, parameters.loc["incline"].value,
+                                  parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14, -7.0, -7.0, 1.0, 1.0)
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14,
+        parameters.loc["alpha"].value, parameters.loc["alpha"].value,
+        parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 15-34
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated] = 3
+                                      VaccinationState.Unvaccinated] = parameters.loc["Age15to34_IncubationPeriod"].value
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                  VaccinationState.Unvaccinated] = 2.2
+                                                  VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_InfectedNoSymptomsToSymptoms"].value)
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                   VaccinationState.Unvaccinated] = 9.2
+                                                   VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_InfectedNoSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                 VaccinationState.Unvaccinated] = 7
+                                                 VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_InfectedSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                              VaccinationState.Unvaccinated] = 10.5
+                                              VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_InfectedSymptomsToSevere"].value)
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                       VaccinationState.Unvaccinated] = 6
+                                       VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_SevereToRecovered"].value)
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated] = 5
+                                      VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_SevereToCritical"].value)
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                         VaccinationState.Unvaccinated] = 7
+                                         VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_CriticalToRecovered"].value)
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                    VaccinationState.Unvaccinated] = 6
+                                    VaccinationState.Unvaccinated] = (
+        parameters.loc["Age15to34_CriticalToDead"].value)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+                                  VaccinationState.Unvaccinated,
+                                  parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
+                                  parameters.loc["incline"].value, parameters.loc["incline"].value,
+                                  parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34, -7.0, -7.0, 1.0, 1.0)
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34,
+        parameters.loc["alpha"].value, parameters.loc["alpha"].value,
+        parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 35-59
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated] = 3
+                                      VaccinationState.Unvaccinated] = parameters.loc["Age35to59_IncubationPeriod"].value
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                  VaccinationState.Unvaccinated] = 2.2
+                                                  VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_InfectedNoSymptomsToSymptoms"].value)
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                   VaccinationState.Unvaccinated] = 9.2
+                                                   VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_InfectedNoSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                 VaccinationState.Unvaccinated] = 7
+                                                 VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_InfectedSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                              VaccinationState.Unvaccinated] = 6
+                                              VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_InfectedSymptomsToSevere"].value)
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                       VaccinationState.Unvaccinated] = 8
+                                       VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_SevereToRecovered"].value)
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated] = 5
+                                      VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_SevereToCritical"].value)
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                         VaccinationState.Unvaccinated] = 17.5
+                                         VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_CriticalToRecovered"].value)
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                    VaccinationState.Unvaccinated] = 16.5
+                                    VaccinationState.Unvaccinated] = (
+        parameters.loc["Age35to59_CriticalToDead"].value)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+                                  VaccinationState.Unvaccinated,
+                                  parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
+                                  parameters.loc["incline"].value, parameters.loc["incline"].value,
+                                  parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59, -7.0, -7.0, 1.0, 1.0)
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59,
+        parameters.loc["alpha"].value, parameters.loc["alpha"].value,
+        parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 60-79
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated] = 3
+                                      VaccinationState.Unvaccinated] = parameters.loc["Age60to79_IncubationPeriod"].value
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                  VaccinationState.Unvaccinated] = 2.2
+                                                  VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_InfectedNoSymptomsToSymptoms"].value)
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                   VaccinationState.Unvaccinated] = 9.2
+                                                   VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_InfectedNoSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                 VaccinationState.Unvaccinated] = 7.0
+                                                 VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_InfectedSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                              VaccinationState.Unvaccinated] = 6.0
+                                              VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_InfectedSymptomsToSevere"].value)
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                       VaccinationState.Unvaccinated] = 10.0
+                                       VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_SevereToRecovered"].value)
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated] = 5
+                                      VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_SevereToCritical"].value)
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                         VaccinationState.Unvaccinated] = 17.5
+                                         VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_CriticalToRecovered"].value)
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                    VaccinationState.Unvaccinated] = 16.5
+                                    VaccinationState.Unvaccinated] = (
+        parameters.loc["Age60to79_CriticalToDead"].value)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+                                  VaccinationState.Unvaccinated,
+                                  parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
+                                  parameters.loc["incline"].value, parameters.loc["incline"].value,
+                                  parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79, -7.0, -7.0, 1.0, 1.0)
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79,
+        parameters.loc["alpha"].value, parameters.loc["alpha"].value,
+        parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 80+
     infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated] = 3
+                                      VaccinationState.Unvaccinated] = parameters.loc["Age80plus_IncubationPeriod"].value
     infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                  VaccinationState.Unvaccinated] = 2.2
+                                                  VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_InfectedNoSymptomsToSymptoms"].value)
     infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                   VaccinationState.Unvaccinated] = 9.2
+                                                   VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_InfectedNoSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                 VaccinationState.Unvaccinated] = 7.0
+                                                 VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_InfectedSymptomsToRecovered"].value)
     infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                              VaccinationState.Unvaccinated] = 6.0
+                                              VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_InfectedSymptomsToSevere"].value)
     infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                       VaccinationState.Unvaccinated] = 15.0
+                                       VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_SevereToRecovered"].value)
     infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated] = 5
+                                      VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_SevereToCritical"].value)
     infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                         VaccinationState.Unvaccinated] = 12.5
+                                         VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_CriticalToRecovered"].value)
     infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                    VaccinationState.Unvaccinated] = 11
+                                    VaccinationState.Unvaccinated] = (
+        parameters.loc["Age80plus_CriticalToDead"].value)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                  VaccinationState.Unvaccinated, 8.1, 8.1, 2.0, 2.0, -0.17, -0.17)
+                                  VaccinationState.Unvaccinated,
+                                  parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
+                                  parameters.loc["incline"].value, parameters.loc["incline"].value,
+                                  parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus, -7.0, -7.0, 1.0, 1.0)
+        infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus,
+        parameters.loc["alpha"].value, parameters.loc["alpha"].value,
+        parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     return infection_params
 
@@ -615,9 +693,8 @@ def set_sim_result_at_start(sim):
 
 
 def run_abm_simulation():
-
-    input_path = '/INSIDe_Demonstrator_AreaList_modified.txt'
-    output_path = '/output/'
+    input_path = 'input/'
+    output_path = 'output/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -627,11 +704,12 @@ def run_abm_simulation():
     # distribution used to distribute the residential areas to one-, two-, three-, four- and five-person households
     household_distribution = [0.4084, 0.3375, 0.1199, 0.0965, 0.0377]
     # read txt file with inputs
-    areas = read_txt(input_path)
+    areas = read_txt(input_path+'INSIDe_Demonstrator_AreaList_modified.txt')
+    parameters = pd.read_csv(input_path+'parameter_table.csv', index_col=0)
     # create simulation
     sim = abm.Simulation(t0)
     # set infection parameters
-    sim.world.infection_parameters = set_infection_parameters()
+    sim.world.infection_parameters = set_infection_parameters(parameters)
     # as input areas do fit one-to-one to abm location types they have there has to be a mapping
     mapping = create_locations_from_input(
         sim.world, areas, household_distribution)

From 488cc7aeedeb44b00d195b2eb6322ab128e0429a Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 9 Oct 2023 16:43:10 +0200
Subject: [PATCH 068/103] add at least one adult to other households

---
 .../simulation/ABM Demonstrator/abm_demonstrator.py        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 979afae6ff..37e96baf44 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -251,7 +251,8 @@ def make_multiple_person_households(household_size,
         hh_one_parent, number_of_one_parent_households)
     # add other households
     hh_other = abm.Household()
-    hh_other.add_members(other, household_size)
+    hh_other.add_members(parent, 1)
+    hh_other.add_members(other, household_size - 1)
     household_group.add_households(hh_other, number_of_other_households)
 
     return household_group
@@ -616,8 +617,8 @@ def set_sim_result_at_start(sim):
 
 def run_abm_simulation():
 
-    input_path = '/INSIDe_Demonstrator_AreaList_modified.txt'
-    output_path = '/output/'
+    input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList_modified.txt'
+    output_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/output/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point

From f43fba9716aca2bc5f6b14c233d8853216184e18 Mon Sep 17 00:00:00 2001
From: Nina Schmid <nina.schmid@uni-bonn.de>
Date: Tue, 10 Oct 2023 09:16:46 +0200
Subject: [PATCH 069/103] platform independent file access

---
 .../ABM Demonstrator/abm_demonstrator.py        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 81a9fa93b9..83b12581fb 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -19,6 +19,7 @@
 #############################################################################
 import argparse
 import numpy as np
+import os
 
 from memilio.simulation import abm
 from memilio.simulation.abm import AgeGroup
@@ -694,8 +695,8 @@ def set_sim_result_at_start(sim):
 
 
 def run_abm_simulation():
-    input_path = 'input/'
-    output_path = 'output/'
+    input_path = 'input'
+    output_path = 'output'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -705,8 +706,8 @@ def run_abm_simulation():
     # distribution used to distribute the residential areas to one-, two-, three-, four- and five-person households
     household_distribution = [0.4084, 0.3375, 0.1199, 0.0965, 0.0377]
     # read txt file with inputs
-    areas = read_txt(input_path+'INSIDe_Demonstrator_AreaList_modified.txt')
-    parameters = pd.read_csv(input_path+'parameter_table.csv', index_col=0)
+    areas = read_txt(os.path.join(input_path, 'INSIDe_Demonstrator_AreaList_modified.txt'))
+    parameters = pd.read_csv(os.path.join(input_path, 'parameter_table.csv'), index_col=0)
     # create simulation
     sim = abm.Simulation(t0)
     # set infection parameters
@@ -726,16 +727,16 @@ def run_abm_simulation():
     # results collected during the simulation
     log = history.log
     # write simulation results to txt file
-    write_results_to_file(output_path + 'output.txt', log)
+    write_results_to_file(os.path.join(output_path, 'output.txt'), log)
     # write location mapping to txt file
     write_location_mapping_to_file(
-        output_path + 'location_mapping.txt', mapping)
+        os.path.join(output_path, 'location_mapping.txt'), mapping)
     # write infection paths per agent to file
-    write_infection_paths_to_file(output_path + 'infection_paths.txt', log)
+    write_infection_paths_to_file(os.path.join(output_path, 'infection_paths.txt'), log)
 
     # print compartment values to csv
     # only used for validation purposes
-    with open(output_path + 'console_output.csv', 'w') as f:
+    with open(os.path.join(output_path, 'console_output.csv'), 'w') as f:
         f.write("t S E C I I_s I_c R D\n")
         for t in range(sim.result.get_num_time_points()):
             line = str(sim.result.get_time(t)) + " "

From 53d31cb96d16694653d70ac235105a152728dfec Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 7 Nov 2023 09:04:50 +0100
Subject: [PATCH 070/103] change Location Id

---
 .../simulation/ABM Demonstrator/abm_demonstrator.py   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 83b12581fb..1fdc7ffc3f 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -590,7 +590,7 @@ def convert_loc_id_to_string(loc_id):
     if int(loc_id[1]) < 10:
         index = "0" + index
 
-    return "I" + type + index
+    return type + index
 
 
 def get_agents_per_location(loc_id, agents):
@@ -706,8 +706,10 @@ def run_abm_simulation():
     # distribution used to distribute the residential areas to one-, two-, three-, four- and five-person households
     household_distribution = [0.4084, 0.3375, 0.1199, 0.0965, 0.0377]
     # read txt file with inputs
-    areas = read_txt(os.path.join(input_path, 'INSIDe_Demonstrator_AreaList_modified.txt'))
-    parameters = pd.read_csv(os.path.join(input_path, 'parameter_table.csv'), index_col=0)
+    areas = read_txt(os.path.join(
+        input_path, 'INSIDe_Demonstrator_AreaList_modified.txt'))
+    parameters = pd.read_csv(os.path.join(
+        input_path, 'parameter_table.csv'), index_col=0)
     # create simulation
     sim = abm.Simulation(t0)
     # set infection parameters
@@ -732,7 +734,8 @@ def run_abm_simulation():
     write_location_mapping_to_file(
         os.path.join(output_path, 'location_mapping.txt'), mapping)
     # write infection paths per agent to file
-    write_infection_paths_to_file(os.path.join(output_path, 'infection_paths.txt'), log)
+    write_infection_paths_to_file(os.path.join(
+        output_path, 'infection_paths.txt'), log)
 
     # print compartment values to csv
     # only used for validation purposes

From 1c07656053a3cc02ea98c50c3891deda32fe20c5 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 21 Mar 2024 10:41:56 +0100
Subject: [PATCH 071/103] fix cpp demonstrator

---
 cpp/models/abm/infection.cpp                |  43 +--
 cpp/models/abm/person.h                     |   6 +-
 cpp/simulations/abm_INSIDe_demonstrator.cpp | 333 +++++++++-----------
 3 files changed, 180 insertions(+), 202 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 10ab8385e3..5e1e26c547 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -166,9 +166,9 @@ void Infection::draw_infection_course_forward(Person::RandomNumberGenerator& rng
             // roll out next infection step
             v = uniform_dist(rng);
             if (v < 0.79) { // TODO: subject to change
-                time_period = days(params.get<InfectedNoSymptomsToSymptoms>()[{
-                    m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
-                next_state  = InfectionState::InfectedSymptoms;
+                time_period =
+                    days(params.get<InfectedNoSymptomsToSymptoms>()[{m_virus_variant, age}]); // TODO: subject to change
+                next_state = InfectionState::InfectedSymptoms;
             }
             else {
                 time_period = days(
@@ -179,24 +179,32 @@ void Infection::draw_infection_course_forward(Person::RandomNumberGenerator& rng
             break;
         case InfectionState::InfectedSymptoms:
             // roll out next infection step
-            v = uniform_dist(rng);
-            if (v < 0.08) { // TODO: subject to change
-                time_period = days(params.get<InfectedSymptomsToSevere>()[{
-                    m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
-                next_state  = InfectionState::InfectedSevere;
-            }
-            else {
-                time_period = days(params.get<InfectedSymptomsToRecovered>()[{
-                    m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
-                next_state  = InfectionState::Recovered;
+            {
+                ScalarType severity_protection_factor = 0.5;
+                if (latest_exposure.first != ExposureType::NoProtection) {
+                    severity_protection_factor =
+                        params.get<SeverityProtectionFactor>()[{latest_exposure.first, age, m_virus_variant}](
+                            t.days() - latest_exposure.second.days());
+                }
+                // roll out next infection step
+                v = uniform_dist(rng);
+                if (v < (1 - severity_protection_factor) * 0.08) { // TODO: subject to change
+                    time_period =
+                        days(params.get<InfectedSymptomsToSevere>()[{m_virus_variant, age}]); // TODO: subject to change
+                    next_state = InfectionState::InfectedSevere;
+                }
+                else {
+                    time_period = days(
+                        params.get<InfectedSymptomsToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
+                    next_state = InfectionState::Recovered;
+                }
+                break;
             }
-            break;
         case InfectionState::InfectedSevere:
             // roll out next infection step
             v = uniform_dist(rng);
             if (v < 0.18) { // TODO: subject to change
-                time_period = days(params.get<SevereToCritical>()[{
-                    m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
+                time_period = days(params.get<SevereToCritical>()[{m_virus_variant, age}]); // TODO: subject to change
                 next_state  = InfectionState::InfectedCritical;
             }
             else {
@@ -208,8 +216,7 @@ void Infection::draw_infection_course_forward(Person::RandomNumberGenerator& rng
             // roll out next infection step
             v = uniform_dist(rng);
             if (v < 0.22) { // TODO: subject to change
-                time_period = days(params.get<CriticalToDead>()[{
-                    m_virus_variant, age, VaccinationState::Unvaccinated}]); // TODO: subject to change
+                time_period = days(params.get<CriticalToDead>()[{m_virus_variant, age}]); // TODO: subject to change
                 next_state  = InfectionState::Dead;
             }
             else {
diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index b8d207a01b..b68c9bc7dd 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -503,11 +503,7 @@ class Person
                 return Person{mio::RandomNumberGenerator(), loc_, AgeGroup(age_), id_};
             },
             loc, age, id);
-
-    TimeSpan get_time_since_transmission()
-    {
-        return m_time_since_transmission;
-    };
+    }
 
     TimeSpan get_time_since_transmission()
     {
diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 109c6da355..2e164d7b23 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -21,6 +21,7 @@
 #include "abm/household.h"
 #include "abm/infection_state.h"
 #include "abm/location.h"
+#include "abm/simulation.h"
 #include "memilio/io/result_io.h"
 #include "memilio/utils/uncertain_value.h"
 #include "memilio/io/io.h"
@@ -32,6 +33,15 @@
 
 namespace fs = boost::filesystem;
 
+// Assign the name to general age group.
+size_t num_age_groups         = 6;
+const auto age_group_0_to_4   = mio::AgeGroup(0);
+const auto age_group_5_to_14  = mio::AgeGroup(1);
+const auto age_group_15_to_34 = mio::AgeGroup(2);
+const auto age_group_35_to_59 = mio::AgeGroup(3);
+const auto age_group_60_to_79 = mio::AgeGroup(4);
+const auto age_group_80_plus  = mio::AgeGroup(5);
+
 struct LocationMapping {
     std::string inputId;
     std::vector<std::string> modelId{};
@@ -118,7 +128,7 @@ mio::abm::LocationId add_location(mio::abm::World& world, mio::abm::LocationType
  * @param[in, out] locationIds vector that maps every input area id to the corresponding abm location ids
  * @param[in] inputId input area id that is added to mapping vector
  * @param[in] locations abm locations that correspond to inputId
- * @return mapping vector 
+ * @return mapping vector
 */
 void insert_locations_to_map(std::vector<LocationMapping>& locationIds, std::string& inputId,
                              std::vector<mio::abm::LocationId>& locations)
@@ -150,7 +160,7 @@ void insert_locations_to_map(std::vector<LocationMapping>& locationIds, std::str
  * @param[in] member household member
  * @param[in] number_of_households number of one-person households in the household group
  * @return household_group The one-person household group
- * 
+ *
 */
 mio::abm::HouseholdGroup make_one_person_households(const mio::abm::HouseholdMember& member, int number_of_households)
 {
@@ -222,18 +232,18 @@ std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::ve
     size_t new_index = world.get_locations().size();
     while (num_inhabitants > 0) {
         //draw household size from the given distribution
-        household_size = mio::DiscreteDistribution<size_t>::get_instance()(distribution);
+        household_size = mio::DiscreteDistribution<size_t>::get_instance()(world.get_rng(), distribution);
         //increase the number of households of the drawn household size
         households[household_size] += 1;
         num_inhabitants -= (int)(household_size + 1);
     }
 
     //One-Person Households
-    auto one_person_household_member = mio::abm::HouseholdMember();
-    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age15to34, 5);
-    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age35to59, 6);
-    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age60to79, 4);
-    one_person_household_member.set_age_weight(mio::abm::AgeGroup::Age80plus, 2);
+    auto one_person_household_member = mio::abm::HouseholdMember(num_age_groups);
+    one_person_household_member.set_age_weight(age_group_15_to_34, 5);
+    one_person_household_member.set_age_weight(age_group_35_to_59, 6);
+    one_person_household_member.set_age_weight(age_group_60_to_79, 4);
+    one_person_household_member.set_age_weight(age_group_80_plus, 2);
     int number_of_one_person_households = households[0];
 
     auto one_person_household_group =
@@ -241,22 +251,22 @@ std::vector<mio::abm::LocationId> add_households(mio::abm::World& world, std::ve
     add_household_group_to_world(world, one_person_household_group);
 
     //Members for multiple person households
-    auto child = mio::abm::HouseholdMember();
-    child.set_age_weight(mio::abm::AgeGroup::Age0to4, 1);
-    child.set_age_weight(mio::abm::AgeGroup::Age5to14, 1);
-
-    auto parent = mio::abm::HouseholdMember();
-    parent.set_age_weight(mio::abm::AgeGroup::Age15to34, 2);
-    parent.set_age_weight(mio::abm::AgeGroup::Age35to59, 2);
-    parent.set_age_weight(mio::abm::AgeGroup::Age60to79, 1);
-
-    auto other = mio::abm::HouseholdMember();
-    other.set_age_weight(mio::abm::AgeGroup::Age0to4, 1);
-    other.set_age_weight(mio::abm::AgeGroup::Age5to14, 2);
-    other.set_age_weight(mio::abm::AgeGroup::Age15to34, 3);
-    other.set_age_weight(mio::abm::AgeGroup::Age35to59, 3);
-    other.set_age_weight(mio::abm::AgeGroup::Age60to79, 2);
-    other.set_age_weight(mio::abm::AgeGroup::Age80plus, 2);
+    auto child = mio::abm::HouseholdMember(num_age_groups);
+    child.set_age_weight(age_group_0_to_4, 1);
+    child.set_age_weight(age_group_5_to_14, 1);
+
+    auto parent = mio::abm::HouseholdMember(num_age_groups);
+    parent.set_age_weight(age_group_15_to_34, 2);
+    parent.set_age_weight(age_group_35_to_59, 2);
+    parent.set_age_weight(age_group_60_to_79, 1);
+
+    auto other = mio::abm::HouseholdMember(num_age_groups);
+    other.set_age_weight(age_group_0_to_4, 1);
+    other.set_age_weight(age_group_5_to_14, 2);
+    other.set_age_weight(age_group_15_to_34, 3);
+    other.set_age_weight(age_group_35_to_59, 3);
+    other.set_age_weight(age_group_60_to_79, 2);
+    other.set_age_weight(age_group_80_plus, 2);
 
     //Two-Person Households
     int two_person_two_parents = (int)(0.4 * households[1]);
@@ -340,7 +350,8 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
         }
         else if (areas[loc].second == "mixed" || areas[loc].second == "mixed\r") {
             //areas of type "mixed" are equally distributed to  of location of type Home amd type Work
-            size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(std::vector<double>{1, 1});
+            size_t location_type =
+                mio::DiscreteDistribution<size_t>::get_instance()(mio::thread_local_rng(), std::vector<double>{1., 1.});
             if (location_type) {
                 locations.emplace_back(add_location(world, mio::abm::LocationType::Work, 40., 100, 2000));
             }
@@ -367,7 +378,8 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
                 }
                 else {
                     //the other areas of type 'shopping_business' are equally distributed to locations of type BasicsShop and type Work
-                    size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(std::vector<double>{1, 1});
+                    size_t location_type = mio::DiscreteDistribution<size_t>::get_instance()(
+                        mio::thread_local_rng(), std::vector<double>{1., 1.});
                     if (location_type) {
                         locations.emplace_back(add_location(world, mio::abm::LocationType::BasicsShop, 20., 100, 1000));
                     }
@@ -391,138 +403,98 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
 
 /**
  * Set infection parameters
- * @param[in, out] infection_params infection parameters 
+ * @param[in, out] infection_params infection parameters
 */
-void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_params)
+void set_infection_parameters(mio::abm::Parameters& infection_params)
 {
     infection_params.set<mio::abm::IncubationPeriod>(
-        {{mio::abm::VirusVariant::Count, mio::abm::AgeGroup::Count, mio::abm::VaccinationState::Count}, 3.});
+        {{mio::abm::VirusVariant::Count, mio::AgeGroup(num_age_groups)}, 3.});
 
     //0-4
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 2.2;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 9.2;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 2.2;
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 9.2;
+    infection_params
+        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
         10.5;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                         mio::abm::VaccinationState::Unvaccinated}]               = 5;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                        mio::abm::VaccinationState::Unvaccinated}]                = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age0to4,
-                                                      mio::abm::VaccinationState::Unvaccinated}]                  = 6;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 5;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = 5;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 6;
 
     //5-14
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        2.2;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
-        9.2;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 2.2;
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 9.2;
+    infection_params
+        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
         10.5;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                         mio::abm::VaccinationState::Unvaccinated}]                = 5;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                        mio::abm::VaccinationState::Unvaccinated}]                 = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age5to14,
-                                                      mio::abm::VaccinationState::Unvaccinated}]                   = 6;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]   = 5;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]    = 5;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]      = 6;
 
     //15-34
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        2.2;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
-        9.2;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 2.2;
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 9.2;
+    infection_params
+        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         10.5;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] = 6;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
-                                                        mio::abm::VaccinationState::Unvaccinated}]                  = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age15to34,
-                                                      mio::abm::VaccinationState::Unvaccinated}]                    = 6;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]   = 6;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]    = 5;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]      = 6;
 
     //35-59
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        2.2;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
-        9.2;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] = 6;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] = 8;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
-                                                        mio::abm::VaccinationState::Unvaccinated}]                  = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 2.2;
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 9.2;
+    infection_params
+        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 7;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        6;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 8;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]  = 5;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         17.5;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age35to59,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 16.5;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 16.5;
 
     //60-79
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        2.2;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        9.2;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] = 6;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
-        10;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
-                                                        mio::abm::VaccinationState::Unvaccinated}] = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79, mio::abm::VaccinationState::Unvaccinated}] =
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 2.2;
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 9.2;
+    infection_params
+        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 7;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        6;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 10;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]  = 5;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         17.5;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age60to79,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 16.5;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 16.5;
 
     //80+
-    infection_params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        2.2;
-    infection_params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        9.2;
-    infection_params.get<mio::abm::InfectedSymptomsToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] = 6;
-    infection_params.get<mio::abm::SevereToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        15;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
-                                                        mio::abm::VaccinationState::Unvaccinated}] = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{
-        mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus, mio::abm::VaccinationState::Unvaccinated}] =
-        12.5;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, mio::abm::AgeGroup::Age80plus,
-                                                      mio::abm::VaccinationState::Unvaccinated}] = 11;
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 2.2;
+    infection_params
+        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 9.2;
+    infection_params
+        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 7;
+    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        6;
+    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]   = 15;
+    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]    = 5;
+    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 12.5;
+    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]      = 11;
 }
 
 /**
@@ -536,9 +508,10 @@ void set_infection_parameters(mio::abm::GlobalInfectionParameters& infection_par
  * @param[in] recovered_infected percentage of infection state 'recovered of other infection state'
  * @return state drawn infection state
 */
-mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infected_no_symptoms,
-                                             ScalarType infected_symptoms, ScalarType infected_severe,
-                                             ScalarType infected_critical, ScalarType recovered)
+mio::abm::InfectionState get_infection_state(mio::abm::Person::RandomNumberGenerator& rng, ScalarType exposed,
+                                             ScalarType infected_no_symptoms, ScalarType infected_symptoms,
+                                             ScalarType infected_severe, ScalarType infected_critical,
+                                             ScalarType recovered)
 {
     ScalarType susceptible =
         1 - exposed - infected_no_symptoms - infected_symptoms - infected_severe - infected_critical - recovered;
@@ -547,7 +520,7 @@ mio::abm::InfectionState get_infection_state(ScalarType exposed, ScalarType infe
     if (weights.size() != (size_t)mio::abm::InfectionState::Count - 1) {
         mio::log_error("Initialization in ABM wrong, please correct vector length.");
     }
-    size_t state = mio::DiscreteDistribution<size_t>::get_instance()(weights);
+    size_t state = mio::DiscreteDistribution<size_t>::get_instance()(rng, weights);
     return (mio::abm::InfectionState)state;
 }
 
@@ -568,11 +541,13 @@ void assign_infection_states(mio::abm::World& world, mio::abm::TimePoint t0, Sca
 {
     auto persons = world.get_persons();
     for (auto& person : persons) {
-        auto infection_state = get_infection_state(exposed, infected_no_symptoms, infected_symptoms, infected_severe,
-                                                   infected_critical, recovered);
+        auto rng             = mio::abm::Person::RandomNumberGenerator(world.get_rng(), person);
+        auto infection_state = get_infection_state(rng, exposed, infected_no_symptoms, infected_symptoms,
+                                                   infected_severe, infected_critical, recovered);
         if (infection_state != mio::abm::InfectionState::Susceptible) {
-            person.add_new_infection(mio::abm::Infection(mio::abm::VirusVariant::Wildtype, person.get_age(),
-                                                         world.get_global_infection_parameters(), t0, infection_state),
+            person.add_new_infection(mio::abm::Infection(rng, mio::abm::VirusVariant::Wildtype, person.get_age(),
+                                                         world.parameters, t0, infection_state,
+                                                         person.get_latest_protection(), false),
                                      t0);
         }
     }
@@ -620,24 +595,24 @@ void assign_locations(mio::abm::World& world)
     auto persons = world.get_persons();
     for (auto& person : persons) {
         //assign shop
-        size_t shop = mio::DiscreteDistribution<size_t>::get_instance()(basic_shops_weights);
+        size_t shop = mio::DiscreteDistribution<size_t>::get_instance()(world.get_rng(), basic_shops_weights);
         person.set_assigned_location(basic_shops[shop]);
         //assign hospital
-        size_t hospital = mio::DiscreteDistribution<size_t>::get_instance()(hospital_weights);
+        size_t hospital = mio::DiscreteDistribution<size_t>::get_instance()(world.get_rng(), hospital_weights);
         person.set_assigned_location(hospitals[hospital]);
         //assign icu
-        size_t icu = mio::DiscreteDistribution<size_t>::get_instance()(icu_weights);
+        size_t icu = mio::DiscreteDistribution<size_t>::get_instance()(world.get_rng(), icu_weights);
         person.set_assigned_location(icus[icu]);
         //assign event
-        size_t event = mio::DiscreteDistribution<size_t>::get_instance()(social_event_weights);
+        size_t event = mio::DiscreteDistribution<size_t>::get_instance()(world.get_rng(), social_event_weights);
         person.set_assigned_location(social_events[event]);
         //assign work and school
-        if (person.get_age() == mio::abm::AgeGroup::Age5to14) {
-            size_t school = mio::DiscreteDistribution<size_t>::get_instance()(school_weights);
+        if (person.get_age() == age_group_5_to_14) {
+            size_t school = mio::DiscreteDistribution<size_t>::get_instance()(world.get_rng(), school_weights);
             person.set_assigned_location(schools[school]);
         }
-        if (person.get_age() == mio::abm::AgeGroup::Age15to34 || person.get_age() == mio::abm::AgeGroup::Age35to59) {
-            size_t work = mio::DiscreteDistribution<size_t>::get_instance()(workplaces_weights);
+        if (person.get_age() == age_group_15_to_34 || person.get_age() == age_group_35_to_59) {
+            size_t work = mio::DiscreteDistribution<size_t>::get_instance()(world.get_rng(), workplaces_weights);
             person.set_assigned_location(workplaces[work]);
         }
     }
@@ -655,6 +630,8 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
 {
     std::vector<std::pair<std::string, std::string>> areas;
     std::vector<int> inhabitants;
+    mio::unused(locationIds);
+    mio::unused(input_dir);
     // Read input file containing the locations and the number of inhabitants per location
     read_txt(areas, inhabitants, input_dir);
 
@@ -665,11 +642,8 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
     ScalarType exposed_pct = 0.005, infected_no_symptoms_pct = 0.001, infected_symptoms_pct = 0.001,
                infected_severe_pct = 0.0001, infected_critical_pct = 0.0, recovered_pct = 0.0;
     //Set global infection parameters
-    mio::abm::GlobalInfectionParameters infection_params;
-    set_infection_parameters(infection_params);
-
-    // Create the world with infection parameters.
-    auto world = mio::abm::World(infection_params);
+    auto world = mio::abm::World(num_age_groups);
+    set_infection_parameters(world.parameters);
 
     //Transform the input location to correspondin abm location
     create_locations_from_input(areas, inhabitants, world, locationIds, one_person_hh_pct, two_person_hh_pct,
@@ -678,7 +652,7 @@ mio::abm::Simulation create_sampled_simulation(const mio::abm::TimePoint& t0, co
     //Assign an infection state to every person
     assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
                             infected_severe_pct, infected_critical_pct, recovered_pct);
-    //Assign the locations to persons
+    // //Assign the locations to persons
     assign_locations(world);
 
     auto sim = mio::abm::Simulation(t0, std::move(world));
@@ -773,6 +747,7 @@ void write_location_mapping_to_file(std::string path, std::vector<LocationMappin
 
 mio::IOResult<void> run(const fs::path& input_dir)
 {
+    mio::unused(input_dir);
     auto t0   = mio::abm::TimePoint(0); // Start time per simulation
     auto tmax = mio::abm::TimePoint(0) + mio::abm::days(14); // End time per simulation
 
@@ -787,25 +762,25 @@ mio::IOResult<void> run(const fs::path& input_dir)
     //advance until tmax
     sim.advance(tmax, history);
 
-    //output
-    auto logg = history.get_log();
-    write_results_to_file("output_abm_demonstrator.txt", logg);
-    write_location_mapping_to_file("location_mapping.txt", LocationIds);
-
-    std::cout << "# t S E C I I_s I_c R_C R_I D\n";
-    for (auto i = 0; i < sim.get_result().get_num_time_points(); ++i) {
-        std::cout << sim.get_result().get_time(i) << " ";
-        auto v = sim.get_result().get_value(i);
-        for (auto j = 0; j < v.size(); ++j) {
-            std::cout << v[j] << " ";
-            if (j < v.size() - 1) {
-                std::cout << " ";
-            }
-        }
-        if (i < sim.get_result().get_num_time_points() - 1) {
-            std::cout << "\n";
-        }
-    }
+    // //output
+    // auto logg = history.get_log();
+    // write_results_to_file("output_abm_demonstrator.txt", logg);
+    // write_location_mapping_to_file("location_mapping.txt", LocationIds);
+
+    // std::cout << "# t S E C I I_s I_c R_C R_I D\n";
+    // for (auto i = 0; i < sim.get_result().get_num_time_points(); ++i) {
+    //     std::cout << sim.get_result().get_time(i) << " ";
+    //     auto v = sim.get_result().get_value(i);
+    //     for (auto j = 0; j < v.size(); ++j) {
+    //         std::cout << v[j] << " ";
+    //         if (j < v.size() - 1) {
+    //             std::cout << " ";
+    //         }
+    //     }
+    //     if (i < sim.get_result().get_num_time_points() - 1) {
+    //         std::cout << "\n";
+    //     }
+    // }
 
     return mio::success();
 }

From 71e1303dc538ac23564f082ce70e9267582c242f Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 22 Mar 2024 14:25:17 +0100
Subject: [PATCH 072/103] fix bindings

---
 .../memilio/simulation/abm.cpp                | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index f5b1f06f9d..132f82d266 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -25,6 +25,7 @@
 //#include "memilio/utils/history.h"
 #include "abm/abm.h"
 #include "abm/household.h"
+#include "abm/vaccine.h"
 #include "pybind11/attr.h"
 #include "pybind11/cast.h"
 #include "pybind11/pybind11.h"
@@ -80,7 +81,7 @@ PYBIND11_MODULE(_simulation_abm, m)
         .value("InfectedSymptoms", mio::abm::InfectionState::InfectedSymptoms)
         .value("InfectedSevere", mio::abm::InfectionState::InfectedSevere)
         .value("InfectedCritical", mio::abm::InfectionState::InfectedCritical)
-        .value("Recovered", mio::abm::InfectionState::Recovered)        
+        .value("Recovered", mio::abm::InfectionState::Recovered)
         .value("Dead", mio::abm::InfectionState::Dead)
         .value("Count", mio::abm::InfectionState::Count);
 
@@ -183,7 +184,7 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def_property_readonly("is_in_quarantine", &mio::abm::Person::is_in_quarantine);
 
     py::class_<mio::abm::HouseholdMember>(m, "HouseholdMember")
-        .def(py::init<>())
+        .def(py::init<int>())
         .def("set_age_weight", &mio::abm::HouseholdMember::set_age_weight);
 
     py::class_<mio::abm::Household>(m, "Household")
@@ -217,22 +218,18 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def_readwrite("time", &mio::abm::Vaccination::time);
 
     py::class_<mio::abm::TestingStrategy>(m, "TestingStrategy")
-                .def(py::init<const std::unordered_map<mio::abm::LocationId, std::vector<mio::abm::TestingScheme>>&>());
-
-    py::class_<mio::abm::Infection>(m, "Infection")
-        .def(py::init<mio::abm::VirusVariant, mio::abm::AgeGroup, const mio::abm::GlobalInfectionParameters&,
-                      mio::abm::TimePoint, mio::abm::InfectionState, bool>());
+        .def(py::init<const std::unordered_map<mio::abm::LocationId, std::vector<mio::abm::TestingScheme>>&>());
 
     py::class_<mio::abm::Infection>(m, "Infection")
-        .def(py::init<mio::abm::VirusVariant, mio::abm::AgeGroup, const mio::abm::GlobalInfectionParameters&,
-                      mio::abm::TimePoint, mio::abm::InfectionState, bool>());
+        .def(py::init<mio::abm::Person::RandomNumberGenerator&, mio::abm::VirusVariant, mio::AgeGroup,
+                      const mio::abm::Parameters&, mio::abm::TimePoint, mio::abm::InfectionState,
+                      std::pair<mio::abm::ExposureType, mio::abm::TimePoint>, bool>());
 
     py::class_<mio::abm::Location>(m, "Location")
         .def("set_capacity", &mio::abm::Location::set_capacity)
         .def_property_readonly("type", &mio::abm::Location::get_type)
         .def_property_readonly("index", &mio::abm::Location::get_index)
-        .def_property_readonly("population", &mio::abm::Location::get_subpopulations,
-                               py::return_value_policy::reference_internal)
+        .def_property_readonly("population", &mio::abm::Location::get_subpopulation)
         .def_property("infection_parameters",
                       py::overload_cast<>(&mio::abm::Location::get_infection_parameters, py::const_),
                       [](mio::abm::Location& self, mio::abm::LocalInfectionParameters params) {
@@ -289,10 +286,9 @@ PYBIND11_MODULE(_simulation_abm, m)
 
     m.def(
         "set_viral_load_parameters",
-        [](mio::abm::GlobalInfectionParameters& infection_params, mio::abm::VirusVariant variant,
-           mio::abm::AgeGroup age, mio::abm::VaccinationState state, double min_peak, double max_peak,
-           double min_incline, double max_incline, double min_decline, double max_decline) {
-            infection_params.get<mio::abm::ViralLoadDistributions>()[{variant, age, state}] =
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double min_peak,
+           double max_peak, double min_incline, double max_incline, double min_decline, double max_decline) {
+            infection_params.get<mio::abm::ViralLoadDistributions>()[{variant, age}] =
                 mio::abm::ViralLoadDistributionsParameters{
                     {min_peak, max_peak}, {min_incline, max_incline}, {min_decline, max_decline}};
         },
@@ -300,8 +296,8 @@ PYBIND11_MODULE(_simulation_abm, m)
 
     m.def(
         "set_infectivity_parameters",
-        [](mio::abm::GlobalInfectionParameters& infection_params, mio::abm::VirusVariant variant,
-           mio::abm::AgeGroup age, double min_alpha, double max_alpha, double min_beta, double max_beta) {
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double min_alpha,
+           double max_alpha, double min_beta, double max_beta) {
             infection_params.get<mio::abm::InfectivityDistributions>()[{variant, age}] =
                 mio::abm::InfectivityDistributionsParameters{{min_alpha, max_alpha}, {min_beta, max_beta}};
         },
@@ -319,7 +315,7 @@ PYBIND11_MODULE(_simulation_abm, m)
              &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
                                                          LogPersonsPerLocationAndInfectionTime>>)
         //.def("advance", &mio::abm::Simulation::advance)
-        .def_property_readonly("result", &mio::abm::Simulation::get_result)
+        //.def_property_readonly("result", &mio::abm::Simulation::get_result)
         .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world),
                                py::return_value_policy::reference_internal);
 
@@ -333,5 +329,5 @@ PYBIND11_MODULE(_simulation_abm, m)
         });
 }
 
-PYMIO_IGNORE_VALUE_TYPE(decltype(std::declval<mio::abm::World>().get_locations()))
-PYMIO_IGNORE_VALUE_TYPE(decltype(std::declval<mio::abm::World>().get_persons()))
+// PYMIO_IGNORE_VALUE_TYPE(decltype(std::declval<mio::abm::World>().get_locations()))
+// PYMIO_IGNORE_VALUE_TYPE(decltype(std::declval<mio::abm::World>().get_persons()))

From 5f37103ab7d1de9f381ab2519b490891d834ea7c Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 27 Mar 2024 16:06:06 +0100
Subject: [PATCH 073/103] introduce parameter distributions

---
 cpp/memilio/utils/random_number_generator.h   |  18 +-
 cpp/models/abm/analyze_result.h               | 123 +++++-
 cpp/models/abm/infection.cpp                  | 135 +++---
 cpp/models/abm/parameters.h                   | 395 ++++++++++++------
 cpp/simulations/abm.cpp                       | 200 ++++-----
 cpp/simulations/abm_INSIDe_demonstrator.cpp   | 147 ++++---
 cpp/simulations/abm_braunschweig.cpp          | 255 ++++++-----
 cpp/tests/test_abm_infection.cpp              |   9 +-
 cpp/tests/test_abm_location.cpp               |   4 +-
 cpp/tests/test_abm_person.cpp                 |   8 +-
 cpp/tests/test_abm_world.cpp                  | 106 ++---
 cpp/tests/test_analyze_result.cpp             |  72 ++--
 .../ABM Demonstrator/abm_demonstrator.py      | 385 ++++++++---------
 .../memilio/simulation/abm.cpp                |  17 +-
 14 files changed, 1082 insertions(+), 792 deletions(-)

diff --git a/cpp/memilio/utils/random_number_generator.h b/cpp/memilio/utils/random_number_generator.h
index c5883e7465..74e28ed53d 100644
--- a/cpp/memilio/utils/random_number_generator.h
+++ b/cpp/memilio/utils/random_number_generator.h
@@ -182,7 +182,9 @@ static_assert(sizeof(Key<uint32_t>) == sizeof(uint32_t), "Empty Base Optimizatio
 * @tparam an unsigned integer type that determines the size of the counter, i.e., the length of the random sequence.
 */
 template <class T>
-struct MEMILIO_ENABLE_EBO Counter : TypeSafe<T, Counter<T>>, OperatorComparison<Counter<T>>, OperatorAdditionSubtraction<Counter<T>> {
+struct MEMILIO_ENABLE_EBO Counter : TypeSafe<T, Counter<T>>,
+                                    OperatorComparison<Counter<T>>,
+                                    OperatorAdditionSubtraction<Counter<T>> {
     static_assert(std::is_unsigned<T>::value, "Underlying Integer type must be unsigned.");
     using TypeSafe<T, Counter<T>>::TypeSafe;
 };
@@ -243,12 +245,13 @@ Counter<UIntC> rng_totalsequence_counter(UIntN subsequence_idx, CounterS counter
     static_assert(N_BITS <= C_BITS, "Subsequence index must not be bigger than total sequence counter.");
     static_assert(N_BITS <= sizeof(UIntN) * BITS_PER_BYTE, "Subsequence index must be at least N bits");
 
-    assert(UIntC(subsequence_idx) <= (UIntC(1) << N_BITS) && "Subsequence index is too large."); //(1 << N) is the same as (2^N)
+    assert(UIntC(subsequence_idx) <= (UIntC(1) << N_BITS) &&
+           "Subsequence index is too large."); //(1 << N) is the same as (2^N)
 
     //N high bits: subsequence idx
     //S low bits: subsequence counter
     //=> C = N + S bits: total sequence counter
-    //example: 
+    //example:
     //subsequence index uint32_t(181) = 0x000000B5
     //subsequence counter uint32_t(41309) = 0x0000A15D
     //total sequence counter = 0x000000B50000A15D
@@ -271,7 +274,7 @@ Counter<UIntC> rng_totalsequence_counter(UIntN subsequence_idx, CounterS counter
 template <class UIntS, class CounterC>
 Counter<UIntS> rng_subsequence_counter(CounterC counter)
 {
-    using UIntC = typename CounterC::ValueType;
+    using UIntC                = typename CounterC::ValueType;
     static const UIntC C_BYTES = sizeof(UIntC);
     static const UIntC S_BYTES = sizeof(UIntS);
 
@@ -673,6 +676,13 @@ using UniformDistribution = DistributionAdapter<std::uniform_real_distribution<R
 template <class Int>
 using PoissonDistribution = DistributionAdapter<std::poisson_distribution<Int>>;
 
+/**
+ * adapted lognormal_distribution.
+ * @see DistributionAdapter
+ */
+template <class Real>
+using LogNormalDistribution = DistributionAdapter<std::lognormal_distribution<Real>>;
+
 } // namespace mio
 
 #endif
diff --git a/cpp/models/abm/analyze_result.h b/cpp/models/abm/analyze_result.h
index 0e93be84a9..745f52379e 100644
--- a/cpp/models/abm/analyze_result.h
+++ b/cpp/models/abm/analyze_result.h
@@ -62,39 +62,128 @@ std::vector<Model> ensemble_params_percentile(const std::vector<std::vector<Mode
 
     for (size_t node = 0; node < num_nodes; node++) {
         for (auto age_group = AgeGroup(0); age_group < AgeGroup(num_groups); age_group++) {
-            for (auto virus_variant = VirusVariant(0); virus_variant < VirusVariant::Count;
-                 virus_variant      = static_cast<VirusVariant>((uint32_t)virus_variant + 1)) {
+            for (auto virus_variant : enum_members<VirusVariant>()) {
                 // Global infection parameters
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<IncubationPeriod>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<IncubationPeriod>()[{virus_variant, age_group}].params.m();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<IncubationPeriod>()[{virus_variant, age_group}].params.s();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedNoSymptomsToSymptoms>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedNoSymptomsToSymptoms>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedNoSymptomsToRecovered>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedNoSymptomsToRecovered>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSymptomsToSevere>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSymptomsToSevere>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSymptomsToRecovered>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSymptomsToRecovered>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<InfectedNoSymptomsToSymptoms>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSevereToCritical>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<InfectedNoSymptomsToRecovered>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSevereToCritical>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<InfectedSymptomsToRecovered>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSevereToRecovered>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<InfectedSymptomsToSevere>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedSevereToRecovered>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<SevereToCritical>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedCriticalToDead>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<SevereToRecovered>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedCriticalToDead>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<CriticalToDead>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedCriticalToRecovered>()[{virus_variant, age_group}]
+                            .params.m();
+                    return result;
                 });
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<CriticalToRecovered>()[{virus_variant, age_group}];
+                    static auto result =
+                        model.parameters.template get<TimeInfectedCriticalToRecovered>()[{virus_variant, age_group}]
+                            .params.s();
+                    return result;
                 });
+
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
-                    return model.parameters.template get<RecoveredToSusceptible>()[{virus_variant, age_group}];
+                    return model.parameters.template get<SymptomsPerInfectedNoSymptoms>()[{virus_variant, age_group}];
                 });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    return model.parameters.template get<SeverePerInfectedSymptoms>()[{virus_variant, age_group}];
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    return model.parameters.template get<CriticalPerInfectedSevere>()[{virus_variant, age_group}];
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    return model.parameters.template get<DeathsPerInfectedCritical>()[{virus_variant, age_group}];
+                });
+
                 param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
                     return model.parameters.template get<DetectInfection>()[{virus_variant, age_group}];
                 });
@@ -158,6 +247,16 @@ std::vector<Model> ensemble_params_percentile(const std::vector<std::vector<Mode
                             .infectivity_beta.params.b();
                     return result;
                 });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<VirusShedFactor>()[{virus_variant, age_group}].params.a();
+                    return result;
+                });
+                param_percentil(node, [age_group, virus_variant](auto&& model) -> auto& {
+                    static auto result =
+                        model.parameters.template get<VirusShedFactor>()[{virus_variant, age_group}].params.b();
+                    return result;
+                });
                 param_percentil(node, [virus_variant](auto&& model) -> auto& {
                     return model.parameters.template get<AerosolTransmissionRates>()[{virus_variant}];
                 });
diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 5e1e26c547..aa50ba332f 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -151,6 +151,8 @@ void Infection::draw_infection_course_forward(Person::RandomNumberGenerator& rng
     assert(age.get() < params.get_num_groups());
     auto t = init_date;
     TimeSpan time_period{}; // time period for current infection state
+    auto time_in_state = params.get<IncubationPeriod>()[{
+        m_virus_variant, age}]; // time distribution parameters for current infection state
     InfectionState next_state{start_state}; // next state to enter
     m_infection_course.push_back(std::pair<TimePoint, InfectionState>(t, next_state));
     auto& uniform_dist = UniformDistribution<double>::get_instance();
@@ -159,28 +161,29 @@ void Infection::draw_infection_course_forward(Person::RandomNumberGenerator& rng
         switch (next_state) {
         case InfectionState::Exposed:
             // roll out how long until infected without symptoms
-            time_period = days(params.get<IncubationPeriod>()[{m_virus_variant, age}]); // subject to change
-            next_state  = InfectionState::InfectedNoSymptoms;
+            time_in_state = params.get<IncubationPeriod>()[{m_virus_variant, age}];
+            time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+            next_state    = InfectionState::InfectedNoSymptoms;
             break;
         case InfectionState::InfectedNoSymptoms:
             // roll out next infection step
             v = uniform_dist(rng);
-            if (v < 0.79) { // TODO: subject to change
-                time_period =
-                    days(params.get<InfectedNoSymptomsToSymptoms>()[{m_virus_variant, age}]); // TODO: subject to change
-                next_state = InfectionState::InfectedSymptoms;
+            if (v < params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}]) {
+                time_in_state = params.get<TimeInfectedNoSymptomsToSymptoms>()[{m_virus_variant, age}];
+                time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                next_state    = InfectionState::InfectedSymptoms;
             }
             else {
-                time_period = days(
-                    params.get<InfectedNoSymptomsToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
-                next_state = InfectionState::Recovered;
+                time_in_state = params.get<TimeInfectedNoSymptomsToRecovered>()[{m_virus_variant, age}];
+                time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                next_state    = InfectionState::Recovered;
             }
 
             break;
         case InfectionState::InfectedSymptoms:
             // roll out next infection step
             {
-                ScalarType severity_protection_factor = 0.5;
+                ScalarType severity_protection_factor = 0.; //CHANGED
                 if (latest_exposure.first != ExposureType::NoProtection) {
                     severity_protection_factor =
                         params.get<SeverityProtectionFactor>()[{latest_exposure.first, age, m_virus_variant}](
@@ -188,41 +191,45 @@ void Infection::draw_infection_course_forward(Person::RandomNumberGenerator& rng
                 }
                 // roll out next infection step
                 v = uniform_dist(rng);
-                if (v < (1 - severity_protection_factor) * 0.08) { // TODO: subject to change
-                    time_period =
-                        days(params.get<InfectedSymptomsToSevere>()[{m_virus_variant, age}]); // TODO: subject to change
-                    next_state = InfectionState::InfectedSevere;
+                if (v < (1 - severity_protection_factor) *
+                            params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}]) {
+                    time_in_state = params.get<TimeInfectedSymptomsToSevere>()[{m_virus_variant, age}];
+                    time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                    next_state    = InfectionState::InfectedSevere;
                 }
                 else {
-                    time_period = days(
-                        params.get<InfectedSymptomsToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
-                    next_state = InfectionState::Recovered;
+                    time_in_state = params.get<TimeInfectedSymptomsToRecovered>()[{m_virus_variant, age}];
+                    time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                    next_state    = InfectionState::Recovered;
                 }
                 break;
             }
         case InfectionState::InfectedSevere:
             // roll out next infection step
             v = uniform_dist(rng);
-            if (v < 0.18) { // TODO: subject to change
-                time_period = days(params.get<SevereToCritical>()[{m_virus_variant, age}]); // TODO: subject to change
-                next_state  = InfectionState::InfectedCritical;
+            if (v < params.get<CriticalPerInfectedSevere>()[{m_virus_variant, age}]) {
+                time_in_state = params.get<TimeInfectedSevereToCritical>()[{m_virus_variant, age}];
+                time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                next_state    = InfectionState::InfectedCritical;
             }
             else {
-                time_period = days(params.get<SevereToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
-                next_state  = InfectionState::Recovered;
+                time_in_state = params.get<TimeInfectedSevereToRecovered>()[{m_virus_variant, age}];
+                time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                next_state    = InfectionState::Recovered;
             }
             break;
         case InfectionState::InfectedCritical:
             // roll out next infection step
             v = uniform_dist(rng);
-            if (v < 0.22) { // TODO: subject to change
-                time_period = days(params.get<CriticalToDead>()[{m_virus_variant, age}]); // TODO: subject to change
-                next_state  = InfectionState::Dead;
+            if (v < params.get<DeathsPerInfectedCritical>()[{m_virus_variant, age}]) {
+                time_in_state = params.get<TimeInfectedCriticalToDead>()[{m_virus_variant, age}];
+                time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                next_state    = InfectionState::Dead;
             }
             else {
-                time_period =
-                    days(params.get<CriticalToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
-                next_state = InfectionState::Recovered;
+                time_in_state = params.get<TimeInfectedCriticalToRecovered>()[{m_virus_variant, age}];
+                time_period   = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
+                next_state    = InfectionState::Recovered;
             }
             break;
         default:
@@ -239,6 +246,8 @@ TimePoint Infection::draw_infection_course_backward(Person::RandomNumberGenerato
 {
     auto start_date = init_date;
     TimeSpan time_period{}; // time period for current infection state
+    auto time_in_state = params.get<IncubationPeriod>()[{
+        m_virus_variant, age}]; // time distribution parameters for current infection state
     InfectionState previous_state{init_state}; // next state to enter
     auto& uniform_dist = UniformDistribution<double>::get_instance();
     ScalarType v; // random draws
@@ -246,56 +255,68 @@ TimePoint Infection::draw_infection_course_backward(Person::RandomNumberGenerato
     while ((previous_state != InfectionState::Exposed)) {
         switch (previous_state) {
 
-        case InfectionState::InfectedNoSymptoms:
-            time_period    = days(params.get<IncubationPeriod>()[{m_virus_variant, age}]); // TODO: subject to change
+        case InfectionState::InfectedNoSymptoms: {
+            time_in_state  = params.get<IncubationPeriod>()[{m_virus_variant, age}];
+            time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
             previous_state = InfectionState::Exposed;
-            break;
+        } break;
 
-        case InfectionState::InfectedSymptoms:
-            time_period =
-                days(params.get<InfectedNoSymptomsToSymptoms>()[{m_virus_variant, age}]); // TODO: subject to change
+        case InfectionState::InfectedSymptoms: {
+            time_in_state  = params.get<TimeInfectedNoSymptomsToSymptoms>()[{m_virus_variant, age}];
+            time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
             previous_state = InfectionState::InfectedNoSymptoms;
-            break;
+        } break;
 
-        case InfectionState::InfectedSevere:
-            time_period =
-                days(params.get<InfectedSymptomsToSevere>()[{m_virus_variant, age}]); // TODO: subject to change
+        case InfectionState::InfectedSevere: {
+            time_in_state  = params.get<TimeInfectedSymptomsToSevere>()[{m_virus_variant, age}];
+            time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
             previous_state = InfectionState::InfectedSymptoms;
-            break;
+        } break;
 
-        case InfectionState::InfectedCritical:
-            time_period    = days(params.get<SevereToCritical>()[{m_virus_variant, age}]); // TODO: subject to change
+        case InfectionState::InfectedCritical: {
+            time_in_state  = params.get<TimeInfectedSevereToCritical>()[{m_virus_variant, age}];
+            time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
             previous_state = InfectionState::InfectedSevere;
-            break;
+        } break;
 
-        case InfectionState::Recovered:
+        case InfectionState::Recovered: {
             // roll out next infection step
             v = uniform_dist(rng);
-            if (v < 0.25) {
-                time_period = days(
-                    params.get<InfectedNoSymptomsToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
+            // compute correct probabilities while factoring out the chance to die
+            auto p_death = params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}] *
+                           params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}] *
+                           params.get<CriticalPerInfectedSevere>()[{m_virus_variant, age}] *
+                           params.get<DeathsPerInfectedCritical>()[{m_virus_variant, age}];
+            if (v > (1 - params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}]) / (1 - p_death)) {
+                time_in_state  = params.get<TimeInfectedNoSymptomsToRecovered>()[{m_virus_variant, age}];
+                time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
                 previous_state = InfectionState::InfectedNoSymptoms;
             }
-            else if (v < 0.5) { // TODO: subject to change
-                time_period =
-                    days(params.get<InfectedSymptomsToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
+            else if (v > params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}] *
+                             (1 - params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}]) / (1 - p_death)) {
+                time_in_state  = params.get<TimeInfectedSymptomsToRecovered>()[{m_virus_variant, age}];
+                time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
                 previous_state = InfectionState::InfectedSymptoms;
             }
-            else if (v < 0.75) {
-                time_period = days(params.get<SevereToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
+            else if (v > params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}] *
+                             params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}] *
+                             (1 - params.get<CriticalPerInfectedSevere>()[{m_virus_variant, age}]) / (1 - p_death)) {
+                time_in_state  = params.get<TimeInfectedSevereToRecovered>()[{m_virus_variant, age}];
+                time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
                 previous_state = InfectionState::InfectedSevere;
             }
             else {
-                time_period =
-                    days(params.get<CriticalToRecovered>()[{m_virus_variant, age}]); // TODO: subject to change
+                time_in_state  = params.get<TimeInfectedCriticalToRecovered>()[{m_virus_variant, age}];
+                time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
                 previous_state = InfectionState::InfectedCritical;
             }
-            break;
+        } break;
 
-        case InfectionState::Dead:
-            time_period    = days(params.get<CriticalToDead>()[{m_virus_variant, age}]); // TODO: subject to change
+        case InfectionState::Dead: {
+            time_in_state  = params.get<TimeInfectedCriticalToDead>()[{m_virus_variant, age}];
+            time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
             previous_state = InfectionState::InfectedCritical;
-            break;
+        } break;
 
         default:
             break;
diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index 6460777b30..fd88a316bf 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -1,7 +1,7 @@
 /* 
 * Copyright (C) 2020-2024 MEmilio
 *
-* Authors: Daniel Abele, Elisabeth Kluth, Khoa Nguyen
+* Authors: Daniel Abele, Elisabeth Kluth, Khoa Nguyen, David Kerkmann
 *
 * Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de>
 *
@@ -32,21 +32,24 @@
 #include "memilio/epidemiology/damping.h"
 #include "memilio/epidemiology/contact_matrix.h"
 #include <limits>
-#include <set>
+#include <unordered_set>
 
 namespace mio
 {
 namespace abm
 {
 
+// Distribution that can be used for the time spend in InfectionStates
+using InfectionStateTimesDistributionsParameters = LogNormalDistribution<double>::ParamType;
+
 /**
- * @brief Time that a Person is infected but not yet infectious.
+ * @brief Time that a Person is infected but not yet infectious in day unit
  */
 struct IncubationPeriod {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
     }
     static std::string name()
     {
@@ -54,113 +57,187 @@ struct IncubationPeriod {
     }
 };
 
-struct InfectedNoSymptomsToSymptoms {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+/**
+* @brief Time that a Person is infected but presymptomatic in day unit
+*/
+struct TimeInfectedNoSymptomsToSymptoms {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
     }
     static std::string name()
     {
-        return "InfectedNoSymptomsToSymptoms";
+        return "TimeInfectedNoSymptomsToSymptoms";
     }
 };
 
-struct InfectedNoSymptomsToRecovered {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+/**
+* @brief Time that a Person is infected when staying asymptomatic in day unit
+*/
+struct TimeInfectedNoSymptomsToRecovered {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
     }
     static std::string name()
     {
-        return "InfectedNoSymptomsToRecovered";
+        return "TimeInfectedNoSymptomsToRecovered";
     }
 };
 
-struct InfectedSymptomsToRecovered {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+/**
+* @brief Time that a Person is infected and symptomatic but
+*        who do not need to be hospitalized yet in day unit
+*/
+struct TimeInfectedSymptomsToSevere {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
     }
     static std::string name()
     {
-        return "InfectedSymptomsToRecovered";
+        return "TimeInfectedSymptomsToSevere";
     }
 };
 
-struct InfectedSymptomsToSevere {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+/**
+* @brief Time that a Person is infected and symptomatic who will recover in day unit
+*/
+struct TimeInfectedSymptomsToRecovered {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
     }
     static std::string name()
     {
-        return "InfectedSymptomsToSevere";
+        return "TimeInfectedSymptomsToRecovered";
     }
 };
 
-struct SevereToCritical {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+/**
+ * @brief Time that a Person is infected and 'simply' hospitalized before becoming critical in day unit
+ */
+struct TimeInfectedSevereToCritical {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
     }
     static std::string name()
     {
-        return "SevereToCritical";
+        return "TimeInfectedSevereToCritical";
     }
 };
 
-struct SevereToRecovered {
+/**
+ * @brief Time that a Person is infected and 'simply' hospitalized before recovering in day unit
+ */
+struct TimeInfectedSevereToRecovered {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
+    static Type get_default(AgeGroup size)
+    {
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
+    }
+    static std::string name()
+    {
+        return "TimeInfectedSevereToRecovered";
+    }
+};
+
+/**
+ * @brief Time that a Person is treated by ICU before dying in day unit
+ */
+struct TimeInfectedCriticalToDead {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
+    static Type get_default(AgeGroup size)
+    {
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
+    }
+    static std::string name()
+    {
+        return "TimeInfectedCriticalToDead";
+    }
+};
+
+/**
+ * @brief Time that a Person is treated by ICU before recovering in day unit
+ */
+struct TimeInfectedCriticalToRecovered {
+    using Type = CustomIndexArray<InfectionStateTimesDistributionsParameters, VirusVariant, AgeGroup>;
+    static Type get_default(AgeGroup size)
+    {
+        return Type({VirusVariant::Count, size}, InfectionStateTimesDistributionsParameters{1., 1.});
+    }
+    static std::string name()
+    {
+        return "TimeInfectedCriticalToRecovered";
+    }
+};
+
+/**
+* @brief the percentage of symptomatic cases
+*/
+struct SymptomsPerInfectedNoSymptoms {
     using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, .5);
     }
     static std::string name()
     {
-        return "SevereToRecovered";
+        return "SymptomaticPerInfectedNoSymptoms";
     }
 };
 
-struct CriticalToRecovered {
+/**
+* @brief the percentage of hospitalized cases per infected cases
+*/
+struct SeverePerInfectedSymptoms {
     using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, .5);
     }
     static std::string name()
     {
-        return "CriticalToRecovered";
+        return "SeverePerInfectedSymptoms";
     }
 };
 
-struct CriticalToDead {
+/**
+* @brief the percentage of ICU cases per hospitalized cases
+*/
+struct CriticalPerInfectedSevere {
     using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, .5);
     }
     static std::string name()
     {
-        return "CriticalToDead";
+        return "CriticalPerInfectedSevere";
     }
 };
 
-struct RecoveredToSusceptible {
+/**
+* @brief the percentage of dead cases per ICU cases
+*/
+struct DeathsPerInfectedCritical {
     using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
-        return Type({VirusVariant::Count, size}, 1.);
+        return Type({VirusVariant::Count, size}, .5);
     }
     static std::string name()
     {
-        return "RecoveredToSusceptible";
+        return "DeathsPerInfectedCritical";
     }
 };
+
 /**
  * @brief Parameters for the ViralLoad course. Default values taken as constant values from the average from
  * https://github.com/VirologyCharite/SARS-CoV-2-VL-paper/tree/main
@@ -208,6 +285,22 @@ struct InfectivityDistributions {
     }
 };
 
+/**
+ * @brief Individual virus shed factor to account for variability in infectious viral load spread.
+*/
+struct VirusShedFactor {
+    using Type = CustomIndexArray<UniformDistribution<double>::ParamType, VirusVariant, AgeGroup>;
+    static Type get_default(AgeGroup size)
+    {
+        Type default_val({VirusVariant::Count, size}, UniformDistribution<double>::ParamType{0., 0.28});
+        return default_val;
+    }
+    static std::string name()
+    {
+        return "VirusShedFactor";
+    }
+};
+
 /**
  * @brief Probability that an Infection is detected.
  */
@@ -335,7 +428,7 @@ struct AntigenTest : public GenericTest {
     using Type = TestParameters;
     static Type get_default()
     {
-        return Type{0.8, 0.88};
+        return Type{0.69, 0.99};
     }
     static std::string name()
     {
@@ -350,7 +443,7 @@ struct PCRTest : public GenericTest {
     using Type = TestParameters;
     static Type get_default()
     {
-        return Type{0.9, 0.99};
+        return Type{0.99, 0.99};
     }
     static std::string name()
     {
@@ -363,7 +456,7 @@ struct PCRTest : public GenericTest {
  */
 struct LockdownDate {
     using Type = TimePoint;
-    static auto get_default(AgeGroup /*size*/)
+    static auto get_default()
     {
         return TimePoint(std::numeric_limits<int>::max());
     }
@@ -543,14 +636,31 @@ struct AgeGroupGotoWork {
     }
 };
 
+/**
+ * @brief The set of Agent Ids to be logged.
+ */
+struct LogAgentIds {
+    using Type = std::unordered_set<uint32_t>;
+    static Type get_default(AgeGroup /*num_agegroups*/)
+    {
+        return {};
+    }
+    static std::string name()
+    {
+        return "LogAgentIds";
+    }
+};
+
 using ParametersBase =
-    ParameterSet<IncubationPeriod, InfectedNoSymptomsToSymptoms, InfectedNoSymptomsToRecovered,
-                 InfectedSymptomsToRecovered, InfectedSymptomsToSevere, SevereToCritical, SevereToRecovered,
-                 CriticalToDead, CriticalToRecovered, RecoveredToSusceptible, ViralLoadDistributions,
-                 InfectivityDistributions, DetectInfection, MaskProtection, AerosolTransmissionRates, LockdownDate,
-                 QuarantineDuration, SocialEventRate, BasicShoppingRate, WorkRatio, SchoolRatio, GotoWorkTimeMinimum,
-                 GotoWorkTimeMaximum, GotoSchoolTimeMinimum, GotoSchoolTimeMaximum, AgeGroupGotoSchool,
-                 AgeGroupGotoWork, InfectionProtectionFactor, SeverityProtectionFactor, HighViralLoadProtectionFactor>;
+    ParameterSet<IncubationPeriod, TimeInfectedNoSymptomsToSymptoms, TimeInfectedNoSymptomsToRecovered,
+                 TimeInfectedSymptomsToSevere, TimeInfectedSymptomsToRecovered, TimeInfectedSevereToCritical,
+                 TimeInfectedSevereToRecovered, TimeInfectedCriticalToDead, TimeInfectedCriticalToRecovered,
+                 SymptomsPerInfectedNoSymptoms, SeverePerInfectedSymptoms, CriticalPerInfectedSevere,
+                 DeathsPerInfectedCritical, ViralLoadDistributions, InfectivityDistributions, VirusShedFactor,
+                 DetectInfection, MaskProtection, AerosolTransmissionRates, LockdownDate, QuarantineDuration,
+                 SocialEventRate, BasicShoppingRate, WorkRatio, SchoolRatio, GotoWorkTimeMinimum, GotoWorkTimeMaximum,
+                 GotoSchoolTimeMinimum, GotoSchoolTimeMaximum, AgeGroupGotoSchool, AgeGroupGotoWork,
+                 InfectionProtectionFactor, SeverityProtectionFactor, HighViralLoadProtectionFactor, LogAgentIds>;
 
 /**
  * @brief Maximum number of Person%s an infectious Person can infect at the respective Location.
@@ -616,76 +726,127 @@ class Parameters : public ParametersBase
     bool check_constraints() const
     {
         for (auto i = AgeGroup(0); i < AgeGroup(m_num_groups); ++i) {
-
-            if (this->get<IncubationPeriod>()[{VirusVariant::Wildtype, i}] < 0) {
-                log_error("Constraint check: Parameter IncubationPeriod of age group {:.0f} smaller than {:.4f}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<InfectedNoSymptomsToSymptoms>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter InfectedNoSymptomsToSymptoms of age group {:.0f} smaller "
-                          "than {:d}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<InfectedNoSymptomsToRecovered>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter InfectedNoSymptomsToRecovered of age group {:.0f} smaller "
-                          "than {:d}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<InfectedSymptomsToRecovered>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error(
-                    "Constraint check: Parameter InfectedSymptomsToRecovered of age group {:.0f} smaller than {:d}",
-                    (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<InfectedSymptomsToSevere>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter InfectedSymptomsToSevere of age group {:.0f} smaller than {:d}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<SevereToCritical>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter SevereToCritical of age group {:.0f} smaller than {:d}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<SevereToRecovered>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter SevereToRecovered of age group {:.0f} smaller than {:d}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<CriticalToDead>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter CriticalToDead of age group {:.0f} smaller than {:d}", (size_t)i,
-                          0);
-                return true;
-            }
-
-            if (this->get<CriticalToRecovered>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter CriticalToRecovered of age group {:.0f} smaller than {:d}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<RecoveredToSusceptible>()[{VirusVariant::Wildtype, i}] < 0.0) {
-                log_error("Constraint check: Parameter RecoveredToSusceptible of age group {:.0f} smaller than {:d}",
-                          (size_t)i, 0);
-                return true;
-            }
-
-            if (this->get<DetectInfection>()[{VirusVariant::Wildtype, i}] < 0.0 ||
-                this->get<DetectInfection>()[{VirusVariant::Wildtype, i}] > 1.0) {
-                log_error("Constraint check: Parameter DetectInfection of age group {:.0f} smaller than {:d} or "
-                          "larger than {:d}",
-                          (size_t)i, 0, 1);
-                return true;
+            for (auto&& v : enum_members<VirusVariant>()) {
+
+                if (this->get<IncubationPeriod>()[{v, i}].params.m() < 0) {
+                    log_error("Constraint check: Lower end of parameter range IncubationPeriod of virus variant {} and "
+                              "age group {:.0f} smaller "
+                              "than {:.4f}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedNoSymptomsToSymptoms>()[{v, i}].params.m() < 0.0) {
+                    log_error("Constraint check: Lower end of parameter range TimeInfectedNoSymptomsToSymptoms "
+                              "of virus variant "
+                              "{} and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedNoSymptomsToRecovered>()[{v, i}].params.m() < 0.0) {
+                    log_error("Constraint check: Lower end of parameter range TimeInfectedNoSymptomsToRecovered of "
+                              "virus variant "
+                              "{} and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedSymptomsToSevere>()[{v, i}].params.m() < 0.0) {
+                    log_error("Constraint check: Lower end of parameter range TimeInfectedSymptomsToSevere of virus "
+                              "variant {} "
+                              "and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedSymptomsToRecovered>()[{v, i}].params.m() < 0.0) {
+                    log_error("Constraint check: Lower end of parameter range TimeInfectedSymptomsToRecovered of virus "
+                              "variant {} "
+                              "and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedSevereToCritical>()[{v, i}].params.m() < 0.0) {
+                    log_error("Constraint check: Lower end of parameter range TimeInfectedSevereToCritical of virus "
+                              "variant {} "
+                              "and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedSevereToRecovered>()[{v, i}].params.m() < 0.0) {
+                    log_error("Constraint check: Lower end of parameter range TimeInfectedSevereToRecovered of virus "
+                              "variant {} "
+                              "and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedCriticalToDead>()[{v, i}].params.m() < 0.0) {
+                    log_error(
+                        "Constraint check: Lower end of parameter range TimeInfectedCriticalToDead of virus variant {} "
+                        "and age group {:.0f} smaller "
+                        "than {:d}",
+                        (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<TimeInfectedCriticalToRecovered>()[{v, i}].params.m() < 0.0) {
+                    log_error("Constraint check: Lower end of parameter range TimeInfectedCriticalToRecovered of virus "
+                              "variant {} "
+                              "and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
+                    return true;
+                }
+
+                if (this->get<SymptomsPerInfectedNoSymptoms>()[{v, i}] < 0.0 ||
+                    this->get<SymptomsPerInfectedNoSymptoms>()[{v, i}] > 1.0) {
+                    log_error("Constraint check: Parameter SymptomsPerInfectedNoSymptoms of virus variant {} and age "
+                              "group {:.0f} smaller than {:d} or larger than {:d}",
+                              (uint32_t)v, (size_t)i, 0, 1);
+                    return true;
+                }
+
+                if (this->get<SeverePerInfectedSymptoms>()[{v, i}] < 0.0 ||
+                    this->get<SeverePerInfectedSymptoms>()[{v, i}] > 1.0) {
+                    log_error("Constraint check: Parameter SeverePerInfectedSymptoms of virus variant {} and age group "
+                              "{:.0f} smaller than {:d} or larger than {:d}",
+                              (uint32_t)v, (size_t)i, 0, 1);
+                    return true;
+                }
+
+                if (this->get<CriticalPerInfectedSevere>()[{v, i}] < 0.0 ||
+                    this->get<CriticalPerInfectedSevere>()[{v, i}] > 1.0) {
+                    log_error("Constraint check: Parameter CriticalPerInfectedSevere of virus variant {} and age group "
+                              "{:.0f} smaller than {:d} or larger than {:d}",
+                              (uint32_t)v, (size_t)i, 0, 1);
+                    return true;
+                }
+
+                if (this->get<DeathsPerInfectedCritical>()[{v, i}] < 0.0 ||
+                    this->get<DeathsPerInfectedCritical>()[{v, i}] > 1.0) {
+                    log_error("Constraint check: Parameter DeathsPerInfectedCritical of age group {:.0f} smaller than "
+                              "{:d} or larger than {:d}",
+                              (uint32_t)v, (size_t)i, 0, 1);
+                    return true;
+                }
+
+                if (this->get<DetectInfection>()[{v, i}] < 0.0 || this->get<DetectInfection>()[{v, i}] > 1.0) {
+                    log_error("Constraint check: Parameter DetectInfection of virus variant {} and age group {:.0f} "
+                              "smaller than {:d} or "
+                              "larger than {:d}",
+                              (uint32_t)v, (size_t)i, 0, 1);
+                    return true;
+                }
             }
 
             if (this->get<GotoWorkTimeMinimum>()[i].seconds() < 0.0 ||
diff --git a/cpp/simulations/abm.cpp b/cpp/simulations/abm.cpp
index 20a3240904..5704952933 100644
--- a/cpp/simulations/abm.cpp
+++ b/cpp/simulations/abm.cpp
@@ -470,153 +470,101 @@ void set_parameters(mio::abm::Parameters params)
     };
 
     //0-4
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.276;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.092;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 0.142;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]           = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                = 0.001;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.276;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.092;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.142;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.001;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.186;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.015;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.001;
 
     //5-14
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.276;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.276;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
         0.092;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.142;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]    = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]           = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]            = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]         = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]              = 0.001;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.142;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.001;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.186;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.015;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.001;
 
     //15-34
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 0.139;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]    = 0.003;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]           = 0.157;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]            = 0.013;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]         = 0.126;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]              = 0.021;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.139;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.003;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.157;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.013;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.126;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 0.021;
 
     //35-59
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.136;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]    = 0.009;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]           = 0.113;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]            = 0.02;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]         = 0.05;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]              = 0.008;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.136;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.009;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.113;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.02;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.05;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.008;
 
     //60-79
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.123;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]    = 0.024;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]           = 0.083;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]            = 0.035;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]              = 0.023;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.123;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.024;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.083;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.023;
 
     //80+
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.315;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.115;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]    = 0.033;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]           = 0.055;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]            = 0.036;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]              = 0.052;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.115;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.033;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.055;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.036;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.052;
 
     // Set each parameter for vaccinated people including personal infection and vaccine protection levels.
     // Summary: https://doi.org/10.1038/s41577-021-00550-x,
-
-    //0-4
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.161;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.132;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 0.143;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]           = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                = 0.001;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]        = 0.0;
-
-    //5-14
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.161;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
-        0.132;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.143;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]    = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]           = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]            = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]         = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]              = 0.001;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]      = 0.0;
-
-    //15-34
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 0.142;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]    = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]           = 0.157;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]            = 0.013;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]         = 0.126;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]              = 0.021;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]      = 0.0;
-
-    //35-59
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
-        0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
-        0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.141;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]    = 0.003;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]           = 0.113;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]            = 0.02;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]         = 0.05;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]              = 0.008;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]      = 0.0;
-
-    //60-79
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
-        0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
-        0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.136;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]    = 0.009;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]           = 0.083;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]            = 0.035;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]              = 0.023;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]      = 0.0;
-
-    //80+
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
-        0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.133;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]    = 0.012;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]           = 0.055;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]            = 0.036;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]              = 0.052;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]      = 0.0;
 }
 
 /**
diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index 2e164d7b23..fba9ded599 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -412,89 +412,121 @@ void set_infection_parameters(mio::abm::Parameters& infection_params)
 
     //0-4
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 2.2;
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 9.2;
     infection_params
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
-        10.5;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 5;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 6;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 10.5;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 5;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
+    infection_params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        6;
 
     //5-14
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 2.2;
+    infection_params
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        9.2;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 10.5;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 5;
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 9.2;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 5;
     infection_params
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
-        10.5;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]   = 5;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]    = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]      = 6;
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 6;
 
     //15-34
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        2.2;
+    infection_params
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        9.2;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 10.5;
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 9.2;
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 6;
     infection_params
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        10.5;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]   = 6;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]    = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]      = 6;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 6;
 
     //35-59
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        2.2;
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        9.2;
     infection_params
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
-        6;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 8;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]  = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 6;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 8;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         17.5;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 16.5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 16.5;
 
     //60-79
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        2.2;
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        9.2;
     infection_params
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
-        6;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 10;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]  = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 6;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 10;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         17.5;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 16.5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 16.5;
 
     //80+
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 2.2;
     infection_params
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        9.2;
     infection_params
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 7;
-    infection_params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
-        6;
-    infection_params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]   = 15;
-    infection_params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]    = 5;
-    infection_params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 12.5;
-    infection_params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]      = 11;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 7;
+    infection_params
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 6;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 15;
+    infection_params
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 12.5;
+    infection_params
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 11;
 }
 
 /**
@@ -747,7 +779,7 @@ void write_location_mapping_to_file(std::string path, std::vector<LocationMappin
 
 mio::IOResult<void> run(const fs::path& input_dir)
 {
-    mio::unused(input_dir);
+    mio::set_log_level(mio::LogLevel::warn);
     auto t0   = mio::abm::TimePoint(0); // Start time per simulation
     auto tmax = mio::abm::TimePoint(0) + mio::abm::days(14); // End time per simulation
 
@@ -796,8 +828,9 @@ void print(T& data)
 
 int main()
 {
-    const fs::path input_dir = "~/Documents/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
-    auto result              = run(input_dir);
+    const fs::path input_dir =
+        "C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/INSIDe_Demonstrator_AreaList.csv";
+    auto result = run(input_dir);
 
     return 0;
 }
\ No newline at end of file
diff --git a/cpp/simulations/abm_braunschweig.cpp b/cpp/simulations/abm_braunschweig.cpp
index d56b9d6ec4..542e18edee 100644
--- a/cpp/simulations/abm_braunschweig.cpp
+++ b/cpp/simulations/abm_braunschweig.cpp
@@ -398,90 +398,116 @@ void set_parameters(mio::abm::Parameters params)
     };
 
     //0-4
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.276;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.092;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 0.142;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]           = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                = 0.001;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.276;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.092;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.142;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.001;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.186;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.015;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.001;
 
     //5-14
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.276;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.276;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
         0.092;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.142;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]    = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]           = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]            = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]         = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]              = 0.001;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.142;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.001;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.186;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.015;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.001;
 
     //15-34
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 0.139;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]    = 0.003;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]           = 0.157;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]            = 0.013;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]         = 0.126;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]              = 0.021;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.139;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.003;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.157;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.013;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.126;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 0.021;
 
     //35-59
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.136;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]    = 0.009;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]           = 0.113;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]            = 0.02;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]         = 0.05;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]              = 0.008;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.136;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.009;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.113;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.02;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.05;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.008;
 
     //60-79
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.123;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]    = 0.024;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]           = 0.083;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]            = 0.035;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]              = 0.023;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.123;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.024;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.083;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.023;
 
     //80+
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.315;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.315;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
         0.079;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.115;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]    = 0.033;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]           = 0.055;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]            = 0.036;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]              = 0.052;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]      = 0.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.115;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.033;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.055;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.036;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.052;
 
     // Set each parameter for vaccinated people including personal infection and vaccine protection levels.
     // Summary: https://doi.org/10.1038/s41577-021-00550-x,
 
     //0-4
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.161;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.132;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 0.143;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]           = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                = 0.001;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]        = 0.0;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.161;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.132;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.001;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.186;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 0.015;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.001;
+
     // Protection of reinfection is the same for all age-groups, based on:
     // https://doi.org/10.1016/S0140-6736(22)02465-5, https://doi.org/10.1038/s41591-021-01377-8
     params.get<mio::abm::InfectionProtectionFactor>()[{mio::abm::ExposureType::NaturalInfection, age_group_0_to_4,
@@ -539,16 +565,19 @@ void set_parameters(mio::abm::Parameters params)
     };
 
     //5-14
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.161;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.161;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
         0.132;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.143;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]    = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]           = 0.186;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]            = 0.015;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]         = 0.143;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]              = 0.001;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}]      = 0.0;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.001;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.186;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.015;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
+        0.143;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 0.001;
     // Protection of reinfection is the same for all age-groups, based on:
     // https://doi.org/10.1016/S0140-6736(22)02465-5, https://doi.org/10.1038/s41591-021-01377-8
     params.get<mio::abm::InfectionProtectionFactor>()[{mio::abm::ExposureType::NaturalInfection, age_group_5_to_14,
@@ -605,17 +634,21 @@ void set_parameters(mio::abm::Parameters params)
     };
 
     //15-34
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.126;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.142;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.001;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.157;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        0.013;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 0.142;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]    = 0.001;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]           = 0.157;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]            = 0.013;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]         = 0.126;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]              = 0.021;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}]      = 0.0;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 0.021;
     // Set up personal infection and vaccine protection levels, based on: https://doi.org/10.1038/s41577-021-00550-x, https://doi.org/10.1038/s41591-021-01377-8
     params.get<mio::abm::InfectionProtectionFactor>()[{mio::abm::ExposureType::NaturalInfection, age_group_15_to_34,
                                                        mio::abm::VirusVariant::Wildtype}] =
@@ -671,17 +704,20 @@ void set_parameters(mio::abm::Parameters params)
     };
 
     //35-59
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.141;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]    = 0.003;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]           = 0.113;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]            = 0.02;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]         = 0.05;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]              = 0.008;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}]      = 0.0;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.141;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.003;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.113;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.02;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        0.05;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 0.008;
     // Protection of reinfection is the same for all age-groups, based on:
     // https://doi.org/10.1016/S0140-6736(22)02465-5, https://doi.org/10.1038/s41591-021-01377-8
     params.get<mio::abm::InfectionProtectionFactor>()[{mio::abm::ExposureType::NaturalInfection, age_group_35_to_59,
@@ -738,17 +774,21 @@ void set_parameters(mio::abm::Parameters params)
     };
 
     //60-79
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
         0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.136;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]    = 0.009;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]           = 0.083;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]            = 0.035;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]              = 0.023;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]      = 0.0;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.136;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.009;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.083;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.023;
     // Protection of reinfection is the same for all age-groups, based on:
     // https://doi.org/10.1016/S0140-6736(22)02465-5, https://doi.org/10.1038/s41591-021-01377-8
     params.get<mio::abm::InfectionProtectionFactor>()[{mio::abm::ExposureType::NaturalInfection, age_group_60_to_79,
@@ -805,16 +845,19 @@ void set_parameters(mio::abm::Parameters params)
     };
 
     //80+
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.179;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.179;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
         0.126;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.133;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]    = 0.012;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]           = 0.055;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]            = 0.036;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]         = 0.035;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]              = 0.052;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}]      = 0.0;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.133;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.012;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.055;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.036;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
+        0.035;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 0.052;
     // Protection of reinfection is the same for all age-groups, based on:
     // https://doi.org/10.1016/S0140-6736(22)02465-5, https://doi.org/10.1038/s41591-021-01377-8
     params.get<mio::abm::InfectionProtectionFactor>()[{mio::abm::ExposureType::NaturalInfection, age_group_80_plus,
diff --git a/cpp/tests/test_abm_infection.cpp b/cpp/tests/test_abm_infection.cpp
index bb6df0c064..17d2894bc2 100644
--- a/cpp/tests/test_abm_infection.cpp
+++ b/cpp/tests/test_abm_infection.cpp
@@ -119,10 +119,11 @@ TEST(TestInfection, drawInfectionCourseBackward)
     mio::abm::Parameters params = mio::abm::Parameters(num_age_groups);
 
     // Time to go from all infected states to recover is 1 day (dt).
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]             = 1;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]           = 1;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]   = 1;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 1;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]   = 1;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 1;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 1;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        1;
 
     ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::UniformDistribution<double>>>> mock_uniform_dist;
     EXPECT_CALL(mock_uniform_dist.get_mock(), invoke)
diff --git a/cpp/tests/test_abm_location.cpp b/cpp/tests/test_abm_location.cpp
index d564964da9..85943b9302 100644
--- a/cpp/tests/test_abm_location.cpp
+++ b/cpp/tests/test_abm_location.cpp
@@ -159,10 +159,10 @@ TEST(TestLocation, reachCapacity)
 
     //setup so p1 doesn't do transition
     world.parameters
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         2 * dt.days();
     world.parameters
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         2 * dt.days();
 
     auto home_id   = world.add_location(mio::abm::LocationType::Home);
diff --git a/cpp/tests/test_abm_person.cpp b/cpp/tests/test_abm_person.cpp
index ef2f8b6427..b72f309f9a 100644
--- a/cpp/tests/test_abm_person.cpp
+++ b/cpp/tests/test_abm_person.cpp
@@ -102,8 +102,8 @@ TEST(TestPerson, setGetAssignedLocation)
 TEST(TestPerson, quarantine)
 {
     using testing::Return;
-    auto rng = mio::RandomNumberGenerator();
-    auto test_params = mio::abm::TestParameters{1.01,1.01}; //100% safe test
+    auto rng         = mio::RandomNumberGenerator();
+    auto test_params = mio::abm::TestParameters{1.01, 1.01}; //100% safe test
 
     auto infection_parameters = mio::abm::Parameters(num_age_groups);
     mio::abm::Location home(mio::abm::LocationType::Home, 0, num_age_groups);
@@ -122,13 +122,13 @@ TEST(TestPerson, quarantine)
     auto t_morning = mio::abm::TimePoint(0) + mio::abm::hours(7);
     auto dt        = mio::abm::hours(1);
     infection_parameters
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
         0.5 * dt.days();
 
     auto person     = make_test_person(home, age_group_35_to_59, mio::abm::InfectionState::InfectedSymptoms, t_morning,
                                        infection_parameters);
     auto rng_person = mio::abm::Person::RandomNumberGenerator(rng, person);
-    
+
     person.get_tested(rng_person, t_morning, test_params);
 
     ASSERT_EQ(person.get_infection_state(t_morning), mio::abm::InfectionState::InfectedSymptoms);
diff --git a/cpp/tests/test_abm_world.cpp b/cpp/tests/test_abm_world.cpp
index 4275202b86..fc41eadcd6 100644
--- a/cpp/tests/test_abm_world.cpp
+++ b/cpp/tests/test_abm_world.cpp
@@ -133,15 +133,16 @@ TEST(TestWorld, evolveStateTransition)
     world.parameters.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         2 * dt.days();
     world.parameters
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         2 * dt.days();
     world.parameters
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         2 * dt.days();
-    world.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+    world.parameters
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         2 * dt.days();
     world.parameters
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
         2 * dt.days();
 
     auto location1 = world.add_location(mio::abm::LocationType::School);
@@ -175,11 +176,10 @@ TEST(TestWorld, evolveMigration)
         auto world = mio::abm::World(num_age_groups);
         //setup so p1 doesn't do transition
         world.parameters
-            .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-            2 * dt.days();
-        world.parameters
-            .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+            .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
             2 * dt.days();
+        world.parameters.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype,
+                                                                             age_group_15_to_34}] = 2 * dt.days();
 
         auto home_id   = world.add_location(mio::abm::LocationType::Home);
         auto school_id = world.add_location(mio::abm::LocationType::School);
@@ -230,14 +230,15 @@ TEST(TestWorld, evolveMigration)
         auto world = mio::abm::World(num_age_groups);
         //setup so p1-p5 don't do transition
         world.parameters
-            .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+            .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
             2 * dt.days();
+        world.parameters.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype,
+                                                                             age_group_15_to_34}] = 2 * dt.days();
         world.parameters
-            .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
             2 * dt.days();
-        world.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-            2 * dt.days();
-        world.parameters.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
+        world.parameters
+            .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
             2 * dt.days();
 
         auto home_id     = world.add_location(mio::abm::LocationType::Home);
@@ -359,10 +360,12 @@ TEST(TestWorld, evolveMigration)
         auto world = mio::abm::World(num_age_groups);
 
         // Time to go from severe to critical infection is 1 day (dt).
-        world.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
+        world.parameters
+            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
             0.5;
         // Time to go from critical infection to dead state is 1/2 day (0.5 * dt).
-        world.parameters.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.5;
+        world.parameters
+            .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.5;
 
         auto home_id     = world.add_location(mio::abm::LocationType::Home);
         auto work_id     = world.add_location(mio::abm::LocationType::Work);
@@ -409,9 +412,10 @@ TEST(TestWorldTestingCriteria, testAddingAndUpdatingAndRunningTestingSchemes)
 
     auto world = mio::abm::World(num_age_groups);
     // make sure the infected person stay in Infected long enough
-    world.parameters.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant(0), age_group_15_to_34}] =
+    world.parameters.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant(0), age_group_15_to_34}] =
+        100;
+    world.parameters.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant(0), age_group_15_to_34}] =
         100;
-    world.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant(0), age_group_15_to_34}] = 100;
 
     auto home_id      = world.add_location(mio::abm::LocationType::Home);
     auto work_id      = world.add_location(mio::abm::LocationType::Work);
@@ -462,17 +466,17 @@ TEST(TestWorld, checkParameterConstraints)
     auto world  = mio::abm::World(num_age_groups);
     auto params = world.parameters;
 
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 1.;
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 2.;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 3.;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 4.;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 5.;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 6.;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 7.;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                = 8.;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]           = 9.;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]        = 10.;
-    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]               = 0.3;
+    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                 = 1.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 2.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        3.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 4.;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = 5.;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = 6.;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 7.;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 8.;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 9.;
+    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                 = 0.3;
     params.get<mio::abm::GotoWorkTimeMinimum>()[age_group_35_to_59]       = mio::abm::hours(4);
     params.get<mio::abm::GotoWorkTimeMaximum>()[age_group_35_to_59]       = mio::abm::hours(8);
     params.get<mio::abm::GotoSchoolTimeMinimum>()[age_group_0_to_4]       = mio::abm::hours(3);
@@ -485,35 +489,35 @@ TEST(TestWorld, checkParameterConstraints)
 
     params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -1.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 1.;
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -2.;
-    ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 2.;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -3.;
+    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 1.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        -2.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 3.;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = -4.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 2.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        -3.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 4.;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = -5.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
+        3.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -4.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 5.;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]         = -6.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 4.;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = -5.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 6.;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -7.;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 5.;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -6.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7.;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = -8.;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 6.;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -7.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 8.;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -9.;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7.;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = -8.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = 9.;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -10.;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 8.;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -9.;
     ASSERT_EQ(params.check_constraints(), true);
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 10.;
-    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]        = 1.1;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 9.;
+    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                 = 1.1;
     ASSERT_EQ(params.check_constraints(), true);
     params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.3;
 
@@ -580,12 +584,12 @@ TEST(TestWorld, copyWorld)
 
     auto infection_params =
         world.parameters.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]
-            .value();
+            .params.m();
 
     auto copied_world = mio::abm::World(world);
     auto copied_infection_params =
         copied_world.parameters.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]
-            .value();
+            .params.m();
 
     // Assert the parameters, trips, locations and persons of copied world are logically equal to that of original world
     ASSERT_EQ(copied_infection_params, infection_params);
diff --git a/cpp/tests/test_analyze_result.cpp b/cpp/tests/test_analyze_result.cpp
index 8648171b6a..5dc63d647b 100644
--- a/cpp/tests/test_analyze_result.cpp
+++ b/cpp/tests/test_analyze_result.cpp
@@ -475,27 +475,31 @@ TEST(TestEnsembleParamsPercentile, graph_abm_basic)
     auto world1           = mio::abm::World(num_age_groups);
     auto world2           = mio::abm::World(num_age_groups);
 
-    world1.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] =
-        0.1;
-    world1.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
+    world1.parameters
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.1;
+    world1.parameters
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
 
-    world2.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] =
-        0.2;
-    world2.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.3;
+    world2.parameters
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
+    world2.parameters
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.3;
 
     auto g1 = std::vector<mio::abm::World>({world1, world2});
 
     world1.parameters
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
-    world1.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] =
-        0.3;
-    world1.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.4;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
+    world1.parameters
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.3;
+    world1.parameters
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.4;
 
     world2.parameters
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.7;
-    world2.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] =
-        0.4;
-    world2.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.5;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.7;
+    world2.parameters
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.4;
+    world2.parameters
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.5;
 
     auto g2 = std::vector<mio::abm::World>({world1, world2});
 
@@ -506,48 +510,56 @@ TEST(TestEnsembleParamsPercentile, graph_abm_basic)
 
     auto check1 =
         ensemble_p49_params[0]
-            .parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.m();
     auto check2 =
         ensemble_p49_params[1]
-            .parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.m();
 
     EXPECT_EQ(check1, 0.1);
     EXPECT_EQ(check2, 0.2);
 
     auto check3 =
         ensemble_p51_params[0]
-            .parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.m();
     auto check4 =
         ensemble_p51_params[1]
-            .parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.m();
 
     EXPECT_EQ(check3, 0.3);
     EXPECT_EQ(check4, 0.4);
 
     auto check5 =
         ensemble_p49_params[0]
-            .parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.m();
     auto check6 =
         ensemble_p49_params[1]
-            .parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.m();
 
     EXPECT_EQ(check5, 0.2);
     EXPECT_EQ(check6, 0.3);
 
     auto check7 =
         ensemble_p51_params[0]
-            .parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.m();
     auto check8 =
         ensemble_p51_params[1]
-            .parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .value();
+            .parameters
+            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+            .params.s();
 
     EXPECT_EQ(check7, 0.4);
     EXPECT_EQ(check8, 0.5);
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 1fdc7ffc3f..8d1b5b305b 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -21,9 +21,9 @@
 import numpy as np
 import os
 
+import memilio.simulation as mio
 from memilio.simulation import abm
-from memilio.simulation.abm import AgeGroup
-from memilio.simulation.abm import VaccinationState
+from memilio.simulation import AgeGroup
 from memilio.simulation.abm import VirusVariant
 from memilio.simulation.abm import History
 from memilio.simulation.abm import Infection
@@ -38,231 +38,185 @@ def __init__(self):
         self.inputId = None
         self.modelId = []
 
-# infection parameters are dependent on age group and vaccination state
+
+# number of age groups
+num_age_groups = 6
+age_group_0_to_4 = AgeGroup(0)
+age_group_5_to_14 = AgeGroup(1)
+age_group_15_to_34 = AgeGroup(2)
+age_group_35_to_59 = AgeGroup(3)
+age_group_60_to_79 = AgeGroup(4)
+age_group_80_plus = AgeGroup(5)
 
 
 def set_infection_parameters(parameters):
-    infection_params = abm.GlobalInfectionParameters()
+    infection_params = abm.Parameters(num_age_groups)
 
     # AgeGroup 0-4
-    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated] = parameters.loc["Age0to4_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                  VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_InfectedNoSymptomsToSymptoms"].value)
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                   VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_InfectedNoSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                                 VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_InfectedSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                              VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_InfectedSymptomsToSevere"].value)
-    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                       VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_SevereToRecovered"].value)
-    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                      VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_SevereToCritical"].value)
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                         VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_CriticalToRecovered"].value)
-    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                    VaccinationState.Unvaccinated] = (
-        parameters.loc["Age0to4_CriticalToDead"].value)
-    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4,
-                                  VaccinationState.Unvaccinated,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype,
+                                      age_group_0_to_4] = parameters.loc["Age0to4_IncubationPeriod"].value
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
+                                                  age_group_0_to_4] = parameters.loc["Age0to4_InfectedNoSymptomsToSymptoms"].value
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
+                                                   age_group_0_to_4] = parameters.loc["Age0to4_InfectedNoSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
+                                                 age_group_0_to_4] = parameters.loc["Age0to4_InfectedSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
+                                              age_group_0_to_4] = parameters.loc["Age0to4_InfectedSymptomsToSevere"].value
+    infection_params.SevereToRecovered[VirusVariant.Wildtype,
+                                       age_group_0_to_4] = parameters.loc["Age0to4_SevereToRecovered"].value
+    infection_params.SevereToCritical[VirusVariant.Wildtype,
+                                      age_group_0_to_4] = parameters.loc["Age0to4_SevereToCritical"].value
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
+                                         age_group_0_to_4] = parameters.loc["Age0to4_CriticalToRecovered"].value
+    infection_params.CriticalToDead[VirusVariant.Wildtype,
+                                    age_group_0_to_4] = parameters.loc["Age0to4_CriticalToDead"].value
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
                                   parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age0to4,
+        infection_params, VirusVariant.Wildtype, age_group_0_to_4,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 5-14
-    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated] = parameters.loc["Age5to14_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                  VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_InfectedNoSymptomsToSymptoms"].value)
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                   VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_InfectedNoSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                                 VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_InfectedSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                              VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_InfectedSymptomsToSevere"].value)
-    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                       VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_SevereToRecovered"].value)
-    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                      VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_SevereToCritical"].value)
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                         VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_CriticalToRecovered"].value)
-    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                    VaccinationState.Unvaccinated] = (
-        parameters.loc["Age5to14_CriticalToDead"].value)
-    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14,
-                                  VaccinationState.Unvaccinated,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype,
+                                      age_group_5_to_14] = parameters.loc["Age5to14_IncubationPeriod"].value
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
+                                                  age_group_5_to_14] = parameters.loc["Age5to14_InfectedNoSymptomsToSymptoms"].value
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
+                                                   age_group_5_to_14] = parameters.loc["Age5to14_InfectedNoSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
+                                                 age_group_5_to_14] = parameters.loc["Age5to14_InfectedSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
+                                              age_group_5_to_14] = parameters.loc["Age5to14_InfectedSymptomsToSevere"].value
+    infection_params.SevereToRecovered[VirusVariant.Wildtype,
+                                       age_group_5_to_14] = parameters.loc["Age5to14_SevereToRecovered"].value
+    infection_params.SevereToCritical[VirusVariant.Wildtype,
+                                      age_group_5_to_14] = parameters.loc["Age5to14_SevereToCritical"].value
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
+                                         age_group_5_to_14] = parameters.loc["Age5to14_CriticalToRecovered"].value
+    infection_params.CriticalToDead[VirusVariant.Wildtype,
+                                    age_group_5_to_14] = parameters.loc["Age5to14_CriticalToDead"].value
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
                                   parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age5to14,
+        infection_params, VirusVariant.Wildtype, age_group_5_to_14,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 15-34
-    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated] = parameters.loc["Age15to34_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                  VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_InfectedNoSymptomsToSymptoms"].value)
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                   VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_InfectedNoSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                                 VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_InfectedSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                              VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_InfectedSymptomsToSevere"].value)
-    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                       VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_SevereToRecovered"].value)
-    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                      VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_SevereToCritical"].value)
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                         VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_CriticalToRecovered"].value)
-    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                    VaccinationState.Unvaccinated] = (
-        parameters.loc["Age15to34_CriticalToDead"].value)
-    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34,
-                                  VaccinationState.Unvaccinated,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype,
+                                      age_group_15_to_34] = parameters.loc["Age15to34_IncubationPeriod"].value
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
+                                                  age_group_15_to_34] = parameters.loc["Age15to34_InfectedNoSymptomsToSymptoms"].value
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
+                                                   age_group_15_to_34] = parameters.loc["Age15to34_InfectedNoSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
+                                                 age_group_15_to_34] = parameters.loc["Age15to34_InfectedSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
+                                              age_group_15_to_34] = parameters.loc["Age15to34_InfectedSymptomsToSevere"].value
+    infection_params.SevereToRecovered[VirusVariant.Wildtype,
+                                       age_group_15_to_34] = parameters.loc["Age15to34_SevereToRecovered"].value
+    infection_params.SevereToCritical[VirusVariant.Wildtype,
+                                      age_group_15_to_34] = parameters.loc["Age15to34_SevereToCritical"].value
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
+                                         age_group_15_to_34] = parameters.loc["Age15to34_CriticalToRecovered"].value
+    infection_params.CriticalToDead[VirusVariant.Wildtype,
+                                    age_group_15_to_34] = parameters.loc["Age15to34_CriticalToDead"].value
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
                                   parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age15to34,
+        infection_params, VirusVariant.Wildtype, age_group_15_to_34,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 35-59
-    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated] = parameters.loc["Age35to59_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                  VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_InfectedNoSymptomsToSymptoms"].value)
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                   VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_InfectedNoSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                                 VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_InfectedSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                              VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_InfectedSymptomsToSevere"].value)
-    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                       VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_SevereToRecovered"].value)
-    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                      VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_SevereToCritical"].value)
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                         VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_CriticalToRecovered"].value)
-    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                    VaccinationState.Unvaccinated] = (
-        parameters.loc["Age35to59_CriticalToDead"].value)
-    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59,
-                                  VaccinationState.Unvaccinated,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype,
+                                      age_group_35_to_59] = parameters.loc["Age35to59_IncubationPeriod"].value
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
+                                                  age_group_35_to_59] = parameters.loc["Age35to59_InfectedNoSymptomsToSymptoms"].value
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
+                                                   age_group_35_to_59] = parameters.loc["Age35to59_InfectedNoSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
+                                                 age_group_35_to_59] = parameters.loc["Age35to59_InfectedSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
+                                              age_group_35_to_59] = parameters.loc["Age35to59_InfectedSymptomsToSevere"].value
+    infection_params.SevereToRecovered[VirusVariant.Wildtype,
+                                       age_group_35_to_59] = parameters.loc["Age35to59_SevereToRecovered"].value
+    infection_params.SevereToCritical[VirusVariant.Wildtype,
+                                      age_group_35_to_59] = parameters.loc["Age35to59_SevereToCritical"].value
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
+                                         age_group_35_to_59] = parameters.loc["Age35to59_CriticalToRecovered"].value
+    infection_params.CriticalToDead[VirusVariant.Wildtype,
+                                    age_group_35_to_59] = parameters.loc["Age35to59_CriticalToDead"].value
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
                                   parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age35to59,
+        infection_params, VirusVariant.Wildtype, age_group_35_to_59,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 60-79
-    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated] = parameters.loc["Age60to79_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                  VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_InfectedNoSymptomsToSymptoms"].value)
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                   VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_InfectedNoSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                                 VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_InfectedSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                              VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_InfectedSymptomsToSevere"].value)
-    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                       VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_SevereToRecovered"].value)
-    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                      VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_SevereToCritical"].value)
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                         VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_CriticalToRecovered"].value)
-    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                    VaccinationState.Unvaccinated] = (
-        parameters.loc["Age60to79_CriticalToDead"].value)
-    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79,
-                                  VaccinationState.Unvaccinated,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype,
+                                      age_group_60_to_79] = parameters.loc["Age60to79_IncubationPeriod"].value
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
+                                                  age_group_60_to_79] = parameters.loc["Age60to79_InfectedNoSymptomsToSymptoms"].value
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
+                                                   age_group_60_to_79] = parameters.loc["Age60to79_InfectedNoSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
+                                                 age_group_60_to_79] = parameters.loc["Age60to79_InfectedSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
+                                              age_group_60_to_79] = parameters.loc["Age60to79_InfectedSymptomsToSevere"].value
+    infection_params.SevereToRecovered[VirusVariant.Wildtype,
+                                       age_group_60_to_79] = parameters.loc["Age60to79_SevereToRecovered"].value
+    infection_params.SevereToCritical[VirusVariant.Wildtype,
+                                      age_group_60_to_79] = parameters.loc["Age60to79_SevereToCritical"].value
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
+                                         age_group_60_to_79] = parameters.loc["Age60to79_CriticalToRecovered"].value
+    infection_params.CriticalToDead[VirusVariant.Wildtype,
+                                    age_group_60_to_79] = parameters.loc["Age60to79_CriticalToDead"].value
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
                                   parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age60to79,
+        infection_params, VirusVariant.Wildtype, age_group_60_to_79,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
 
     # AgeGroup 80+
-    infection_params.IncubationPeriod[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated] = parameters.loc["Age80plus_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                  VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_InfectedNoSymptomsToSymptoms"].value)
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                   VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_InfectedNoSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                                 VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_InfectedSymptomsToRecovered"].value)
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                              VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_InfectedSymptomsToSevere"].value)
-    infection_params.SevereToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                       VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_SevereToRecovered"].value)
-    infection_params.SevereToCritical[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                      VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_SevereToCritical"].value)
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                         VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_CriticalToRecovered"].value)
-    infection_params.CriticalToDead[VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                    VaccinationState.Unvaccinated] = (
-        parameters.loc["Age80plus_CriticalToDead"].value)
-    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus,
-                                  VaccinationState.Unvaccinated,
+    infection_params.IncubationPeriod[VirusVariant.Wildtype,
+                                      age_group_80_plus] = parameters.loc["Age80plus_IncubationPeriod"].value
+    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
+                                                  age_group_80_plus] = parameters.loc["Age80plus_InfectedNoSymptomsToSymptoms"].value
+    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
+                                                   age_group_80_plus] = parameters.loc["Age80plus_InfectedNoSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
+                                                 age_group_80_plus] = parameters.loc["Age80plus_InfectedSymptomsToRecovered"].value
+    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
+                                              age_group_80_plus] = parameters.loc["Age80plus_InfectedSymptomsToSevere"].value
+    infection_params.SevereToRecovered[VirusVariant.Wildtype,
+                                       age_group_80_plus] = parameters.loc["Age80plus_SevereToRecovered"].value
+    infection_params.SevereToCritical[VirusVariant.Wildtype,
+                                      age_group_80_plus] = parameters.loc["Age80plus_SevereToCritical"].value
+    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
+                                         age_group_80_plus] = parameters.loc["Age80plus_CriticalToRecovered"].value
+    infection_params.CriticalToDead[VirusVariant.Wildtype,
+                                    age_group_80_plus] = parameters.loc["Age80plus_CriticalToDead"].value
+    abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_80_plus,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
                                   parameters.loc["decline"].value, parameters.loc["decline"].value)
     abm.set_infectivity_parameters(
-        infection_params, VirusVariant.Wildtype, AgeGroup.Age80plus,
+        infection_params, VirusVariant.Wildtype, age_group_80_plus,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
 
@@ -276,12 +230,12 @@ def read_txt(path):
 
 def make_one_person_households(number_of_households):
     # one-person household member
-    one_person_household_member = abm.HouseholdMember()
+    one_person_household_member = abm.HouseholdMember(num_age_groups)
     # set weights for household member
-    one_person_household_member.set_age_weight(AgeGroup.Age15to34, 4364)
-    one_person_household_member.set_age_weight(AgeGroup.Age35to59, 7283)
-    one_person_household_member.set_age_weight(AgeGroup.Age60to79, 4100)
-    one_person_household_member.set_age_weight(AgeGroup.Age80plus, 1800)
+    one_person_household_member.set_age_weight(age_group_15_to_34, 4364)
+    one_person_household_member.set_age_weight(age_group_35_to_59, 7283)
+    one_person_household_member.set_age_weight(age_group_60_to_79, 4100)
+    one_person_household_member.set_age_weight(age_group_80_plus, 1800)
 
     # create one-person household group
     household_group = abm.HouseholdGroup()
@@ -298,22 +252,22 @@ def make_multiple_person_households(household_size,
                                     number_of_other_households):
 
     # members for multiple person households
-    child = abm.HouseholdMember()
-    child.set_age_weight(AgeGroup.Age0to4, 1)
-    child.set_age_weight(AgeGroup.Age5to14, 1)
-
-    parent = abm.HouseholdMember()
-    parent.set_age_weight(AgeGroup.Age15to34, 2)
-    parent.set_age_weight(AgeGroup.Age35to59, 2)
-    parent.set_age_weight(AgeGroup.Age60to79, 1)
-
-    other = abm.HouseholdMember()
-    other.set_age_weight(AgeGroup.Age0to4, 5000)
-    other.set_age_weight(AgeGroup.Age5to14, 6000)
-    other.set_age_weight(AgeGroup.Age15to34, 14943)
-    other.set_age_weight(AgeGroup.Age35to59, 22259)
-    other.set_age_weight(AgeGroup.Age60to79, 11998)
-    other.set_age_weight(AgeGroup.Age80plus, 5038)
+    child = abm.HouseholdMember(num_age_groups)
+    child.set_age_weight(age_group_0_to_4, 1)
+    child.set_age_weight(age_group_5_to_14, 1)
+
+    parent = abm.HouseholdMember(num_age_groups)
+    parent.set_age_weight(age_group_15_to_34, 2)
+    parent.set_age_weight(age_group_35_to_59, 2)
+    parent.set_age_weight(age_group_60_to_79, 1)
+
+    other = abm.HouseholdMember(num_age_groups)
+    other.set_age_weight(age_group_0_to_4, 5000)
+    other.set_age_weight(age_group_5_to_14, 6000)
+    other.set_age_weight(age_group_15_to_34, 14943)
+    other.set_age_weight(age_group_35_to_59, 22259)
+    other.set_age_weight(age_group_60_to_79, 11998)
+    other.set_age_weight(age_group_80_plus, 5038)
 
     household_group = abm.HouseholdGroup()
     # add two parent households
@@ -519,8 +473,8 @@ def assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, in
                                            p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
                                                infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_pct, 0.0])
         if (abm.InfectionState(infection_state) != abm.InfectionState.Susceptible):
-            person.add_new_infection(Infection(VirusVariant.Wildtype, person.age,
-                                     world.infection_parameters, t0, abm.InfectionState(infection_state), False), t0)
+            person.add_new_infection(Infection(
+                world, person, VirusVariant.Wildtype, t0, abm.InfectionState(infection_state), False), t0)
 
 
 def find_all_locations_of_type(world, type):
@@ -569,13 +523,13 @@ def assign_locations(world):
             social_events[int(event)].index, social_events[int(event)].type))
 
         # assign school to agents between 5 and 14 years
-        if (person.age == AgeGroup.Age5to14):
+        if (person.age == age_group_5_to_14):
             school = np.random.choice(
                 np.arange(0, len(schools)), p=school_weights)
             person.set_assigned_location(abm.LocationId(
                 schools[int(school)].index, schools[int(school)].type))
         # assign work to agents between 15 and 59
-        if (person.age == AgeGroup.Age15to34 or person.age == AgeGroup.Age35to59):
+        if (person.age == age_group_15_to_34 or person.age == age_group_35_to_59):
             work = np.random.choice(
                 np.arange(0, len(workplaces)), p=workplace_weights)
             person.set_assigned_location(abm.LocationId(
@@ -695,8 +649,9 @@ def set_sim_result_at_start(sim):
 
 
 def run_abm_simulation():
-    input_path = 'input'
-    output_path = 'output'
+    mio.set_log_level(mio.LogLevel.Warning)
+    input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
+    output_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -710,11 +665,11 @@ def run_abm_simulation():
         input_path, 'INSIDe_Demonstrator_AreaList_modified.txt'))
     parameters = pd.read_csv(os.path.join(
         input_path, 'parameter_table.csv'), index_col=0)
-    # create simulation
-    sim = abm.Simulation(t0)
+    # create simulation with starting timepoint and number of age groups
+    sim = abm.Simulation(t0, num_age_groups)
     # set infection parameters
-    sim.world.infection_parameters = set_infection_parameters(parameters)
-    # as input areas do fit one-to-one to abm location types they have there has to be a mapping
+    sim.world.parameters = set_infection_parameters(parameters)
+    # as input areas do not fit one-to-one to abm location types, there has to be a mapping
     mapping = create_locations_from_input(
         sim.world, areas, household_distribution)
     # assign initial infection states according to distribution
@@ -737,16 +692,6 @@ def run_abm_simulation():
     write_infection_paths_to_file(os.path.join(
         output_path, 'infection_paths.txt'), log)
 
-    # print compartment values to csv
-    # only used for validation purposes
-    with open(os.path.join(output_path, 'console_output.csv'), 'w') as f:
-        f.write("t S E C I I_s I_c R D\n")
-        for t in range(sim.result.get_num_time_points()):
-            line = str(sim.result.get_time(t)) + " "
-            comps = sim.result.get_value(t)
-            for c in range(len(comps)):
-                line += str(comps[c]) + " "
-            f.write(line + "\n")
     print('done')
 
 
@@ -755,4 +700,6 @@ def run_abm_simulation():
         'abm demonstrator',
         description='Example demonstrating the agent-based model for a synthetic population.')
     args = arg_parser.parse_args()
+    # set LogLevel
+    mio.set_log_level(mio.LogLevel.Warning)
     run_abm_simulation(**args.__dict__)
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 132f82d266..040ea2d2db 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -30,6 +30,7 @@
 #include "pybind11/cast.h"
 #include "pybind11/pybind11.h"
 #include "pybind11/operators.h"
+#include "utils/logging.h"
 #include <type_traits>
 
 namespace py = pybind11;
@@ -74,6 +75,8 @@ struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
 
 PYBIND11_MODULE(_simulation_abm, m)
 {
+    //pymio::bind_logging(m, "LogLevel");
+
     pymio::iterable_enum<mio::abm::InfectionState>(m, "InfectionState", py::module_local{})
         .value("Susceptible", mio::abm::InfectionState::Susceptible)
         .value("Exposed", mio::abm::InfectionState::Exposed)
@@ -221,9 +224,13 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def(py::init<const std::unordered_map<mio::abm::LocationId, std::vector<mio::abm::TestingScheme>>&>());
 
     py::class_<mio::abm::Infection>(m, "Infection")
-        .def(py::init<mio::abm::Person::RandomNumberGenerator&, mio::abm::VirusVariant, mio::AgeGroup,
-                      const mio::abm::Parameters&, mio::abm::TimePoint, mio::abm::InfectionState,
-                      std::pair<mio::abm::ExposureType, mio::abm::TimePoint>, bool>());
+        .def(py::init([](mio::abm::World& world, mio::abm::Person& person, mio::abm::VirusVariant variant,
+                         mio::abm::TimePoint start_date, mio::abm::InfectionState start_state, bool detected) {
+            mio::abm::Person::RandomNumberGenerator& rng =
+                mio::abm::Person::RandomNumberGenerator(world.get_rng(), person);
+            return mio::abm::Infection(rng, variant, person.get_age(), world.parameters, start_date, start_state,
+                                       person.get_latest_protection(), detected);
+        }));
 
     py::class_<mio::abm::Location>(m, "Location")
         .def("set_capacity", &mio::abm::Location::set_capacity)
@@ -265,6 +272,7 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("get_individualized_location",
              py::overload_cast<mio::abm::LocationId>(&mio::abm::World::get_individualized_location, py::const_),
              py::return_value_policy::reference_internal)
+        .def("get_rng", &mio::abm::World::get_rng, py::return_value_policy::reference_internal)
         .def_property_readonly("locations", &mio::abm::World::get_locations,
                                py::keep_alive<1, 0>{}) //keep this world alive while contents are referenced in ranges
         .def_property_readonly("persons", &mio::abm::World::get_persons, py::keep_alive<1, 0>{})
@@ -327,6 +335,9 @@ PYBIND11_MODULE(_simulation_abm, m)
                                                       LogPersonsPerLocationAndInfectionTime>& self) {
             return self.get_log();
         });
+
+    py::class_<mio::abm::Person::RandomNumberGenerator>(m, "RandomNumberGenerator")
+        .def(py::init<mio::RandomNumberGenerator, mio::abm::Person>());
 }
 
 // PYMIO_IGNORE_VALUE_TYPE(decltype(std::declval<mio::abm::World>().get_locations()))

From 831707456542aaa2e3cc8b6ca6c2975b30757d61 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 28 Mar 2024 12:47:50 +0100
Subject: [PATCH 074/103] minor changes

---
 cpp/models/abm/location.cpp | 36 ++++++++++++++++++++++++++++--------
 cpp/models/abm/location.h   |  6 ++++++
 cpp/models/abm/world.cpp    |  5 +++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/cpp/models/abm/location.cpp b/cpp/models/abm/location.cpp
index c1ff912720..cdf4d68b81 100644
--- a/cpp/models/abm/location.cpp
+++ b/cpp/models/abm/location.cpp
@@ -83,21 +83,19 @@ void Location::interact(Person::RandomNumberGenerator& rng, Person& person, Time
     assert(person.get_cells().size() && "Person is in multiple cells. Interact logic is incorrect at the moment.");
     for (auto cell_index :
          person.get_cells()) { // TODO: the logic here is incorrect in case a person is in multiple cells
-        std::pair<VirusVariant, ScalarType> local_indiv_trans_prob[static_cast<uint32_t>(VirusVariant::Count)];
+        std::pair<VirusVariant, ScalarType> local_indiv_expected_trans[static_cast<uint32_t>(VirusVariant::Count)];
         for (uint32_t v = 0; v != static_cast<uint32_t>(VirusVariant::Count); ++v) {
             VirusVariant virus = static_cast<VirusVariant>(v);
-            ScalarType local_indiv_trans_prob_v =
-                (std::min(
-                     m_parameters.get<MaximumContacts>(),
-                     transmission_contacts_per_day(cell_index, virus, age_receiver, global_params.get_num_groups())) +
+            ScalarType local_indiv_expected_trans_v =
+                (transmission_contacts_per_day(cell_index, virus, age_receiver, global_params.get_num_groups()) +
                  transmission_air_per_day(cell_index, virus, global_params)) *
-                (1 - mask_protection) * dt.days() * (1 - person.get_protection_factor(t, virus, global_params));
+                (1 - mask_protection) * (1 - person.get_protection_factor(t, virus, global_params));
 
-            local_indiv_trans_prob[v] = std::make_pair(virus, local_indiv_trans_prob_v);
+            local_indiv_expected_trans[v] = std::make_pair(virus, local_indiv_expected_trans_v);
         }
         VirusVariant virus =
             random_transition(rng, VirusVariant::Count, dt,
-                              local_indiv_trans_prob); // use VirusVariant::Count for no virus submission
+                              local_indiv_expected_trans); // use VirusVariant::Count for no virus submission
         if (virus != VirusVariant::Count) {
             person.add_new_infection(Infection(rng, virus, age_receiver, global_params, t + dt / 2,
                                                mio::abm::InfectionState::Exposed, person.get_latest_protection(),
@@ -106,6 +104,28 @@ void Location::interact(Person::RandomNumberGenerator& rng, Person& person, Time
     }
 }
 
+void Location::adjust_contact_rates(size_t num_agegroups)
+{
+    ScalarType total_contacts = 0.;
+    for (auto contact_from = AgeGroup(0); contact_from < AgeGroup(num_agegroups); contact_from++) {
+        // slizing would be preferred but is problematic since both Tags of ContactRates are AgeGroup
+        for (auto contact_to = AgeGroup(0); contact_to < AgeGroup(num_agegroups); contact_to++) {
+            total_contacts += m_parameters.get<ContactRates>()[{contact_from, contact_to}];
+        }
+        if (total_contacts > m_parameters.get<MaximumContacts>()) {
+            for (auto contact_to = AgeGroup(0); contact_to < AgeGroup(num_agegroups); contact_to++) {
+                m_parameters.get<ContactRates>()[{contact_from, contact_to}] =
+                    m_parameters.get<ContactRates>()[{contact_from, contact_to}] * m_parameters.get<MaximumContacts>() /
+                    total_contacts;
+            }
+        }
+        total_contacts = 0;
+        //auto contact_rates_slice = m_parameters.get<ContactRates>().slice(AgeGroup(contact_from));
+        //auto total_contacts      = std::accumulate(contact_rates_slice.begin(), contact_rates_slice.end(), 0.);
+        //contact_rates_slice = std::min(1., m_parameters.get<MaximumContacts>() / total_contacts) * contact_rates_slice;
+    }
+}
+
 void Location::cache_exposure_rates(TimePoint t, TimeSpan dt, size_t num_agegroups)
 {
     //cache for next step so it stays constant during the step while subpopulations change
diff --git a/cpp/models/abm/location.h b/cpp/models/abm/location.h
index ef2ae14d7e..13541c6ea6 100644
--- a/cpp/models/abm/location.h
+++ b/cpp/models/abm/location.h
@@ -222,6 +222,12 @@ class Location
      */
     void remove_person(Person& person);
 
+    /**
+     * @brief Adjust local contact rates based on maximum contacts.
+     * @param[in] num_agegroups The number of age groups in the model.
+    */
+    void adjust_contact_rates(size_t num_agegroups);
+
     /** 
      * @brief Prepare the Location for the next Simulation step.
      * @param[in] t Current TimePoint of the Simulation.
diff --git a/cpp/models/abm/world.cpp b/cpp/models/abm/world.cpp
index e534b8cec0..6a802db9e6 100755
--- a/cpp/models/abm/world.cpp
+++ b/cpp/models/abm/world.cpp
@@ -57,9 +57,9 @@ Person& World::add_person(const LocationId id, AgeGroup age)
 void World::evolve(TimePoint t, TimeSpan dt)
 {
     begin_step(t, dt);
-    log_info("ABM World interaction.");
+    //log_info("ABM World interaction.");
     interaction(t, dt);
-    log_info("ABM World migration.");
+    //log_info("ABM World migration.");
     migration(t, dt);
 }
 
@@ -152,6 +152,7 @@ void World::begin_step(TimePoint t, TimeSpan dt)
     PRAGMA_OMP(parallel for)
     for (auto i = size_t(0); i < m_locations.size(); ++i) {
         auto&& location = m_locations[i];
+        location->adjust_contact_rates(parameters.get_num_groups());
         location->cache_exposure_rates(t, dt, parameters.get_num_groups());
     }
 }

From b745387f1668855b3a574b7cc84e06bdbffdc875 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 2 Apr 2024 09:31:36 +0200
Subject: [PATCH 075/103] new parameters

---
 cpp/simulations/abm_INSIDe_demonstrator.cpp   | 268 ++++++++++++++----
 .../ABM Demonstrator/abm_demonstrator.py      | 265 ++++++++++-------
 .../memilio/simulation/abm.cpp                |  99 +++++++
 3 files changed, 464 insertions(+), 168 deletions(-)

diff --git a/cpp/simulations/abm_INSIDe_demonstrator.cpp b/cpp/simulations/abm_INSIDe_demonstrator.cpp
index fba9ded599..636999c68a 100644
--- a/cpp/simulations/abm_INSIDe_demonstrator.cpp
+++ b/cpp/simulations/abm_INSIDe_demonstrator.cpp
@@ -401,132 +401,280 @@ void create_locations_from_input(std::vector<std::pair<std::string, std::string>
     }
 }
 
+/**
+* Returns parameters for LogNormalDistributiom given desired expected value and standard deviation.
+* @param[in] mean desired expected value
+* @param[in] std desired standard deviation
+* @return pair with parameters for LogNormalDistribtuion
+*/
+std::pair<double, double> get_my_and_sigma(double mean, double std)
+{
+    double my    = log(mean * mean / sqrt(mean * mean + std * std));
+    double sigma = sqrt(log(1 + std * std / (mean * mean)));
+    return {my, sigma};
+}
+
 /**
  * Set infection parameters
  * @param[in, out] infection_params infection parameters
 */
 void set_infection_parameters(mio::abm::Parameters& infection_params)
 {
-    infection_params.set<mio::abm::IncubationPeriod>(
-        {{mio::abm::VirusVariant::Count, mio::AgeGroup(num_age_groups)}, 3.});
+    //set parameters for every agegroup
+    auto incubation_period_params                      = get_my_and_sigma(3, 1.2);
+    infection_params.get<mio::abm::IncubationPeriod>() = {incubation_period_params.first,
+                                                          incubation_period_params.second};
 
     //0-4
+    auto TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(2.2, 0.5);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+
+    auto TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(9.2, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+
+    auto TimeInfectedSymptomsToSevere = get_my_and_sigma(10.5, 1.1);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+
+    auto TimeInfectedSymptomsToRecovered = get_my_and_sigma(7.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 10.5;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+
+    auto TimeInfectedSevereToRecovered = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 5;
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+
+    auto TimeInfectedSevereToCritical = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 5;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+
+    auto TimeInfectedCriticalToRecovered = get_my_and_sigma(7.0, 3.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7;
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+
+    auto TimeInfectedCriticalToDead = get_my_and_sigma(6.0, 2.0);
     infection_params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] =
-        6;
+        {TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
 
     //5-14
+    TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(2.2, 0.5);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+
+    TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(9.2, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] =
-        9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+
+    TimeInfectedSymptomsToSevere = get_my_and_sigma(10.5, 1.1);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+
+    TimeInfectedSymptomsToRecovered = get_my_and_sigma(7.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 10.5;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+
+    TimeInfectedSevereToRecovered = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 5;
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+
+    TimeInfectedSevereToCritical = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 5;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+
+    TimeInfectedCriticalToRecovered = get_my_and_sigma(7.0, 3.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 7;
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+
+    TimeInfectedCriticalToDead = get_my_and_sigma(6.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 6;
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = {
+        TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
 
     //15-34
+    TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(2.2, 0.5);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+
+    TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(9.2, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+
+    TimeInfectedSymptomsToSevere = get_my_and_sigma(10.5, 1.1);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+
+    TimeInfectedSymptomsToRecovered = get_my_and_sigma(7.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 10.5;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+
+    TimeInfectedSevereToRecovered = get_my_and_sigma(6.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 6;
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+
+    TimeInfectedSevereToCritical = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 5;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+
+    TimeInfectedCriticalToRecovered = get_my_and_sigma(7.0, 3.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 7;
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+
+    TimeInfectedCriticalToDead = get_my_and_sigma(6.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 6;
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = {
+        TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
 
     //35-59
+    TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(2.2, 0.5);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
-        2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+
+    TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(9.2, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
-        9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+
+    TimeInfectedSymptomsToSevere = get_my_and_sigma(6.0, 1.1);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 7;
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+
+    TimeInfectedSymptomsToRecovered = get_my_and_sigma(7.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 6;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+
+    TimeInfectedSevereToRecovered = get_my_and_sigma(8.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 8;
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+
+    TimeInfectedSevereToCritical = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 5;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+
+    TimeInfectedCriticalToRecovered = get_my_and_sigma(17.5, 3.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
-        17.5;
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+
+    TimeInfectedCriticalToDead = get_my_and_sigma(16.5, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = 16.5;
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] = {
+        TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
 
     //60-79
+    TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(2.2, 0.5);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
-        2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+
+    TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(9.2, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
-        9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+
+    TimeInfectedSymptomsToSevere = get_my_and_sigma(6.0, 1.1);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 7;
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+
+    TimeInfectedSymptomsToRecovered = get_my_and_sigma(7.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 6;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+
+    TimeInfectedSevereToRecovered = get_my_and_sigma(10.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 10;
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+
+    TimeInfectedSevereToCritical = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 5;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+
+    TimeInfectedCriticalToRecovered = get_my_and_sigma(17.5, 3.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
-        17.5;
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+
+    TimeInfectedCriticalToDead = get_my_and_sigma(16.5, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 16.5;
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = {
+        TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
 
     //80+
+    TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(2.2, 0.5);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 2.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+
+    TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(9.2, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] =
-        9.2;
+        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+
+    TimeInfectedSymptomsToSevere = get_my_and_sigma(6.0, 1.1);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 7;
+        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+
+    TimeInfectedSymptomsToRecovered = get_my_and_sigma(7.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 6;
+        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+
+    TimeInfectedSevereToRecovered = get_my_and_sigma(15.0, 3.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 15;
+        .get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+
+    TimeInfectedSevereToCritical = get_my_and_sigma(5.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 5;
+        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+
+    TimeInfectedCriticalToRecovered = get_my_and_sigma(12.5, 3.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 12.5;
+        .get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+
+    TimeInfectedCriticalToDead = get_my_and_sigma(11.0, 2.0);
     infection_params
-        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = 11;
+        .get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_80_plus}] = {
+        TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
+
+    // Set percentage parameters
+    infection_params.get<mio::abm::SymptomsPerInfectedNoSymptoms>() = 0.79;
+    infection_params.get<mio::abm::SeverePerInfectedSymptoms>()     = 0.08;
+    infection_params.get<mio::abm::CriticalPerInfectedSevere>()     = 0.18;
+    infection_params.get<mio::abm::DeathsPerInfectedCritical>()     = 0.1;
 }
 
 /**
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 8d1b5b305b..751bb01cd1 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -50,27 +50,28 @@ def __init__(self):
 
 
 def set_infection_parameters(parameters):
+
     infection_params = abm.Parameters(num_age_groups)
 
     # AgeGroup 0-4
-    infection_params.IncubationPeriod[VirusVariant.Wildtype,
-                                      age_group_0_to_4] = parameters.loc["Age0to4_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
-                                                  age_group_0_to_4] = parameters.loc["Age0to4_InfectedNoSymptomsToSymptoms"].value
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
-                                                   age_group_0_to_4] = parameters.loc["Age0to4_InfectedNoSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
-                                                 age_group_0_to_4] = parameters.loc["Age0to4_InfectedSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
-                                              age_group_0_to_4] = parameters.loc["Age0to4_InfectedSymptomsToSevere"].value
-    infection_params.SevereToRecovered[VirusVariant.Wildtype,
-                                       age_group_0_to_4] = parameters.loc["Age0to4_SevereToRecovered"].value
-    infection_params.SevereToCritical[VirusVariant.Wildtype,
-                                      age_group_0_to_4] = parameters.loc["Age0to4_SevereToCritical"].value
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
-                                         age_group_0_to_4] = parameters.loc["Age0to4_CriticalToRecovered"].value
-    infection_params.CriticalToDead[VirusVariant.Wildtype,
-                                    age_group_0_to_4] = parameters.loc["Age0to4_CriticalToDead"].value
+    abm.set_incubationPeriod(
+        infection_params, VirusVariant.Wildtype, age_group_0_to_4, parameters.loc["Age0to4_IncubationPeriod"].value, parameters.loc["Age0to4_IncubationPeriod"].dev)
+    abm.set_TimeInfectedNoSymptomsToSymptoms(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                             parameters.loc["Age0to4_InfectedNoSymptomsToSymptoms"].value, parameters.loc["Age0to4_InfectedNoSymptomsToSymptoms"].dev)
+    abm.set_TimeInfectedNoSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                              parameters.loc["Age0to4_InfectedNoSymptomsToRecovered"].value, parameters.loc["Age0to4_InfectedNoSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                            parameters.loc["Age0to4_InfectedSymptomsToRecovered"].value, parameters.loc["Age0to4_InfectedSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToSevere(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                         parameters.loc["Age0to4_InfectedSymptomsToSevere"].value, parameters.loc["Age0to4_InfectedSymptomsToSevere"].dev)
+    abm.set_TimeInfectedSevereToRecovered(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                          parameters.loc["Age0to4_SevereToRecovered"].value, parameters.loc["Age0to4_SevereToRecovered"].dev)
+    abm.set_TimeInfectedSevereToCritical(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                         parameters.loc["Age0to4_SevereToCritical"].value, parameters.loc["Age0to4_SevereToCritical"].dev)
+    abm.set_TimeInfectedCriticalToRecovered(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                            parameters.loc["Age0to4_CriticalToRecovered"].value, parameters.loc["Age0to4_CriticalToRecovered"].dev)
+    abm.set_TimeInfectedCriticalToDead(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
+                                       parameters.loc["Age0to4_CriticalToDead"].value, parameters.loc["Age0to4_CriticalToDead"].dev)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_0_to_4,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
@@ -79,26 +80,34 @@ def set_infection_parameters(parameters):
         infection_params, VirusVariant.Wildtype, age_group_0_to_4,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
+    infection_params.SymptomaticPerInfectedNoSymptoms[VirusVariant.Wildtype,
+                                                      age_group_0_to_4] = parameters.loc["Age0to4_SymptomsPerInfectedNoSymptoms"].value
+    infection_params.SeverePerInfectedSymptoms[VirusVariant.Wildtype,
+                                               age_group_0_to_4] = parameters.loc["Age0to4_SeverePerInfectedSymptoms"].value
+    infection_params.CriticalPerInfectedSevere[VirusVariant.Wildtype,
+                                               age_group_0_to_4] = parameters.loc["Age0to4_CriticalPerInfectedSevere"].value
+    infection_params.DeathsPerInfectedCritical[VirusVariant.Wildtype,
+                                               age_group_0_to_4] = parameters.loc["Age0to4_DeathsPerInfectedCritical"].value
 
     # AgeGroup 5-14
-    infection_params.IncubationPeriod[VirusVariant.Wildtype,
-                                      age_group_5_to_14] = parameters.loc["Age5to14_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
-                                                  age_group_5_to_14] = parameters.loc["Age5to14_InfectedNoSymptomsToSymptoms"].value
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
-                                                   age_group_5_to_14] = parameters.loc["Age5to14_InfectedNoSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
-                                                 age_group_5_to_14] = parameters.loc["Age5to14_InfectedSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
-                                              age_group_5_to_14] = parameters.loc["Age5to14_InfectedSymptomsToSevere"].value
-    infection_params.SevereToRecovered[VirusVariant.Wildtype,
-                                       age_group_5_to_14] = parameters.loc["Age5to14_SevereToRecovered"].value
-    infection_params.SevereToCritical[VirusVariant.Wildtype,
-                                      age_group_5_to_14] = parameters.loc["Age5to14_SevereToCritical"].value
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
-                                         age_group_5_to_14] = parameters.loc["Age5to14_CriticalToRecovered"].value
-    infection_params.CriticalToDead[VirusVariant.Wildtype,
-                                    age_group_5_to_14] = parameters.loc["Age5to14_CriticalToDead"].value
+    abm.set_incubationPeriod(
+        infection_params, VirusVariant.Wildtype, age_group_5_to_14, parameters.loc["Age5to14_IncubationPeriod"].value, parameters.loc["Age5to14_IncubationPeriod"].dev)
+    abm.set_TimeInfectedNoSymptomsToSymptoms(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                             parameters.loc["Age5to14_InfectedNoSymptomsToSymptoms"].value, parameters.loc["Age5to14_InfectedNoSymptomsToSymptoms"].dev)
+    abm.set_TimeInfectedNoSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                              parameters.loc["Age5to14_InfectedNoSymptomsToRecovered"].value, parameters.loc["Age5to14_InfectedNoSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                            parameters.loc["Age5to14_InfectedSymptomsToRecovered"].value, parameters.loc["Age5to14_InfectedSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToSevere(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                         parameters.loc["Age5to14_InfectedSymptomsToSevere"].value, parameters.loc["Age5to14_InfectedSymptomsToSevere"].dev)
+    abm.set_TimeInfectedSevereToRecovered(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                          parameters.loc["Age5to14_SevereToRecovered"].value, parameters.loc["Age5to14_SevereToRecovered"].dev)
+    abm.set_TimeInfectedSevereToCritical(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                         parameters.loc["Age5to14_SevereToCritical"].value, parameters.loc["Age5to14_SevereToCritical"].dev)
+    abm.set_TimeInfectedCriticalToRecovered(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                            parameters.loc["Age5to14_CriticalToRecovered"].value, parameters.loc["Age5to14_CriticalToRecovered"].dev)
+    abm.set_TimeInfectedCriticalToDead(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
+                                       parameters.loc["Age5to14_CriticalToDead"].value, parameters.loc["Age5to14_CriticalToDead"].dev)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_5_to_14,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
@@ -107,26 +116,34 @@ def set_infection_parameters(parameters):
         infection_params, VirusVariant.Wildtype, age_group_5_to_14,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
+    infection_params.SymptomaticPerInfectedNoSymptoms[VirusVariant.Wildtype,
+                                                      age_group_5_to_14] = parameters.loc["Age5to14_SymptomsPerInfectedNoSymptoms"].value
+    infection_params.SeverePerInfectedSymptoms[VirusVariant.Wildtype,
+                                               age_group_5_to_14] = parameters.loc["Age5to14_SeverePerInfectedSymptoms"].value
+    infection_params.CriticalPerInfectedSevere[VirusVariant.Wildtype,
+                                               age_group_5_to_14] = parameters.loc["Age5to14_CriticalPerInfectedSevere"].value
+    infection_params.DeathsPerInfectedCritical[VirusVariant.Wildtype,
+                                               age_group_5_to_14] = parameters.loc["Age5to14_DeathsPerInfectedCritical"].value
 
     # AgeGroup 15-34
-    infection_params.IncubationPeriod[VirusVariant.Wildtype,
-                                      age_group_15_to_34] = parameters.loc["Age15to34_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
-                                                  age_group_15_to_34] = parameters.loc["Age15to34_InfectedNoSymptomsToSymptoms"].value
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
-                                                   age_group_15_to_34] = parameters.loc["Age15to34_InfectedNoSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
-                                                 age_group_15_to_34] = parameters.loc["Age15to34_InfectedSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
-                                              age_group_15_to_34] = parameters.loc["Age15to34_InfectedSymptomsToSevere"].value
-    infection_params.SevereToRecovered[VirusVariant.Wildtype,
-                                       age_group_15_to_34] = parameters.loc["Age15to34_SevereToRecovered"].value
-    infection_params.SevereToCritical[VirusVariant.Wildtype,
-                                      age_group_15_to_34] = parameters.loc["Age15to34_SevereToCritical"].value
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
-                                         age_group_15_to_34] = parameters.loc["Age15to34_CriticalToRecovered"].value
-    infection_params.CriticalToDead[VirusVariant.Wildtype,
-                                    age_group_15_to_34] = parameters.loc["Age15to34_CriticalToDead"].value
+    abm.set_incubationPeriod(
+        infection_params, VirusVariant.Wildtype, age_group_15_to_34, parameters.loc["Age15to34_IncubationPeriod"].value, parameters.loc["Age15to34_IncubationPeriod"].dev)
+    abm.set_TimeInfectedNoSymptomsToSymptoms(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                             parameters.loc["Age15to34_InfectedNoSymptomsToSymptoms"].value, parameters.loc["Age15to34_InfectedNoSymptomsToSymptoms"].dev)
+    abm.set_TimeInfectedNoSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                              parameters.loc["Age15to34_InfectedNoSymptomsToRecovered"].value, parameters.loc["Age15to34_InfectedNoSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                            parameters.loc["Age15to34_InfectedSymptomsToRecovered"].value, parameters.loc["Age15to34_InfectedSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToSevere(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                         parameters.loc["Age15to34_InfectedSymptomsToSevere"].value, parameters.loc["Age15to34_InfectedSymptomsToSevere"].dev)
+    abm.set_TimeInfectedSevereToRecovered(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                          parameters.loc["Age15to34_SevereToRecovered"].value, parameters.loc["Age15to34_SevereToRecovered"].dev)
+    abm.set_TimeInfectedSevereToCritical(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                         parameters.loc["Age15to34_SevereToCritical"].value, parameters.loc["Age15to34_SevereToCritical"].dev)
+    abm.set_TimeInfectedCriticalToRecovered(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                            parameters.loc["Age15to34_CriticalToRecovered"].value, parameters.loc["Age15to34_CriticalToRecovered"].dev)
+    abm.set_TimeInfectedCriticalToDead(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
+                                       parameters.loc["Age15to34_CriticalToDead"].value, parameters.loc["Age15to34_CriticalToDead"].dev)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_15_to_34,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
@@ -135,26 +152,34 @@ def set_infection_parameters(parameters):
         infection_params, VirusVariant.Wildtype, age_group_15_to_34,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
+    infection_params.SymptomaticPerInfectedNoSymptoms[VirusVariant.Wildtype,
+                                                      age_group_15_to_34] = parameters.loc["Age15to34_SymptomsPerInfectedNoSymptoms"].value
+    infection_params.SeverePerInfectedSymptoms[VirusVariant.Wildtype,
+                                               age_group_15_to_34] = parameters.loc["Age15to34_SeverePerInfectedSymptoms"].value
+    infection_params.CriticalPerInfectedSevere[VirusVariant.Wildtype,
+                                               age_group_15_to_34] = parameters.loc["Age15to34_CriticalPerInfectedSevere"].value
+    infection_params.DeathsPerInfectedCritical[VirusVariant.Wildtype,
+                                               age_group_15_to_34] = parameters.loc["Age15to34_DeathsPerInfectedCritical"].value
 
     # AgeGroup 35-59
-    infection_params.IncubationPeriod[VirusVariant.Wildtype,
-                                      age_group_35_to_59] = parameters.loc["Age35to59_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
-                                                  age_group_35_to_59] = parameters.loc["Age35to59_InfectedNoSymptomsToSymptoms"].value
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
-                                                   age_group_35_to_59] = parameters.loc["Age35to59_InfectedNoSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
-                                                 age_group_35_to_59] = parameters.loc["Age35to59_InfectedSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
-                                              age_group_35_to_59] = parameters.loc["Age35to59_InfectedSymptomsToSevere"].value
-    infection_params.SevereToRecovered[VirusVariant.Wildtype,
-                                       age_group_35_to_59] = parameters.loc["Age35to59_SevereToRecovered"].value
-    infection_params.SevereToCritical[VirusVariant.Wildtype,
-                                      age_group_35_to_59] = parameters.loc["Age35to59_SevereToCritical"].value
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
-                                         age_group_35_to_59] = parameters.loc["Age35to59_CriticalToRecovered"].value
-    infection_params.CriticalToDead[VirusVariant.Wildtype,
-                                    age_group_35_to_59] = parameters.loc["Age35to59_CriticalToDead"].value
+    abm.set_incubationPeriod(
+        infection_params, VirusVariant.Wildtype, age_group_35_to_59, parameters.loc["Age35to59_IncubationPeriod"].value, parameters.loc["Age35to59_IncubationPeriod"].dev)
+    abm.set_TimeInfectedNoSymptomsToSymptoms(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                             parameters.loc["Age35to59_InfectedNoSymptomsToSymptoms"].value, parameters.loc["Age35to59_InfectedNoSymptomsToSymptoms"].dev)
+    abm.set_TimeInfectedNoSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                              parameters.loc["Age35to59_InfectedNoSymptomsToRecovered"].value, parameters.loc["Age35to59_InfectedNoSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                            parameters.loc["Age35to59_InfectedSymptomsToRecovered"].value, parameters.loc["Age35to59_InfectedSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToSevere(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                         parameters.loc["Age35to59_InfectedSymptomsToSevere"].value, parameters.loc["Age35to59_InfectedSymptomsToSevere"].dev)
+    abm.set_TimeInfectedSevereToRecovered(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                          parameters.loc["Age35to59_SevereToRecovered"].value, parameters.loc["Age35to59_SevereToRecovered"].dev)
+    abm.set_TimeInfectedSevereToCritical(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                         parameters.loc["Age35to59_SevereToCritical"].value, parameters.loc["Age35to59_SevereToCritical"].dev)
+    abm.set_TimeInfectedCriticalToRecovered(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                            parameters.loc["Age35to59_CriticalToRecovered"].value, parameters.loc["Age35to59_CriticalToRecovered"].dev)
+    abm.set_TimeInfectedCriticalToDead(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
+                                       parameters.loc["Age35to59_CriticalToDead"].value, parameters.loc["Age35to59_CriticalToDead"].dev)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_35_to_59,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
@@ -163,26 +188,34 @@ def set_infection_parameters(parameters):
         infection_params, VirusVariant.Wildtype, age_group_35_to_59,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
+    infection_params.SymptomaticPerInfectedNoSymptoms[VirusVariant.Wildtype,
+                                                      age_group_35_to_59] = parameters.loc["Age35to59_SymptomsPerInfectedNoSymptoms"].value
+    infection_params.SeverePerInfectedSymptoms[VirusVariant.Wildtype,
+                                               age_group_35_to_59] = parameters.loc["Age35to59_SeverePerInfectedSymptoms"].value
+    infection_params.CriticalPerInfectedSevere[VirusVariant.Wildtype,
+                                               age_group_35_to_59] = parameters.loc["Age35to59_CriticalPerInfectedSevere"].value
+    infection_params.DeathsPerInfectedCritical[VirusVariant.Wildtype,
+                                               age_group_35_to_59] = parameters.loc["Age35to59_DeathsPerInfectedCritical"].value
 
     # AgeGroup 60-79
-    infection_params.IncubationPeriod[VirusVariant.Wildtype,
-                                      age_group_60_to_79] = parameters.loc["Age60to79_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
-                                                  age_group_60_to_79] = parameters.loc["Age60to79_InfectedNoSymptomsToSymptoms"].value
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
-                                                   age_group_60_to_79] = parameters.loc["Age60to79_InfectedNoSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
-                                                 age_group_60_to_79] = parameters.loc["Age60to79_InfectedSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
-                                              age_group_60_to_79] = parameters.loc["Age60to79_InfectedSymptomsToSevere"].value
-    infection_params.SevereToRecovered[VirusVariant.Wildtype,
-                                       age_group_60_to_79] = parameters.loc["Age60to79_SevereToRecovered"].value
-    infection_params.SevereToCritical[VirusVariant.Wildtype,
-                                      age_group_60_to_79] = parameters.loc["Age60to79_SevereToCritical"].value
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
-                                         age_group_60_to_79] = parameters.loc["Age60to79_CriticalToRecovered"].value
-    infection_params.CriticalToDead[VirusVariant.Wildtype,
-                                    age_group_60_to_79] = parameters.loc["Age60to79_CriticalToDead"].value
+    abm.set_incubationPeriod(
+        infection_params, VirusVariant.Wildtype, age_group_60_to_79, parameters.loc["Age60to79_IncubationPeriod"].value, parameters.loc["Age60to79_IncubationPeriod"].dev)
+    abm.set_TimeInfectedNoSymptomsToSymptoms(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                             parameters.loc["Age60to79_InfectedNoSymptomsToSymptoms"].value, parameters.loc["Age60to79_InfectedNoSymptomsToSymptoms"].dev)
+    abm.set_TimeInfectedNoSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                              parameters.loc["Age60to79_InfectedNoSymptomsToRecovered"].value, parameters.loc["Age60to79_InfectedNoSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                            parameters.loc["Age60to79_InfectedSymptomsToRecovered"].value, parameters.loc["Age60to79_InfectedSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToSevere(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                         parameters.loc["Age60to79_InfectedSymptomsToSevere"].value, parameters.loc["Age60to79_InfectedSymptomsToSevere"].dev)
+    abm.set_TimeInfectedSevereToRecovered(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                          parameters.loc["Age60to79_SevereToRecovered"].value, parameters.loc["Age60to79_SevereToRecovered"].dev)
+    abm.set_TimeInfectedSevereToCritical(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                         parameters.loc["Age60to79_SevereToCritical"].value, parameters.loc["Age60to79_SevereToCritical"].dev)
+    abm.set_TimeInfectedCriticalToRecovered(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                            parameters.loc["Age60to79_CriticalToRecovered"].value, parameters.loc["Age60to79_CriticalToRecovered"].dev)
+    abm.set_TimeInfectedCriticalToDead(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
+                                       parameters.loc["Age60to79_CriticalToDead"].value, parameters.loc["Age60to79_CriticalToDead"].dev)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_60_to_79,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
@@ -191,26 +224,34 @@ def set_infection_parameters(parameters):
         infection_params, VirusVariant.Wildtype, age_group_60_to_79,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
+    infection_params.SymptomaticPerInfectedNoSymptoms[VirusVariant.Wildtype,
+                                                      age_group_60_to_79] = parameters.loc["Age60to79_SymptomsPerInfectedNoSymptoms"].value
+    infection_params.SeverePerInfectedSymptoms[VirusVariant.Wildtype,
+                                               age_group_60_to_79] = parameters.loc["Age60to79_SeverePerInfectedSymptoms"].value
+    infection_params.CriticalPerInfectedSevere[VirusVariant.Wildtype,
+                                               age_group_60_to_79] = parameters.loc["Age60to79_CriticalPerInfectedSevere"].value
+    infection_params.DeathsPerInfectedCritical[VirusVariant.Wildtype,
+                                               age_group_60_to_79] = parameters.loc["Age60to79_DeathsPerInfectedCritical"].value
 
     # AgeGroup 80+
-    infection_params.IncubationPeriod[VirusVariant.Wildtype,
-                                      age_group_80_plus] = parameters.loc["Age80plus_IncubationPeriod"].value
-    infection_params.InfectedNoSymptomsToSymptoms[VirusVariant.Wildtype,
-                                                  age_group_80_plus] = parameters.loc["Age80plus_InfectedNoSymptomsToSymptoms"].value
-    infection_params.InfectedNoSymptomsToRecovered[VirusVariant.Wildtype,
-                                                   age_group_80_plus] = parameters.loc["Age80plus_InfectedNoSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToRecovered[VirusVariant.Wildtype,
-                                                 age_group_80_plus] = parameters.loc["Age80plus_InfectedSymptomsToRecovered"].value
-    infection_params.InfectedSymptomsToSevere[VirusVariant.Wildtype,
-                                              age_group_80_plus] = parameters.loc["Age80plus_InfectedSymptomsToSevere"].value
-    infection_params.SevereToRecovered[VirusVariant.Wildtype,
-                                       age_group_80_plus] = parameters.loc["Age80plus_SevereToRecovered"].value
-    infection_params.SevereToCritical[VirusVariant.Wildtype,
-                                      age_group_80_plus] = parameters.loc["Age80plus_SevereToCritical"].value
-    infection_params.CriticalToRecovered[VirusVariant.Wildtype,
-                                         age_group_80_plus] = parameters.loc["Age80plus_CriticalToRecovered"].value
-    infection_params.CriticalToDead[VirusVariant.Wildtype,
-                                    age_group_80_plus] = parameters.loc["Age80plus_CriticalToDead"].value
+    abm.set_incubationPeriod(
+        infection_params, VirusVariant.Wildtype, age_group_80_plus, parameters.loc["Age80plus_IncubationPeriod"].value, parameters.loc["Age80plus_IncubationPeriod"].dev)
+    abm.set_TimeInfectedNoSymptomsToSymptoms(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                             parameters.loc["Age80plus_InfectedNoSymptomsToSymptoms"].value, parameters.loc["Age80plus_InfectedNoSymptomsToSymptoms"].dev)
+    abm.set_TimeInfectedNoSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                              parameters.loc["Age80plus_InfectedNoSymptomsToRecovered"].value, parameters.loc["Age80plus_InfectedNoSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToRecovered(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                            parameters.loc["Age80plus_InfectedSymptomsToRecovered"].value, parameters.loc["Age80plus_InfectedSymptomsToRecovered"].dev)
+    abm.set_TimeInfectedSymptomsToSevere(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                         parameters.loc["Age80plus_InfectedSymptomsToSevere"].value, parameters.loc["Age80plus_InfectedSymptomsToSevere"].dev)
+    abm.set_TimeInfectedSevereToRecovered(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                          parameters.loc["Age80plus_SevereToRecovered"].value, parameters.loc["Age80plus_SevereToRecovered"].dev)
+    abm.set_TimeInfectedSevereToCritical(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                         parameters.loc["Age80plus_SevereToCritical"].value, parameters.loc["Age80plus_SevereToCritical"].dev)
+    abm.set_TimeInfectedCriticalToRecovered(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                            parameters.loc["Age80plus_CriticalToRecovered"].value, parameters.loc["Age80plus_CriticalToRecovered"].dev)
+    abm.set_TimeInfectedCriticalToDead(infection_params, VirusVariant.Wildtype, age_group_80_plus,
+                                       parameters.loc["Age80plus_CriticalToDead"].value, parameters.loc["Age80plus_CriticalToDead"].dev)
     abm.set_viral_load_parameters(infection_params, VirusVariant.Wildtype, age_group_80_plus,
                                   parameters.loc["peak_max"].value, parameters.loc["peak_max"].value,
                                   parameters.loc["incline"].value, parameters.loc["incline"].value,
@@ -219,6 +260,14 @@ def set_infection_parameters(parameters):
         infection_params, VirusVariant.Wildtype, age_group_80_plus,
         parameters.loc["alpha"].value, parameters.loc["alpha"].value,
         parameters.loc["beta"].value, parameters.loc["beta"].value)
+    infection_params.SymptomaticPerInfectedNoSymptoms[VirusVariant.Wildtype,
+                                                      age_group_80_plus] = parameters.loc["Age80plus_SymptomsPerInfectedNoSymptoms"].value
+    infection_params.SeverePerInfectedSymptoms[VirusVariant.Wildtype,
+                                               age_group_80_plus] = parameters.loc["Age80plus_SeverePerInfectedSymptoms"].value
+    infection_params.CriticalPerInfectedSevere[VirusVariant.Wildtype,
+                                               age_group_80_plus] = parameters.loc["Age80plus_CriticalPerInfectedSevere"].value
+    infection_params.DeathsPerInfectedCritical[VirusVariant.Wildtype,
+                                               age_group_80_plus] = parameters.loc["Age80plus_DeathsPerInfectedCritical"].value
 
     return infection_params
 
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 040ea2d2db..a8edcf48f3 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -73,6 +73,13 @@ struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
     }
 };
 
+std::pair<double, double> get_my_and_sigma(double mean, double std)
+{
+    double my    = log(mean * mean / sqrt(mean * mean + std * std));
+    double sigma = sqrt(log(1 + std * std / (mean * mean)));
+    return {my, sigma};
+}
+
 PYBIND11_MODULE(_simulation_abm, m)
 {
     //pymio::bind_logging(m, "LogLevel");
@@ -114,6 +121,8 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def_readwrite("specificity", &mio::abm::TestParameters::specificity);
 
     pymio::bind_CustomIndexArray<mio::UncertainValue, mio::abm::VirusVariant, mio::AgeGroup>(m, "_AgeParameterArray");
+    // pymio::bind_CustomIndexArray<LogNormalDistribution<double>::ParamType, mio::abm::VirusVariant, mio::AgeGroup>(
+    //     m, "_AgeParameterDist");
     pymio::bind_Index<mio::abm::ExposureType>(m, "ExposureTypeIndex");
     pymio::bind_ParameterSet<mio::abm::ParametersBase>(m, "ParametersBase");
     py::class_<mio::abm::Parameters, mio::abm::ParametersBase>(m, "Parameters")
@@ -302,6 +311,96 @@ PYBIND11_MODULE(_simulation_abm, m)
         },
         py::return_value_policy::reference_internal);
 
+    m.def(
+        "set_incubationPeriod",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto incubation_period_params                                      = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::IncubationPeriod>()[{variant, age}] = {incubation_period_params.first,
+                                                                                  incubation_period_params.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedNoSymptomsToSymptoms",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{variant, age}] = {
+                TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedNoSymptomsToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{variant, age}] = {
+                TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSymptomsToSevere",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSymptomsToSevere = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{variant, age}] = {
+                TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSymptomsToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSymptomsToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{variant, age}] = {
+                TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSevereToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSevereToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSevereToRecovered>()[{variant, age}] = {
+                TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSevereToCritical",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSevereToCritical = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSevereToCritical>()[{variant, age}] = {
+                TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedCriticalToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedCriticalToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{variant, age}] = {
+                TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedCriticalToDead",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedCriticalToDead                                              = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedCriticalToDead>()[{variant, age}] = {
+                TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
+        },
+        py::return_value_policy::reference_internal);
+
     m.def(
         "set_infectivity_parameters",
         [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double min_alpha,

From b8c4a4fa27b989c131f2e6d98d69c9c4036ba52d Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 2 Apr 2024 16:03:12 +0200
Subject: [PATCH 076/103] bug fix

---
 pycode/memilio-simulation/memilio/simulation/abm.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index a8edcf48f3..eb455489ec 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -235,7 +235,7 @@ PYBIND11_MODULE(_simulation_abm, m)
     py::class_<mio::abm::Infection>(m, "Infection")
         .def(py::init([](mio::abm::World& world, mio::abm::Person& person, mio::abm::VirusVariant variant,
                          mio::abm::TimePoint start_date, mio::abm::InfectionState start_state, bool detected) {
-            mio::abm::Person::RandomNumberGenerator& rng =
+            auto rng =
                 mio::abm::Person::RandomNumberGenerator(world.get_rng(), person);
             return mio::abm::Infection(rng, variant, person.get_age(), world.parameters, start_date, start_state,
                                        person.get_latest_protection(), detected);
@@ -435,8 +435,6 @@ PYBIND11_MODULE(_simulation_abm, m)
             return self.get_log();
         });
 
-    py::class_<mio::abm::Person::RandomNumberGenerator>(m, "RandomNumberGenerator")
-        .def(py::init<mio::RandomNumberGenerator, mio::abm::Person>());
 }
 
 // PYMIO_IGNORE_VALUE_TYPE(decltype(std::declval<mio::abm::World>().get_locations()))

From 2a9e569199f58a3fcd8a5c5d3fbb94a0ebabf49e Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 2 Apr 2024 16:06:04 +0200
Subject: [PATCH 077/103] bug fix

---
 pycode/memilio-simulation/memilio/simulation/abm.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index eb455489ec..aeeec7c972 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -235,8 +235,7 @@ PYBIND11_MODULE(_simulation_abm, m)
     py::class_<mio::abm::Infection>(m, "Infection")
         .def(py::init([](mio::abm::World& world, mio::abm::Person& person, mio::abm::VirusVariant variant,
                          mio::abm::TimePoint start_date, mio::abm::InfectionState start_state, bool detected) {
-            auto rng =
-                mio::abm::Person::RandomNumberGenerator(world.get_rng(), person);
+            auto rng = mio::abm::Person::RandomNumberGenerator(world.get_rng(), person);
             return mio::abm::Infection(rng, variant, person.get_age(), world.parameters, start_date, start_state,
                                        person.get_latest_protection(), detected);
         }));
@@ -413,7 +412,7 @@ PYBIND11_MODULE(_simulation_abm, m)
     // m.def("get_instance", [](mio::abm::GlobalInfectionParameters& params) {
     //     auto inf_params = params.get<mio::abm::InfectivityDistributions>()[{mio::abm::VirusVariant::Wildtype,
     //                                                                         mio::abm::AgeGroup::Age80plus}];
-    //     return inf_params.infectivity_alpha.get_distribution_instance()(inf_params.infectivity_alpha.params);
+    //      return inf_params.infectivity_alpha.get_distribution_instance()(inf_params.infectivity_alpha.params);
     // });
 
     py::class_<mio::abm::Simulation>(m, "Simulation")
@@ -434,7 +433,6 @@ PYBIND11_MODULE(_simulation_abm, m)
                                                       LogPersonsPerLocationAndInfectionTime>& self) {
             return self.get_log();
         });
-
 }
 
 // PYMIO_IGNORE_VALUE_TYPE(decltype(std::declval<mio::abm::World>().get_locations()))

From c5ccc67ae6e9047537cb87c42c49e20fa49cb2d8 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 17 Apr 2024 10:48:53 +0200
Subject: [PATCH 078/103] set aerosol transmission to 0

---
 cpp/models/abm/location.cpp     |  8 +++++---
 cpp/models/abm/location.h       |  3 ++-
 cpp/models/abm/parameters.h     | 26 +++++++++++++++++++++-----
 cpp/models/abm/world.cpp        |  2 +-
 cpp/tests/test_abm_location.cpp |  6 +++---
 cpp/tests/test_abm_masks.cpp    |  2 +-
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/cpp/models/abm/location.cpp b/cpp/models/abm/location.cpp
index cdf4d68b81..d5389b5e57 100644
--- a/cpp/models/abm/location.cpp
+++ b/cpp/models/abm/location.cpp
@@ -126,7 +126,7 @@ void Location::adjust_contact_rates(size_t num_agegroups)
     }
 }
 
-void Location::cache_exposure_rates(TimePoint t, TimeSpan dt, size_t num_agegroups)
+void Location::cache_exposure_rates(TimePoint t, TimeSpan dt, size_t num_agegroups, const Parameters& params)
 {
     //cache for next step so it stays constant during the step while subpopulations change
     //otherwise we would have to cache all state changes during a step which uses more memory
@@ -141,8 +141,10 @@ void Location::cache_exposure_rates(TimePoint t, TimeSpan dt, size_t num_agegrou
                 /* average infectivity over the time step 
                  *  to second order accuracy using midpoint rule
                 */
-                cell.m_cached_exposure_rate_contacts[{virus, age}] += inf.get_infectivity(t + dt / 2);
-                cell.m_cached_exposure_rate_air[{virus}] += inf.get_infectivity(t + dt / 2);
+                cell.m_cached_exposure_rate_contacts[{virus, age}] +=
+                    params.get<InfectionRateFromViralShed>()[{virus}] * inf.get_infectivity(t + dt / 2);
+                cell.m_cached_exposure_rate_air[{virus}] +=
+                    params.get<InfectionRateFromViralShed>()[{virus}] * inf.get_infectivity(t + dt / 2);
             }
         }
         if (m_capacity_adapted_transmission_risk) {
diff --git a/cpp/models/abm/location.h b/cpp/models/abm/location.h
index 13541c6ea6..869f05a8a6 100644
--- a/cpp/models/abm/location.h
+++ b/cpp/models/abm/location.h
@@ -233,8 +233,9 @@ class Location
      * @param[in] t Current TimePoint of the Simulation.
      * @param[in] dt The duration of the Simulation step.
      * @param[in] num_agegroups The number of age groups in the model.
+     * @param[in] params Parameters of the Model.
      */
-    void cache_exposure_rates(TimePoint t, TimeSpan dt, size_t num_agegroups);
+    void cache_exposure_rates(TimePoint t, TimeSpan dt, size_t num_agegroups, const Parameters& params);
 
     /**
      * @brief Get the Location specific Infection parameters.
diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index fd88a316bf..722006d9af 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -331,6 +331,21 @@ struct MaskProtection {
     }
 };
 
+/**
+ * @brief Determines the infection rate by viral shed. Used as a linear factor.
+*/
+struct InfectionRateFromViralShed {
+    using Type = CustomIndexArray<ScalarType, VirusVariant>;
+    static Type get_default(AgeGroup /*size*/)
+    {
+        return Type({VirusVariant::Count}, 2.0); //Julia
+    }
+    static std::string name()
+    {
+        return "InfectionRateFromViralShed";
+    }
+};
+
 /**
  * @brief Aerosol transmission rates. 
 */
@@ -338,7 +353,7 @@ struct AerosolTransmissionRates {
     using Type = CustomIndexArray<ScalarType, VirusVariant>;
     static Type get_default(AgeGroup /*size*/)
     {
-        return Type({VirusVariant::Count}, 1.0);
+        return Type({VirusVariant::Count}, 0.0); //Julia
     }
     static std::string name()
     {
@@ -657,10 +672,11 @@ using ParametersBase =
                  TimeInfectedSevereToRecovered, TimeInfectedCriticalToDead, TimeInfectedCriticalToRecovered,
                  SymptomsPerInfectedNoSymptoms, SeverePerInfectedSymptoms, CriticalPerInfectedSevere,
                  DeathsPerInfectedCritical, ViralLoadDistributions, InfectivityDistributions, VirusShedFactor,
-                 DetectInfection, MaskProtection, AerosolTransmissionRates, LockdownDate, QuarantineDuration,
-                 SocialEventRate, BasicShoppingRate, WorkRatio, SchoolRatio, GotoWorkTimeMinimum, GotoWorkTimeMaximum,
-                 GotoSchoolTimeMinimum, GotoSchoolTimeMaximum, AgeGroupGotoSchool, AgeGroupGotoWork,
-                 InfectionProtectionFactor, SeverityProtectionFactor, HighViralLoadProtectionFactor, LogAgentIds>;
+                 DetectInfection, MaskProtection, InfectionRateFromViralShed, AerosolTransmissionRates, LockdownDate,
+                 QuarantineDuration, SocialEventRate, BasicShoppingRate, WorkRatio, SchoolRatio, GotoWorkTimeMinimum,
+                 GotoWorkTimeMaximum, GotoSchoolTimeMinimum, GotoSchoolTimeMaximum, AgeGroupGotoSchool,
+                 AgeGroupGotoWork, InfectionProtectionFactor, SeverityProtectionFactor, HighViralLoadProtectionFactor,
+                 LogAgentIds>;
 
 /**
  * @brief Maximum number of Person%s an infectious Person can infect at the respective Location.
diff --git a/cpp/models/abm/world.cpp b/cpp/models/abm/world.cpp
index 6a802db9e6..4dfaab4956 100755
--- a/cpp/models/abm/world.cpp
+++ b/cpp/models/abm/world.cpp
@@ -153,7 +153,7 @@ void World::begin_step(TimePoint t, TimeSpan dt)
     for (auto i = size_t(0); i < m_locations.size(); ++i) {
         auto&& location = m_locations[i];
         location->adjust_contact_rates(parameters.get_num_groups());
-        location->cache_exposure_rates(t, dt, parameters.get_num_groups());
+        location->cache_exposure_rates(t, dt, parameters.get_num_groups(), parameters);
     }
 }
 
diff --git a/cpp/tests/test_abm_location.cpp b/cpp/tests/test_abm_location.cpp
index 85943b9302..7595a061a6 100644
--- a/cpp/tests/test_abm_location.cpp
+++ b/cpp/tests/test_abm_location.cpp
@@ -127,7 +127,7 @@ TEST(TestLocation, CacheExposureRate)
     infected2.migrate_to(location, {0, 1});
 
     //cache precomputed results
-    location.cache_exposure_rates(t, dt, num_age_groups);
+    location.cache_exposure_rates(t, dt, num_age_groups, params);
 
     EXPECT_NEAR((location.get_cells()[0].m_cached_exposure_rate_contacts[{variant, age}]), 0.015015859523894731, 1e-14);
     EXPECT_NEAR((location.get_cells()[0].m_cached_exposure_rate_air[{variant}]), 0.015015859523894731, 1e-14);
@@ -142,7 +142,7 @@ TEST(TestLocation, CacheExposureRate)
     location.set_capacity(2, 22, 0); // Capacity for Cell 1
     location.set_capacity(2, 22, 1); // Capacity for Cell 2
     location.set_capacity(2, 22, 2); // Capacity for Cell 3
-    location.cache_exposure_rates(t, dt, num_age_groups);
+    location.cache_exposure_rates(t, dt, num_age_groups, params);
 
     EXPECT_NEAR((location.get_cells()[0].m_cached_exposure_rate_air[{variant}]), 0.045047578571684191, 1e-14);
     EXPECT_NEAR((location.get_cells()[1].m_cached_exposure_rate_air[{variant}]), 0.022523789285842095, 1e-14);
@@ -259,7 +259,7 @@ TEST(TestLocation, interact)
     location.add_person(infected3, {0});
 
     //cache precomputed results
-    location.cache_exposure_rates(t, dt, num_age_groups);
+    location.cache_exposure_rates(t, dt, num_age_groups, params);
 
     ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::ExponentialDistribution<double>>>>
         mock_exponential_dist;
diff --git a/cpp/tests/test_abm_masks.cpp b/cpp/tests/test_abm_masks.cpp
index dd0fa484af..1d02b72b47 100644
--- a/cpp/tests/test_abm_masks.cpp
+++ b/cpp/tests/test_abm_masks.cpp
@@ -74,7 +74,7 @@ TEST(TestMasks, maskProtection)
 
     //cache precomputed results
     auto dt = mio::abm::days(1);
-    infection_location.cache_exposure_rates(t, dt, num_age_groups);
+    infection_location.cache_exposure_rates(t, dt, num_age_groups, params);
     // susc_person1 wears a mask, default protection is 1
     susc_person1.set_wear_mask(true);
     // susc_person2 does not wear a mask

From 06d942af1383f2e22013e31da6c28ff0a32aba17 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 28 Aug 2024 15:09:33 +0200
Subject: [PATCH 079/103] bug fix and rework output

---
 cpp/models/abm/infection.cpp                  | 27 ++++--
 cpp/models/abm/infection.h                    | 13 +--
 cpp/models/abm/parameters.h                   |  6 +-
 .../ABM Demonstrator/abm_demonstrator.py      | 88 +++++++++++++++----
 .../memilio/simulation/abm.cpp                | 16 +++-
 .../memilio/simulation/simulation.cpp         |  4 +
 6 files changed, 124 insertions(+), 30 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index aa50ba332f..27c5b4ef17 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -19,6 +19,7 @@
 */
 
 #include "abm/infection.h"
+#include <algorithm>
 #include <math.h>
 
 namespace mio
@@ -85,12 +86,13 @@ ScalarType Infection::get_infectivity(TimePoint t) const
     auto scaled_time       = TimePoint(0) + seconds(int(scaling_factor * (t.seconds() - time_shift.seconds()) -
                                                   (scaling_factor - 1) * m_viral_load.start_date.seconds()));
     ScalarType infectivity = 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(scaled_time))));
-    if (m_infection_course.size() > 3 && m_infection_course[3].second == InfectionState::InfectedSevere) {
-        return infectivity;
-    }
-    else {
-        return 0.75 * infectivity;
-    }
+    return 0.75 * infectivity;
+    // if (m_infection_course.size() > 3 && m_infection_course[3].second == InfectionState::InfectedSevere) {
+    //     return infectivity;
+    // }
+    // else {
+    //     return 0.75 * infectivity;
+    // }
 }
 
 VirusVariant Infection::get_virus_variant() const
@@ -134,6 +136,19 @@ TimePoint Infection::get_start_date() const
     return m_viral_load.start_date;
 }
 
+TimeSpan Infection::get_time_in_state(InfectionState state)
+{
+    auto pos = std::find_if(m_infection_course.begin(), m_infection_course.end(),
+                            [state](const std::pair<TimePoint, InfectionState>& inf) {
+                                return (inf.second == state);
+                            });
+    // infection state is not part of infection course
+    if (pos == m_infection_course.end()) {
+        return TimeSpan(0);
+    }
+    return ((pos + 1)->first - pos->first);
+}
+
 TimePoint Infection::draw_infection_course(Person::RandomNumberGenerator& rng, AgeGroup age, const Parameters& params,
                                            TimePoint init_date, InfectionState init_state,
                                            std::pair<ExposureType, TimePoint> latest_protection)
diff --git a/cpp/models/abm/infection.h b/cpp/models/abm/infection.h
index d34d9c0ecb..9dd85d8380 100644
--- a/cpp/models/abm/infection.h
+++ b/cpp/models/abm/infection.h
@@ -120,6 +120,14 @@ class Infection
     */
     TimePoint get_start_date() const;
 
+    /**
+     * @brief Get the the time in #InfectionState. 
+     * If the infection state is not part of the infection course, the time is zero.
+     * @param[in] state InfectionState of the query.
+     * @return TimeSpan spent in state.
+     */
+    TimeSpan get_time_in_state(InfectionState state);
+
 private:
     /**
      * @brief Determine ViralLoad course and Infection course based on init_state.
@@ -160,11 +168,6 @@ class Infection
     TimePoint draw_infection_course_backward(Person::RandomNumberGenerator& rng, AgeGroup age, const Parameters& params,
                                              TimePoint init_date, InfectionState init_state);
 
-    /**
-     * @return the time a person is infected.
-    */
-    void get_time_infected();
-
     std::vector<std::pair<TimePoint, InfectionState>> m_infection_course; ///< Start date of each #InfectionState.
     VirusVariant m_virus_variant; ///< Variant of the Infection.
     ViralLoad m_viral_load; ///< ViralLoad of the Infection.
diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index 722006d9af..b4b35f26ab 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -338,7 +338,7 @@ struct InfectionRateFromViralShed {
     using Type = CustomIndexArray<ScalarType, VirusVariant>;
     static Type get_default(AgeGroup /*size*/)
     {
-        return Type({VirusVariant::Count}, 2.0); //Julia
+        return Type({VirusVariant::Count}, 0.2); //Julia
     }
     static std::string name()
     {
@@ -404,7 +404,7 @@ struct SeverityProtectionFactor {
  */
 struct HighViralLoadProtectionFactor {
     using Type = InputFunctionForProtectionLevel;
-    static auto get_default()
+    static auto get_default(AgeGroup /*size*/)
     {
         return Type([](ScalarType /*days*/) -> ScalarType {
             return 0;
@@ -471,7 +471,7 @@ struct PCRTest : public GenericTest {
  */
 struct LockdownDate {
     using Type = TimePoint;
-    static auto get_default()
+    static auto get_default(AgeGroup /*size*/)
     {
         return TimePoint(std::numeric_limits<int>::max());
     }
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 751bb01cd1..d2b9319547 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -49,6 +49,23 @@ def __init__(self):
 age_group_80_plus = AgeGroup(5)
 
 
+def age_group_to_string(age_group):
+    if (age_group == age_group_0_to_4):
+        return "0"
+    elif (age_group == age_group_5_to_14):
+        return "1"
+    elif (age_group == age_group_15_to_34):
+        return "2"
+    elif (age_group == age_group_35_to_59):
+        return "3"
+    elif (age_group == age_group_60_to_79):
+        return "4"
+    elif (age_group == age_group_80_plus):
+        return "5"
+    else:
+        return "AgeGroup not found"
+
+
 def set_infection_parameters(parameters):
 
     infection_params = abm.Parameters(num_age_groups)
@@ -663,20 +680,49 @@ def write_infection_paths_to_file_states(path, log):
     f.close()
 
 
-def write_infection_paths_to_file(path, log):
-    agent_ids = [log[2][0][i][1] for i in range(len(log[2][0]))]
+def write_infection_paths_to_file(path, world, tmax):
     with open(path, 'w') as f:
         f.write("Agent_id S E I_ns I_sy I_sev I_cri R D\n")
-        for id in agent_ids:
+        for person in world.persons:
             line = str(id) + " "
-            # times_per_state is number of time points per compartment: [S, E, I_ns, I_sy, I_sev, I_cri, R, D]
-            times_per_state = [0 for comp in range(8)]
-            for t in range(len(log[2])):
-                times_per_state[int(log[2][t][id][3])] += 1
-            for state in range(len(times_per_state)):
-                line += str(times_per_state[state]) + " "
-            f.write(line)
-            f.write('\n')
+            if person.infection_state(tmax) == abm.InfectionState.Susceptible:
+                line += str(tmax.hours) + " "
+                for i in range(int(abm.InfectionState.Count)-1):
+                    line += "0 "
+            else:
+                time_S = max(
+                    person.infection.get_infection_start() - abm.TimePoint(0), abm.TimeSpan(0))
+                time_E = person.infection.get_time_in_state(
+                    abm.InfectionState.Exposed)
+                time_INS = person.infection.get_time_in_state(
+                    abm.InfectionState.InfectedNoSymptoms)
+                time_ISy = person.infection.get_time_in_state(
+                    abm.InfectionState.InfectedSymptoms)
+                time_ISev = person.infection.get_time_in_state(
+                    abm.InfectionState.InfectedSevere)
+                time_ICri = person.infection.get_time_in_state(
+                    abm.InfectionState.InfectedCritical)
+                time_R = 0
+                time_D = 0
+                if (person.infection_state(tmax) == abm.InfectionState.Recovered):
+                    time_infected = time_E + time_INS + time_ISy + time_ISev + time_ICri
+                    if (time_S.hours == 0):
+                        time_R = tmax - \
+                            (time_infected +
+                             (person.infection.get_infection_start() - abm.TimePoint(0)))
+                    else:
+                        time_R = tmax - time_S - time_infected
+                if (person.infection_state(tmax) == abm.InfectionState.Dead):
+                    time_infected = time_E + time_INS + time_ISy + time_ISev + time_ICri
+                    if (time_S.hours == 0):
+                        time_R = tmax - \
+                            (time_infected +
+                             (person.infection.get_infection_start() - abm.TimePoint(0)))
+                    else:
+                        time_R = tmax - time_S - time_infected
+                line += str(time_S.hours) + " " + str(time_E.hours) + " " + str(time_INS.hours) + " " + str(time_ISy) + " " \
+                    + str(time_ISev) + " " + str(time_ICri) + \
+                    " " + str(time_R) + " " + str(time_D)
     f.close()
 
 
@@ -697,10 +743,20 @@ def set_sim_result_at_start(sim):
         result += location.population.get_last_value()
 
 
+def write_age_and_hh(world, path):
+    with open(path, 'w') as f:
+        for person in world.persons:
+            line = str(person.id) + " " + age_group_to_string(person.age) + " " + \
+                str(person.assigned_location(abm.LocationType.Home))
+            f.write(line)
+            f.write('\n')
+        f.close()
+
+
 def run_abm_simulation():
     mio.set_log_level(mio.LogLevel.Warning)
     input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
-    output_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
+    output_path = 'H:/Documents/INSIDeDemonstrator/share_with_julia/memilio_output/20240828/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -728,18 +784,20 @@ def run_abm_simulation():
     assign_locations(sim.world)
     # output object
     history = History()
+    # just used for debugging
+    # write_age_and_hh(sim.world, os.path.join(output_path, 'age_hh.txt'))
     # advance simulation until tmax
     sim.advance(tmax, history)
     # results collected during the simulation
     log = history.log
+    # write infection paths per agent to file
+    write_infection_paths_to_file(os.path.join(
+        output_path, 'infection_paths.txt'), sim.world, tmax)
     # write simulation results to txt file
     write_results_to_file(os.path.join(output_path, 'output.txt'), log)
     # write location mapping to txt file
     write_location_mapping_to_file(
         os.path.join(output_path, 'location_mapping.txt'), mapping)
-    # write infection paths per agent to file
-    write_infection_paths_to_file(os.path.join(
-        output_path, 'infection_paths.txt'), log)
 
     print('done')
 
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index aeeec7c972..0d5a98d98e 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -191,8 +191,18 @@ PYBIND11_MODULE(_simulation_abm, m)
              [](mio::abm::Person& self, mio::abm::Infection& infection, mio::abm::TimePoint t) {
                  self.add_new_infection(std::move(infection), t);
              })
+        .def("assigned_location",
+             [](mio::abm::Person& self, mio::abm::LocationType type) {
+                 return self.get_assigned_location_index(type);
+             })
+        .def("infection_state",
+             [](mio::abm::Person& self, mio::abm::TimePoint t) {
+                 return self.get_infection_state(t);
+             })
+        .def_property_readonly("infection", py::overload_cast<>(&mio::abm::Person::get_infection, py::const_))
         .def_property_readonly("location", py::overload_cast<>(&mio::abm::Person::get_location, py::const_))
         .def_property_readonly("age", &mio::abm::Person::get_age)
+        .def_property_readonly("id", &mio::abm::Person::get_person_id)
         .def_property_readonly("is_in_quarantine", &mio::abm::Person::is_in_quarantine);
 
     py::class_<mio::abm::HouseholdMember>(m, "HouseholdMember")
@@ -238,7 +248,11 @@ PYBIND11_MODULE(_simulation_abm, m)
             auto rng = mio::abm::Person::RandomNumberGenerator(world.get_rng(), person);
             return mio::abm::Infection(rng, variant, person.get_age(), world.parameters, start_date, start_state,
                                        person.get_latest_protection(), detected);
-        }));
+        }))
+        .def("get_infection_start", &mio::abm::Infection::get_infection_start)
+        .def("get_time_in_state", [](mio::abm::Infection& self, mio::abm::InfectionState state) {
+            return self.get_time_in_state(state);
+        });
 
     py::class_<mio::abm::Location>(m, "Location")
         .def("set_capacity", &mio::abm::Location::set_capacity)
diff --git a/pycode/memilio-simulation/memilio/simulation/simulation.cpp b/pycode/memilio-simulation/memilio/simulation/simulation.cpp
index e60ee53704..25bb92a2c9 100755
--- a/pycode/memilio-simulation/memilio/simulation/simulation.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/simulation.cpp
@@ -38,6 +38,8 @@
 #include "memilio/geography/regions.h"
 #include "memilio/epidemiology/contact_matrix.h"
 
+#include "models/abm/virus_variant.h"
+
 namespace py = pybind11;
 
 namespace pymio
@@ -54,6 +56,8 @@ std::string pretty_name<mio::AgeGroup>()
 PYBIND11_MODULE(_simulation, m)
 {
     pymio::bind_CustomIndexArray<mio::UncertainValue, mio::AgeGroup>(m, "AgeGroupArray");
+    pymio::bind_CustomIndexArray<bool, mio::AgeGroup>(m, "b_AgeGroupArray");
+    pymio::bind_CustomIndexArray<double, mio::abm::VirusVariant>(m, "d_VirusVariantArray");
     py::class_<mio::AgeGroup, mio::Index<mio::AgeGroup>>(m, "AgeGroup").def(py::init<size_t>());
 
     pymio::bind_date(m, "Date");

From c21be46f3aadf32644b15b398ccb6746d4ee7659 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 2 Sep 2024 08:28:07 +0200
Subject: [PATCH 080/103] new infectivity curve

---
 cpp/models/abm/infection.cpp                  | 45 +++++++++++--------
 cpp/models/abm/parameters.h                   |  2 +-
 .../ABM Demonstrator/abm_demonstrator.py      | 31 +++++++------
 3 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 27c5b4ef17..6dd495896d 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -20,7 +20,10 @@
 
 #include "abm/infection.h"
 #include <algorithm>
+#include <cstddef>
+#include <cstdlib>
 #include <math.h>
+#include <stdexcept>
 
 namespace mio
 {
@@ -44,20 +47,30 @@ Infection::Infection(Person::RandomNumberGenerator& rng, VirusVariant virus, Age
     }
     m_viral_load.peak = vl_params.viral_load_peak.get_distribution_instance()(rng, vl_params.viral_load_peak.params) *
                         high_viral_load_factor;
-    m_viral_load.incline =
-        vl_params.viral_load_incline.get_distribution_instance()(rng, vl_params.viral_load_incline.params);
-    m_viral_load.decline =
-        vl_params.viral_load_decline.get_distribution_instance()(rng, vl_params.viral_load_decline.params);
-    m_viral_load.end_date =
-        m_viral_load.start_date +
-        days(int(m_viral_load.peak / m_viral_load.incline - m_viral_load.peak / m_viral_load.decline));
+    m_time_is_infected = m_infection_course.back().first - m_infection_course[0].first;
+    // the third entry in the infection course is the time an agents switches to InfectedSymptoms or recovers after non-symptomatic
+    TimePoint t_peak      = m_infection_course[2].first;
+    m_viral_load.incline  = std::abs(m_viral_load.peak / (t_peak - m_infection_course[0].first).days());
+    m_viral_load.end_date = m_viral_load.start_date + m_time_is_infected;
+    if (m_infection_course.size() < 4) {
+        t_peak            = m_viral_load.start_date + TimeSpan(int(0.65 * m_time_is_infected.seconds()));
+        m_viral_load.peak = m_viral_load.incline * (t_peak - m_viral_load.start_date).days();
+    }
+    m_viral_load.decline = -m_viral_load.peak / (m_viral_load.end_date - t_peak).days();
 
     auto inf_params = params.get<InfectivityDistributions>()[{virus, age}];
     m_log_norm_alpha =
         inf_params.infectivity_alpha.get_distribution_instance()(rng, inf_params.infectivity_alpha.params);
     m_log_norm_beta = inf_params.infectivity_beta.get_distribution_instance()(rng, inf_params.infectivity_beta.params);
 
-    m_time_is_infected = m_infection_course.back().first - m_infection_course[0].first;
+    // // print infection course
+    // for (size_t i = size_t(0); i < m_infection_course.size(); ++i) {
+    //     std::cout << static_cast<int>(m_infection_course[i].second) << ": " << m_infection_course[i].first.days();
+    // }
+    // std::cout << "\n";
+    // for (auto t = m_viral_load.start_date; t <= m_viral_load.end_date + days(3); t += days(1)) {
+    //     std::cout << "t: " << t.days() << " i(t): " << get_infectivity(t) << std::endl;
+    // }
 }
 
 ScalarType Infection::get_viral_load(TimePoint t) const
@@ -81,18 +94,12 @@ ScalarType Infection::get_infectivity(TimePoint t) const
     auto time_shift = (m_infection_course[1].first - m_infection_course[0].first) - minutes(1872);
     if (m_viral_load.start_date + time_shift >= t)
         return 0;
-    ScalarType scaling_factor =
-        double((m_viral_load.end_date - m_viral_load.start_date).seconds()) / double(m_time_is_infected.seconds());
-    auto scaled_time       = TimePoint(0) + seconds(int(scaling_factor * (t.seconds() - time_shift.seconds()) -
-                                                  (scaling_factor - 1) * m_viral_load.start_date.seconds()));
-    ScalarType infectivity = 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(scaled_time))));
+    ScalarType infectivity = 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(t - time_shift))));
+    if ((infectivity < 0) ||
+        (infectivity > (1.0 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * m_viral_load.peak)))))) {
+        log_error("Error: Infectivity smaller zero or above peak value.");
+    }
     return 0.75 * infectivity;
-    // if (m_infection_course.size() > 3 && m_infection_course[3].second == InfectionState::InfectedSevere) {
-    //     return infectivity;
-    // }
-    // else {
-    //     return 0.75 * infectivity;
-    // }
 }
 
 VirusVariant Infection::get_virus_variant() const
diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index b4b35f26ab..5be46c3208 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -338,7 +338,7 @@ struct InfectionRateFromViralShed {
     using Type = CustomIndexArray<ScalarType, VirusVariant>;
     static Type get_default(AgeGroup /*size*/)
     {
-        return Type({VirusVariant::Count}, 0.2); //Julia
+        return Type({VirusVariant::Count}, 0.4); //Julia
     }
     static std::string name()
     {
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index d2b9319547..9c59b35628 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -684,9 +684,9 @@ def write_infection_paths_to_file(path, world, tmax):
     with open(path, 'w') as f:
         f.write("Agent_id S E I_ns I_sy I_sev I_cri R D\n")
         for person in world.persons:
-            line = str(id) + " "
+            line = str(int(person.id)) + " "
             if person.infection_state(tmax) == abm.InfectionState.Susceptible:
-                line += str(tmax.hours) + " "
+                line += str(int(tmax.hours)) + " "
                 for i in range(int(abm.InfectionState.Count)-1):
                     line += "0 "
             else:
@@ -702,8 +702,8 @@ def write_infection_paths_to_file(path, world, tmax):
                     abm.InfectionState.InfectedSevere)
                 time_ICri = person.infection.get_time_in_state(
                     abm.InfectionState.InfectedCritical)
-                time_R = 0
-                time_D = 0
+                time_R = abm.TimePoint(0)
+                time_D = abm.TimePoint(0)
                 if (person.infection_state(tmax) == abm.InfectionState.Recovered):
                     time_infected = time_E + time_INS + time_ISy + time_ISev + time_ICri
                     if (time_S.hours == 0):
@@ -720,9 +720,12 @@ def write_infection_paths_to_file(path, world, tmax):
                              (person.infection.get_infection_start() - abm.TimePoint(0)))
                     else:
                         time_R = tmax - time_S - time_infected
-                line += str(time_S.hours) + " " + str(time_E.hours) + " " + str(time_INS.hours) + " " + str(time_ISy) + " " \
-                    + str(time_ISev) + " " + str(time_ICri) + \
-                    " " + str(time_R) + " " + str(time_D)
+                line += str(int(time_S.hours)) + " " + str(int(time_E.hours)) + " " + str(int(time_INS.hours)) + " " + str(int(time_ISy.hours)) + " " \
+                    + str(int(time_ISev.hours)) + " " + str(int(time_ICri.hours)) + \
+                    " " + str(int(time_R.hours)) + " " + \
+                    str(int(time_D.hours)) + " "
+            f.write(line)
+            f.write('\n')
     f.close()
 
 
@@ -753,10 +756,10 @@ def write_age_and_hh(world, path):
         f.close()
 
 
-def run_abm_simulation():
+def run_abm_simulation(sim_num):
     mio.set_log_level(mio.LogLevel.Warning)
     input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
-    output_path = 'H:/Documents/INSIDeDemonstrator/share_with_julia/memilio_output/20240828/'
+    output_path = 'H:/Documents/INSIDeDemonstrator/share_with_julia/memilio_output/20240831/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -792,12 +795,13 @@ def run_abm_simulation():
     log = history.log
     # write infection paths per agent to file
     write_infection_paths_to_file(os.path.join(
-        output_path, 'infection_paths.txt'), sim.world, tmax)
+        output_path, str(sim_num) + '_infection_paths.txt'), sim.world, tmax)
     # write simulation results to txt file
-    write_results_to_file(os.path.join(output_path, 'output.txt'), log)
+    write_results_to_file(os.path.join(
+        output_path, str(sim_num) + '_output.txt'), log)
     # write location mapping to txt file
     write_location_mapping_to_file(
-        os.path.join(output_path, 'location_mapping.txt'), mapping)
+        os.path.join(output_path, str(sim_num) + '_location_mapping.txt'), mapping)
 
     print('done')
 
@@ -809,4 +813,5 @@ def run_abm_simulation():
     args = arg_parser.parse_args()
     # set LogLevel
     mio.set_log_level(mio.LogLevel.Warning)
-    run_abm_simulation(**args.__dict__)
+    for i in range(250):
+        run_abm_simulation(i, **args.__dict__)

From f4e70d20fbad8e081531633349e0f3ca3784347e Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 6 Sep 2024 07:43:15 +0200
Subject: [PATCH 081/103] change t_peak and t_shift

---
 cpp/models/abm/infection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 6dd495896d..9df1d7e57b 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -53,7 +53,7 @@ Infection::Infection(Person::RandomNumberGenerator& rng, VirusVariant virus, Age
     m_viral_load.incline  = std::abs(m_viral_load.peak / (t_peak - m_infection_course[0].first).days());
     m_viral_load.end_date = m_viral_load.start_date + m_time_is_infected;
     if (m_infection_course.size() < 4) {
-        t_peak            = m_viral_load.start_date + TimeSpan(int(0.65 * m_time_is_infected.seconds()));
+        t_peak            = m_viral_load.start_date + TimeSpan(int(0.5 * m_time_is_infected.seconds()));
         m_viral_load.peak = m_viral_load.incline * (t_peak - m_viral_load.start_date).days();
     }
     m_viral_load.decline = -m_viral_load.peak / (m_viral_load.end_date - t_peak).days();
@@ -91,7 +91,7 @@ ScalarType Infection::get_viral_load(TimePoint t) const
 
 ScalarType Infection::get_infectivity(TimePoint t) const
 {
-    auto time_shift = (m_infection_course[1].first - m_infection_course[0].first) - minutes(1872);
+    auto time_shift = TimeSpan(int(0.6 * (m_infection_course[1].first - m_infection_course[0].first).seconds()));
     if (m_viral_load.start_date + time_shift >= t)
         return 0;
     ScalarType infectivity = 1 / (1 + exp(-(m_log_norm_alpha + m_log_norm_beta * get_viral_load(t - time_shift))));

From 26f708f86833b5847ac11a65e928375bba6b1abc Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 9 Sep 2024 08:30:07 +0200
Subject: [PATCH 082/103] add individual return from work/school times

---
 cpp/models/abm/migration_rules.cpp            |   6 +-
 cpp/models/abm/parameters.h                   | 100 +++++++++++++++++-
 cpp/models/abm/person.cpp                     |  28 ++++-
 cpp/models/abm/person.h                       |  26 ++++-
 .../ABM Demonstrator/abm_demonstrator.py      |   4 +-
 5 files changed, 152 insertions(+), 12 deletions(-)

diff --git a/cpp/models/abm/migration_rules.cpp b/cpp/models/abm/migration_rules.cpp
index ab7d4cc6d1..87b0a7d65f 100644
--- a/cpp/models/abm/migration_rules.cpp
+++ b/cpp/models/abm/migration_rules.cpp
@@ -61,7 +61,8 @@ LocationType go_to_school(Person::RandomNumberGenerator& /*rng*/, const Person&
         return LocationType::School;
     }
     //return home
-    if (current_loc == LocationType::School && t.hour_of_day() >= 15) {
+    if (current_loc == LocationType::School && person.get_return_from_school_time(params) >= t.time_since_midnight() &&
+        person.get_return_from_school_time(params) < t.time_since_midnight() + dt) {
         return LocationType::Home;
     }
     return current_loc;
@@ -80,7 +81,8 @@ LocationType go_to_work(Person::RandomNumberGenerator& /*rng*/, const Person& pe
         return LocationType::Work;
     }
     //return home
-    if (current_loc == LocationType::Work && t.hour_of_day() >= 17) {
+    if (current_loc == LocationType::Work && t.time_since_midnight() <= person.get_return_from_work_time(params) &&
+        t.time_since_midnight() + dt > person.get_return_from_work_time(params)) {
         return LocationType::Home;
     }
     return current_loc;
diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index 5be46c3208..954685c917 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -586,6 +586,36 @@ struct GotoWorkTimeMaximum {
     }
 };
 
+/**
+ * @brief Earliest time that a Person can return from work.
+ */
+struct ReturnFromWorkTimeMinimum {
+    using Type = CustomIndexArray<TimeSpan, AgeGroup>;
+    static auto get_default(AgeGroup size)
+    {
+        return CustomIndexArray<TimeSpan, AgeGroup>(size, hours(15));
+    }
+    static std::string name()
+    {
+        return "ReturnFromWorkTimeMinimum";
+    }
+};
+
+/**
+ * @brief Latest time that a Person can return from work.
+ */
+struct ReturnFromWorkTimeMaximum {
+    using Type = CustomIndexArray<TimeSpan, AgeGroup>;
+    static auto get_default(AgeGroup size)
+    {
+        return CustomIndexArray<TimeSpan, AgeGroup>(size, hours(18));
+    }
+    static std::string name()
+    {
+        return "ReturnFromWorkTimeMaximum";
+    }
+};
+
 /**
  * @brief Earliest time that a Person can go to school.
  */
@@ -616,6 +646,36 @@ struct GotoSchoolTimeMaximum {
     }
 };
 
+/**
+ * @brief Earliest time that a Person can return from school.
+ */
+struct ReturnFromSchoolTimeMinimum {
+    using Type = CustomIndexArray<TimeSpan, AgeGroup>;
+    static auto get_default(AgeGroup size)
+    {
+        return CustomIndexArray<TimeSpan, AgeGroup>(size, hours(14));
+    }
+    static std::string name()
+    {
+        return "ReturnFromSchoolTimeMinimum";
+    }
+};
+
+/**
+ * @brief Latest time that a Person can return from school.
+ */
+struct ReturnFromSchoolTimeMaximum {
+    using Type = CustomIndexArray<TimeSpan, AgeGroup>;
+    static auto get_default(AgeGroup size)
+    {
+        return CustomIndexArray<TimeSpan, AgeGroup>(size, hours(17));
+    }
+    static std::string name()
+    {
+        return "ReturnFromSchoolTimeMaximum";
+    }
+};
+
 /**
  * @brief The set of AgeGroups that can go to school.
  */
@@ -674,7 +734,8 @@ using ParametersBase =
                  DeathsPerInfectedCritical, ViralLoadDistributions, InfectivityDistributions, VirusShedFactor,
                  DetectInfection, MaskProtection, InfectionRateFromViralShed, AerosolTransmissionRates, LockdownDate,
                  QuarantineDuration, SocialEventRate, BasicShoppingRate, WorkRatio, SchoolRatio, GotoWorkTimeMinimum,
-                 GotoWorkTimeMaximum, GotoSchoolTimeMinimum, GotoSchoolTimeMaximum, AgeGroupGotoSchool,
+                 GotoWorkTimeMaximum, ReturnFromWorkTimeMinimum, ReturnFromWorkTimeMaximum GotoSchoolTimeMinimum,
+                 GotoSchoolTimeMaximum, ReturnFromSchoolTimeMinimum, ReturnFromSchoolTimeMaximum, AgeGroupGotoSchool,
                  AgeGroupGotoWork, InfectionProtectionFactor, SeverityProtectionFactor, HighViralLoadProtectionFactor,
                  LogAgentIds>;
 
@@ -881,6 +942,25 @@ class Parameters : public ParametersBase
                 return true;
             }
 
+            if (this->get<ReturnFromWorkTimeMinimum>()[i].seconds() < 0.0 ||
+                this->get<ReturnFromWorkTimeMinimum>()[i].seconds() >
+                    this->get<ReturnFromWorkTimeMaximum>()[i].seconds()) {
+                log_error("Constraint check: Parameter ReturnFromWorkTimeMinimum of age group {:.0f} smaller {:d} or "
+                          "larger {:d}",
+                          (size_t)i, 0, this->get<ReturnFromWorkTimeMaximum>()[i].seconds());
+                return true;
+            }
+
+            if (this->get<ReturnFromWorkTimeMaximum>()[i].seconds() <
+                    this->get<ReturnFromWorkTimeMinimum>()[i].seconds() ||
+                this->get<ReturnFromWorkTimeMaximum>()[i] > days(1)) {
+                log_error(
+                    "Constraint check: Parameter ReturnFromWorkTimeMaximum of age group {:.0f} smaller {:d} or larger "
+                    "than one day time span",
+                    (size_t)i, this->get<ReturnFromWorkTimeMinimum>()[i].seconds());
+                return true;
+            }
+
             if (this->get<GotoSchoolTimeMinimum>()[i].seconds() < 0.0 ||
                 this->get<GotoSchoolTimeMinimum>()[i].seconds() > this->get<GotoSchoolTimeMaximum>()[i].seconds()) {
                 log_error("Constraint check: Parameter GotoSchoolTimeMinimum of age group {:.0f} smaller {:d} or "
@@ -896,6 +976,24 @@ class Parameters : public ParametersBase
                           (size_t)i, this->get<GotoSchoolTimeMinimum>()[i].seconds());
                 return true;
             }
+            if (this->get<ReturnFromSchoolTimeMinimum>()[i].seconds() < 0.0 ||
+                this->get<ReturnFromSchoolTimeMinimum>()[i].seconds() >
+                    this->get<ReturnFromSchoolTimeMaximum>()[i].seconds()) {
+                log_error("Constraint check: Parameter ReturnFromSchoolTimeMinimum of age group {:.0f} smaller {:d} or "
+                          "larger {:d}",
+                          (size_t)i, 0, this->get<ReturnFromWorkTimeMaximum>()[i].seconds());
+                return true;
+            }
+
+            if (this->get<ReturnFromSchoolTimeMaximum>()[i].seconds() <
+                    this->get<ReturnFromSchoolTimeMinimum>()[i].seconds() ||
+                this->get<ReturnFromSchoolTimeMaximum>()[i] > days(1)) {
+                log_error(
+                    "Constraint check: Parameter ReturnFromWorkTimeMaximum of age group {:.0f} smaller {:d} or larger "
+                    "than one day time span",
+                    (size_t)i, this->get<ReturnFromSchoolTimeMinimum>()[i].seconds());
+                return true;
+            }
         }
 
         if (this->get<MaskProtection>()[MaskType::Community] < 0.0 ||
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 2d94cc8a7b..e59ff6513e 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -47,10 +47,12 @@ Person::Person(mio::RandomNumberGenerator& rng, Location& location, AgeGroup age
     , m_cells{0}
     , m_last_transport_mode(TransportMode::Unknown)
 {
-    m_random_workgroup        = UniformDistribution<double>::get_instance()(rng);
-    m_random_schoolgroup      = UniformDistribution<double>::get_instance()(rng);
-    m_random_goto_work_hour   = UniformDistribution<double>::get_instance()(rng);
-    m_random_goto_school_hour = UniformDistribution<double>::get_instance()(rng);
+    m_random_workgroup               = UniformDistribution<double>::get_instance()(rng);
+    m_random_schoolgroup             = UniformDistribution<double>::get_instance()(rng);
+    m_random_goto_work_hour          = UniformDistribution<double>::get_instance()(rng);
+    m_random_return_from_work_hour   = UniformDistribution<double>::get_instance()(rng);
+    m_random_goto_school_hour        = UniformDistribution<double>::get_instance()(rng);
+    m_random_return_from_school_hour = UniformDistribution<double>::get_instance()(rng);
 }
 
 Person Person::copy_person(Location& location)
@@ -191,6 +193,15 @@ TimeSpan Person::get_go_to_work_time(const Parameters& params) const
     return minimum_goto_work_time + seconds(seconds_after_minimum);
 }
 
+TimeSpan Person::get_return_from_work_time(const Parameters& params) const
+{
+    TimeSpan minimum_return_from_work_time = params.get<ReturnFromWorkTimeMinimum>()[m_age];
+    TimeSpan maximum_return_from_work_time = params.get<ReturnFromWorkTimeMaximum>()[m_age];
+    int timeSlots             = (maximum_return_from_work_time.seconds() - minimum_return_from_work_time.seconds());
+    int seconds_after_minimum = int(timeSlots * m_random_return_from_work_hour);
+    return minimum_return_from_work_time + seconds(seconds_after_minimum);
+}
+
 TimeSpan Person::get_go_to_school_time(const Parameters& params) const
 {
     TimeSpan minimum_goto_school_time = params.get<GotoSchoolTimeMinimum>()[m_age];
@@ -200,6 +211,15 @@ TimeSpan Person::get_go_to_school_time(const Parameters& params) const
     return minimum_goto_school_time + seconds(seconds_after_minimum);
 }
 
+TimeSpan Person::get_return_from_school_time(const Parameters& params) const
+{
+    TimeSpan minimum_return_from_school_time = params.get<ReturnFromSchoolTimeMinimum>()[m_age];
+    TimeSpan maximum_return_from_school_time = params.get<ReturnFromSchoolTimeMaximum>()[m_age];
+    int timeSlots             = (maximum_return_from_school_time.seconds() - minimum_return_from_school_time.seconds());
+    int seconds_after_minimum = int(timeSlots * m_random_return_from_school_hour);
+    return minimum_return_from_school_time + seconds(seconds_after_minimum);
+}
+
 bool Person::goes_to_school(TimePoint t, const Parameters& params) const
 {
     return m_random_schoolgroup < params.get<SchoolRatio>().get_matrix_at(t.days())[0];
diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index b68c9bc7dd..51273f6945 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -300,6 +300,15 @@ class Person
      */
     TimeSpan get_go_to_work_time(const Parameters& params) const;
 
+    /**
+     * @brief Draw at what time the Person returns from work.
+     * Every Person has a random number to determine what time to return from work.
+     * Depending on this number Person decides what time it has to return from work.
+     * @param[in] params Parameters that describe the migration between Location%s.
+     * @return The time of returning from work.
+     */
+    TimeSpan get_return_from_work_time(const Parameters& params) const;
+
     /**
      * @brief Draw if the Person goes to school or stays at home during lockdown.
      * Every Person has a random number that determines if they go to school in case of a lockdown.
@@ -310,7 +319,7 @@ class Person
     bool goes_to_school(TimePoint t, const Parameters& params) const;
 
     /**
-     * @brief Draw at what time the Person goes to work.
+     * @brief Draw at what time the Person goes to school.
      * Every Person has a random number to determine what time to go to school.
      * Depending on this number Person decides what time has to go to school.
      * @param[in] params Parameters that describe the migration between Location%s.
@@ -318,6 +327,15 @@ class Person
      */
     TimeSpan get_go_to_school_time(const Parameters& params) const;
 
+    /**
+     * @brief Draw at what time the Person return from school.
+     * Every Person has a random number to determine what time to return from school.
+     * Depending on this number Person decides what time it has to return from school.
+     * @param[in] params Parameters that describe the migration between Location%s.
+     * @return The time of returning from school.
+     */
+    TimeSpan get_return_from_school_time(const Parameters& params) const;
+
     /**
      * @brief Answers the question if a Person is currently in quarantine.
      * If a Person is in quarantine this Person cannot migrate to Location%s other than Home or the Hospital.
@@ -329,7 +347,7 @@ class Person
     {
         return t < m_quarantine_start + params.get<mio::abm::QuarantineDuration>();
     }
-    
+
     /**
      * @brief Removes the quarantine status of the Person.
      */
@@ -450,7 +468,7 @@ class Person
         m_vaccinations.push_back(Vaccination(v, t));
     }
 
-  /**
+    /**
      * @brief Get the transport mode the Person used to get to its current Location.
      * @return TransportMode the Person used to get to its current Location.
     */
@@ -526,7 +544,9 @@ class Person
     double m_random_workgroup; ///< Value to determine if the Person goes to work or works from home during lockdown.
     double m_random_schoolgroup; ///< Value to determine if the Person goes to school or stays at home during lockdown.
     double m_random_goto_work_hour; ///< Value to determine at what time the Person goes to work.
+    double m_random_return_from_work_hour; ///< Value to determine at what time the Person returns from work.
     double m_random_goto_school_hour; ///< Value to determine at what time the Person goes to school.
+    double m_random_return_from_school_hour; ///< Value to determine at what time the Person returns from school.
     TimePoint m_time_of_last_test; ///< TimePoint of the last negative test.
     Mask m_mask; ///< The Mask of the Person.
     bool m_wears_mask = false; ///< Whether the Person currently wears a Mask.
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 9c59b35628..7914ae612b 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -759,7 +759,7 @@ def write_age_and_hh(world, path):
 def run_abm_simulation(sim_num):
     mio.set_log_level(mio.LogLevel.Warning)
     input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
-    output_path = 'H:/Documents/INSIDeDemonstrator/share_with_julia/memilio_output/20240831/'
+    output_path = 'H:/Documents/INSIDeDemonstrator/share_with_julia/memilio_output/20240902/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(0)
     # starting time point
@@ -813,5 +813,5 @@ def run_abm_simulation(sim_num):
     args = arg_parser.parse_args()
     # set LogLevel
     mio.set_log_level(mio.LogLevel.Warning)
-    for i in range(250):
+    for i in range(10):
         run_abm_simulation(i, **args.__dict__)

From 1ecf01e62cf54d2d42b5e0e69d9e891aa679648d Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:00:47 +0200
Subject: [PATCH 083/103] seed and comp output

---
 cpp/models/abm/infection.cpp                  |  9 +++++++
 cpp/models/abm/infection.h                    |  6 +++++
 cpp/models/abm/migration_rules.cpp            |  3 ++-
 cpp/models/abm/parameters.h                   |  2 +-
 cpp/models/abm/person.cpp                     | 27 ++++---------------
 cpp/models/abm/person.h                       |  3 +--
 .../memilio/simulation/abm.cpp                | 11 ++++++++
 7 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 9df1d7e57b..e2774b4f42 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -128,6 +128,15 @@ TimePoint Infection::get_infection_start() const
         .first;
 }
 
+TimePoint Infection::get_infection_end() const
+{
+    return (*std::find_if(m_infection_course.begin(), m_infection_course.end(),
+                          [](const std::pair<TimePoint, InfectionState>& inf) {
+                              return (inf.second == InfectionState::Recovered || inf.second == InfectionState::Dead);
+                          }))
+        .first;
+}
+
 void Infection::set_detected()
 {
     m_detected = true;
diff --git a/cpp/models/abm/infection.h b/cpp/models/abm/infection.h
index 9dd85d8380..2e5cfd61fc 100644
--- a/cpp/models/abm/infection.h
+++ b/cpp/models/abm/infection.h
@@ -105,6 +105,12 @@ class Infection
      */
     TimePoint get_infection_start() const;
 
+    /**
+     * @brief Get the end time  of the Infection.
+     * @return End time point of the Infection i.e. time point of recovery or death.
+     */
+    TimePoint get_infection_end() const;
+
     /**
      * @brief Set the Infection to detected.
      */
diff --git a/cpp/models/abm/migration_rules.cpp b/cpp/models/abm/migration_rules.cpp
index 87b0a7d65f..cb8841fcca 100644
--- a/cpp/models/abm/migration_rules.cpp
+++ b/cpp/models/abm/migration_rules.cpp
@@ -113,7 +113,8 @@ LocationType go_to_event(Person::RandomNumberGenerator& rng, const Person& perso
     auto current_loc = person.get_location().get_type();
     //leave
     if (current_loc == LocationType::Home && t < params.get<LockdownDate>() &&
-        ((t.day_of_week() <= 4 && t.hour_of_day() >= 19) || (t.day_of_week() >= 5 && t.hour_of_day() >= 10)) &&
+        ((t.day_of_week() <= 4 && t.hour_of_day() >= 19 && t.hour_of_day() < 22) ||
+         (t.day_of_week() >= 5 && t.hour_of_day() >= 10 && t.hour_of_day() < 22)) &&
         !person.is_in_quarantine(t, params)) {
         return random_transition(rng, current_loc, dt,
                                  {{LocationType::SocialEvent,
diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index 954685c917..7b94a145b4 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -734,7 +734,7 @@ using ParametersBase =
                  DeathsPerInfectedCritical, ViralLoadDistributions, InfectivityDistributions, VirusShedFactor,
                  DetectInfection, MaskProtection, InfectionRateFromViralShed, AerosolTransmissionRates, LockdownDate,
                  QuarantineDuration, SocialEventRate, BasicShoppingRate, WorkRatio, SchoolRatio, GotoWorkTimeMinimum,
-                 GotoWorkTimeMaximum, ReturnFromWorkTimeMinimum, ReturnFromWorkTimeMaximum GotoSchoolTimeMinimum,
+                 GotoWorkTimeMaximum, ReturnFromWorkTimeMinimum, ReturnFromWorkTimeMaximum, GotoSchoolTimeMinimum,
                  GotoSchoolTimeMaximum, ReturnFromSchoolTimeMinimum, ReturnFromSchoolTimeMaximum, AgeGroupGotoSchool,
                  AgeGroupGotoWork, InfectionProtectionFactor, SeverityProtectionFactor, HighViralLoadProtectionFactor,
                  LogAgentIds>;
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index e59ff6513e..37d4300119 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -65,12 +65,11 @@ Person Person::copy_person(Location& location)
 
 void Person::interact(RandomNumberGenerator& rng, TimePoint t, TimeSpan dt, const Parameters& params)
 {
-    auto old_infection_state = get_infection_state(t);
     if (get_infection_state(t) == InfectionState::Susceptible) { // Susceptible
         m_location->interact(rng, *this, t, dt, params);
     }
     m_time_at_location += dt;
-    change_time_since_transmission(old_infection_state, get_infection_state(t + dt), dt, t);
+    change_time_since_transmission(dt, t);
 }
 
 void Person::migrate_to(Location& loc_new, mio::abm::TransportMode transport_mode, const std::vector<uint32_t>& cells)
@@ -114,29 +113,13 @@ void Person::add_new_infection(Infection&& inf, TimePoint current_time)
     m_infections.push_back(std::move(inf));
 }
 
-void Person::change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
-                                            const TimeSpan dt, TimePoint t)
+void Person::change_time_since_transmission(const TimeSpan dt, TimePoint t)
 {
-    if (new_inf_state == InfectionState::Recovered || new_inf_state == InfectionState::Dead) {
-        m_time_since_transmission = mio::abm::TimeSpan(std::numeric_limits<int>::max() / 2);
-    }
-    else if (curr_inf_state != new_inf_state) {
-        if (new_inf_state == InfectionState::Exposed) {
-            m_time_since_transmission = mio::abm::TimeSpan(0);
-        }
-        else {
-            m_time_since_transmission += dt;
-        }
+    if (is_infected(t + dt)) {
+        m_time_since_transmission = ((t + dt) - m_infections.back().get_infection_start());
     }
     else {
-        if (is_infected(t)) {
-            if (m_time_since_transmission > mio::abm::TimeSpan(std::numeric_limits<int>::max() / 4)) {
-                m_time_since_transmission = mio::abm::TimeSpan(0);
-            }
-            else {
-                m_time_since_transmission += dt;
-            }
-        }
+        m_time_since_transmission = mio::abm::TimeSpan(std::numeric_limits<int>::max() / 2);
     }
 }
 
diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index 51273f6945..20d3bfd2ad 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -529,8 +529,7 @@ class Person
     };
 
 private:
-    void change_time_since_transmission(const InfectionState curr_inf_state, const InfectionState new_inf_state,
-                                        const TimeSpan dt, TimePoint t);
+    void change_time_since_transmission(const TimeSpan dt, TimePoint t);
 
     observer_ptr<Location> m_location; ///< Current Location of the Person.
     std::vector<uint32_t> m_assigned_locations; /**! Vector with the indices of the assigned Locations so that the 
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index 0d5a98d98e..e16d65eee4 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -31,6 +31,8 @@
 #include "pybind11/pybind11.h"
 #include "pybind11/operators.h"
 #include "utils/logging.h"
+#include <cstddef>
+#include <cstdint>
 #include <type_traits>
 
 namespace py = pybind11;
@@ -423,6 +425,15 @@ PYBIND11_MODULE(_simulation_abm, m)
         },
         py::return_value_policy::reference_internal);
 
+    m.def(
+        "set_seeds",
+        [](mio::abm::World& world, int seed) {
+            auto rng = mio::RandomNumberGenerator();
+            rng.seed({static_cast<uint32_t>(seed)});
+            world.get_rng() = rng;
+        },
+        py::return_value_policy::reference_internal);
+
     // m.def("get_instance", [](mio::abm::GlobalInfectionParameters& params) {
     //     auto inf_params = params.get<mio::abm::InfectivityDistributions>()[{mio::abm::VirusVariant::Wildtype,
     //                                                                         mio::abm::AgeGroup::Age80plus}];

From 6842175ad96850eb40dccdcaff863323e858de36 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:04:48 +0200
Subject: [PATCH 084/103] bug fix

---
 .../simulation/ABM Demonstrator/abm_demonstrator.py  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 7914ae612b..a3078f7b09 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -720,10 +720,10 @@ def write_infection_paths_to_file(path, world, tmax):
                              (person.infection.get_infection_start() - abm.TimePoint(0)))
                     else:
                         time_R = tmax - time_S - time_infected
-                line += str(int(time_S.hours)) + " " + str(int(time_E.hours)) + " " + str(int(time_INS.hours)) + " " + str(int(time_ISy.hours)) + " " \
-                    + str(int(time_ISev.hours)) + " " + str(int(time_ICri.hours)) + \
-                    " " + str(int(time_R.hours)) + " " + \
-                    str(int(time_D.hours)) + " "
+                line += str(time_S.hours) + " " + str(time_E.hours) + " " + str(time_INS.hours) + " " + str(time_ISy.hours) + " " \
+                    + str(time_ISev.hours) + " " + str(time_ICri.hours) + \
+                    " " + str(time_R.hours) + " " + \
+                    str(time_D.hours) + " "
             f.write(line)
             f.write('\n')
     f.close()
@@ -775,6 +775,8 @@ def run_abm_simulation(sim_num):
         input_path, 'parameter_table.csv'), index_col=0)
     # create simulation with starting timepoint and number of age groups
     sim = abm.Simulation(t0, num_age_groups)
+    # set seeds for simulation
+    abm.set_seeds(sim.world, 18)
     # set infection parameters
     sim.world.parameters = set_infection_parameters(parameters)
     # as input areas do not fit one-to-one to abm location types, there has to be a mapping
@@ -813,5 +815,5 @@ def run_abm_simulation(sim_num):
     args = arg_parser.parse_args()
     # set LogLevel
     mio.set_log_level(mio.LogLevel.Warning)
-    for i in range(10):
+    for i in range(1):
         run_abm_simulation(i, **args.__dict__)

From 95c537b702959725c08020661908b36d5db4de70 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:07:16 +0200
Subject: [PATCH 085/103] add comp output

---
 .../simulation/ABM Demonstrator/abm_demonstrator.py        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index a3078f7b09..4cf9e78e9a 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -756,6 +756,10 @@ def write_age_and_hh(world, path):
         f.close()
 
 
+def write_compartments_to_file(world, path, timepoints):
+    print('test')
+
+
 def run_abm_simulation(sim_num):
     mio.set_log_level(mio.LogLevel.Warning)
     input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
@@ -798,6 +802,9 @@ def run_abm_simulation(sim_num):
     # write infection paths per agent to file
     write_infection_paths_to_file(os.path.join(
         output_path, str(sim_num) + '_infection_paths.txt'), sim.world, tmax)
+    # write compartment size per time step to file
+    write_compartments_to_file(sim.world, os.path.join(
+        output_path, str(sim_num) + '_comps.csv'), log[0])
     # write simulation results to txt file
     write_results_to_file(os.path.join(
         output_path, str(sim_num) + '_output.txt'), log)

From 6608a986c049d4dfe2c1594c1cbd4d9d838aa592 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:10:25 +0200
Subject: [PATCH 086/103] test

---
 .../examples/simulation/ABM Demonstrator/abm_demonstrator.py  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 4cf9e78e9a..26ab28c766 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -757,7 +757,9 @@ def write_age_and_hh(world, path):
 
 
 def write_compartments_to_file(world, path, timepoints):
-    print('test')
+    with open(path, 'w') as f:
+        f.write("t S E Ins Isy Isev Icri R D\n")
+        f.close()
 
 
 def run_abm_simulation(sim_num):

From a4684d7dc76eb69ec376b4ea23fe0cc949301bd8 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:11:18 +0200
Subject: [PATCH 087/103] test

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 26ab28c766..2ada011189 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -759,6 +759,8 @@ def write_age_and_hh(world, path):
 def write_compartments_to_file(world, path, timepoints):
     with open(path, 'w') as f:
         f.write("t S E Ins Isy Isev Icri R D\n")
+        for t in range(len(timepoints)):
+            tp = abm.TimePoint(0) + abm.hours(t)
         f.close()
 
 

From 18e6337cd642bde6ed17c4fc369553b90a45df58 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:11:45 +0200
Subject: [PATCH 088/103] test

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 2ada011189..dcfa18e80e 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -761,6 +761,7 @@ def write_compartments_to_file(world, path, timepoints):
         f.write("t S E Ins Isy Isev Icri R D\n")
         for t in range(len(timepoints)):
             tp = abm.TimePoint(0) + abm.hours(t)
+            line = str(timepoints[t]) + " "
         f.close()
 
 

From a197f20ae9d2ec7d63e4fbf50d7db7696e702d08 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:12:07 +0200
Subject: [PATCH 089/103] test

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index dcfa18e80e..08bafea1e5 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -762,6 +762,8 @@ def write_compartments_to_file(world, path, timepoints):
         for t in range(len(timepoints)):
             tp = abm.TimePoint(0) + abm.hours(t)
             line = str(timepoints[t]) + " "
+            f.write(line)
+            f.write('\n')
         f.close()
 
 

From d73cf6efc065a7a9738b6c3f5fbef0c2bb73f68b Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:12:29 +0200
Subject: [PATCH 090/103] test

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 08bafea1e5..400f812850 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -762,6 +762,7 @@ def write_compartments_to_file(world, path, timepoints):
         for t in range(len(timepoints)):
             tp = abm.TimePoint(0) + abm.hours(t)
             line = str(timepoints[t]) + " "
+            comps = np.zeros(int(abm.InfectionState.Count))
             f.write(line)
             f.write('\n')
         f.close()

From e4fad2f954d9bf6c1fd2c8349dc1485c470af366 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:13:59 +0200
Subject: [PATCH 091/103] test

---
 pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 400f812850..76a3876654 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -763,6 +763,8 @@ def write_compartments_to_file(world, path, timepoints):
             tp = abm.TimePoint(0) + abm.hours(t)
             line = str(timepoints[t]) + " "
             comps = np.zeros(int(abm.InfectionState.Count))
+            for person in world.persons:
+                state = person.infection_state(tp)
             f.write(line)
             f.write('\n')
         f.close()

From 9c8ea31a828fcdd121ab036d12af7ad71ba6c964 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 12 Sep 2024 16:14:42 +0200
Subject: [PATCH 092/103] test

---
 .../examples/simulation/ABM Demonstrator/abm_demonstrator.py   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 76a3876654..95ba7f4c1a 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -765,6 +765,9 @@ def write_compartments_to_file(world, path, timepoints):
             comps = np.zeros(int(abm.InfectionState.Count))
             for person in world.persons:
                 state = person.infection_state(tp)
+                comps[int(state)] += 1
+            for c in comps:
+                line += str(c) + " "
             f.write(line)
             f.write('\n')
         f.close()

From dabbd1969a1c44585858114976eefc6bc2588cd0 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 17 Sep 2024 10:02:44 +0200
Subject: [PATCH 093/103] new intialization

---
 cpp/models/abm/parameters.h                            |  2 +-
 .../simulation/ABM Demonstrator/abm_demonstrator.py    | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index 7b94a145b4..9ca6b40177 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -338,7 +338,7 @@ struct InfectionRateFromViralShed {
     using Type = CustomIndexArray<ScalarType, VirusVariant>;
     static Type get_default(AgeGroup /*size*/)
     {
-        return Type({VirusVariant::Count}, 0.4); //Julia
+        return Type({VirusVariant::Count}, 0.1); //Julia
     }
     static std::string name()
     {
diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 95ba7f4c1a..574b96575f 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -431,8 +431,6 @@ def insert_locations_to_map(mapping, inputId, locationIds):
 
 
 def create_locations_from_input(world, input_areas, household_distribution):
-    # set seeds to have fixed locations for given input
-    np.random.seed(0)
     # map input area ids to corresponding abm location ids
     mapping = []
     # bools to make sure the world has a school and a hospital
@@ -778,7 +776,7 @@ def run_abm_simulation(sim_num):
     input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
     output_path = 'H:/Documents/INSIDeDemonstrator/share_with_julia/memilio_output/20240902/'
     # set seed for fixed model initialization (locations and initial infection states)
-    np.random.seed(0)
+    np.random.seed(sim_num)
     # starting time point
     t0 = abm.TimePoint(0)
     # end time point: simulation will run 14 days
@@ -793,15 +791,15 @@ def run_abm_simulation(sim_num):
     # create simulation with starting timepoint and number of age groups
     sim = abm.Simulation(t0, num_age_groups)
     # set seeds for simulation
-    abm.set_seeds(sim.world, 18)
+    abm.set_seeds(sim.world, sim_num)
     # set infection parameters
     sim.world.parameters = set_infection_parameters(parameters)
     # as input areas do not fit one-to-one to abm location types, there has to be a mapping
     mapping = create_locations_from_input(
         sim.world, areas, household_distribution)
     # assign initial infection states according to distribution
-    assign_infection_states(sim.world, t0, 0.005, 0.001,
-                            0.001, 0.0001, 0.0, 0.0)
+    assign_infection_states(sim.world, t0, 0.002, 0.005,
+                            0.0029, 0.0001, 0.0, 0.0)
     # assign locations to agents
     assign_locations(sim.world)
     # output object

From 547c21433db64f4c9da8e4af4f448f7cf3752eb8 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Mon, 23 Sep 2024 14:03:57 +0200
Subject: [PATCH 094/103] input files

---
 .../ABM Demonstrator/abm_demonstrator.py      |   8 +-
 .../input/INSIDe_Demonstrator_AreaList.txt    | 124 ++++++++++++++++++
 .../input/parameter_table.csv                 |  86 ++++++++++++
 3 files changed, 215 insertions(+), 3 deletions(-)
 create mode 100644 pycode/examples/simulation/ABM Demonstrator/input/INSIDe_Demonstrator_AreaList.txt
 create mode 100644 pycode/examples/simulation/ABM Demonstrator/input/parameter_table.csv

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 574b96575f..17bd3fd229 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -20,6 +20,7 @@
 import argparse
 import numpy as np
 import os
+import sys
 
 import memilio.simulation as mio
 from memilio.simulation import abm
@@ -29,6 +30,7 @@
 from memilio.simulation.abm import Infection
 
 import pandas as pd
+
 # class used to map input areas to abm locations
 
 
@@ -773,8 +775,8 @@ def write_compartments_to_file(world, path, timepoints):
 
 def run_abm_simulation(sim_num):
     mio.set_log_level(mio.LogLevel.Warning)
-    input_path = 'C:/Users/bick_ju/Documents/INSIDe/Demonstrator/INSIDeDemonstrator/'
-    output_path = 'H:/Documents/INSIDeDemonstrator/share_with_julia/memilio_output/20240902/'
+    input_path = sys.path[0] + '/input/'
+    output_path = sys.path[0] + '/output/'
     # set seed for fixed model initialization (locations and initial infection states)
     np.random.seed(sim_num)
     # starting time point
@@ -785,7 +787,7 @@ def run_abm_simulation(sim_num):
     household_distribution = [0.4084, 0.3375, 0.1199, 0.0965, 0.0377]
     # read txt file with inputs
     areas = read_txt(os.path.join(
-        input_path, 'INSIDe_Demonstrator_AreaList_modified.txt'))
+        input_path, 'INSIDe_Demonstrator_AreaList.txt'))
     parameters = pd.read_csv(os.path.join(
         input_path, 'parameter_table.csv'), index_col=0)
     # create simulation with starting timepoint and number of age groups
diff --git a/pycode/examples/simulation/ABM Demonstrator/input/INSIDe_Demonstrator_AreaList.txt b/pycode/examples/simulation/ABM Demonstrator/input/INSIDe_Demonstrator_AreaList.txt
new file mode 100644
index 0000000000..0b1200d451
--- /dev/null
+++ b/pycode/examples/simulation/ABM Demonstrator/input/INSIDe_Demonstrator_AreaList.txt	
@@ -0,0 +1,124 @@
+id	inhabitants	type
+00001	0	recreational
+00002	0	recreational
+00003	0	recreational
+00004	0	recreational
+00005	0	recreational
+00006	0	recreational
+00007	0	recreational
+00008	0	recreational
+00009	0	shopping_business
+00010	0	shopping_business
+00011	0	shopping_business
+00012	0	shopping_business
+00013	0	shopping_business
+00014	0	shopping_business
+00015	0	shopping_business
+00016	0	shopping_business
+00017	0	shopping_business
+00018	0	shopping_business
+00019	0	shopping_business
+00020	0	shopping_business
+00021	0	shopping_business
+00022	0	shopping_business
+00023	0	shopping_business
+00024	0	shopping_business
+00025	0	shopping_business
+00026	0	shopping_business
+00027	0	shopping_business
+00028	0	shopping_business
+00029	0	shopping_business
+00030	0	shopping_business
+00031	0	university
+00032	0	university
+00033	35	residential_3
+00034	20	residential_3
+00035	10	residential_3
+00036	10	residential_3
+00037	3	residential_3
+00038	10	residential_3
+00039	3	residential_3
+00040	10	residential_3
+00041	10	residential_3
+00042	10	residential_3
+00043	10	residential_3
+00044	10	residential_3
+00045	10	residential_3
+00046	10	residential_3
+00047	10	residential_3
+00048	10	residential_3
+00049	10	residential_3
+00050	10	residential_3
+00051	10	residential_3
+00052	10	residential_3
+00053	10	residential_3
+00054	10	residential_3
+00055	10	residential_3
+00056	10	residential_3
+00057	10	residential_3
+00058	10	residential_3
+00059	10	residential_3
+00060	10	residential_3
+00061	10	residential_3
+00062	0	university
+00063	0	university
+00064	0	university
+00065	0	university
+00066	0	university
+00067	0	university
+00068	0	university
+00069	0	university
+00070	12	mixed
+00072	8	mixed
+00074	8	mixed
+00075	5	mixed
+00076	6	mixed
+00077	7	mixed
+00078	4	mixed
+00079	0	shopping_business
+00080	0	shopping_business
+00081	0	shopping_business
+00082	0	shopping_business
+00083	37	residential_1
+00084	25	residential_1
+00085	28	residential_1
+00086	7	residential_1
+00087	7	residential_1
+00088	10	residential_1
+00089	10	residential_1
+00090	10	residential_1
+00091	10	residential_1
+00092	10	residential_1
+00093	10	residential_1
+00094	10	residential_1
+00095	10	residential_1
+00096	10	residential_1
+00097	10	residential_1
+00098	10	residential_1
+00099	10	residential_1
+00100	8	residential_1
+00101	8	residential_1
+00102	31	residential_1
+00103	16	residential_1
+00104	0	recreational
+00105	0	shopping_business
+00106	0	shopping_business
+00107	0	recreational
+00108	0	recreational
+00109	0	shopping_business
+00110	0	recreational
+00111	40	residential_2
+00112	7	residential_2
+00113	10	residential_2
+00114	10	residential_2
+00115	10	residential_2
+00116	10	residential_2
+00117	10	residential_2
+00118	10	residential_2
+00119	10	residential_2
+00120	10	residential_2
+00121	10	residential_2
+00122	18	residential_2
+00123	10	residential_2
+00124	15	residential_2
+00125	10	residential_2
\ No newline at end of file
diff --git a/pycode/examples/simulation/ABM Demonstrator/input/parameter_table.csv b/pycode/examples/simulation/ABM Demonstrator/input/parameter_table.csv
new file mode 100644
index 0000000000..50b211a6b0
--- /dev/null
+++ b/pycode/examples/simulation/ABM Demonstrator/input/parameter_table.csv	
@@ -0,0 +1,86 @@
+parameter,value,dev
+Age0to4_IncubationPeriod,3,1.2
+Age0to4_InfectedNoSymptomsToSymptoms,2.2,0.5
+Age0to4_InfectedNoSymptomsToRecovered,9.2,2.0
+Age0to4_InfectedSymptomsToRecovered,7,2.0
+Age0to4_InfectedSymptomsToSevere,10.5,1.1
+Age0to4_SevereToRecovered,5,2.0
+Age0to4_SevereToCritical,5,2.0
+Age0to4_CriticalToRecovered,7,3.0
+Age0to4_CriticalToDead,6,2.0
+Age0to4_SymptomsPerInfectedNoSymptoms,0.79,0.0
+Age0to4_SeverePerInfectedSymptoms,0.08,0.0
+Age0to4_CriticalPerInfectedSevere,0.18,0.0
+Age0to4_DeathsPerInfectedCritical,0.1,0.0
+Age5to14_IncubationPeriod,3,1.2
+Age5to14_InfectedNoSymptomsToSymptoms,2.2,0.5
+Age5to14_InfectedNoSymptomsToRecovered,9.2,2.0
+Age5to14_InfectedSymptomsToRecovered,7,2.0
+Age5to14_InfectedSymptomsToSevere,10.5,1.1
+Age5to14_SevereToRecovered,5,2.0
+Age5to14_SevereToCritical,5,2.0
+Age5to14_CriticalToRecovered,7,3.0
+Age5to14_CriticalToDead,6,2.0
+Age5to14_SymptomsPerInfectedNoSymptoms,0.79,0.0
+Age5to14_SeverePerInfectedSymptoms,0.08,0.0
+Age5to14_CriticalPerInfectedSevere,0.18,0.0
+Age5to14_DeathsPerInfectedCritical,0.1,0.0
+Age15to34_IncubationPeriod,3,1.2
+Age15to34_InfectedNoSymptomsToSymptoms,2.2,0.5
+Age15to34_InfectedNoSymptomsToRecovered,9.2,2.0
+Age15to34_InfectedSymptomsToRecovered,7,2.0
+Age15to34_InfectedSymptomsToSevere,10.5,1.1
+Age15to34_SevereToRecovered,6,2.0
+Age15to34_SevereToCritical,5,2.0
+Age15to34_CriticalToRecovered,7,3.0
+Age15to34_CriticalToDead,6,2.0
+Age15to34_SymptomsPerInfectedNoSymptoms,0.79,0.0
+Age15to34_SeverePerInfectedSymptoms,0.08,0.0
+Age15to34_CriticalPerInfectedSevere,0.18,0.0
+Age15to34_DeathsPerInfectedCritical,0.1,0.0
+Age35to59_IncubationPeriod,3,1.2
+Age35to59_InfectedNoSymptomsToSymptoms,2.2,0.5
+Age35to59_InfectedNoSymptomsToRecovered,9.2,2.0
+Age35to59_InfectedSymptomsToRecovered,7,2.0
+Age35to59_InfectedSymptomsToSevere,6,1.1
+Age35to59_SevereToRecovered,8,2.0
+Age35to59_SevereToCritical,5,2.0
+Age35to59_CriticalToRecovered,17.5,3.0
+Age35to59_CriticalToDead,16.5,2.0
+Age35to59_SymptomsPerInfectedNoSymptoms,0.79,0.0
+Age35to59_SeverePerInfectedSymptoms,0.08,0.0
+Age35to59_CriticalPerInfectedSevere,0.18,0.0
+Age35to59_DeathsPerInfectedCritical,0.1,0.0
+Age60to79_IncubationPeriod,3,1.2
+Age60to79_InfectedNoSymptomsToSymptoms,2.2,0.5
+Age60to79_InfectedNoSymptomsToRecovered,9.2,2.0
+Age60to79_InfectedSymptomsToRecovered,7,2.0
+Age60to79_InfectedSymptomsToSevere,6,1.1
+Age60to79_SevereToRecovered,10,2.0
+Age60to79_SevereToCritical,5,2.0
+Age60to79_CriticalToRecovered,17.5,3.0
+Age60to79_CriticalToDead,16.5,2.0
+Age60to79_SymptomsPerInfectedNoSymptoms,0.79,0.0
+Age60to79_SeverePerInfectedSymptoms,0.08,0.0
+Age60to79_CriticalPerInfectedSevere,0.18,0.0
+Age60to79_DeathsPerInfectedCritical,0.1,0.0
+Age80plus_IncubationPeriod,3,1.2
+Age80plus_InfectedNoSymptomsToSymptoms,2.2,0.5
+Age80plus_InfectedNoSymptomsToRecovered,9.2,2.0
+Age80plus_InfectedSymptomsToRecovered,7,2.0
+Age80plus_InfectedSymptomsToSevere,6,1.1
+Age80plus_SevereToRecovered,15,3.0
+Age80plus_SevereToCritical,5,2.0
+Age80plus_CriticalToRecovered,12.5,3.0
+Age80plus_CriticalToDead,11,2.0
+Age80plus_SymptomsPerInfectedNoSymptoms,0.79,0.0
+Age80plus_SeverePerInfectedSymptoms,0.08,0.0
+Age80plus_CriticalPerInfectedSevere,0.18,0.0
+Age80plus_DeathsPerInfectedCritical,0.1,0.0
+incline,2
+decline,-0.17
+alpha,-7
+beta,1
+t_limit,1.3
+peak_max,8.1
+s_sc,12589254.1179417
\ No newline at end of file

From 7c40a5794b58a04c05bf88b4350a949a93d3e704 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 17 Dec 2024 11:32:29 +0100
Subject: [PATCH 095/103] new output format

---
 .../ABM Demonstrator/abm_demonstrator.py      | 44 ++++++++++++++++---
 .../memilio/simulation/abm.cpp                | 28 ++++++++----
 2 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 17bd3fd229..56b4665948 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -21,6 +21,8 @@
 import numpy as np
 import os
 import sys
+import h5py
+import time
 
 import memilio.simulation as mio
 from memilio.simulation import abm
@@ -603,11 +605,11 @@ def assign_locations(world):
 
 
 def convert_loc_id_to_string(loc_id):
-    type = str(int(loc_id[0]))
-    index = str(loc_id[1])
-    if int(int(loc_id[0])) < 10:
+    type = str(int(loc_id.type))
+    index = str(loc_id.index)
+    if int(loc_id.type) < 10:
         type = "0" + type
-    if int(loc_id[1]) < 10:
+    if int(loc_id.index) < 10:
         index = "0" + index
 
     return type + index
@@ -616,7 +618,7 @@ def convert_loc_id_to_string(loc_id):
 def get_agents_per_location(loc_id, agents):
     agents_per_loc = []
     for a in agents:
-        if (int(a[0].type) == int(loc_id[0]) and a[0].index == loc_id[1]):
+        if (int(a[0].type) == int(loc_id.type) and a[0].index == loc_id.index):
             agents_per_loc.append(a)
     return agents_per_loc
 
@@ -773,6 +775,30 @@ def write_compartments_to_file(world, path, timepoints):
         f.close()
 
 
+def convert_time_since_transmission(time):
+    if (time.days > 1000):
+        return -1.0
+    else:
+        return time.hours
+
+
+def write_results_to_h5(path, log):
+    file = h5py.File(path, 'w')
+    result_list = []
+    for agent in log[3][0]:
+        gr = file.create_group(str(agent))
+        loc_ids = np.array([convert_loc_id_to_string(log[2][t][agent][0])
+                           for t in range(len(log[2]))], dtype=np.str_)
+        time_since_transm = np.array([convert_time_since_transmission(
+            log[2][t][agent][2]) for t in range(len(log[2]))], dtype=np.float64)
+        ds = gr.create_dataset('loc_ids', shape=len(
+            loc_ids), dtype=h5py.string_dtype())
+        ds[:] = loc_ids
+        gr.create_dataset("time_since_transm",
+                          data=time_since_transm, dtype=np.float64)
+    file.close()
+
+
 def run_abm_simulation(sim_num):
     mio.set_log_level(mio.LogLevel.Warning)
     input_path = sys.path[0] + '/input/'
@@ -818,9 +844,17 @@ def run_abm_simulation(sim_num):
     # write compartment size per time step to file
     write_compartments_to_file(sim.world, os.path.join(
         output_path, str(sim_num) + '_comps.csv'), log[0])
+    start = time.time()
+    write_results_to_h5(os.path.join(
+        output_path, str(sim_num) + '_output.h5'), log)
+    end = time.time()
+    print(f'Time to write output h5: {end - start} seconds')
+    start = time.time()
     # write simulation results to txt file
     write_results_to_file(os.path.join(
         output_path, str(sim_num) + '_output.txt'), log)
+    end = time.time()
+    print(f'Time to write output txt: {end - start} seconds')
     # write location mapping to txt file
     write_location_mapping_to_file(
         os.path.join(output_path, str(sim_num) + '_location_mapping.txt'), mapping)
diff --git a/pycode/memilio-simulation/memilio/simulation/abm.cpp b/pycode/memilio-simulation/memilio/simulation/abm.cpp
index e16d65eee4..9f4c63cd49 100644
--- a/pycode/memilio-simulation/memilio/simulation/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/abm.cpp
@@ -48,17 +48,30 @@ struct LogTimePoint : mio::LogAlways {
 
 //LocationId logger
 struct LogLocationIds : mio::LogOnce {
-    using Type = std::vector<std::tuple<mio::abm::LocationType, uint32_t>>;
+    using Type = std::vector<mio::abm::LocationId>;
     static Type log(const mio::abm::Simulation& sim)
     {
-        std::vector<std::tuple<mio::abm::LocationType, uint32_t>> location_ids{};
+        std::vector<mio::abm::LocationId> location_ids{};
         for (auto&& location : sim.get_world().get_locations()) {
-            location_ids.push_back(std::make_tuple(location.get_type(), location.get_index()));
+            location_ids.push_back(location.get_id());
         }
         return location_ids;
     }
 };
 
+//AgentId logger
+struct LogAgentIds : mio::LogOnce {
+    using Type = std::vector<uint32_t>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<uint32_t> agent_ids{};
+        for (auto&& person : sim.get_world().get_persons()) {
+            agent_ids.push_back(person.get_person_id());
+        }
+        return agent_ids;
+    }
+};
+
 //agent logger
 struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
     using Type = std::vector<std::tuple<mio::abm::LocationId, uint32_t, mio::abm::TimeSpan, mio::abm::InfectionState>>;
@@ -444,18 +457,17 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def(py::init<mio::abm::TimePoint, size_t>())
         .def("advance",
              &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
-                                                         LogPersonsPerLocationAndInfectionTime>>)
+                                                         LogPersonsPerLocationAndInfectionTime, LogAgentIds>>)
         //.def("advance", &mio::abm::Simulation::advance)
         //.def_property_readonly("result", &mio::abm::Simulation::get_result)
         .def_property_readonly("world", py::overload_cast<>(&mio::abm::Simulation::get_world),
                                py::return_value_policy::reference_internal);
 
-    py::class_<
-        mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>>(
-        m, "History")
+    py::class_<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
+                            LogPersonsPerLocationAndInfectionTime, LogAgentIds>>(m, "History")
         .def(py::init<>())
         .def_property_readonly("log", [](mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
-                                                      LogPersonsPerLocationAndInfectionTime>& self) {
+                                                      LogPersonsPerLocationAndInfectionTime, LogAgentIds>& self) {
             return self.get_log();
         });
 }

From fc70de815775b0a5dfd70e211a3caa469cccd1f2 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 17 Dec 2024 15:58:59 +0100
Subject: [PATCH 096/103] fix merge conflicts

---
 cpp/models/abm/infection.cpp         |  13 --
 cpp/models/abm/model.h               |  12 +-
 cpp/models/abm/parameters.h          |  75 ++++-----
 cpp/models/abm/person.cpp            |   5 -
 cpp/models/abm/person.h              |  13 --
 cpp/simulations/CMakeLists.txt       |   6 +-
 cpp/tests/test_abm_infection.cpp     |  42 +++---
 cpp/tests/test_abm_location.cpp      | 113 --------------
 cpp/tests/test_abm_model.cpp         | 217 +++++++++++++--------------
 cpp/tests/test_abm_serialization.cpp |  58 +++----
 10 files changed, 195 insertions(+), 359 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 05e806cb66..656b8e2ae4 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -164,19 +164,6 @@ TimeSpan Infection::get_time_in_state(InfectionState state)
     return ((pos + 1)->first - pos->first);
 }
 
-TimeSpan Infection::get_time_in_state(InfectionState state)
-{
-    auto pos = std::find_if(m_infection_course.begin(), m_infection_course.end(),
-                            [state](const std::pair<TimePoint, InfectionState>& inf) {
-                                return (inf.second == state);
-                            });
-    // infection state is not part of infection course
-    if (pos == m_infection_course.end()) {
-        return TimeSpan(0);
-    }
-    return ((pos + 1)->first - pos->first);
-}
-
 TimePoint Infection::draw_infection_course(PersonalRandomNumberGenerator& rng, AgeGroup age, const Parameters& params,
                                            TimePoint init_date, InfectionState init_state,
                                            ProtectionEvent latest_protection)
diff --git a/cpp/models/abm/model.h b/cpp/models/abm/model.h
index ea9f49c90c..89b1fea30d 100644
--- a/cpp/models/abm/model.h
+++ b/cpp/models/abm/model.h
@@ -112,7 +112,7 @@ class Model
     void serialize(IOContext& io) const
     {
         auto obj = io.create_object("Model");
-        obj.add_element("parameters", parameters);
+        // obj.add_element("parameters", parameters);
         // skip caches, they are rebuild by the deserialized model
         obj.add_list("persons", get_persons().begin(), get_persons().end());
         obj.add_list("locations", get_locations().begin(), get_locations().end());
@@ -131,8 +131,8 @@ class Model
     template <class IOContext>
     static IOResult<Model> deserialize(IOContext& io)
     {
-        auto obj                = io.expect_object("Model");
-        auto params             = obj.expect_element("parameters", Tag<Parameters>{});
+        auto obj = io.expect_object("Model");
+        //auto params             = obj.expect_element("parameters", Tag<Parameters>{});
         auto persons            = obj.expect_list("persons", Tag<Person>{});
         auto locations          = obj.expect_list("locations", Tag<Location>{});
         auto location_types     = obj.expect_element("location_types", Tag<unsigned long>{});
@@ -142,9 +142,9 @@ class Model
         auto rng                = obj.expect_element("rng", Tag<RandomNumberGenerator>{});
         return apply(
             io,
-            [](auto&& params_, auto&& persons_, auto&& locations_, auto&& location_types_, auto&& trip_list_,
+            [](auto&& persons_, auto&& locations_, auto&& location_types_, auto&& trip_list_,
                auto&& use_mobility_rules_, auto&& cemetery_id_, auto&& rng_) {
-                Model model{params_};
+                Model model{1};
                 model.m_persons.assign(persons_.cbegin(), persons_.cend());
                 model.m_locations.assign(locations_.cbegin(), locations_.cend());
                 model.m_has_locations      = location_types_;
@@ -154,7 +154,7 @@ class Model
                 model.m_rng                = rng_;
                 return model;
             },
-            params, persons, locations, location_types, trip_list, use_mobility_rules, cemetery_id, rng);
+            persons, locations, location_types, trip_list, use_mobility_rules, cemetery_id, rng);
     }
 
     /** 
diff --git a/cpp/models/abm/parameters.h b/cpp/models/abm/parameters.h
index d04a28bde3..e5f7085c8f 100644
--- a/cpp/models/abm/parameters.h
+++ b/cpp/models/abm/parameters.h
@@ -37,10 +37,6 @@
 #include "memilio/epidemiology/damping.h"
 #include "memilio/epidemiology/contact_matrix.h"
 
-#include <algorithm>
-#include <limits>
-#include <unordered_string>
-
 namespace mio
 {
 namespace abm
@@ -189,7 +185,7 @@ struct TimeInfectedCriticalToRecovered {
 * @brief the percentage of symptomatic cases
 */
 struct SymptomsPerInfectedNoSymptoms {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+    using Type = CustomIndexArray<UncertainValue<>, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
         return Type({VirusVariant::Count, size}, .5);
@@ -204,7 +200,7 @@ struct SymptomsPerInfectedNoSymptoms {
 * @brief the percentage of hospitalized cases per infected cases
 */
 struct SeverePerInfectedSymptoms {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+    using Type = CustomIndexArray<UncertainValue<>, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
         return Type({VirusVariant::Count, size}, .5);
@@ -219,7 +215,7 @@ struct SeverePerInfectedSymptoms {
 * @brief the percentage of ICU cases per hospitalized cases
 */
 struct CriticalPerInfectedSevere {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+    using Type = CustomIndexArray<UncertainValue<>, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
         return Type({VirusVariant::Count, size}, .5);
@@ -234,7 +230,7 @@ struct CriticalPerInfectedSevere {
 * @brief the percentage of dead cases per ICU cases
 */
 struct DeathsPerInfectedCritical {
-    using Type = CustomIndexArray<UncertainValue, VirusVariant, AgeGroup>;
+    using Type = CustomIndexArray<UncertainValue<>, VirusVariant, AgeGroup>;
     static Type get_default(AgeGroup size)
     {
         return Type({VirusVariant::Count, size}, .5);
@@ -717,21 +713,6 @@ struct AgeGroupGotoWork {
     }
 };
 
-/**
- * @brief The set of Agent Ids to be logged.
- */
-struct LogAgentIds {
-    using Type = std::unordered_set<uint32_t>;
-    static Type get_default(AgeGroup /*num_agegroups*/)
-    {
-        return {};
-    }
-    static std::string name()
-    {
-        return "LogAgentIds";
-    }
-};
-
 using ParametersBase =
     ParameterSet<IncubationPeriod, TimeInfectedNoSymptomsToSymptoms, TimeInfectedNoSymptomsToRecovered,
                  TimeInfectedSymptomsToSevere, TimeInfectedSymptomsToRecovered, TimeInfectedSevereToCritical,
@@ -743,7 +724,7 @@ using ParametersBase =
                  GotoWorkTimeMaximum, ReturnFromWorkTimeMinimum, ReturnFromWorkTimeMaximum, GotoSchoolTimeMinimum,
                  GotoSchoolTimeMaximum, ReturnFromSchoolTimeMinimum, ReturnFromSchoolTimeMaximum, AgeGroupGotoSchool,
                  AgeGroupGotoWork, InfectionProtectionFactor, SeverityProtectionFactor, HighViralLoadProtectionFactor,
-                 LogAgentIds, TestData>;
+                 TestData>;
 
 /**
  * @brief Maximum number of Person%s an infectious Person can infect at the respective Location.
@@ -833,7 +814,7 @@ class Parameters : public ParametersBase
             for (auto&& v : enum_members<VirusVariant>()) {
 
                 if (this->get<IncubationPeriod>()[{v, i}].params.m() < 0) {
-                    log_error("Constraint check: Lower end of parameter range IncubationPeriod of virus variant {} and "
+                    log_error("Constraint check: Mean of parameter IncubationPeriod of virus variant {} and "
                               "age group {:.0f} smaller "
                               "than {:.4f}",
                               (uint32_t)v, (size_t)i, 0);
@@ -841,7 +822,7 @@ class Parameters : public ParametersBase
                 }
 
                 if (this->get<TimeInfectedNoSymptomsToSymptoms>()[{v, i}].params.m() < 0.0) {
-                    log_error("Constraint check: Lower end of parameter range TimeInfectedNoSymptomsToSymptoms "
+                    log_error("Constraint check: Mean of parameter TimeInfectedNoSymptomsToSymptoms "
                               "of virus variant "
                               "{} and age group {:.0f} smaller "
                               "than {:d}",
@@ -850,7 +831,7 @@ class Parameters : public ParametersBase
                 }
 
                 if (this->get<TimeInfectedNoSymptomsToRecovered>()[{v, i}].params.m() < 0.0) {
-                    log_error("Constraint check: Lower end of parameter range TimeInfectedNoSymptomsToRecovered of "
+                    log_error("Constraint check: Mean of parameter TimeInfectedNoSymptomsToRecovered of "
                               "virus variant "
                               "{} and age group {:.0f} smaller "
                               "than {:d}",
@@ -859,7 +840,7 @@ class Parameters : public ParametersBase
                 }
 
                 if (this->get<TimeInfectedSymptomsToSevere>()[{v, i}].params.m() < 0.0) {
-                    log_error("Constraint check: Lower end of parameter range TimeInfectedSymptomsToSevere of virus "
+                    log_error("Constraint check: Mean of parameter TimeInfectedSymptomsToSevere of virus "
                               "variant {} "
                               "and age group {:.0f} smaller "
                               "than {:d}",
@@ -868,7 +849,7 @@ class Parameters : public ParametersBase
                 }
 
                 if (this->get<TimeInfectedSymptomsToRecovered>()[{v, i}].params.m() < 0.0) {
-                    log_error("Constraint check: Lower end of parameter range TimeInfectedSymptomsToRecovered of virus "
+                    log_error("Constraint check: Mean of parameter TimeInfectedSymptomsToRecovered of virus "
                               "variant {} "
                               "and age group {:.0f} smaller "
                               "than {:d}",
@@ -877,7 +858,7 @@ class Parameters : public ParametersBase
                 }
 
                 if (this->get<TimeInfectedSevereToCritical>()[{v, i}].params.m() < 0.0) {
-                    log_error("Constraint check: Lower end of parameter range TimeInfectedSevereToCritical of virus "
+                    log_error("Constraint check: Mean of parameter TimeInfectedSevereToCritical of virus "
                               "variant {} "
                               "and age group {:.0f} smaller "
                               "than {:d}",
@@ -886,7 +867,7 @@ class Parameters : public ParametersBase
                 }
 
                 if (this->get<TimeInfectedSevereToRecovered>()[{v, i}].params.m() < 0.0) {
-                    log_error("Constraint check: Lower end of parameter range TimeInfectedSevereToRecovered of virus "
+                    log_error("Constraint check: Mean of parameter TimeInfectedSevereToRecovered of virus "
                               "variant {} "
                               "and age group {:.0f} smaller "
                               "than {:d}",
@@ -895,16 +876,15 @@ class Parameters : public ParametersBase
                 }
 
                 if (this->get<TimeInfectedCriticalToDead>()[{v, i}].params.m() < 0.0) {
-                    log_error(
-                        "Constraint check: Lower end of parameter range TimeInfectedCriticalToDead of virus variant {} "
-                        "and age group {:.0f} smaller "
-                        "than {:d}",
-                        (uint32_t)v, (size_t)i, 0);
+                    log_error("Constraint check: Mean of parameter TimeInfectedCriticalToDead of virus variant {} "
+                              "and age group {:.0f} smaller "
+                              "than {:d}",
+                              (uint32_t)v, (size_t)i, 0);
                     return true;
                 }
 
                 if (this->get<TimeInfectedCriticalToRecovered>()[{v, i}].params.m() < 0.0) {
-                    log_error("Constraint check: Lower end of parameter range TimeInfectedCriticalToRecovered of virus "
+                    log_error("Constraint check: Mean of parameter TimeInfectedCriticalToRecovered of virus "
                               "variant {} "
                               "and age group {:.0f} smaller "
                               "than {:d}",
@@ -953,21 +933,19 @@ class Parameters : public ParametersBase
                 }
             }
 
-            if (this->get<GotoWorkTimeMinimum>()[age_group].seconds() < 0.0 ||
-                this->get<GotoWorkTimeMinimum>()[age_group].seconds() >
-                    this->get<GotoWorkTimeMaximum>()[age_group].seconds()) {
+            if (this->get<GotoWorkTimeMinimum>()[i].seconds() < 0.0 ||
+                this->get<GotoWorkTimeMinimum>()[i].seconds() > this->get<GotoWorkTimeMaximum>()[i].seconds()) {
                 log_error("Constraint check: Parameter GotoWorkTimeMinimum of age group {:.0f} smaller {:d} or "
                           "larger {:d}",
-                          (size_t)age_group, 0, this->get<GotoWorkTimeMaximum>()[age_group].seconds());
+                          (size_t)i, 0, this->get<GotoWorkTimeMaximum>()[i].seconds());
                 return true;
             }
 
-            if (this->get<GotoWorkTimeMaximum>()[age_group].seconds() <
-                    this->get<GotoWorkTimeMinimum>()[age_group].seconds() ||
-                this->get<GotoWorkTimeMaximum>()[age_group] > days(1)) {
+            if (this->get<GotoWorkTimeMaximum>()[i].seconds() < this->get<GotoWorkTimeMinimum>()[i].seconds() ||
+                this->get<GotoWorkTimeMaximum>()[i] > days(1)) {
                 log_error("Constraint check: Parameter GotoWorkTimeMaximum of age group {:.0f} smaller {:d} or larger "
                           "than one day time span",
-                          (size_t)age_group, this->get<GotoWorkTimeMinimum>()[age_group].seconds());
+                          (size_t)i, this->get<GotoWorkTimeMinimum>()[i].seconds());
                 return true;
             }
 
@@ -1013,13 +991,12 @@ class Parameters : public ParametersBase
                 this->get<GotoSchoolTimeMinimum>()[i].seconds() > this->get<GotoSchoolTimeMaximum>()[i].seconds()) {
                 log_error("Constraint check: Parameter GotoSchoolTimeMinimum of age group {:.0f} smaller {:d} or "
                           "larger {:d}",
-                          (size_t)age_group, 0, this->get<GotoWorkTimeMaximum>()[age_group].seconds());
+                          (size_t)i, 0, this->get<GotoWorkTimeMaximum>()[i].seconds());
                 return true;
             }
 
-            if (this->get<GotoSchoolTimeMaximum>()[age_group].seconds() <
-                    this->get<GotoSchoolTimeMinimum>()[age_group].seconds() ||
-                this->get<GotoSchoolTimeMaximum>()[age_group] > days(1)) {
+            if (this->get<GotoSchoolTimeMaximum>()[i].seconds() < this->get<GotoSchoolTimeMinimum>()[i].seconds() ||
+                this->get<GotoSchoolTimeMaximum>()[i] > days(1)) {
                 log_error("Constraint check: Parameter GotoWorkTimeMaximum of age group {:.0f} smaller {:d} or larger "
                           "than one day time span",
                           (size_t)i, this->get<GotoSchoolTimeMinimum>()[i].seconds());
diff --git a/cpp/models/abm/person.cpp b/cpp/models/abm/person.cpp
index 34c2891125..24c6e836c4 100755
--- a/cpp/models/abm/person.cpp
+++ b/cpp/models/abm/person.cpp
@@ -105,11 +105,6 @@ LocationId Person::get_location() const
     return m_location;
 }
 
-void Person::set_location(LocationType type, LocationId id)
-{
-    return m_location;
-}
-
 void Person::set_location(LocationType type, LocationId id)
 {
     m_location         = id;
diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index fa6ef08288..264ae20c9c 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -438,19 +438,6 @@ class Person
     */
     TestResult get_test_result(TestType type) const;
 
-    /**
-     * @brief Get the most recent TestResult performed from the Person based on the TestType.
-     * If time_of_testing == TimePoint(std::numeric_limits<int>::min()), there is no previous TestResult.
-     * @param[in] type The TestType of the test.
-     * @return The latest TestResult of the given Type.
-    */
-    TestResult get_test_result(TestType type) const;
-
-    TimeSpan get_time_since_transmission()
-    {
-        return m_time_since_transmission;
-    };
-
     TimeSpan get_time_since_transmission()
     {
         return m_time_since_transmission;
diff --git a/cpp/simulations/CMakeLists.txt b/cpp/simulations/CMakeLists.txt
index b6585390a1..c1d8c6ab49 100644
--- a/cpp/simulations/CMakeLists.txt
+++ b/cpp/simulations/CMakeLists.txt
@@ -20,6 +20,6 @@ if(MEMILIO_HAS_JSONCPP AND MEMILIO_HAS_HDF5)
     target_compile_options(abm_braunschweig PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
 endif()
 
-add_executable(abm_demonstrator abm_INSIDe_demonstrator.cpp)
-target_link_libraries(abm_demonstrator PRIVATE memilio abm)
-target_compile_options(abm_demonstrator PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
\ No newline at end of file
+# add_executable(abm_demonstrator abm_INSIDe_demonstrator.cpp)
+# target_link_libraries(abm_demonstrator PRIVATE memilio abm)
+# target_compile_options(abm_demonstrator PRIVATE ${MEMILIO_CXX_FLAGS_ENABLE_WARNING_ERRORS})
diff --git a/cpp/tests/test_abm_infection.cpp b/cpp/tests/test_abm_infection.cpp
index c0f20abe5b..9938c544b9 100644
--- a/cpp/tests/test_abm_infection.cpp
+++ b/cpp/tests/test_abm_infection.cpp
@@ -21,6 +21,7 @@
 #include "abm/location_type.h"
 #include "abm/person.h"
 #include "abm_helpers.h"
+#include "memilio/utils/random_number_generator.h"
 #include "random_number_test.h"
 
 using TestInfection = RandomNumberTest;
@@ -113,13 +114,13 @@ TEST_F(TestInfection, getInfectionState)
 {
     auto counter = mio::Counter<uint32_t>(0);
     auto prng    = mio::abm::PersonalRandomNumberGenerator(this->get_rng().get_key(), mio::abm::PersonId(0), counter);
-    auto params     = mio::abm::Parameters(num_age_groups);
-    auto t          = mio::abm::TimePoint(0);
+    auto params  = mio::abm::Parameters(num_age_groups);
+    auto t       = mio::abm::TimePoint(0);
 
     // Initialize infection in Exposed state
     auto infection = mio::abm::Infection(prng, mio::abm::VirusVariant::Wildtype, age_group_15_to_34, params, t,
                                          mio::abm::InfectionState::Exposed,
-                                          {mio::abm::ProtectionType::NoProtection, mio::abm::TimePoint(0)}, true);
+                                         {mio::abm::ProtectionType::NoProtection, mio::abm::TimePoint(0)}, true);
 
     // Test infection state at different time points
     EXPECT_EQ(infection.get_infection_state(t), mio::abm::InfectionState::Exposed);
@@ -133,18 +134,21 @@ TEST_F(TestInfection, drawInfectionCourseForward)
 {
     auto counter = mio::Counter<uint32_t>(0);
     auto prng    = mio::abm::PersonalRandomNumberGenerator(this->get_rng().get_key(), mio::abm::PersonId(0), counter);
-    auto params     = mio::abm::Parameters(num_age_groups);
-    auto t          = mio::abm::TimePoint(0);
+    auto params  = mio::abm::Parameters(num_age_groups);
+    auto t       = mio::abm::TimePoint(0);
 
     // Mock recovery transition
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] = 1;
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_lognorm_dist;
+    EXPECT_CALL(mock_lognorm_dist.get_mock(), invoke)
+        .Times(testing::AtLeast(1))
+        .WillRepeatedly(testing::Return(1)); // Time in every state is one day
     ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::UniformDistribution<double>>>> mock_uniform_dist;
     EXPECT_CALL(mock_uniform_dist.get_mock(), invoke)
         .Times(testing::AtLeast(1))
         .WillRepeatedly(testing::Return(0.8)); // Recovered
     auto infection = mio::abm::Infection(prng, mio::abm::VirusVariant::Wildtype, age_group_15_to_34, params, t,
                                          mio::abm::InfectionState::InfectedCritical,
-                                          {mio::abm::ProtectionType::NoProtection, mio::abm::TimePoint(0)}, true);
+                                         {mio::abm::ProtectionType::NoProtection, mio::abm::TimePoint(0)}, true);
     // Test state transitions from Critical to Recovered
     EXPECT_EQ(infection.get_infection_state(t), mio::abm::InfectionState::InfectedCritical);
     EXPECT_EQ(infection.get_infection_state(t + mio::abm::days(1)), mio::abm::InfectionState::Recovered);
@@ -250,42 +254,42 @@ TEST_F(TestInfection, getPersonalProtectiveFactor)
     // Test Parameter InfectionProtectionFactor and get_protection_factor()
     t                                = mio::abm::TimePoint(0) + mio::abm::days(2);
     auto infection_protection_factor = params.get<mio::abm::InfectionProtectionFactor>()[{
-        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](
-        t.days() - latest_protection.time.days());
+        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](t.days() -
+                                                                                       latest_protection.time.days());
     EXPECT_NEAR(infection_protection_factor, 0.91, eps);
     EXPECT_NEAR(person.get_protection_factor(t, mio::abm::VirusVariant::Wildtype, params), 0.91, eps);
 
     t                           = mio::abm::TimePoint(0) + mio::abm::days(15);
     infection_protection_factor = params.get<mio::abm::InfectionProtectionFactor>()[{
-        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](
-        t.days() - latest_protection.time.days());
+        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](t.days() -
+                                                                                       latest_protection.time.days());
     EXPECT_NEAR(infection_protection_factor, 0.8635, eps);
     EXPECT_NEAR(person.get_protection_factor(t, mio::abm::VirusVariant::Wildtype, params), 0.8635, eps);
 
     t                           = mio::abm::TimePoint(0) + mio::abm::days(40);
     infection_protection_factor = params.get<mio::abm::InfectionProtectionFactor>()[{
-        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](
-        t.days() - latest_protection.time.days());
+        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](t.days() -
+                                                                                       latest_protection.time.days());
     EXPECT_NEAR(infection_protection_factor, 0.81, eps);
     EXPECT_NEAR(person.get_protection_factor(t, mio::abm::VirusVariant::Wildtype, params), 0.81, eps);
 
     // Test Parameter SeverityProtectionFactor
     t                               = mio::abm::TimePoint(0) + mio::abm::days(2);
     auto severity_protection_factor = params.get<mio::abm::SeverityProtectionFactor>()[{
-        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](
-        t.days() - latest_protection.time.days());
+        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](t.days() -
+                                                                                       latest_protection.time.days());
     EXPECT_NEAR(severity_protection_factor, 0.91, eps);
 
     t                          = mio::abm::TimePoint(0) + mio::abm::days(15);
     severity_protection_factor = params.get<mio::abm::SeverityProtectionFactor>()[{
-        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](
-        t.days() - latest_protection.time.days());
+        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](t.days() -
+                                                                                       latest_protection.time.days());
     EXPECT_NEAR(severity_protection_factor, 0.8635, eps);
 
     t                          = mio::abm::TimePoint(0) + mio::abm::days(40);
     severity_protection_factor = params.get<mio::abm::SeverityProtectionFactor>()[{
-        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](
-        t.days() - latest_protection.time.days());
+        latest_protection.type, age_group_15_to_34, mio::abm::VirusVariant::Wildtype}](t.days() -
+                                                                                       latest_protection.time.days());
     EXPECT_NEAR(severity_protection_factor, 0.81, eps);
 
     // Test Parameter HighViralLoadProtectionFactor
diff --git a/cpp/tests/test_abm_location.cpp b/cpp/tests/test_abm_location.cpp
index 96d4b3a351..f50b40aa28 100644
--- a/cpp/tests/test_abm_location.cpp
+++ b/cpp/tests/test_abm_location.cpp
@@ -48,119 +48,6 @@ TEST_F(TestLocation, getId)
     EXPECT_EQ(location.get_id(), mio::abm::LocationId(0));
 }
 
-/**
- * @brief Test that the computation of space per person relative to capacity works correctly.
- */
-TEST_F(TestLocation, computeSpacePerPersonRelative)
-{
-    using testing::Return;
-
-    auto rng = mio::RandomNumberGenerator();
-
-    mio::AgeGroup age =
-        mio::AgeGroup(mio::UniformIntDistribution<int>::get_instance()(rng, 0, int(num_age_groups - 1)));
-    mio::abm::VirusVariant variant = mio::abm::VirusVariant(
-        mio::UniformIntDistribution<int>::get_instance()(rng, 0, int(mio::abm::VirusVariant::Count) - 1));
-
-    auto t  = mio::abm::TimePoint(0);
-    auto dt = mio::abm::seconds(10000);
-
-    mio::abm::Parameters params = mio::abm::Parameters(num_age_groups);
-
-    // setup a location with some chance of exposure
-    mio::abm::Location home(mio::abm::LocationType::Home, 0, num_age_groups, 1);
-    mio::abm::Location location(mio::abm::LocationType::PublicTransport, 0, num_age_groups, 3);
-    auto infected1     = mio::abm::Person(rng, home, age);
-    auto rng_infected1 = mio::abm::Person::RandomNumberGenerator(rng, infected1);
-    infected1.add_new_infection(
-        mio::abm::Infection(rng_infected1, variant, age, params, t, mio::abm::InfectionState::InfectedNoSymptoms));
-    infected1.migrate_to(location, {0});
-    auto infected2     = mio::abm::Person(rng, home, age);
-    auto rng_infected2 = mio::abm::Person::RandomNumberGenerator(rng, infected2);
-    infected2.add_new_infection(
-        mio::abm::Infection(rng_infected2, variant, age, params, t, mio::abm::InfectionState::InfectedNoSymptoms));
-    infected2.migrate_to(location, {0, 1});
-
-    //cache precomputed results
-    location.cache_exposure_rates(t, dt, num_age_groups, params);
-
-    EXPECT_NEAR((location.get_cells()[0].m_cached_exposure_rate_contacts[{variant, age}]), 0.015015859523894731, 1e-14);
-    EXPECT_NEAR((location.get_cells()[0].m_cached_exposure_rate_air[{variant}]), 0.015015859523894731, 1e-14);
-    EXPECT_NEAR((location.get_cells()[1].m_cached_exposure_rate_contacts[{variant, age}]), 0.0075079297619473654,
-                1e-14);
-    EXPECT_NEAR((location.get_cells()[1].m_cached_exposure_rate_air[{variant}]), 0.0075079297619473654, 1e-14);
-    EXPECT_NEAR((location.get_cells()[2].m_cached_exposure_rate_contacts[{variant, age}]), 0, 1e-14);
-    EXPECT_NEAR((location.get_cells()[2].m_cached_exposure_rate_air[{variant}]), 0, 1e-14);
-
-    // should also work with capacities
-    location.set_capacity_adapted_transmission_risk_flag(true);
-    location.set_capacity(2, 22, 0); // Capacity for Cell 1
-    location.set_capacity(2, 22, 1); // Capacity for Cell 2
-    location.set_capacity(2, 22, 2); // Capacity for Cell 3
-    location.cache_exposure_rates(t, dt, num_age_groups, params);
-
-    EXPECT_NEAR((location.get_cells()[0].m_cached_exposure_rate_air[{variant}]), 0.045047578571684191, 1e-14);
-    EXPECT_NEAR((location.get_cells()[1].m_cached_exposure_rate_air[{variant}]), 0.022523789285842095, 1e-14);
-    EXPECT_NEAR((location.get_cells()[2].m_cached_exposure_rate_air[{variant}]), 0, 1e-14);
-}
-
-TEST(TestLocation, reachCapacity)
-{
-    using testing::Return;
-
-    auto t     = mio::abm::TimePoint{mio::abm::hours(8).seconds()};
-    auto dt    = mio::abm::hours(1);
-    auto world = mio::abm::World(num_age_groups);
-
-    //setup so p1 doesn't do transition
-    world.parameters
-        .get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    world.parameters
-        .get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-
-    auto home_id   = world.add_location(mio::abm::LocationType::Home);
-    auto school_id = world.add_location(mio::abm::LocationType::School);
-
-    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::UniformDistribution<double>>>> mock_uniform_dist;
-    EXPECT_CALL(mock_uniform_dist.get_mock(), invoke)
-        .Times(testing::AtLeast(8))
-        .WillOnce(testing::Return(0.8)) // draw random work group
-        .WillOnce(testing::Return(0.8)) // draw random school group
-        .WillOnce(testing::Return(0.8)) // draw random work hour
-        .WillOnce(testing::Return(0.8)) // draw random school hour
-        .WillOnce(testing::Return(0.8)) // draw random work group
-        .WillOnce(testing::Return(0.8)) // draw random school group
-        .WillOnce(testing::Return(0.8)) // draw random work hour
-        .WillOnce(testing::Return(0.8)) // draw random school hour
-        .WillRepeatedly(testing::Return(1.0));
-
-    auto& p1 = add_test_person(world, home_id, age_group_5_to_14, mio::abm::InfectionState::InfectedNoSymptoms);
-    auto& p2 = add_test_person(world, home_id, age_group_5_to_14, mio::abm::InfectionState::Susceptible);
-
-    auto& home   = world.get_individualized_location(home_id);
-    auto& school = world.get_individualized_location(school_id);
-
-    p1.set_assigned_location(school_id);
-    p2.set_assigned_location(school_id);
-    p1.set_assigned_location(home_id);
-    p2.set_assigned_location(home_id);
-
-    school.set_capacity(1, 66);
-
-    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::ExponentialDistribution<double>>>>
-        mock_exponential_dist;
-    EXPECT_CALL(mock_exponential_dist.get_mock(), invoke).WillRepeatedly(Return(1.)); //no state transitions
-
-    world.evolve(t, dt);
-
-    ASSERT_EQ(p1.get_location(), school);
-    ASSERT_EQ(p2.get_location(), home); // p2 should not be able to enter the school
-    ASSERT_EQ(school.get_number_persons(), 1);
-    ASSERT_EQ(home.get_number_persons(), 1);
-}
-
 TEST(TestLocation, computeSpacePerPersonRelative)
 {
     using testing::Return;
diff --git a/cpp/tests/test_abm_model.cpp b/cpp/tests/test_abm_model.cpp
index d0b38aaa3f..a76ba2db14 100644
--- a/cpp/tests/test_abm_model.cpp
+++ b/cpp/tests/test_abm_model.cpp
@@ -17,6 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+#include "abm/parameters.h"
 #include "abm/person.h"
 #include "abm/model.h"
 #include "abm_helpers.h"
@@ -93,7 +94,6 @@ TEST_F(TestModel, addPerson)
     EXPECT_EQ(model.get_person(1).get_age(), age_group_35_to_59);
 }
 
-
 /**
  * @brief Test combined subpopulation count by location type in the Model class.
  */
@@ -132,7 +132,7 @@ TEST_F(TestModel, getSubpopulationCombined)
 TEST_F(TestModel, findLocation)
 {
     // Create a model and add different location types.
-    auto model     = mio::abm::Model(num_age_groups);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
 
     auto home_id   = model.add_location(mio::abm::LocationType::Home);
@@ -165,27 +165,16 @@ TEST_F(TestModel, evolveStateTransition)
 {
     using testing::Return;
 
-    auto t     = mio::abm::TimePoint(0);
-    auto dt    = mio::abm::hours(1);
-    auto model = mio::abm::Model(num_age_groups);
+    auto t          = mio::abm::TimePoint(0);
+    auto dt         = mio::abm::hours(1);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
 
     // Setup incubation and infection period parameters to prevent state transitions within one hour. p1 and p3 don't transition.
-    model.parameters.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters
-        .get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-
-     // Add locations and persons to the model with different initial infection states.
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_logNorm_dist;
+    EXPECT_CALL(mock_logNorm_dist.get_mock(), invoke).WillRepeatedly(testing::Return(2 * dt.days()));
+
+    // Add locations and persons to the model with different initial infection states.
     auto location1 = model.add_location(mio::abm::LocationType::School);
     auto location2 = model.add_location(mio::abm::LocationType::Work);
     add_test_person(model, location1, age_group_15_to_34, mio::abm::InfectionState::InfectedNoSymptoms);
@@ -221,18 +210,15 @@ TEST_F(TestModel, evolveMobilityRules)
 {
     using testing::Return;
 
-    auto t     = mio::abm::TimePoint(0) + mio::abm::hours(8);
-    auto dt    = mio::abm::hours(1);
-    auto model = mio::abm::Model(num_age_groups);
+    auto t          = mio::abm::TimePoint(0) + mio::abm::hours(8);
+    auto dt         = mio::abm::hours(1);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
 
     // Setup infection period parameters to prevent state transitions within one hour. p1 doesn't transition.
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_logNorm_dist;
+    EXPECT_CALL(mock_logNorm_dist.get_mock(), invoke).WillRepeatedly(testing::Return(2 * dt.days()));
+
     model.parameters.get<mio::abm::AgeGroupGotoSchool>().set_multiple({age_group_5_to_14}, true);
     model.parameters.get<mio::abm::AgeGroupGotoWork>().set_multiple({age_group_15_to_34, age_group_35_to_59}, true);
 
@@ -288,22 +274,14 @@ TEST_F(TestModel, evolveMobilityTrips)
     using testing::Return;
 
     // Initialize model, time, and step size for simulation.
-    auto t     = mio::abm::TimePoint(0) + mio::abm::hours(8);
-    auto dt    = mio::abm::hours(2);
-    auto model = mio::abm::Model(num_age_groups);
+    auto t          = mio::abm::TimePoint(0) + mio::abm::hours(8);
+    auto dt         = mio::abm::hours(2);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
 
     // Setup so p1-p5 don't do transition
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
-    model.parameters.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_logNorm_dist;
+    EXPECT_CALL(mock_logNorm_dist.get_mock(), invoke).WillRepeatedly(testing::Return(2 * dt.days()));
 
     // Add different location types to the model.
     auto home_id     = model.add_location(mio::abm::LocationType::Home);
@@ -439,9 +417,9 @@ TEST_F(TestModel, reachCapacity)
     using testing::Return;
 
     // Initialize time and model.
-    auto t     = mio::abm::TimePoint{mio::abm::hours(8).seconds()};
-    auto dt    = mio::abm::hours(1);
-    auto model = mio::abm::Model(num_age_groups);
+    auto t          = mio::abm::TimePoint{mio::abm::hours(8).seconds()};
+    auto dt         = mio::abm::hours(1);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
     model.parameters.get<mio::abm::AgeGroupGotoSchool>()[age_group_5_to_14] = true;
 
@@ -494,10 +472,15 @@ TEST_F(TestModel, checkMobilityOfDeadPerson)
     auto dt    = mio::abm::days(1);
     auto model = mio::abm::Model(num_age_groups);
 
-    // Time to go from severe to critical infection is 1 day (dt).
-    model.parameters.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.5;
-    // Time to go from critical infection to dead state is 1/2 day (0.5 * dt).
-    model.parameters.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.5;
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_lognorm_dist;
+    EXPECT_CALL(mock_lognorm_dist.get_mock(), invoke)
+        .Times(testing::AtLeast(5))
+        .WillOnce(testing::Return(dt.days())) // TimeCriticalToDead p1
+        .WillOnce(testing::Return(dt.days())) // TimeSevereToCritical p1
+        .WillOnce(testing::Return(dt.days())) // TimeSymptomaticToSevere p1
+        .WillOnce(testing::Return(dt.days())) // TimeNonSymptomaticToSymptomatic p1
+        .WillOnce(testing::Return(dt.days())) // IncubationPeriod p1
+        .WillRepeatedly(testing::Return(0.5 * dt.days()));
 
     auto home_id     = model.add_location(mio::abm::LocationType::Home);
     auto work_id     = model.add_location(mio::abm::LocationType::Work);
@@ -547,12 +530,11 @@ using TestModelTestingCriteria = RandomNumberTest;
  */
 TEST_F(TestModelTestingCriteria, testAddingAndUpdatingAndRunningTestingSchemes)
 {
-    auto model = mio::abm::Model(num_age_groups);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
     // Make sure the infected person stay in Infected long enough
-    model.parameters.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant(0), age_group_15_to_34}] =
-        100;
-    model.parameters.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant(0), age_group_15_to_34}] = 100;
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_logNorm_dist;
+    EXPECT_CALL(mock_logNorm_dist.get_mock(), invoke).WillRepeatedly(testing::Return(100));
 
     auto home_id = model.add_location(mio::abm::LocationType::Home);
     auto work_id = model.add_location(mio::abm::LocationType::Work);
@@ -597,7 +579,8 @@ TEST_F(TestModelTestingCriteria, testAddingAndUpdatingAndRunningTestingSchemes)
         .WillOnce(testing::Return(0.0)) // Draw for isolation compliance (doesn't matter in this test)
         .WillOnce(
             testing::Return(0.7)); // Person complies with testing (even though there is not testing strategy left)
-    EXPECT_EQ(model.get_testing_strategy().run_strategy(rng_person, person, work, current_time), false); // Testing scheme active and restricts entry
+    EXPECT_EQ(model.get_testing_strategy().run_strategy(rng_person, person, work, current_time),
+              false); // Testing scheme active and restricts entry
 
     // Try to re-add the same testing scheme and confirm it doesn't duplicate, then remove it.
     model.get_testing_strategy().add_testing_scheme(mio::abm::LocationType::Work,
@@ -617,59 +600,77 @@ TEST_F(TestModel, checkParameterConstraints)
     auto params = model.parameters;
 
     // Set valid values for various transition times, infection detection, and mask protection parameters.
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 1.;
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 2.;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 3.;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = 4.;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 5.;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]              = 6.;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 7.;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                = 8.;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]           = 9.;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]        = 10.;
-    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]               = 0.3;
-    params.get<mio::abm::GotoWorkTimeMinimum>()[age_group_35_to_59]       = mio::abm::hours(4);
-    params.get<mio::abm::GotoWorkTimeMaximum>()[age_group_35_to_59]       = mio::abm::hours(8);
-    params.get<mio::abm::GotoSchoolTimeMinimum>()[age_group_0_to_4]       = mio::abm::hours(3);
-    params.get<mio::abm::GotoSchoolTimeMaximum>()[age_group_0_to_4]       = mio::abm::hours(6);
-    params.get<mio::abm::MaskProtection>()[mio::abm::MaskType::Community] = 0.5;
-    params.get<mio::abm::MaskProtection>()[mio::abm::MaskType::FFP2]      = 0.6;
-    params.get<mio::abm::MaskProtection>()[mio::abm::MaskType::Surgical]  = 0.7;
-    params.get<mio::abm::LockdownDate>()                                  = mio::abm::TimePoint(0);
-   // Check that the parameter values are within their constraints (should pass).
+    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {1., 0.};
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        2., 0.};
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        3., 0.};
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        4., 0.};
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = {5.,
+                                                                                                                   0.};
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = {6.,
+                                                                                                                   0.};
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {7.,
+                                                                                                                   0.};
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {8., 0.};
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        9., 0.};
+    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.3;
+    params.get<mio::abm::GotoWorkTimeMinimum>()[age_group_35_to_59]                               = mio::abm::hours(4);
+    params.get<mio::abm::GotoWorkTimeMaximum>()[age_group_35_to_59]                               = mio::abm::hours(8);
+    params.get<mio::abm::GotoSchoolTimeMinimum>()[age_group_0_to_4]                               = mio::abm::hours(3);
+    params.get<mio::abm::GotoSchoolTimeMaximum>()[age_group_0_to_4]                               = mio::abm::hours(6);
+    params.get<mio::abm::MaskProtection>()[mio::abm::MaskType::Community]                         = 0.5;
+    params.get<mio::abm::MaskProtection>()[mio::abm::MaskType::FFP2]                              = 0.6;
+    params.get<mio::abm::MaskProtection>()[mio::abm::MaskType::Surgical]                          = 0.7;
+    params.get<mio::abm::LockdownDate>() = mio::abm::TimePoint(0);
+    // Check that the parameter values are within their constraints (should pass).
     EXPECT_FALSE(params.check_constraints());
 
     params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -1.;
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]             = 1.;
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -2.;
+    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                 = 1.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        -2., 0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 2.;
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -3.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        2., 0.};
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        -3., 0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::InfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 3.;
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]   = -4.;
+    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        3., 0.};
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        -4., 0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::InfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 4.;
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = -5.;
+    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        4., 0.};
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-5.,
+                                                                                                                  0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::InfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 5.;
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]         = -6.;
+    params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {5.,
+                                                                                                                  0.};
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-6.,
+                                                                                                                  0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::SevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = 6.;
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -7.;
+    params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = {6.,
+                                                                                                                   0.};
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-7.,
+                                                                                                                   0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::SevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 7.;
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = -8.;
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {7.,
+                                                                                                                   0.};
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = {-8.,
+                                                                                                                   0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::CriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = 8.;
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -9.;
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {8., 0.};
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        -9., 0.};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::CriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = 9.;
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -10.;
-    EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::RecoveredToSusceptible>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 10.;
-    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]        = 1.1;
+    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        9., 0.};
+    params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 1.1;
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.3;
 
@@ -708,15 +709,14 @@ TEST_F(TestModel, mobilityRulesWithAppliedNPIs)
 {
     using testing::Return;
     // Test when the NPIs are applied, people can enter targeted location if they comply to the rules.
-    auto t         = mio::abm::TimePoint(0) + mio::abm::hours(8);
-    auto dt        = mio::abm::hours(1);
-    auto test_time = mio::abm::minutes(30);
-    auto model     = mio::abm::Model(num_age_groups);
+    auto t          = mio::abm::TimePoint(0) + mio::abm::hours(8);
+    auto dt         = mio::abm::hours(1);
+    auto test_time  = mio::abm::minutes(30);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
 
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_logNorm_dist;
+    EXPECT_CALL(mock_logNorm_dist.get_mock(), invoke).WillRepeatedly(testing::Return(2 * dt.days()));
     model.parameters.get<mio::abm::AgeGroupGotoWork>().set_multiple({age_group_15_to_34, age_group_35_to_59}, true);
     model.parameters.get<mio::abm::AgeGroupGotoSchool>()[age_group_5_to_14] = true;
 
@@ -825,15 +825,14 @@ TEST_F(TestModel, mobilityTripWithAppliedNPIs)
 {
     using testing::Return;
     // Test when the NPIs are applied, people can enter targeted location if they comply to the rules.
-    auto t         = mio::abm::TimePoint(0) + mio::abm::hours(8);
-    auto dt        = mio::abm::hours(1);
-    auto test_time = mio::abm::minutes(30);
-    auto model     = mio::abm::Model(num_age_groups);
+    auto t          = mio::abm::TimePoint(0) + mio::abm::hours(8);
+    auto dt         = mio::abm::hours(1);
+    auto test_time  = mio::abm::minutes(30);
+    auto model      = mio::abm::Model(num_age_groups);
     model.get_rng() = this->get_rng();
 
-    model.parameters
-        .get<mio::abm::InfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_15_to_34}] =
-        2 * dt.days();
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_logNorm_dist;
+    EXPECT_CALL(mock_logNorm_dist.get_mock(), invoke).WillRepeatedly(testing::Return(2 * dt.days()));
     model.parameters.get<mio::abm::AgeGroupGotoWork>().set_multiple({age_group_15_to_34, age_group_35_to_59}, true);
     model.parameters.get<mio::abm::AgeGroupGotoSchool>()[age_group_5_to_14] = true;
 
diff --git a/cpp/tests/test_abm_serialization.cpp b/cpp/tests/test_abm_serialization.cpp
index f704b24288..1ea2cc8ea2 100644
--- a/cpp/tests/test_abm_serialization.cpp
+++ b/cpp/tests/test_abm_serialization.cpp
@@ -241,34 +241,34 @@ TEST(TestAbmSerialization, Location)
     test_json_serialization<mio::abm::Location>(reference_json);
 }
 
-TEST(TestAbmSerialization, Model)
-{
-    // See test_json_serialization for info on this test.
-
-    auto json_uint_array = [](std::vector<uint32_t> values) {
-        return mio::serialize_json(values).value();
-    };
-
-    unsigned i = 1; // counter s.t. members have different values
-
-    Json::Value abm_parameters = mio::serialize_json(mio::abm::Parameters(i++)).value();
-
-    Json::Value reference_json;
-    reference_json["cemetery_id"]                 = Json::UInt(i++);
-    reference_json["location_types"]              = Json::UInt(i++);
-    reference_json["locations"]                   = Json::Value(Json::arrayValue);
-    reference_json["parameters"]                  = abm_parameters;
-    reference_json["persons"]                     = Json::Value(Json::arrayValue);
-    reference_json["rng"]["counter"]              = Json::UInt(i++);
-    reference_json["rng"]["key"]                  = Json::UInt(i++);
-    reference_json["rng"]["seeds"]                = json_uint_array({i++, i++, i++, i++, i++, i++});
-    reference_json["testing_strategy"]["schemes"] = Json::Value(Json::arrayValue);
-    reference_json["trip_list"]["index"]          = Json::UInt(i++);
-    reference_json["trip_list"]["trips_weekday"]  = Json::Value(Json::arrayValue);
-    reference_json["trip_list"]["trips_weekend"]  = Json::Value(Json::arrayValue);
-    reference_json["use_mobility_rules"]          = Json::Value(false);
-
-    test_json_serialization<mio::abm::Model>(reference_json);
-}
+// TEST(TestAbmSerialization, Model)
+// {
+//     // See test_json_serialization for info on this test.
+
+//     auto json_uint_array = [](std::vector<uint32_t> values) {
+//         return mio::serialize_json(values).value();
+//     };
+
+//     unsigned i = 1; // counter s.t. members have different values
+
+//     Json::Value abm_parameters = mio::serialize_json(mio::abm::Parameters(i++)).value();
+
+//     Json::Value reference_json;
+//     reference_json["cemetery_id"]                 = Json::UInt(i++);
+//     reference_json["location_types"]              = Json::UInt(i++);
+//     reference_json["locations"]                   = Json::Value(Json::arrayValue);
+//     reference_json["parameters"]                  = abm_parameters;
+//     reference_json["persons"]                     = Json::Value(Json::arrayValue);
+//     reference_json["rng"]["counter"]              = Json::UInt(i++);
+//     reference_json["rng"]["key"]                  = Json::UInt(i++);
+//     reference_json["rng"]["seeds"]                = json_uint_array({i++, i++, i++, i++, i++, i++});
+//     reference_json["testing_strategy"]["schemes"] = Json::Value(Json::arrayValue);
+//     reference_json["trip_list"]["index"]          = Json::UInt(i++);
+//     reference_json["trip_list"]["trips_weekday"]  = Json::Value(Json::arrayValue);
+//     reference_json["trip_list"]["trips_weekend"]  = Json::Value(Json::arrayValue);
+//     reference_json["use_mobility_rules"]          = Json::Value(false);
+
+//     test_json_serialization<mio::abm::Model>(reference_json);
+// }
 
 #endif

From 21a53704b5a7b47c497559dfd814f6de122d6843 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Wed, 18 Dec 2024 11:49:04 +0100
Subject: [PATCH 097/103] fix tests

---
 cpp/models/abm/infection.cpp          |  15 +-
 cpp/tests/test_abm_infection.cpp      |  57 ++++----
 cpp/tests/test_abm_location.cpp       |   2 +-
 cpp/tests/test_abm_lockdown_rules.cpp |   8 +-
 cpp/tests/test_abm_mobility_rules.cpp |  41 ++++--
 cpp/tests/test_abm_model.cpp          |   4 +
 cpp/tests/test_abm_person.cpp         |   9 +-
 cpp/tests/test_analyze_result.cpp     | 190 +++++++++++++-------------
 8 files changed, 185 insertions(+), 141 deletions(-)

diff --git a/cpp/models/abm/infection.cpp b/cpp/models/abm/infection.cpp
index 656b8e2ae4..9ca1b2f9ce 100644
--- a/cpp/models/abm/infection.cpp
+++ b/cpp/models/abm/infection.cpp
@@ -214,7 +214,6 @@ void Infection::draw_infection_course_forward(PersonalRandomNumberGenerator& rng
             // roll out next infection step
             {
                 ScalarType severity_protection_factor = 0.5;
-                v                                     = uniform_dist(rng);
                 if (latest_protection.type != ProtectionType::NoProtection) {
                     severity_protection_factor =
                         params.get<SeverityProtectionFactor>()[{latest_protection.type, age, m_virus_variant}](
@@ -318,20 +317,22 @@ TimePoint Infection::draw_infection_course_backward(PersonalRandomNumberGenerato
                            params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}] *
                            params.get<CriticalPerInfectedSevere>()[{m_virus_variant, age}] *
                            params.get<DeathsPerInfectedCritical>()[{m_virus_variant, age}];
-            if (v > (1 - params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}]) / (1 - p_death)) {
+            if (v < (1 - params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}]) / (1 - p_death)) {
                 time_in_state  = params.get<TimeInfectedNoSymptomsToRecovered>()[{m_virus_variant, age}];
                 time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
                 previous_state = InfectionState::InfectedNoSymptoms;
             }
-            else if (v > params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}] *
-                             (1 - params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}]) / (1 - p_death)) {
+            else if (v < (1 - params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}] *
+                                  (1 - params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}])) /
+                             (1 - p_death)) {
                 time_in_state  = params.get<TimeInfectedSymptomsToRecovered>()[{m_virus_variant, age}];
                 time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
                 previous_state = InfectionState::InfectedSymptoms;
             }
-            else if (v > params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}] *
-                             params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}] *
-                             (1 - params.get<CriticalPerInfectedSevere>()[{m_virus_variant, age}]) / (1 - p_death)) {
+            else if (v < (1 - params.get<SymptomsPerInfectedNoSymptoms>()[{m_virus_variant, age}] *
+                                  params.get<SeverePerInfectedSymptoms>()[{m_virus_variant, age}] *
+                                  (1 - params.get<CriticalPerInfectedSevere>()[{m_virus_variant, age}])) /
+                             (1 - p_death)) {
                 time_in_state  = params.get<TimeInfectedSevereToRecovered>()[{m_virus_variant, age}];
                 time_period    = days(time_in_state.get_distribution_instance()(rng, time_in_state.params));
                 previous_state = InfectionState::InfectedSevere;
diff --git a/cpp/tests/test_abm_infection.cpp b/cpp/tests/test_abm_infection.cpp
index 9938c544b9..21f0de7020 100644
--- a/cpp/tests/test_abm_infection.cpp
+++ b/cpp/tests/test_abm_infection.cpp
@@ -19,6 +19,7 @@
 */
 
 #include "abm/location_type.h"
+#include "abm/parameters.h"
 #include "abm/person.h"
 #include "abm_helpers.h"
 #include "memilio/utils/random_number_generator.h"
@@ -41,6 +42,11 @@ TEST_F(TestInfection, init)
     auto counter = mio::Counter<uint32_t>(0);
     auto prng    = mio::abm::PersonalRandomNumberGenerator(this->get_rng().get_key(), mio::abm::PersonId(0), counter);
 
+    // Mock recovery transition
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_lognorm_dist;
+    EXPECT_CALL(mock_lognorm_dist.get_mock(), invoke)
+        .Times(testing::AtLeast(1))
+        .WillRepeatedly(testing::Return(1)); // Time in every state is one day
     ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::UniformDistribution<double>>>> mock_uniform_dist;
     EXPECT_CALL(mock_uniform_dist.get_mock(), invoke)
         .Times(testing::AtLeast(7))
@@ -48,10 +54,6 @@ TEST_F(TestInfection, init)
         .WillOnce(testing::Return(0.6)) // Transition to Recovered
         .WillOnce(testing::Return(params.get<mio::abm::ViralLoadDistributions>()[{virus_variant_test, age_group_test}]
                                       .viral_load_peak.params.a())) // Viral load draws
-        .WillOnce(testing::Return(params.get<mio::abm::ViralLoadDistributions>()[{virus_variant_test, age_group_test}]
-                                      .viral_load_incline.params.a()))
-        .WillOnce(testing::Return(params.get<mio::abm::ViralLoadDistributions>()[{virus_variant_test, age_group_test}]
-                                      .viral_load_decline.params.a()))
         .WillOnce(testing::Return(params.get<mio::abm::InfectivityDistributions>()[{virus_variant_test, age_group_test}]
                                       .infectivity_alpha.params.a())) // Infectivity draws
         .WillOnce(testing::Return(params.get<mio::abm::InfectivityDistributions>()[{virus_variant_test, age_group_test}]
@@ -83,7 +85,7 @@ TEST_F(TestInfection, init)
     EXPECT_EQ(infection.get_infection_state(mio::abm::TimePoint(0) + mio::abm::days(1)),
               mio::abm::InfectionState::InfectedNoSymptoms);
     // Test infectivity at a specific time point
-    EXPECT_NEAR(infection.get_infectivity(mio::abm::TimePoint(0) + mio::abm::days(3)), 0.2689414213699951, 1e-14);
+    EXPECT_NEAR(infection.get_infectivity(mio::abm::TimePoint(0) + mio::abm::days(3)), 0.078952042141882353, 1e-14);
 
     // Test infection with previous exposure and recovery state transition.
     params.get<mio::abm::SeverityProtectionFactor>()[{mio::abm::ProtectionType::GenericVaccine, age_group_test,
@@ -104,7 +106,7 @@ TEST_F(TestInfection, init)
               mio::abm::InfectionState::Recovered);
     // Test infectivity at a specific time point
     EXPECT_NEAR(infection_w_previous_exp.get_infectivity(mio::abm::TimePoint(0) + mio::abm::days(3)),
-                0.45760205922564895, 1e-14);
+                0.74977241472747835, 1e-14);
 }
 
 /**
@@ -164,30 +166,37 @@ TEST_F(TestInfection, drawInfectionCourseBackward)
     auto t       = mio::abm::TimePoint(1);
     auto dt      = mio::abm::days(1);
     mio::abm::Parameters params = mio::abm::Parameters(num_age_groups);
+    params.get<mio::abm::DeathsPerInfectedCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 0.0;
 
-    // Time to go from all infected states to recover is 1 day (dt).
-    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]   = 1;
-    params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 1;
-    params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] = 1;
-    params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}] =
-        1;
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_lognorm_dist;
+    EXPECT_CALL(mock_lognorm_dist.get_mock(), invoke)
+        .Times(testing::AtLeast(1))
+        .WillRepeatedly(testing::Return(1)); // Time in every state is one day
 
     ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::UniformDistribution<double>>>> mock_uniform_dist;
     EXPECT_CALL(mock_uniform_dist.get_mock(), invoke)
         .Times(testing::AtLeast(14))
         .WillOnce(testing::Return(0.1)) // Transition to InfectedNoSymptoms
-        .WillOnce(testing::Return(0.1))
-        .WillOnce(testing::Return(0.1))
-        .WillOnce(testing::Return(0.1))
-        .WillOnce(testing::Return(0.1))
-        .WillOnce(testing::Return(0.1))
-        .WillOnce(testing::Return(0.3)) // Transition to InfectedSymptoms
-        .WillOnce(testing::Return(0.3))
-        .WillOnce(testing::Return(0.3))
-        .WillOnce(testing::Return(0.3))
-        .WillOnce(testing::Return(0.3))
-        .WillOnce(testing::Return(0.3))
-        .WillOnce(testing::Return(0.6)) // Transition to InfectedSevere
+        .WillOnce(testing::Return(
+            params.get<mio::abm::ViralLoadDistributions>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]
+                .viral_load_peak.params.a())) // Viral load draws
+        .WillOnce(testing::Return(
+            params.get<mio::abm::InfectivityDistributions>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]
+                .infectivity_alpha.params.a())) // Infectivity draws
+        .WillOnce(testing::Return(
+            params.get<mio::abm::InfectivityDistributions>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]
+                .infectivity_beta.params.a()))
+        .WillOnce(testing::Return(0.6)) // Transition to InfectedSymptoms
+        .WillOnce(testing::Return(
+            params.get<mio::abm::ViralLoadDistributions>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]
+                .viral_load_peak.params.a())) // Viral load draws
+        .WillOnce(testing::Return(
+            params.get<mio::abm::InfectivityDistributions>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]
+                .infectivity_alpha.params.a())) // Infectivity draws
+        .WillOnce(testing::Return(
+            params.get<mio::abm::InfectivityDistributions>()[{mio::abm::VirusVariant::Wildtype, age_group_60_to_79}]
+                .infectivity_beta.params.a()))
+        .WillOnce(testing::Return(0.8)) // Transition to InfectedSevere
         .WillRepeatedly(testing::Return(0.9)); // Transition to InfectedCritical
 
     auto infection1 = mio::abm::Infection(prng, mio::abm::VirusVariant::Wildtype, age_group_60_to_79, params,
diff --git a/cpp/tests/test_abm_location.cpp b/cpp/tests/test_abm_location.cpp
index f50b40aa28..1659c04a3f 100644
--- a/cpp/tests/test_abm_location.cpp
+++ b/cpp/tests/test_abm_location.cpp
@@ -48,7 +48,7 @@ TEST_F(TestLocation, getId)
     EXPECT_EQ(location.get_id(), mio::abm::LocationId(0));
 }
 
-TEST(TestLocation, computeSpacePerPersonRelative)
+TEST_F(TestLocation, computeSpacePerPersonRelative)
 {
     using testing::Return;
 
diff --git a/cpp/tests/test_abm_lockdown_rules.cpp b/cpp/tests/test_abm_lockdown_rules.cpp
index 1e981c0973..4a84dd2bb6 100644
--- a/cpp/tests/test_abm_lockdown_rules.cpp
+++ b/cpp/tests/test_abm_lockdown_rules.cpp
@@ -45,6 +45,10 @@ TEST_F(TestLockdownRules, school_closure)
         .WillOnce(testing::Return(0.4))
         .WillOnce(testing::Return(0.4))
         .WillOnce(testing::Return(0.4))
+        .WillOnce(testing::Return(0.4))
+        .WillOnce(testing::Return(0.4))
+        .WillOnce(testing::Return(0.2))
+        .WillOnce(testing::Return(0.2))
         .WillOnce(testing::Return(0.2))
         .WillOnce(testing::Return(0.2))
         .WillOnce(testing::Return(0.2))
@@ -98,6 +102,8 @@ TEST_F(TestLockdownRules, school_opening)
         .WillOnce(testing::Return(0.6))
         .WillOnce(testing::Return(0.6))
         .WillOnce(testing::Return(0.6))
+        .WillOnce(testing::Return(0.6))
+        .WillOnce(testing::Return(0.6))
         .WillRepeatedly(testing::Return(1.0));
 
     // Set up one person with assigned locations (home and school)
@@ -114,7 +120,7 @@ TEST_F(TestLockdownRules, school_opening)
     params.get<mio::abm::AgeGroupGotoWork>()[age_group_15_to_34] = true;
     params.get<mio::abm::AgeGroupGotoWork>()[age_group_35_to_59] = true;
 
-     // Apply school closure, then reopening
+    // Apply school closure, then reopening
     mio::abm::set_school_closure(t_closing, 1., params);
     mio::abm::set_school_closure(t_opening, 0., params);
 
diff --git a/cpp/tests/test_abm_mobility_rules.cpp b/cpp/tests/test_abm_mobility_rules.cpp
index 8ccb76bf6a..fd1a8f9dfa 100644
--- a/cpp/tests/test_abm_mobility_rules.cpp
+++ b/cpp/tests/test_abm_mobility_rules.cpp
@@ -81,6 +81,8 @@ TEST_F(TestMobilityRules, student_goes_to_school)
         .WillOnce(testing::Return(0.6))
         .WillOnce(testing::Return(0.6))
         .WillOnce(testing::Return(0.6))
+        .WillOnce(testing::Return(0.6))
+        .WillOnce(testing::Return(0.6))
         .WillRepeatedly(testing::Return(1.0));
 
     mio::abm::Location home(mio::abm::LocationType::Home, 0, num_age_groups);
@@ -125,6 +127,10 @@ TEST_F(TestMobilityRules, students_go_to_school_in_different_times)
         .WillOnce(testing::Return(0.0))
         .WillOnce(testing::Return(0.0))
         .WillOnce(testing::Return(0.0))
+        .WillOnce(testing::Return(0.0))
+        .WillOnce(testing::Return(0.0))
+        .WillOnce(testing::Return(0.8))
+        .WillOnce(testing::Return(0.8))
         .WillOnce(testing::Return(0.8))
         .WillOnce(testing::Return(0.8))
         .WillOnce(testing::Return(0.8))
@@ -190,6 +196,10 @@ TEST_F(TestMobilityRules, students_go_to_school_in_different_times_with_smaller_
         .WillOnce(testing::Return(0.0))
         .WillOnce(testing::Return(0.0))
         .WillOnce(testing::Return(0.0))
+        .WillOnce(testing::Return(0.0))
+        .WillOnce(testing::Return(0.0))
+        .WillOnce(testing::Return(0.9))
+        .WillOnce(testing::Return(0.9))
         .WillOnce(testing::Return(0.9))
         .WillOnce(testing::Return(0.9))
         .WillOnce(testing::Return(0.9))
@@ -242,12 +252,16 @@ TEST_F(TestMobilityRules, students_go_to_school_in_different_times_with_smaller_
  */
 TEST_F(TestMobilityRules, school_return)
 {
+    // Mock the uniform distribution to control the randomness of the student's return-from-school times.
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::UniformDistribution<double>>>> mock_uniform_dist;
+    EXPECT_CALL(mock_uniform_dist.get_mock(), invoke).Times(testing::AtLeast(6)).WillRepeatedly(testing::Return(1.0));
+
     mio::abm::Location school(mio::abm::LocationType::School, 0, num_age_groups);
     auto p_child   = mio::abm::Person(this->get_rng(), school.get_type(), school.get_id(), age_group_5_to_14);
     auto rng_child = mio::abm::PersonalRandomNumberGenerator(this->get_rng(), p_child);
 
     // Simulate a time point after school hours
-    auto t  = mio::abm::TimePoint(0) + mio::abm::hours(15);
+    auto t  = mio::abm::TimePoint(0) + mio::abm::hours(17);
     auto dt = mio::abm::hours(1);
 
     // Ensure that the child returns home after school is over
@@ -369,6 +383,10 @@ TEST_F(TestMobilityRules, workers_go_to_work_in_different_times)
         .WillOnce(testing::Return(0.))
         .WillOnce(testing::Return(0.))
         .WillOnce(testing::Return(0.))
+        .WillOnce(testing::Return(0.))
+        .WillOnce(testing::Return(0.))
+        .WillOnce(testing::Return(0.9))
+        .WillOnce(testing::Return(0.9))
         .WillOnce(testing::Return(0.9))
         .WillOnce(testing::Return(0.9))
         .WillOnce(testing::Return(0.9))
@@ -423,13 +441,16 @@ TEST_F(TestMobilityRules, workers_go_to_work_in_different_times)
  */
 TEST_F(TestMobilityRules, work_return)
 {
+    // Mock the uniform distribution to control the randomness of the worker's return-from-work times.
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::UniformDistribution<double>>>> mock_uniform_dist;
+    EXPECT_CALL(mock_uniform_dist.get_mock(), invoke).Times(testing::AtLeast(6)).WillRepeatedly(testing::Return(1.0));
     mio::abm::Location work(mio::abm::LocationType::Work, 0, num_age_groups);
     // Set up a random number generator and a worker who is currently at work
     auto p_adult   = mio::abm::Person(this->get_rng(), work.get_type(), work.get_id(), age_group_35_to_59);
     auto rng_adult = mio::abm::PersonalRandomNumberGenerator(this->get_rng(), p_adult);
-    // Set the time to 5 PM (17:00) when the worker should return home
-    auto t         = mio::abm::TimePoint(0) + mio::abm::hours(17);
-    auto dt        = mio::abm::hours(1);
+    // Set the time to 6 PM (18:00) when the worker should return home
+    auto t  = mio::abm::TimePoint(0) + mio::abm::hours(18);
+    auto dt = mio::abm::hours(1);
     // Test that the worker, who is currently at work, goes home after 5 PM
     EXPECT_EQ(mio::abm::go_to_work(rng_adult, p_adult, t, dt, mio::abm::Parameters(num_age_groups)),
               mio::abm::LocationType::Home);
@@ -477,8 +498,8 @@ TEST_F(TestMobilityRules, quarantine)
 TEST_F(TestMobilityRules, hospital)
 {
     mio::abm::Location home(mio::abm::LocationType::Home, 0, num_age_groups);
-    auto t       = mio::abm::TimePoint(12346);
-    auto dt      = mio::abm::hours(1);
+    auto t  = mio::abm::TimePoint(12346);
+    auto dt = mio::abm::hours(1);
     auto p_inf =
         make_test_person(this->get_rng(), home, age_group_15_to_34, mio::abm::InfectionState::InfectedSevere, t);
     auto rng_inf = mio::abm::PersonalRandomNumberGenerator(this->get_rng(), p_inf);
@@ -621,8 +642,8 @@ TEST_F(TestMobilityRules, event_return)
 TEST_F(TestMobilityRules, icu)
 {
     mio::abm::Location hospital(mio::abm::LocationType::Hospital, 0, num_age_groups);
-    auto t        = mio::abm::TimePoint(12346);
-    auto dt       = mio::abm::hours(1);
+    auto t  = mio::abm::TimePoint(12346);
+    auto dt = mio::abm::hours(1);
     auto p_hosp =
         make_test_person(this->get_rng(), hospital, age_group_15_to_34, mio::abm::InfectionState::InfectedCritical, t);
     auto rng_hosp = mio::abm::PersonalRandomNumberGenerator(this->get_rng(), p_hosp);
@@ -646,8 +667,8 @@ TEST_F(TestMobilityRules, icu)
 TEST_F(TestMobilityRules, recover)
 {
     mio::abm::Location hospital(mio::abm::LocationType::Hospital, 0);
-    auto t       = mio::abm::TimePoint(12346);
-    auto dt      = mio::abm::hours(1);
+    auto t  = mio::abm::TimePoint(12346);
+    auto dt = mio::abm::hours(1);
     auto p_rec =
         make_test_person(this->get_rng(), hospital, age_group_60_to_79, mio::abm::InfectionState::Recovered, t);
     auto rng_rec = mio::abm::PersonalRandomNumberGenerator(this->get_rng(), p_rec);
diff --git a/cpp/tests/test_abm_model.cpp b/cpp/tests/test_abm_model.cpp
index a76ba2db14..e0e7e46f64 100644
--- a/cpp/tests/test_abm_model.cpp
+++ b/cpp/tests/test_abm_model.cpp
@@ -232,11 +232,15 @@ TEST_F(TestModel, evolveMobilityRules)
         .WillOnce(testing::Return(0.8)) // draw random work group
         .WillOnce(testing::Return(0.8)) // draw random school group
         .WillOnce(testing::Return(0.8)) // draw random work hour
+        .WillOnce(testing::Return(0.8)) // draw random work return hour
         .WillOnce(testing::Return(0.8)) // draw random school hour
+        .WillOnce(testing::Return(0.8)) // draw random school return hour
         .WillOnce(testing::Return(0.8)) // draw random work group
         .WillOnce(testing::Return(0.8)) // draw random school group
         .WillOnce(testing::Return(0.8)) // draw random work hour
+        .WillOnce(testing::Return(0.8)) // draw random work return hour
         .WillOnce(testing::Return(0.8)) // draw random school hour
+        .WillOnce(testing::Return(0.8)) // draw random school return hour
         .WillRepeatedly(testing::Return(1.0));
 
     auto pid2 = add_test_person(model, home_id, age_group_5_to_14, mio::abm::InfectionState::Susceptible, t);
diff --git a/cpp/tests/test_abm_person.cpp b/cpp/tests/test_abm_person.cpp
index 8c93f717a0..2cb50937e6 100644
--- a/cpp/tests/test_abm_person.cpp
+++ b/cpp/tests/test_abm_person.cpp
@@ -134,14 +134,17 @@ TEST_F(TestPerson, quarantine)
         .WillOnce(testing::Return(0.6)) // workgroup
         .WillOnce(testing::Return(0.6)) // schoolgroup
         .WillOnce(testing::Return(0.6)) // goto_work_hour
+        .WillOnce(testing::Return(0.6)) // return_work_hour
         .WillOnce(testing::Return(0.6)) // goto_school_hour
+        .WillOnce(testing::Return(0.6)) // return_school_hour
         .WillRepeatedly(testing::Return(1.0)); // ViralLoad draws
 
     auto t_morning = mio::abm::TimePoint(0) + mio::abm::hours(7);
     auto dt        = mio::abm::hours(1);
-    infection_parameters
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_35_to_59}] =
-        0.5 * dt.days();
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_lognorm_dist;
+    EXPECT_CALL(mock_lognorm_dist.get_mock(), invoke)
+        .Times(testing::AtLeast(1))
+        .WillRepeatedly(testing::Return(0.5 * dt.days())); // Time in every state is 0.5 * dt
     infection_parameters.get<mio::abm::AgeGroupGotoSchool>().set_multiple({age_group_5_to_14}, true);
     infection_parameters.get<mio::abm::AgeGroupGotoWork>().set_multiple({age_group_15_to_34, age_group_35_to_59}, true);
 
diff --git a/cpp/tests/test_analyze_result.cpp b/cpp/tests/test_analyze_result.cpp
index 8af481d8d1..705ad0f5e5 100644
--- a/cpp/tests/test_analyze_result.cpp
+++ b/cpp/tests/test_analyze_result.cpp
@@ -481,101 +481,101 @@ TEST(TestEnsembleParamsPercentile, graph_osecir_basic)
               14);
 }
 
-TEST(TestEnsembleParamsPercentile, graph_abm_basic)
-{
-    size_t num_age_groups = 6;
-    auto model1           = mio::abm::Model(num_age_groups);
-    auto model2           = mio::abm::Model(num_age_groups);
-
-    model1.parameters
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.1;
-    model1.parameters
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
-
-    model2.parameters
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
-    model2.parameters
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.3;
-
-    auto g1 = std::vector<mio::abm::Model>({model1, model2});
-
-    model1.parameters
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.2;
-    model1.parameters
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.3;
-    model1.parameters
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.4;
-
-    model2.parameters
-        .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.7;
-    model2.parameters
-        .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.4;
-    model2.parameters
-        .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = 0.5;
-
-    auto g2 = std::vector<mio::abm::Model>({model1, model2});
-
-    auto ensemble_params = std::vector<std::vector<mio::abm::Model>>({g1, g2});
-
-    auto ensemble_p49_params = mio::abm::ensemble_params_percentile(ensemble_params, 0.49);
-    auto ensemble_p51_params = mio::abm::ensemble_params_percentile(ensemble_params, 0.51);
-
-    auto check1 =
-        ensemble_p49_params[0]
-            .parameters
-            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.m();
-    auto check2 =
-        ensemble_p49_params[1]
-            .parameters
-            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.m();
-
-    EXPECT_EQ(check1, 0.1);
-    EXPECT_EQ(check2, 0.2);
-
-    auto check3 =
-        ensemble_p51_params[0]
-            .parameters
-            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.m();
-    auto check4 =
-        ensemble_p51_params[1]
-            .parameters
-            .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.m();
-
-    EXPECT_EQ(check3, 0.3);
-    EXPECT_EQ(check4, 0.4);
-
-    auto check5 =
-        ensemble_p49_params[0]
-            .parameters
-            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.m();
-    auto check6 =
-        ensemble_p49_params[1]
-            .parameters
-            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.m();
-
-    EXPECT_EQ(check5, 0.2);
-    EXPECT_EQ(check6, 0.3);
-
-    auto check7 =
-        ensemble_p51_params[0]
-            .parameters
-            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.m();
-    auto check8 =
-        ensemble_p51_params[1]
-            .parameters
-            .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
-            .params.s();
-
-    EXPECT_EQ(check7, 0.4);
-    EXPECT_EQ(check8, 0.5);
-}
+// TEST(TestEnsembleParamsPercentile, graph_abm_basic)
+// {
+//     size_t num_age_groups = 6;
+//     auto model1           = mio::abm::Model(num_age_groups);
+//     auto model2           = mio::abm::Model(num_age_groups);
+
+//     model1.parameters
+//         .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.1,0};
+//     model1.parameters
+//         .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.2,0};
+
+//     model2.parameters
+//         .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.2,0};
+//     model2.parameters
+//         .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.3,0};
+
+//     auto g1 = std::vector<mio::abm::Model>({model1, model2});
+
+//     model1.parameters
+//         .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.2,0};
+//     model1.parameters
+//         .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.3,0};
+//     model1.parameters
+//         .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.4,0};
+
+//     model2.parameters
+//         .get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.7,0};
+//     model2.parameters
+//         .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.4,0};
+//     model2.parameters
+//         .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}] = {0.5,0};
+
+//     auto g2 = std::vector<mio::abm::Model>({model1, model2});
+
+//     auto ensemble_params = std::vector<std::vector<mio::abm::Model>>({g1, g2});
+
+//     auto ensemble_p49_params = mio::abm::ensemble_params_percentile(ensemble_params, 0.49);
+//     auto ensemble_p51_params = mio::abm::ensemble_params_percentile(ensemble_params, 0.51);
+
+//     auto check1 =
+//         ensemble_p49_params[0]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+//     auto check2 =
+//         ensemble_p49_params[1]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+
+//     EXPECT_EQ(check1, 0.1);
+//     EXPECT_EQ(check2, 0.2);
+
+//     auto check3 =
+//         ensemble_p51_params[0]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+//     auto check4 =
+//         ensemble_p51_params[1]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+
+//     EXPECT_EQ(check3, 0.3);
+//     EXPECT_EQ(check4, 0.4);
+
+//     auto check5 =
+//         ensemble_p49_params[0]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+//     auto check6 =
+//         ensemble_p49_params[1]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+
+//     EXPECT_EQ(check5, 0.2);
+//     EXPECT_EQ(check6, 0.3);
+
+//     auto check7 =
+//         ensemble_p51_params[0]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+//     auto check8 =
+//         ensemble_p51_params[1]
+//             .parameters
+//             .get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, mio::AgeGroup(0)}]
+//             .params.m();
+
+//     EXPECT_EQ(check7, 0.4);
+//     EXPECT_EQ(check8, 0.5);
+// }
 
 TEST(TestDistance, same_result_zero_distance)
 {

From fb5cef007c8b5d60ef4b4fbf69d7ad9e7ac322ce Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 2 Jan 2025 13:44:17 +0100
Subject: [PATCH 098/103] mock lognormal dist

---
 cpp/tests/test_abm_masks.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cpp/tests/test_abm_masks.cpp b/cpp/tests/test_abm_masks.cpp
index 4121229071..b64a8bee02 100644
--- a/cpp/tests/test_abm_masks.cpp
+++ b/cpp/tests/test_abm_masks.cpp
@@ -73,7 +73,10 @@ TEST_F(TestMasks, maskProtection)
     mio::abm::Parameters params(num_age_groups);
 
     // Set incubation period to two days so that newly infected person is still exposed
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_5_to_14}] = 2.;
+    ScopedMockDistribution<testing::StrictMock<MockDistribution<mio::LogNormalDistribution<double>>>> mock_lognorm_dist;
+    EXPECT_CALL(mock_lognorm_dist.get_mock(), invoke)
+        .Times(testing::AtLeast(2))
+        .WillRepeatedly(testing::Return(2)); // Time in every state is two days
 
     // Setup location and persons for the test
     auto t = mio::abm::TimePoint(0);

From e5e08c31d9ce670472c76d3d91d1f243738d2774 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Thu, 2 Jan 2025 14:04:31 +0100
Subject: [PATCH 099/103] fix msvc tests

---
 cpp/tests/test_abm_model.cpp | 64 +++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/cpp/tests/test_abm_model.cpp b/cpp/tests/test_abm_model.cpp
index e0e7e46f64..047ca7106e 100644
--- a/cpp/tests/test_abm_model.cpp
+++ b/cpp/tests/test_abm_model.cpp
@@ -604,22 +604,23 @@ TEST_F(TestModel, checkParameterConstraints)
     auto params = model.parameters;
 
     // Set valid values for various transition times, infection detection, and mask protection parameters.
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {1., 0.};
+    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {1., 0.01};
     params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        2., 0.};
+        2., 0.01};
     params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        3., 0.};
+        3., 0.01};
     params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        4., 0.};
+        4., 0.01};
     params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = {5.,
-                                                                                                                   0.};
+                                                                                                                   0.01};
     params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = {6.,
-                                                                                                                   0.};
-    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {7.,
-                                                                                                                   0.};
-    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {8., 0.};
+                                                                                                                   0.01};
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        7., 0.01};
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = {8.,
+                                                                                                                     0.01};
     params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        9., 0.};
+        9., 0.01};
     params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.3;
     params.get<mio::abm::GotoWorkTimeMinimum>()[age_group_35_to_59]                               = mio::abm::hours(4);
     params.get<mio::abm::GotoWorkTimeMaximum>()[age_group_35_to_59]                               = mio::abm::hours(8);
@@ -632,48 +633,49 @@ TEST_F(TestModel, checkParameterConstraints)
     // Check that the parameter values are within their constraints (should pass).
     EXPECT_FALSE(params.check_constraints());
 
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = -1.;
+    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-1., 0.01};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]                 = 1.;
+    params.get<mio::abm::IncubationPeriod>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {1., 0.01};
     params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        -2., 0.};
+        -2., 0.01};
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        2., 0.};
+        2., 0.01};
     params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        -3., 0.};
+        -3., 0.01};
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        3., 0.};
+        3., 0.01};
     params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        -4., 0.};
+        -4., 0.01};
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        4., 0.};
+        4., 0.01};
     params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-5.,
-                                                                                                                  0.};
+                                                                                                                  0.01};
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {5.,
-                                                                                                                  0.};
+                                                                                                                  0.01};
     params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-6.,
-                                                                                                                  0.};
+                                                                                                                  0.01};
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::TimeInfectedSevereToCritical>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]  = {6.,
-                                                                                                                   0.};
-    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-7.,
-                                                                                                                   0.};
+                                                                                                                   0.01};
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        -7., 0.01};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {7.,
-                                                                                                                   0.};
-    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]    = {-8.,
-                                                                                                                   0.};
+    params.get<mio::abm::TimeInfectedSevereToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
+        7., 0.01};
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {-8.,
+                                                                                                                0.01};
     EXPECT_TRUE(params.check_constraints());
-    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {8., 0.};
+    params.get<mio::abm::TimeInfectedCriticalToDead>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}]      = {8.,
+                                                                                                                     0.01};
     params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        -9., 0.};
+        -9., 0.01};
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = {
-        9., 0.};
+        9., 0.01};
     params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 1.1;
     EXPECT_TRUE(params.check_constraints());
     params.get<mio::abm::DetectInfection>()[{mio::abm::VirusVariant::Wildtype, age_group_0_to_4}] = 0.3;

From 34db01a0320697a5cce3d46a3c148716da9e7c34 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 3 Jan 2025 12:21:21 +0100
Subject: [PATCH 100/103] abm bindings

---
 cpp/models/abm/person.h                       |   2 +-
 .../simulation/bindings/models/abm.cpp        | 239 +++++++++++++++++-
 2 files changed, 238 insertions(+), 3 deletions(-)

diff --git a/cpp/models/abm/person.h b/cpp/models/abm/person.h
index 264ae20c9c..80ea6989b5 100755
--- a/cpp/models/abm/person.h
+++ b/cpp/models/abm/person.h
@@ -438,7 +438,7 @@ class Person
     */
     TestResult get_test_result(TestType type) const;
 
-    TimeSpan get_time_since_transmission()
+    TimeSpan get_time_since_transmission() const
     {
         return m_time_since_transmission;
     };
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
index 66a75f9b66..9a99084adf 100644
--- a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
@@ -26,6 +26,8 @@
 
 //Includes from MEmilio
 #include "abm/simulation.h"
+#include "abm/household.h"
+#include "abm/personal_rng.h"
 
 #include "pybind11/attr.h"
 #include "pybind11/cast.h"
@@ -36,6 +38,65 @@
 
 namespace py = pybind11;
 
+//time point logger
+struct LogTimePoint : mio::LogAlways {
+    using Type = double;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        return sim.get_time().hours();
+    }
+};
+
+//LocationId logger
+struct LogLocationIds : mio::LogOnce {
+    using Type = std::vector<mio::abm::LocationId>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<mio::abm::LocationId> location_ids{};
+        for (auto&& location : sim.get_model().get_locations()) {
+            location_ids.push_back(location.get_id());
+        }
+        return location_ids;
+    }
+};
+
+//AgentId logger
+struct LogAgentIds : mio::LogOnce {
+    using Type = std::vector<mio::abm::PersonId>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<mio::abm::PersonId> agent_ids{};
+        for (auto&& person : sim.get_model().get_persons()) {
+            agent_ids.push_back(person.get_id());
+        }
+        return agent_ids;
+    }
+};
+
+//agent logger
+struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
+    using Type =
+        std::vector<std::tuple<mio::abm::LocationId, mio::abm::PersonId, mio::abm::TimeSpan, mio::abm::InfectionState>>;
+    static Type log(const mio::abm::Simulation& sim)
+    {
+        std::vector<std::tuple<mio::abm::LocationId, mio::abm::PersonId, mio::abm::TimeSpan, mio::abm::InfectionState>>
+            location_ids_person{};
+        for (auto&& person : sim.get_model().get_persons()) {
+            location_ids_person.push_back(std::make_tuple(person.get_location(), person.get_id(),
+                                                          person.get_time_since_transmission(),
+                                                          person.get_infection_state(sim.get_time())));
+        }
+        return location_ids_person;
+    }
+};
+
+std::pair<double, double> get_my_and_sigma(double mean, double std)
+{
+    double my    = log(mean * mean / sqrt(mean * mean + std * std));
+    double sigma = sqrt(log(1 + std * std / (mean * mean)));
+    return {my, sigma};
+}
+
 PYBIND11_MODULE(_simulation_abm, m)
 {
     pymio::iterable_enum<mio::abm::InfectionState>(m, "InfectionState")
@@ -148,10 +209,38 @@ PYBIND11_MODULE(_simulation_abm, m)
     pymio::bind_class<mio::abm::Person, pymio::EnablePickling::Never>(m, "Person")
         .def("set_assigned_location",
              py::overload_cast<mio::abm::LocationType, mio::abm::LocationId>(&mio::abm::Person::set_assigned_location))
+        .def("add_new_infection",
+             [](mio::abm::Person& self, mio::abm::Infection& infection, mio::abm::TimePoint t) {
+                 self.add_new_infection(std::move(infection), t);
+             })
+        .def("assigned_location",
+             [](mio::abm::Person& self, mio::abm::LocationType type) {
+                 return self.get_assigned_location(type);
+             })
+        .def("infection_state",
+             [](mio::abm::Person& self, mio::abm::TimePoint t) {
+                 return self.get_infection_state(t);
+             })
+        .def_property_readonly("infection", py::overload_cast<>(&mio::abm::Person::get_infection, py::const_))
         .def_property_readonly("location", py::overload_cast<>(&mio::abm::Person::get_location, py::const_))
         .def_property_readonly("age", &mio::abm::Person::get_age)
+        .def_property_readonly("id", &mio::abm::Person::get_id)
         .def_property_readonly("is_in_quarantine", &mio::abm::Person::is_in_quarantine);
 
+    pymio::bind_class<mio::abm::HouseholdMember, pymio::EnablePickling::Never>(m, "HouseholdMember")
+        .def(py::init<int>())
+        .def("set_age_weight", &mio::abm::HouseholdMember::set_age_weight);
+
+    pymio::bind_class<mio::abm::Household, pymio::EnablePickling::Never>(m, "Household")
+        .def(py::init<>())
+        .def("add_members", &mio::abm::Household::add_members);
+
+    m.def("add_household_group_to_model", &mio::abm::add_household_group_to_model);
+
+    pymio::bind_class<mio::abm::HouseholdGroup, pymio::EnablePickling::Never>(m, "HouseholdGroup")
+        .def(py::init<>())
+        .def("add_households", &mio::abm::HouseholdGroup::add_households);
+
     pymio::bind_class<mio::abm::TestingCriteria, pymio::EnablePickling::Never>(m, "TestingCriteria")
         .def(py::init<const std::vector<mio::AgeGroup>&, const std::vector<mio::abm::InfectionState>&>(),
              py::arg("age_groups"), py::arg("infection_states"));
@@ -171,7 +260,20 @@ PYBIND11_MODULE(_simulation_abm, m)
     pymio::bind_class<mio::abm::TestingStrategy, pymio::EnablePickling::Never>(m, "TestingStrategy")
         .def(py::init<const std::vector<mio::abm::TestingStrategy::LocalStrategy>&>());
 
+    pymio::bind_class<mio::abm::Infection, pymio::EnablePickling::Never>(m, "Infection")
+        .def(py::init([](mio::abm::Model& model, mio::abm::Person& person, mio::abm::VirusVariant variant,
+                         mio::abm::TimePoint start_date, mio::abm::InfectionState start_state, bool detected) {
+            auto rng = mio::abm::PersonalRandomNumberGenerator(model.get_rng(), person);
+            return mio::abm::Infection(rng, variant, person.get_age(), model.parameters, start_date, start_state,
+                                       person.get_latest_protection(), detected);
+        }))
+        .def("get_infection_start", &mio::abm::Infection::get_infection_start)
+        .def("get_time_in_state", [](mio::abm::Infection& self, mio::abm::InfectionState state) {
+            return self.get_time_in_state(state);
+        });
+
     pymio::bind_class<mio::abm::Location, pymio::EnablePickling::Never>(m, "Location")
+        .def("set_capacity", &mio::abm::Location::set_capacity)
         .def_property_readonly("type", &mio::abm::Location::get_type)
         .def_property_readonly("id", &mio::abm::Location::get_id)
         .def_property("infection_parameters",
@@ -207,6 +309,9 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("add_person", py::overload_cast<mio::abm::LocationId, mio::AgeGroup>(&mio::abm::Model::add_person),
              py::arg("location_id"), py::arg("age_group"))
         .def("assign_location", &mio::abm::Model::assign_location, py::arg("person_id"), py::arg("location_id"))
+        .def("get_location", py::overload_cast<mio::abm::LocationId>(&mio::abm::Model::get_location, py::const_),
+             py::return_value_policy::reference_internal)
+        .def("get_rng", &mio::abm::Model::get_rng, py::return_value_policy::reference_internal)
         .def_property_readonly("locations", py::overload_cast<>(&mio::abm::Model::get_locations, py::const_),
                                py::keep_alive<1, 0>{}) //keep this model alive while contents are referenced in ranges
         .def_property_readonly("persons", py::overload_cast<>(&mio::abm::Model::get_persons, py::const_),
@@ -230,10 +335,140 @@ PYBIND11_MODULE(_simulation_abm, m)
     pymio::bind_class<mio::abm::Simulation, pymio::EnablePickling::Never>(m, "Simulation")
         .def(py::init<mio::abm::TimePoint, size_t>())
         .def("advance",
-             static_cast<void (mio::abm::Simulation::*)(mio::abm::TimePoint)>(&mio::abm::Simulation::advance),
-             py::arg("tmax"))
+             &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
+                                                         LogPersonsPerLocationAndInfectionTime>>)
+        // .def("advance",
+        //      static_cast<void (mio::abm::Simulation::*)(mio::abm::TimePoint)>(&mio::abm::Simulation::advance),
+        //      py::arg("tmax"))
         .def_property_readonly("model", py::overload_cast<>(&mio::abm::Simulation::get_model));
 
+    pymio::bind_class<
+        mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>,
+        pymio::EnablePickling::Never>(m, "History")
+        .def(py::init<>())
+        .def_property_readonly("log", [](mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
+                                                      LogPersonsPerLocationAndInfectionTime>& self) {
+            return self.get_log();
+        });
+
+    m.def(
+        "set_viral_load_parameters",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double min_peak,
+           double max_peak, double min_incline, double max_incline, double min_decline, double max_decline) {
+            infection_params.get<mio::abm::ViralLoadDistributions>()[{variant, age}] =
+                mio::abm::ViralLoadDistributionsParameters{
+                    {min_peak, max_peak}, {min_incline, max_incline}, {min_decline, max_decline}};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_incubationPeriod",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto incubation_period_params                                      = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::IncubationPeriod>()[{variant, age}] = {incubation_period_params.first,
+                                                                                  incubation_period_params.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedNoSymptomsToSymptoms",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedNoSymptomsToSymptoms = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedNoSymptomsToSymptoms>()[{variant, age}] = {
+                TimeInfectedNoSymptomsToSymptoms.first, TimeInfectedNoSymptomsToSymptoms.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedNoSymptomsToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedNoSymptomsToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedNoSymptomsToRecovered>()[{variant, age}] = {
+                TimeInfectedNoSymptomsToRecovered.first, TimeInfectedNoSymptomsToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSymptomsToSevere",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSymptomsToSevere = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSymptomsToSevere>()[{variant, age}] = {
+                TimeInfectedSymptomsToSevere.first, TimeInfectedSymptomsToSevere.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSymptomsToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSymptomsToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSymptomsToRecovered>()[{variant, age}] = {
+                TimeInfectedSymptomsToRecovered.first, TimeInfectedSymptomsToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSevereToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSevereToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSevereToRecovered>()[{variant, age}] = {
+                TimeInfectedSevereToRecovered.first, TimeInfectedSevereToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedSevereToCritical",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedSevereToCritical = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedSevereToCritical>()[{variant, age}] = {
+                TimeInfectedSevereToCritical.first, TimeInfectedSevereToCritical.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedCriticalToRecovered",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedCriticalToRecovered = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedCriticalToRecovered>()[{variant, age}] = {
+                TimeInfectedCriticalToRecovered.first, TimeInfectedCriticalToRecovered.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_TimeInfectedCriticalToDead",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double mean,
+           double std) {
+            auto TimeInfectedCriticalToDead                                              = get_my_and_sigma(mean, std);
+            infection_params.get<mio::abm::TimeInfectedCriticalToDead>()[{variant, age}] = {
+                TimeInfectedCriticalToDead.first, TimeInfectedCriticalToDead.second};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_infectivity_parameters",
+        [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double min_alpha,
+           double max_alpha, double min_beta, double max_beta) {
+            infection_params.get<mio::abm::InfectivityDistributions>()[{variant, age}] =
+                mio::abm::InfectivityDistributionsParameters{{min_alpha, max_alpha}, {min_beta, max_beta}};
+        },
+        py::return_value_policy::reference_internal);
+
+    m.def(
+        "set_seeds",
+        [](mio::abm::Model& model, int seed) {
+            auto rng = mio::RandomNumberGenerator();
+            rng.seed({static_cast<uint32_t>(seed)});
+            model.get_rng() = rng;
+        },
+        py::return_value_policy::reference_internal);
+
     m.attr("__version__") = "dev";
 }
 

From c8eb6f568d0c92d5d7a7afd14876c4a11b2ecd23 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 3 Jan 2025 16:27:21 +0100
Subject: [PATCH 101/103] fix demonstrator

---
 .../ABM Demonstrator/abm_demonstrator.py      | 237 +++++++++---------
 .../simulation/bindings/models/abm.cpp        |  40 +--
 2 files changed, 148 insertions(+), 129 deletions(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index 56b4665948..e26ae2d514 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -361,10 +361,10 @@ def make_multiple_person_households(household_size,
     return household_group
 
 
-def add_households(world, distribution, num_inhabitants):
+def add_households(model, distribution, num_inhabitants):
     household_sizes = np.zeros(len(distribution))
     locationIds = []
-    new_index = len(world.locations)
+    new_index = len(model.locations)
     # distribute inhabintants to households
     while num_inhabitants > 0:
         size = np.random.choice(
@@ -374,7 +374,7 @@ def add_households(world, distribution, num_inhabitants):
 
     # one-person household
     one_person_household_group = make_one_person_households(household_sizes[0])
-    abm.add_household_group_to_world(world, one_person_household_group)
+    abm.add_household_group_to_model(model, one_person_household_group)
 
     # two-person households
     two_person_two_parents = int(0.85 * household_sizes[1])
@@ -383,7 +383,7 @@ def add_households(world, distribution, num_inhabitants):
         household_sizes[1] - two_person_two_parents - two_person_one_parent)
     two_person_household_group = make_multiple_person_households(2, two_person_two_parents,
                                                                  two_person_one_parent, two_person_other)
-    abm.add_household_group_to_world(world, two_person_household_group)
+    abm.add_household_group_to_model(model, two_person_household_group)
 
     # three-person households
     three_person_two_parents = int(0.83 * household_sizes[2])
@@ -392,7 +392,7 @@ def add_households(world, distribution, num_inhabitants):
         household_sizes[2] - three_person_two_parents - three_person_one_parent)
     three_person_household_group = make_multiple_person_households(3, three_person_two_parents,
                                                                    three_person_one_parent, three_person_other)
-    abm.add_household_group_to_world(world, three_person_household_group)
+    abm.add_household_group_to_model(model, three_person_household_group)
 
     # four-person households
     four_person_two_parents = int(0.93 * household_sizes[3])
@@ -401,7 +401,7 @@ def add_households(world, distribution, num_inhabitants):
         household_sizes[3] - four_person_two_parents - four_person_one_parent)
     four_person_household_group = make_multiple_person_households(4, four_person_two_parents,
                                                                   four_person_one_parent, four_person_other)
-    abm.add_household_group_to_world(world, four_person_household_group)
+    abm.add_household_group_to_model(model, four_person_household_group)
 
     # five-person households
     five_person_two_parents = int(0.88 * household_sizes[4])
@@ -410,206 +410,214 @@ def add_households(world, distribution, num_inhabitants):
         household_sizes[4] - five_person_two_parents - five_person_one_parent)
     five_person_household_group = make_multiple_person_households(5, five_person_two_parents,
                                                                   five_person_one_parent, five_person_other)
-    abm.add_household_group_to_world(world, five_person_household_group)
+    abm.add_household_group_to_model(model, five_person_household_group)
 
     for hh in range(int(sum(household_sizes))):
-        id = abm.LocationId(new_index, abm.LocationType.Home)
-        locationIds.append(id)
+        locationIds.append(
+            (mio.abm.LocationId(new_index), abm.LocationType.Home))
         new_index += 1
     return locationIds
 
 
-def insert_locations_to_map(mapping, inputId, locationIds):
+def insert_locations_to_map(mapping, inputId, locations):
     map = LocationMapping()
     map.inputId = inputId
-    for id in locationIds:
-        type = str(int(id.type))
-        index = str(id.index)
-        if int(id.type) < 10:
+    for loc in locations:
+        type = str(int(loc[1]))
+        index = str(loc[0].index())
+        if int(loc[1]) < 10:
             type = "0" + type
-        if int(id.index) < 10:
+        if loc[0].index() < 10:
             index = "0" + index
         map.modelId.append(type+index)
     mapping.append(map)
     return mapping
 
 
-def create_locations_from_input(world, input_areas, household_distribution):
+def create_locations_from_input(model, input_areas, household_distribution):
     # map input area ids to corresponding abm location ids
     mapping = []
-    # bools to make sure the world has a school and a hospital
+    # bools to make sure the model has a school and a hospital
     has_school = False
     has_hospital = False
     for index, area in input_areas.iterrows():
-        locationIds = []
+        locations = []
         if ('residential' in area.type):
             # area 'residential' corresponds to location type 'Home'
-            locationIds = add_households(
-                world, household_distribution, area.inhabitants)
+            locations = add_households(
+                model, household_distribution, area.inhabitants)
         elif (area.type == 'recreational'):
             # area 'recreational' corresponds to location type 'SocialEvent'
-            location = world.add_location(abm.LocationType.SocialEvent)
+            location = model.add_location(abm.LocationType.SocialEvent)
             # set maximum contacts and capacity for social events
-            world.get_individualized_location(
+            model.get_location(
                 location).infection_parameters.MaximumContacts = 30.
-            world.get_individualized_location(location).set_capacity(30, 40, 0)
-            locationIds.append(location)
+            model.get_location(location).set_capacity(30, 40, 0)
+            locations.append((model.get_location(location).id,
+                             model.get_location(location).type))
         elif (area.type == 'shopping_business'):
             # area 'shopping_business' corresponds to location type School, Hospital, BasicsShops, Work
             if (not has_school):
-                # if world does not have a school yet, a school is added
-                location = world.add_location(abm.LocationType.School)
+                # if model does not have a school yet, a school is added
+                location = model.add_location(abm.LocationType.School)
                 # set maximum contacts and capacity for school
-                world.get_individualized_location(
+                model.get_location(
                     location).infection_parameters.MaximumContacts = 40.
-                world.get_individualized_location(
+                model.get_location(
                     location).set_capacity(500, 2000, 0)
-                locationIds.append(location)
+                locations.append(
+                    (model.get_location(location).id, model.get_location(location).type))
                 has_school = True
             elif (not has_hospital):
-                # if world does not have a hospital yet, a hospital and a icu is added
-                locHosp = world.add_location(abm.LocationType.Hospital)
+                # if model does not have a hospital yet, a hospital and a icu is added
+                locHosp = model.add_location(abm.LocationType.Hospital)
                 # set maximum contacts and capacity for hospital
-                world.get_individualized_location(
+                model.get_location(
                     locHosp).infection_parameters.MaximumContacts = 5.
-                world.get_individualized_location(
+                model.get_location(
                     locHosp).set_capacity(300, 10000, 0)
-                locICU = world.add_location(abm.LocationType.ICU)
+                locICU = model.add_location(abm.LocationType.ICU)
                 # set maximum contacts and capacity for icu
-                world.get_individualized_location(
+                model.get_location(
                     locICU).infection_parameters.MaximumContacts = 5.
-                world.get_individualized_location(
+                model.get_location(
                     locICU).set_capacity(30, 1000, 0)
-                locationIds.append(locHosp)
-                locationIds.append(locICU)
+                locations.append(
+                    (model.get_location(locHosp).id, model.get_location(locHosp).type))
+                locations.append((model.get_location(locICU).id,
+                                 model.get_location(locICU).type))
                 has_hospital = True
             else:
                 # when hospital and school has been added, the area 'shopping_business' is either
                 # transformed to location type BasicsShop or location type Work with same probability
                 type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
                 if (type):
-                    location = world.add_location(abm.LocationType.BasicsShop)
+                    location = model.add_location(abm.LocationType.BasicsShop)
                     # set maximum contacts and capacity for basics shops
-                    world.get_individualized_location(
+                    model.get_location(
                         location).infection_parameters.MaximumContacts = 20.
-                    world.get_individualized_location(
+                    model.get_location(
                         location).set_capacity(100, 1000, 0)
-                    locationIds.append(location)
+                    locations.append(
+                        (model.get_location(location).id, model.get_location(location).type))
                 else:
-                    location = world.add_location(abm.LocationType.Work)
+                    location = model.add_location(abm.LocationType.Work)
                     # set maximum contacts and capacity for work
-                    world.get_individualized_location(
+                    model.get_location(
                         location).infection_parameters.MaximumContacts = 40.
-                    world.get_individualized_location(
+                    model.get_location(
                         location).set_capacity(300, 2000, 0)
-                    locationIds.append(location)
+                    locations.append(
+                        (model.get_location(location).id, model.get_location(location).type))
         elif (area.type == 'university'):
             # area 'university' corresponds to location type 'Work'
-            location = world.add_location(abm.LocationType.Work)
+            location = model.add_location(abm.LocationType.Work)
             # set maximum contacts and capacity for work
-            world.get_individualized_location(
+            model.get_location(
                 location).infection_parameters.MaximumContacts = 50.
-            world.get_individualized_location(
+            model.get_location(
                 location).set_capacity(200, 4000, 0)
-            locationIds.append(location)
+            locations.append((model.get_location(location).id,
+                             model.get_location(location).type))
         elif (area.type == 'mixed'):
             # area 'mixed' corresponds either to location type 'Work' or location type 'Home' with same probability
             type = np.random.choice(np.arange(0, 2), p=[0.5, 0.5])
             if (type):
-                location = world.add_location(abm.LocationType.Work)
+                location = model.add_location(abm.LocationType.Work)
                 # set maximum contacts and capacity for work
-                world.get_individualized_location(
+                model.get_location(
                     location).infection_parameters.MaximumContacts = 40.
-                world.get_individualized_location(
+                model.get_location(
                     location).set_capacity(100, 2000, 0)
-                locationIds.append(location)
+                locations.append(
+                    (model.get_location(location).id, model.get_location(location).type))
             else:
-                locationIds = add_households(
-                    world, household_distribution, area.inhabitants)
-        insert_locations_to_map(mapping, str(area.id), locationIds)
+                locations = add_households(
+                    model, household_distribution, area.inhabitants)
+        insert_locations_to_map(mapping, str(area.id), locations)
     return mapping
 
 
-def assign_infection_states(world, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
+def assign_infection_states(model, t0, exposed_pct, infected_no_symptoms_pct, infected_symptoms_pct,
                             infected_severe_pct, infected_critical_pct, recovered_pct):
     susceptible_pct = 1 - exposed_pct - infected_no_symptoms_pct - \
         infected_symptoms_pct - infected_severe_pct - \
         infected_critical_pct - recovered_pct
-    for person in world.persons:
+    for person in model.persons:
         # draw infection state from distribution for every agent
         infection_state = np.random.choice(np.arange(0, int(abm.InfectionState.Count)),
                                            p=[susceptible_pct, exposed_pct, infected_no_symptoms_pct,
                                                infected_symptoms_pct, infected_severe_pct, infected_critical_pct, recovered_pct, 0.0])
         if (abm.InfectionState(infection_state) != abm.InfectionState.Susceptible):
             person.add_new_infection(Infection(
-                world, person, VirusVariant.Wildtype, t0, abm.InfectionState(infection_state), False), t0)
+                model, person, VirusVariant.Wildtype, t0, abm.InfectionState(infection_state), False), t0)
 
 
-def find_all_locations_of_type(world, type):
+def find_all_locations_of_type(model, type):
     locations = []
-    for loc in world.locations:
+    for loc in model.locations:
         if (loc.type == type):
-            locations.append(abm.LocationId(loc.index, type))
+            locations.append(loc.id)
     return locations
 
 
-def assign_locations(world):
-    # get locations from world
-    schools = find_all_locations_of_type(world, abm.LocationType.School)
+def assign_locations(model):
+    # get locations from model
+    schools = find_all_locations_of_type(model, abm.LocationType.School)
     school_weights = [(1/len(schools)) for i in range(len(schools))]
-    hospitals = find_all_locations_of_type(world, abm.LocationType.Hospital)
+    hospitals = find_all_locations_of_type(model, abm.LocationType.Hospital)
     hospital_weights = [(1/len(hospitals)) for i in range(len(hospitals))]
-    icus = find_all_locations_of_type(world, abm.LocationType.ICU)
+    icus = find_all_locations_of_type(model, abm.LocationType.ICU)
     icu_weights = [(1/len(icus)) for i in range(len(icus))]
-    workplaces = find_all_locations_of_type(world, abm.LocationType.Work)
+    workplaces = find_all_locations_of_type(model, abm.LocationType.Work)
     workplace_weights = [(1/len(workplaces)) for i in range(len(workplaces))]
     basic_shops = find_all_locations_of_type(
-        world, abm.LocationType.BasicsShop)
+        model, abm.LocationType.BasicsShop)
     shop_weights = [(1/len(basic_shops)) for i in range(len(basic_shops))]
     social_events = find_all_locations_of_type(
-        world, abm.LocationType.SocialEvent)
+        model, abm.LocationType.SocialEvent)
     event_weights = [(1/len(social_events)) for i in range(len(social_events))]
 
     # assign locations to agents
-    for person in world.persons:
+    for person in model.persons:
         shop = np.random.choice(np.arange(0, len(basic_shops)), p=shop_weights)
-        person.set_assigned_location(abm.LocationId(
-            basic_shops[int(shop)].index, basic_shops[int(shop)].type))
+        person.set_assigned_location(model.get_location(basic_shops[int(shop)]).type,
+                                     basic_shops[int(shop)])
 
         hospital = np.random.choice(
             np.arange(0, len(hospitals)), p=hospital_weights)
-        person.set_assigned_location(abm.LocationId(
-            hospitals[int(hospital)].index, hospitals[int(hospital)].type))
+        person.set_assigned_location(model.get_location(hospitals[int(hospital)]).type,
+                                     hospitals[int(hospital)])
 
         icu = np.random.choice(np.arange(0, len(icus)), p=icu_weights)
-        person.set_assigned_location(abm.LocationId(
-            icus[int(icu)].index, icus[int(icu)].type))
+        person.set_assigned_location(model.get_location(icus[int(icu)]).type,
+                                     icus[int(icu)])
 
         event = np.random.choice(
             np.arange(0, len(social_events)), p=event_weights)
-        person.set_assigned_location(abm.LocationId(
-            social_events[int(event)].index, social_events[int(event)].type))
+        person.set_assigned_location(model.get_location(social_events[int(event)]).type,
+                                     social_events[int(event)])
 
         # assign school to agents between 5 and 14 years
         if (person.age == age_group_5_to_14):
             school = np.random.choice(
                 np.arange(0, len(schools)), p=school_weights)
-            person.set_assigned_location(abm.LocationId(
-                schools[int(school)].index, schools[int(school)].type))
+            person.set_assigned_location(model.get_location(schools[int(school)]).type,
+                                         schools[int(school)])
         # assign work to agents between 15 and 59
         if (person.age == age_group_15_to_34 or person.age == age_group_35_to_59):
             work = np.random.choice(
                 np.arange(0, len(workplaces)), p=workplace_weights)
-            person.set_assigned_location(abm.LocationId(
-                workplaces[int(work)].index, workplaces[int(work)].type))
+            person.set_assigned_location(model.get_location(workplaces[int(work)]).type,
+                                         workplaces[int(work)])
 
 
-def convert_loc_id_to_string(loc_id):
-    type = str(int(loc_id.type))
-    index = str(loc_id.index)
-    if int(loc_id.type) < 10:
+def convert_loc_id_to_string(loc):
+    type = str(int(loc[1]))
+    index = str(loc[0].index())
+    if int(loc[1]) < 10:
         type = "0" + type
-    if int(loc_id.index) < 10:
+    if int(loc[0].index()) < 10:
         index = "0" + index
 
     return type + index
@@ -618,7 +626,7 @@ def convert_loc_id_to_string(loc_id):
 def get_agents_per_location(loc_id, agents):
     agents_per_loc = []
     for a in agents:
-        if (int(a[0].type) == int(loc_id.type) and a[0].index == loc_id.index):
+        if (int(a[1]) == int(loc_id[1]) and a[0].index() == loc_id[0].index()):
             agents_per_loc.append(a)
     return agents_per_loc
 
@@ -637,11 +645,11 @@ def write_results_to_file(path, log):
                 line += " " + str(time_points[t]) + \
                     " " + str(len(agents_per_loc))
                 for a in agents_per_loc:
-                    if (a[2].days > 1000):
+                    if (a[3].days > 1000):
                         time_since_transmission = -1.0
                     else:
-                        time_since_transmission = a[2].hours
-                    line += " " + str(a[1]) + " " + \
+                        time_since_transmission = a[3].hours
+                    line += " " + str(a[2].index()) + " " + \
                         str(time_since_transmission)
             f.write(line)
             f.write('\n')
@@ -682,11 +690,11 @@ def write_infection_paths_to_file_states(path, log):
     f.close()
 
 
-def write_infection_paths_to_file(path, world, tmax):
+def write_infection_paths_to_file(path, model, tmax):
     with open(path, 'w') as f:
         f.write("Agent_id S E I_ns I_sy I_sev I_cri R D\n")
-        for person in world.persons:
-            line = str(int(person.id)) + " "
+        for person in model.persons:
+            line = str(int(person.id.index())) + " "
             if person.infection_state(tmax) == abm.InfectionState.Susceptible:
                 line += str(int(tmax.hours)) + " "
                 for i in range(int(abm.InfectionState.Count)-1):
@@ -743,14 +751,14 @@ def write_location_mapping_to_file(path, mapping):
 
 
 def set_sim_result_at_start(sim):
-    for location in sim.world.locations:
+    for location in sim.model.locations:
         result = sim.result.get_last_value()
         result += location.population.get_last_value()
 
 
-def write_age_and_hh(world, path):
+def write_age_and_hh(model, path):
     with open(path, 'w') as f:
-        for person in world.persons:
+        for person in model.persons:
             line = str(person.id) + " " + age_group_to_string(person.age) + " " + \
                 str(person.assigned_location(abm.LocationType.Home))
             f.write(line)
@@ -758,14 +766,14 @@ def write_age_and_hh(world, path):
         f.close()
 
 
-def write_compartments_to_file(world, path, timepoints):
+def write_compartments_to_file(model, path, timepoints):
     with open(path, 'w') as f:
         f.write("t S E Ins Isy Isev Icri R D\n")
         for t in range(len(timepoints)):
             tp = abm.TimePoint(0) + abm.hours(t)
             line = str(timepoints[t]) + " "
             comps = np.zeros(int(abm.InfectionState.Count))
-            for person in world.persons:
+            for person in model.persons:
                 state = person.infection_state(tp)
                 comps[int(state)] += 1
             for c in comps:
@@ -787,10 +795,10 @@ def write_results_to_h5(path, log):
     result_list = []
     for agent in log[3][0]:
         gr = file.create_group(str(agent))
-        loc_ids = np.array([convert_loc_id_to_string(log[2][t][agent][0])
+        loc_ids = np.array([convert_loc_id_to_string((log[2][t][agent.index()][0], log[2][t][agent.index()][1]))
                            for t in range(len(log[2]))], dtype=np.str_)
         time_since_transm = np.array([convert_time_since_transmission(
-            log[2][t][agent][2]) for t in range(len(log[2]))], dtype=np.float64)
+            log[2][t][agent.index()][3]) for t in range(len(log[2]))], dtype=np.float64)
         ds = gr.create_dataset('loc_ids', shape=len(
             loc_ids), dtype=h5py.string_dtype())
         ds[:] = loc_ids
@@ -800,7 +808,7 @@ def write_results_to_h5(path, log):
 
 
 def run_abm_simulation(sim_num):
-    mio.set_log_level(mio.LogLevel.Warning)
+    mio.set_log_level(mio.LogLevel.Off)
     input_path = sys.path[0] + '/input/'
     output_path = sys.path[0] + '/output/'
     # set seed for fixed model initialization (locations and initial infection states)
@@ -819,30 +827,30 @@ def run_abm_simulation(sim_num):
     # create simulation with starting timepoint and number of age groups
     sim = abm.Simulation(t0, num_age_groups)
     # set seeds for simulation
-    abm.set_seeds(sim.world, sim_num)
+    abm.set_seeds(sim.model, sim_num)
     # set infection parameters
-    sim.world.parameters = set_infection_parameters(parameters)
+    sim.model.parameters = set_infection_parameters(parameters)
     # as input areas do not fit one-to-one to abm location types, there has to be a mapping
     mapping = create_locations_from_input(
-        sim.world, areas, household_distribution)
+        sim.model, areas, household_distribution)
     # assign initial infection states according to distribution
-    assign_infection_states(sim.world, t0, 0.002, 0.005,
+    assign_infection_states(sim.model, t0, 0.002, 0.005,
                             0.0029, 0.0001, 0.0, 0.0)
     # assign locations to agents
-    assign_locations(sim.world)
+    assign_locations(sim.model)
     # output object
     history = History()
     # just used for debugging
-    # write_age_and_hh(sim.world, os.path.join(output_path, 'age_hh.txt'))
+    # write_age_and_hh(sim.model, os.path.join(output_path, 'age_hh.txt'))
     # advance simulation until tmax
     sim.advance(tmax, history)
     # results collected during the simulation
     log = history.log
     # write infection paths per agent to file
     write_infection_paths_to_file(os.path.join(
-        output_path, str(sim_num) + '_infection_paths.txt'), sim.world, tmax)
+        output_path, str(sim_num) + '_infection_paths.txt'), sim.model, tmax)
     # write compartment size per time step to file
-    write_compartments_to_file(sim.world, os.path.join(
+    write_compartments_to_file(sim.model, os.path.join(
         output_path, str(sim_num) + '_comps.csv'), log[0])
     start = time.time()
     write_results_to_h5(os.path.join(
@@ -868,6 +876,7 @@ def run_abm_simulation(sim_num):
         description='Example demonstrating the agent-based model for a synthetic population.')
     args = arg_parser.parse_args()
     # set LogLevel
-    mio.set_log_level(mio.LogLevel.Warning)
-    for i in range(1):
+    mio.set_log_level(mio.LogLevel.Off)
+    mio.abm.set_log_level_warn()
+    for i in range(1, 2):
         run_abm_simulation(i, **args.__dict__)
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
index 9a99084adf..3e7c502ca5 100644
--- a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
@@ -49,12 +49,12 @@ struct LogTimePoint : mio::LogAlways {
 
 //LocationId logger
 struct LogLocationIds : mio::LogOnce {
-    using Type = std::vector<mio::abm::LocationId>;
+    using Type = std::vector<std::tuple<mio::abm::LocationId, mio::abm::LocationType>>;
     static Type log(const mio::abm::Simulation& sim)
     {
-        std::vector<mio::abm::LocationId> location_ids{};
+        std::vector<std::tuple<mio::abm::LocationId, mio::abm::LocationType>> location_ids{};
         for (auto&& location : sim.get_model().get_locations()) {
-            location_ids.push_back(location.get_id());
+            location_ids.push_back(std::make_tuple(location.get_id(), location.get_type()));
         }
         return location_ids;
     }
@@ -75,15 +75,16 @@ struct LogAgentIds : mio::LogOnce {
 
 //agent logger
 struct LogPersonsPerLocationAndInfectionTime : mio::LogAlways {
-    using Type =
-        std::vector<std::tuple<mio::abm::LocationId, mio::abm::PersonId, mio::abm::TimeSpan, mio::abm::InfectionState>>;
+    using Type = std::vector<std::tuple<mio::abm::LocationId, mio::abm::LocationType, mio::abm::PersonId,
+                                        mio::abm::TimeSpan, mio::abm::InfectionState>>;
     static Type log(const mio::abm::Simulation& sim)
     {
-        std::vector<std::tuple<mio::abm::LocationId, mio::abm::PersonId, mio::abm::TimeSpan, mio::abm::InfectionState>>
+        std::vector<std::tuple<mio::abm::LocationId, mio::abm::LocationType, mio::abm::PersonId, mio::abm::TimeSpan,
+                               mio::abm::InfectionState>>
             location_ids_person{};
         for (auto&& person : sim.get_model().get_persons()) {
-            location_ids_person.push_back(std::make_tuple(person.get_location(), person.get_id(),
-                                                          person.get_time_since_transmission(),
+            location_ids_person.push_back(std::make_tuple(person.get_location(), person.get_location_type(),
+                                                          person.get_id(), person.get_time_since_transmission(),
                                                           person.get_infection_state(sim.get_time())));
         }
         return location_ids_person;
@@ -107,7 +108,8 @@ PYBIND11_MODULE(_simulation_abm, m)
         .value("InfectedSevere", mio::abm::InfectionState::InfectedSevere)
         .value("InfectedCritical", mio::abm::InfectionState::InfectedCritical)
         .value("Recovered", mio::abm::InfectionState::Recovered)
-        .value("Dead", mio::abm::InfectionState::Dead);
+        .value("Dead", mio::abm::InfectionState::Dead)
+        .value("Count", mio::abm::InfectionState::Count);
 
     pymio::iterable_enum<mio::abm::ProtectionType>(m, "ProtectionType")
         .value("NoProtection", mio::abm::ProtectionType::NoProtection)
@@ -126,7 +128,8 @@ PYBIND11_MODULE(_simulation_abm, m)
         .value("ICU", mio::abm::LocationType::ICU)
         .value("Car", mio::abm::LocationType::Car)
         .value("PublicTransport", mio::abm::LocationType::PublicTransport)
-        .value("TransportWithoutContact", mio::abm::LocationType::TransportWithoutContact);
+        .value("TransportWithoutContact", mio::abm::LocationType::TransportWithoutContact)
+        .value("Cemetery", mio::abm::LocationType::Cemetery);
 
     pymio::iterable_enum<mio::abm::TestType>(m, "TestType")
         .value("Generic", mio::abm::TestType::Generic)
@@ -336,18 +339,18 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def(py::init<mio::abm::TimePoint, size_t>())
         .def("advance",
              &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
-                                                         LogPersonsPerLocationAndInfectionTime>>)
+                                                         LogPersonsPerLocationAndInfectionTime, LogAgentIds>>)
         // .def("advance",
         //      static_cast<void (mio::abm::Simulation::*)(mio::abm::TimePoint)>(&mio::abm::Simulation::advance),
         //      py::arg("tmax"))
         .def_property_readonly("model", py::overload_cast<>(&mio::abm::Simulation::get_model));
 
-    pymio::bind_class<
-        mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds, LogPersonsPerLocationAndInfectionTime>,
-        pymio::EnablePickling::Never>(m, "History")
+    pymio::bind_class<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
+                                   LogPersonsPerLocationAndInfectionTime, LogAgentIds>,
+                      pymio::EnablePickling::Never>(m, "History")
         .def(py::init<>())
         .def_property_readonly("log", [](mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
-                                                      LogPersonsPerLocationAndInfectionTime>& self) {
+                                                      LogPersonsPerLocationAndInfectionTime, LogAgentIds>& self) {
             return self.get_log();
         });
 
@@ -469,6 +472,13 @@ PYBIND11_MODULE(_simulation_abm, m)
         },
         py::return_value_policy::reference_internal);
 
+    m.def(
+        "set_log_level_warn",
+        []() {
+            mio::set_log_level(mio::LogLevel::warn);
+        },
+        py::return_value_policy::reference_internal);
+
     m.attr("__version__") = "dev";
 }
 

From 952ebd69a98b0d5930e7aa2d171ac0dd2ab35433 Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Fri, 3 Jan 2025 16:57:31 +0100
Subject: [PATCH 102/103] set age groups for school and work

---
 .../simulation/ABM Demonstrator/abm_demonstrator.py       | 6 +++++-
 .../memilio/simulation/bindings/models/abm.cpp            | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py
index e26ae2d514..bc9be55153 100644
--- a/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
+++ b/pycode/examples/simulation/ABM Demonstrator/abm_demonstrator.py	
@@ -794,7 +794,7 @@ def write_results_to_h5(path, log):
     file = h5py.File(path, 'w')
     result_list = []
     for agent in log[3][0]:
-        gr = file.create_group(str(agent))
+        gr = file.create_group(str(agent.index()))
         loc_ids = np.array([convert_loc_id_to_string((log[2][t][agent.index()][0], log[2][t][agent.index()][1]))
                            for t in range(len(log[2]))], dtype=np.str_)
         time_since_transm = np.array([convert_time_since_transmission(
@@ -830,6 +830,10 @@ def run_abm_simulation(sim_num):
     abm.set_seeds(sim.model, sim_num)
     # set infection parameters
     sim.model.parameters = set_infection_parameters(parameters)
+    # set age groups that go to school and work
+    abm.set_AgeGroupGoToSchool(sim.model.parameters, age_group_5_to_14)
+    abm.set_AgeGroupGoToWork(sim.model.parameters, age_group_15_to_34)
+    abm.set_AgeGroupGoToWork(sim.model.parameters, age_group_35_to_59)
     # as input areas do not fit one-to-one to abm location types, there has to be a mapping
     mapping = create_locations_from_input(
         sim.model, areas, household_distribution)
diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
index 3e7c502ca5..6e2bc14c23 100644
--- a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
@@ -454,6 +454,14 @@ PYBIND11_MODULE(_simulation_abm, m)
         },
         py::return_value_policy::reference_internal);
 
+    m.def("set_AgeGroupGoToSchool", [](mio::abm::Parameters& infection_params, mio::AgeGroup age) {
+        infection_params.get<mio::abm::AgeGroupGotoSchool>()[age] = true;
+    });
+
+    m.def("set_AgeGroupGoToWork", [](mio::abm::Parameters& infection_params, mio::AgeGroup age) {
+        infection_params.get<mio::abm::AgeGroupGotoWork>()[age] = true;
+    });
+
     m.def(
         "set_infectivity_parameters",
         [](mio::abm::Parameters& infection_params, mio::abm::VirusVariant variant, mio::AgeGroup age, double min_alpha,

From afc0f4b7ad6cc5d3c620516035556367c215af7d Mon Sep 17 00:00:00 2001
From: jubicker <julia.bicker@dlr.de>
Date: Tue, 7 Jan 2025 09:57:00 +0100
Subject: [PATCH 103/103] fix python unittest

---
 .../memilio/simulation/bindings/models/abm.cpp              | 6 +++---
 .../memilio-simulation/memilio/simulation_test/test_abm.py  | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
index 6e2bc14c23..2feeec89be 100644
--- a/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
+++ b/pycode/memilio-simulation/memilio/simulation/bindings/models/abm.cpp
@@ -340,9 +340,9 @@ PYBIND11_MODULE(_simulation_abm, m)
         .def("advance",
              &mio::abm::Simulation::advance<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
                                                          LogPersonsPerLocationAndInfectionTime, LogAgentIds>>)
-        // .def("advance",
-        //      static_cast<void (mio::abm::Simulation::*)(mio::abm::TimePoint)>(&mio::abm::Simulation::advance),
-        //      py::arg("tmax"))
+        .def("advance",
+             static_cast<void (mio::abm::Simulation::*)(mio::abm::TimePoint)>(&mio::abm::Simulation::advance),
+             py::arg("tmax"))
         .def_property_readonly("model", py::overload_cast<>(&mio::abm::Simulation::get_model));
 
     pymio::bind_class<mio::History<mio::DataWriterToMemory, LogTimePoint, LogLocationIds,
diff --git a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
index f14bbbc5e1..3ea993f162 100644
--- a/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
+++ b/pycode/memilio-simulation/memilio/simulation_test/test_abm.py
@@ -98,9 +98,7 @@ def test_simulation(self):
             model.assign_location(p1_id, loc_id)
             model.assign_location(p2_id, loc_id)
 
-        model.parameters.InfectedSymptomsToSevere[abm.VirusVariant.Wildtype, mio.AgeGroup(
-            0)] = 0.0
-        model.parameters.InfectedSymptomsToRecovered[abm.VirusVariant.Wildtype, mio.AgeGroup(
+        model.parameters.SeverePerInfectedSymptoms[abm.VirusVariant.Wildtype, mio.AgeGroup(
             0)] = 0.0
 
         # trips