merge main

cpp/models/abm/parameters.h

@@ -24,6 +24,7 @@
 #include "abm/time.h"
 #include "abm/virus_variant.h"
 #include "abm/protection_event.h"
+#include "abm/protection_event.h"
 #include "abm/test_type.h"
 #include "memilio/config.h"
 #include "memilio/io/default_serialize.h"
@@ -128,7 +129,7 @@ struct TimeInfectedSymptomsToRecovered {
     }
     static std::string name()
     {
-        return "TimeInfectedNoSymptomsToSymptoms";
+        return "TimeInfectedSymptomsToRecovered";
     }
 };
 

cpp/simulations/abm.cpp

@@ -23,6 +23,7 @@
 #include "abm/lockdown_rules.h"
 #include "memilio/config.h"
 #include "abm/state_transition_dist.h"
+#include "memilio/config.h"
 #include "memilio/io/result_io.h"
 #include "memilio/utils/random_number_generator.h"
 #include "memilio/utils/uncertain_value.h"

cpp/simulations/abm_braunschweig.cpp

@@ -21,6 +21,7 @@
 #include "abm/location_id.h"
 #include "abm/lockdown_rules.h"
 #include "abm/parameters.h"
+#include "abm/parameters.h"
 #include "abm/person.h"
 #include "abm/simulation.h"
 #include "abm/model.h"

cpp/tests/test_abm_infection.cpp

@@ -2,6 +2,7 @@
 * Copyright (C) 2020-2024 MEmilio
 *
 * Authors: David Kerkmann, Khoa Nguyen
+* Authors: David Kerkmann, Khoa Nguyen
 *
 * Contact: Martin J. Kuehn <[email protected]>
 *
@@ -34,6 +35,7 @@ TEST_F(TestInfection, init)
     auto params             = mio::abm::Parameters(num_age_groups);
     auto virus_variant_test = mio::abm::VirusVariant::Wildtype;
     auto age_group_test     = age_group_15_to_34;
+    mio::abm::Location loc(mio::abm::LocationType::Hospital, 0);
 
     params.get<mio::abm::VirusShedFactor>()[{virus_variant_test, age_group_test}] = {0.1, 0.2};
 

cpp/tests/test_abm_location.cpp

@@ -85,6 +85,7 @@ TEST_F(TestLocation, interact)
     auto t  = mio::abm::TimePoint(0);
     auto dt = mio::abm::seconds(8640); //0.1 days
 
+    // Setup model parameters for viral loads and infectivity distributions.
     // Setup model parameters for viral loads and infectivity distributions.
     mio::abm::Parameters params = mio::abm::Parameters(num_age_groups);
     params.set_default<mio::abm::ViralLoadDistributions>(num_age_groups);

cpp/tests/test_abm_masks.cpp

@@ -64,7 +64,6 @@ TEST_F(TestMasks, changeMask)
     EXPECT_EQ(mask.get_type(), mio::abm::MaskType::Surgical);
     EXPECT_EQ(mask.get_time_used(t), mio::abm::hours(0));
 }
-
 /**
  * @brief Test mask protection during person interactions.
  */

cpp/tests/test_abm_model.cpp

@@ -94,6 +94,10 @@ TEST_F(TestModel, addPerson)
     EXPECT_EQ(model.get_persons().size(), 2);
     EXPECT_EQ(model.get_person(0).get_age(), age_group_15_to_34);
     EXPECT_EQ(model.get_person(1).get_age(), age_group_35_to_59);
+    // Verify the number of persons in the model and their respective age groups.
+    EXPECT_EQ(model.get_persons().size(), 2);
+    EXPECT_EQ(model.get_person(0).get_age(), age_group_15_to_34);
+    EXPECT_EQ(model.get_person(1).get_age(), age_group_35_to_59);
 }
 
 /**
@@ -348,6 +352,8 @@ TEST_F(TestModel, evolveMobilityTrips)
     data.add_trip(trip2);
     data.add_trip(trip3);
 
+    // Set trips to use weekday trips on weekends.
+    data.use_weekday_trips_on_weekend();
     // Set trips to use weekday trips on weekends.
     data.use_weekday_trips_on_weekend();
 
@@ -371,7 +377,7 @@ TEST_F(TestModel, evolveMobilityTrips)
 
     // Move all persons back to their home location to prepare for weekend trips.
     model.change_location(p1.get_id(), home_id);
-    model.change_location(p1.get_id(), home_id);
+    model.change_location(p3.get_id(), home_id);
     model.change_location(p2.get_id(), home_id);
     model.change_location(p5.get_id(), home_id);