Skip to content

1382 Fix incorrect overload detection and type mismatch in test_commuters #1394

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
merged 2 commits into from
Oct 27, 2025
+42 −43
Merged

1382 Fix incorrect overload detection and type mismatch in test_commuters #1394

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
cb22596
Add missing FP templates
julianlitz Oct 13, 2025
fcedc38
Eliminate empty fallback function
julianlitz Oct 15, 2025
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
73 changes: 36 additions & 37 deletions cpp/memilio/mobility/metapopulation_mobility_instant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ void calculate_mobility_returns(Eigen::Ref<typename TimeSeries<FP>::Vector> mobi
* detect a get_infections_relative function for the Model type.
*/
template <typename FP, class Sim>
using get_infections_relative_expr_t = decltype(get_infections_relative(
using get_infections_relative_expr_t = decltype(get_infections_relative<FP>(
std::declval<const Sim&>(), std::declval<FP>(), std::declval<const Eigen::Ref<const Eigen::VectorX<FP>>&>()));

/**
Expand All @@ -490,26 +490,25 @@ using get_infections_relative_expr_t = decltype(get_infections_relative(
* @param y the current value of the simulation.
* @param t the current simulation time
*/
template <typename FP, class Sim,
std::enable_if_t<!is_expression_valid<get_infections_relative_expr_t, Sim>::value, void*> = nullptr>
FP get_infections_relative(const SimulationNode<FP, Sim>& /*node*/, FP /*t*/,
const Eigen::Ref<const Eigen::VectorX<FP>>& /*y*/)
{
assert(false && "Overload get_infections_relative for your own model/simulation if you want to use dynamic NPIs.");
return 0;
}
template <typename FP, class Sim,
std::enable_if_t<is_expression_valid<get_infections_relative_expr_t, Sim>::value, void*> = nullptr>
template <typename FP, class Sim>
FP get_infections_relative(const SimulationNode<FP, Sim>& node, FP t, const Eigen::Ref<const Eigen::VectorX<FP>>& y)
{
return get_infections_relative<FP, Sim>(node.get_simulation(), t, y);
if constexpr (is_expression_valid<get_infections_relative_expr_t, FP, Sim>::value) {
return get_infections_relative<FP>(node.get_simulation(), t, y);
}
else {
mio::unused(node, t, y);
mio::log_debug("get_infections_relative called without specialization for this simulation type. "
"Implement an overload in your model if you intend to use dynamic NPIs.");
return FP{0};
}
}

/**
* detect a get_mobility_factors function for the Model type.
*/
template <typename FP, class Sim>
using get_mobility_factors_expr_t = decltype(get_mobility_factors(
using get_mobility_factors_expr_t = decltype(get_mobility_factors<FP>(
std::declval<const Sim&>(), std::declval<FP>(), std::declval<const Eigen::Ref<const Eigen::VectorX<FP>>&>()));

/**
Expand All @@ -523,26 +522,26 @@ using get_mobility_factors_expr_t = decltype(get_mobility_factors(
* @param t the current simulation time
* @return a vector expression, same size as y, with the factor for each compartment.
*/
template <typename FP, class Sim,
std::enable_if_t<!is_expression_valid<get_mobility_factors_expr_t, Sim>::value, void*> = nullptr>
auto get_mobility_factors(const SimulationNode<FP, Sim>& /*node*/, FP /*t*/,
const Eigen::Ref<const Eigen::VectorX<FP>>& y)
{
return Eigen::VectorX<FP>::Ones(y.rows());
}
template <typename FP, class Sim,
std::enable_if_t<is_expression_valid<get_mobility_factors_expr_t, Sim>::value, void*> = nullptr>
template <typename FP, class Sim>
auto get_mobility_factors(const SimulationNode<FP, Sim>& node, FP t, const Eigen::Ref<const Eigen::VectorX<FP>>& y)
{
return get_mobility_factors<FP, Sim>(node.get_simulation(), t, y);
if constexpr (is_expression_valid<get_mobility_factors_expr_t, FP, Sim>::value) {
return get_mobility_factors<FP>(node.get_simulation(), t, y);
}
else {
mio::unused(node, t);
mio::log_debug("get_mobility_factors called without specialization for this simulation type. "
"Using default mobility factor (1.0) for all compartments.");
return Eigen::VectorX<FP>::Ones(y.rows());
}
}

/**
* detect a get_mobility_factors function for the Model type.
*/
template <typename FP, class Sim>
using test_commuters_expr_t = decltype(test_commuters(
std::declval<Sim&>(), std::declval<Eigen::Ref<const Eigen::VectorX<FP>>&>(), std::declval<FP>()));
using test_commuters_expr_t = decltype(test_commuters<FP>(
std::declval<Sim&>(), std::declval<Eigen::Ref<Eigen::VectorX<FP>>>(), std::declval<FP>()));

/**
* Test persons when moving from their source node.
Expand All @@ -554,17 +553,17 @@ using test_commuters_expr_t = decltype(test_commuters(
* @param mobile_population mutable reference to vector of persons per compartment that change nodes.
* @param t the current simulation time.
*/
template <typename FP, class Sim,
std::enable_if_t<!is_expression_valid<test_commuters_expr_t, Sim>::value, void*> = nullptr>
void test_commuters(SimulationNode<FP, Sim>& /*node*/, Eigen::Ref<Eigen::VectorX<FP>> /*mobile_population*/,
FP /*time*/)
{
}
template <typename FP, class Sim,
std::enable_if_t<is_expression_valid<test_commuters_expr_t, Sim>::value, void*> = nullptr>
template <typename FP, class Sim>
void test_commuters(SimulationNode<FP, Sim>& node, Eigen::Ref<Eigen::VectorX<FP>> mobile_population, FP time)
{
return test_commuters<FP, Sim>(node.get_simulation(), mobile_population, time);
if constexpr (is_expression_valid<test_commuters_expr_t, FP, Sim>::value) {
test_commuters<FP>(node.get_simulation(), mobile_population, time);
}
else {
mio::unused(node, mobile_population, time);
mio::log_debug("test_commuters called without specialization for this simulation type. "
"Implement an overload in your model if you intend to use commuter testing.");
}
}

template <typename FP>
Expand All @@ -581,7 +580,7 @@ void mio::MobilityEdge<FP>::apply_mobility(FP t, FP dt, SimulationNode<FP, Sim>&
if (dyn_npis.get_thresholds().size() > 0 &&
floating_point_greater_equal<FP>(t, m_t_last_dynamic_npi_check + dyn_npis.get_interval().get())) {
auto inf_rel =
get_infections_relative<FP, Sim>(node_from, t, node_from.get_last_state()) * dyn_npis.get_base_value();
get_infections_relative<FP>(node_from, t, node_from.get_last_state()) * dyn_npis.get_base_value();
auto exceeded_threshold = dyn_npis.get_max_exceeded_threshold(inf_rel);
if (exceeded_threshold != dyn_npis.get_thresholds().end() &&
(exceeded_threshold->first > m_dynamic_npi.first ||
Expand All @@ -602,8 +601,8 @@ void mio::MobilityEdge<FP>::apply_mobility(FP t, FP dt, SimulationNode<FP, Sim>&
if (m_return_times.get_time(i) <= t) {
auto v0 = find_value_reverse<FP>(node_to.get_result(), m_mobile_population.get_time(i), 1e-10, 1e-10);
assert(v0 != node_to.get_result().rend() && "unexpected error.");
calculate_mobility_returns<FP, Sim>(m_mobile_population[i], node_to.get_simulation(), *v0,
m_mobile_population.get_time(i), dt);
calculate_mobility_returns<FP>(m_mobile_population[i], node_to.get_simulation(), *v0,
m_mobile_population.get_time(i), dt);

//the lower-order return calculation may in rare cases produce negative compartments,
//especially at the beginning of the simulation.
Expand Down
4 changes: 2 additions & 2 deletions cpp/models/ode_secir/model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ IOResult<FP> get_reproduction_number(FP t_value, const Simulation<FP, Base>& sim
* @tparam FP floating point type, e.g., double.
* @tparam Base simulation type that uses a secir compartment model; see Simulation.
*/
template <typename FP, class Base = mio::Simulation<Model<FP>, FP>>
template <typename FP, class Base = mio::Simulation<FP, Model<FP>>>
auto get_mobility_factors(const Simulation<FP, Base>& sim, FP /*t*/, const Eigen::Ref<const Eigen::VectorX<FP>>& y)
{
auto& params = sim.get_model().parameters;
Expand Down Expand Up @@ -689,7 +689,7 @@ auto get_mobility_factors(const Simulation<FP, Base>& sim, FP /*t*/, const Eigen
return factors;
}

template <typename FP, class Base = mio::Simulation<Model<FP>, FP>>
template <typename FP, class Base = mio::Simulation<FP, Model<FP>>>
auto test_commuters(Simulation<FP, Base>& sim, Eigen::Ref<Eigen::VectorX<FP>> mobile_population, FP time)
{
auto& model = sim.get_model();
Expand Down
4 changes: 2 additions & 2 deletions cpp/models/ode_secirts/model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ FP get_infections_relative(const Simulation<FP, Base>& sim, FP /*t*/, const Eige
* @return vector expression, same size as y, with migration factors per compartment.
* @tparam Base simulation type that uses a SECIRS-type compartment model. see Simulation.
*/
template <typename FP, class Base = mio::Simulation<Model<FP>, FP>>
template <typename FP, class Base = mio::Simulation<FP, Model<FP>>>
auto get_migration_factors(const Simulation<Base>& sim, FP /*t*/, const Eigen::Ref<const Eigen::VectorX<FP>>& y)
{
auto& params = sim.get_model().parameters;
Expand Down Expand Up @@ -943,7 +943,7 @@ auto get_migration_factors(const Simulation<Base>& sim, FP /*t*/, const Eigen::R
* @param[in,out] migrated Vector representing the number of commuters in each state.
* @param[in] time Current simulation time, used to determine the commuter detection period.
*/
template <typename FP, class Base = mio::Simulation<Model<FP>, FP>>
template <typename FP, class Base = mio::Simulation<FP, Model<FP>>>
auto test_commuters(Simulation<FP, Base>& sim, Eigen::Ref<Eigen::VectorX<FP>> migrated, FP time)
{
auto& model = sim.get_model();
Expand Down
4 changes: 2 additions & 2 deletions cpp/models/ode_secirvvs/model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ FP get_infections_relative(const Simulation<FP, Base>& sim, FP /*t*/, const Eige
* @return vector expression, same size as y, with mobility factors per compartment.
* @tparam Base simulation type that uses a secir compartment model. see Simulation.
*/
template <typename FP, class Base = mio::Simulation<Model<FP>, FP>>
template <typename FP, class Base = mio::Simulation<FP, Model<FP>>>
auto get_mobility_factors(const Simulation<Base>& sim, FP /*t*/, const Eigen::Ref<const Eigen::VectorX<FP>>& y)

{
Expand Down Expand Up @@ -866,7 +866,7 @@ auto get_mobility_factors(const Simulation<Base>& sim, FP /*t*/, const Eigen::Re
return factors;
}

template <typename FP, class Base = mio::Simulation<Model<FP>, FP>>
template <typename FP, class Base = mio::Simulation<FP, Model<FP>>>
auto test_commuters(Simulation<FP, Base>& sim, Eigen::Ref<Eigen::VectorX<FP>> mobile_population, FP time)
{
auto& model = sim.get_model();
Expand Down