Skip to content

1034 ide model simulation does not work under some conditions #1035

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
annawendler merged 1 commit into from
May 15, 2024
Merged

1034 ide model simulation does not work under some conditions #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cpp/memilio/epidemiology/state_age_function.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,8 +658,8 @@ struct ConstantFunction : public StateAgeFunction {
unused(tol);
m_support_max = -2.;

log_error("This function is not suited to be a TransitionDistribution. Do not call in case of StateAgeFunctions"
"of type b); see documentation of StateAgeFunction Base class.");
log_error("This function is not suited to be a TransitionDistribution. Do not call in case of "
"StateAgeFunctions of type b); see documentation of StateAgeFunction Base class.");

return m_support_max;
}
Expand Down
15 changes: 10 additions & 5 deletions cpp/models/ide_secir/model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,17 @@ void Model::compute_compartment_from_flows(ScalarType dt, Eigen::Index idx_Infec
Eigen::Index idx_IncomingFlow, int idx_TransitionDistribution1,
int idx_TransitionDistribution2)
{
ScalarType sum = 0;

ScalarType sum = 0;
ScalarType calc_time = 0;
// Determine relevant calculation area and corresponding index.
ScalarType calc_time =
std::max(parameters.get<TransitionDistributions>()[idx_TransitionDistribution1].get_support_max(dt, m_tol),
parameters.get<TransitionDistributions>()[idx_TransitionDistribution2].get_support_max(dt, m_tol));
if ((1 - parameters.get<TransitionProbabilities>()[idx_TransitionDistribution1]) > 0) {
Comment thread
annawendler marked this conversation as resolved.
calc_time =
std::max(parameters.get<TransitionDistributions>()[idx_TransitionDistribution1].get_support_max(dt, m_tol),
parameters.get<TransitionDistributions>()[idx_TransitionDistribution2].get_support_max(dt, m_tol));
}
else {
calc_time = parameters.get<TransitionDistributions>()[idx_TransitionDistribution1].get_support_max(dt, m_tol);
}

Eigen::Index calc_time_index = (Eigen::Index)std::ceil(calc_time / dt) - 1;

Expand Down