Skip to content

1498 Detection of non unique flows in the FlowModel #1499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reneSchm merged 2 commits into from
Feb 26, 2026
Merged

1498 Detection of non unique flows in the FlowModel #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e150fe
detect non unique flows
HenrZu Feb 26, 2026
fb923e3
fix tests odesecirts
HenrZu Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cpp/memilio/compartments/flow_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class FlowModel : public CompartmentalModel<FP, Comp, Pop, Params>
// Enforce that Comp is a unique Category of PopIndex, since we use Flows (via their source/target) to provide
// Comp indices for the population.
static_assert(FlowIndex::size == PopIndex::size - 1, "Compartments must be used exactly once as population index.");
static_assert(!Flows::has_duplicates, "Flow duplicates detected. Flows must be unique.");

public:
using Base = CompartmentalModel<FP, Comp, Pop, Params>;
Expand Down
3 changes: 3 additions & 0 deletions cpp/memilio/utils/type_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ struct TypeList {
{
return sizeof...(Types);
}

/// @brief Checks whether TypeList contains any type multiple times.
static constexpr bool has_duplicates = has_duplicates_v<Types...>;
};

/// Specialization of type_at_index for TypeList. @see type_at_index.
Expand Down
1 change: 0 additions & 1 deletion cpp/models/ode_secirts/model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ using Flows = TypeList<
Flow<InfectionState::InfectedSevereNaive, InfectionState::DeadNaive>,
Flow<InfectionState::InfectedCriticalNaive, InfectionState::DeadNaive>,
Flow<InfectionState::InfectedCriticalNaive, InfectionState::TemporaryImmunePartialImmunity>,
Flow<InfectionState::TemporaryImmunePartialImmunity, InfectionState::SusceptiblePartialImmunity>,
//partial immunity
Flow<InfectionState::SusceptiblePartialImmunity, InfectionState::ExposedPartialImmunity>,
Flow<InfectionState::SusceptiblePartialImmunity, InfectionState::TemporaryImmuneImprovedImmunity>,
Expand Down
32 changes: 16 additions & 16 deletions cpp/tests/test_odesecirts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,17 @@ TEST(TestOdeSECIRTS, get_flows)

model.get_flows(y, y, 0.0, flows);

std::vector<double> expected_values = {0.09375, 0.90625, 1, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
0.5, 0.5, 0, 0.5, 0.5, 1, 0.046875, 0.953125, 1, 0.5, 0.5,
0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0, 0.5, 0.5,
0.046875, 0.953125, 1, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
0.5, 0.5, 0, 0.5, 0.5, 0, 1, 1, 1};
std::vector<double> expected_values = {
0.09375, 0.90625, 1, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
0, 0.5, 0.5, 0.046875, 0.953125, 1, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
0.5, 0.5, 0.5, 0, 0.5, 0.5, 0.046875, 0.953125, 1, 0.5, 0.5, 0.5, 0.5,
0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0, 0.5, 0.5, 1, 1, 1, 1};

EXPECT_EQ(flows.size(), 53);
EXPECT_EQ(flows.size(), 52);

// Compare expected with actual values
for (size_t i = 0; i < expected_values.size(); i++) {
EXPECT_NEAR(flows(i), expected_values[i], 1e-10);
for (auto i = 0; i < flows.size(); i++) {
EXPECT_NEAR(flows(i), expected_values[i], 1e-5);
}
}

Expand All @@ -148,8 +148,8 @@ TEST(TestOdeSECIRTS, Simulation)
EXPECT_EQ(sim.get_result().get_num_time_points(), 2); // stores initial value and single step

Eigen::VectorXd expected_result(29);
expected_result << 1.0, 2.0, 0.09375, 0.046875, 0.046875, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.5, 0.5, 0.5,
0.5, 1.0, 1.0, 1.0, 0.5, 0.5, 0.5, 0.0, 1.5, 1.5, 1.5, 2.90625, 7.90625;
expected_result << 1, 1, 0.09375, 0.046875, 0.046875, 1, 1, 1, 0, 0, 0, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 1, 1, 1, 0.5,
0.5, 0.5, 0, 1.5, 1.5, 1.5, 3.90625, 7.90625;
EXPECT_EQ(sim.get_result().get_last_value(), expected_result);
}

Expand All @@ -165,14 +165,14 @@ TEST(TestOdeSECIRTS, FlowSimulation)
EXPECT_EQ(sim.get_result().get_num_time_points(), 2); // stores initial value and single step

Eigen::VectorXd expected_result(29);
expected_result << 1.0, 2.0, 0.09375, 0.046875, 0.046875, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.5, 0.5, 0.5,
0.5, 1.0, 1.0, 1.0, 0.5, 0.5, 0.5, 0.0, 1.5, 1.5, 1.5, 2.90625, 7.90625;
expected_result << 1, 1, 0.09375, 0.046875, 0.046875, 1, 1, 1, 0, 0, 0, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 1, 1, 1, 0.5,
0.5, 0.5, 0, 1.5, 1.5, 1.5, 3.90625, 7.90625;
EXPECT_EQ(sim.get_result().get_last_value(), expected_result);

Eigen::VectorXd expected_flows(53);
expected_flows << 0.09375, 0.90625, 1.0, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.0, 0.5, 0.5, 1.0,
0.046875, 0.953125, 1.0, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.0, 0.5, 0.5, 0.046875, 0.953125,
1.0, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.0, 0.5, 0.5, 0.0, 1.0, 1.0, 1.0;
Eigen::VectorXd expected_flows(52);
expected_flows << 0.09375, 0.90625, 1, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0, 0.5, 0.5, 0.046875,
0.953125, 1, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0, 0.5, 0.5, 0.046875, 0.953125, 1, 0.5, 0.5,
0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0, 0.5, 0.5, 1, 1, 1, 1;
EXPECT_EQ(sim.get_flows().get_last_value(), expected_flows);
}

Expand Down