Skip to content

1006 Prevent NaNs in SDE models #1008

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
mknaranja merged 1 commit into from
Apr 19, 2024
Merged

1006 Prevent NaNs in SDE models #1008

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
10 changes: 5 additions & 5 deletions cpp/models/sde_sir/model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ class Model : public FlowModel<InfectionState, Populations<InfectionState>, Para
// take the minimum of the calculated flow and the source compartment, to ensure that
// no compartment attains negative values.

flows[get_flat_flow_index<InfectionState::Susceptible, InfectionState::Infected>()] = std::min(
flows[get_flat_flow_index<InfectionState::Susceptible, InfectionState::Infected>()] = std::clamp(
coeffStoI * y[(size_t)InfectionState::Susceptible] * pop[(size_t)InfectionState::Infected] +
sqrt(coeffStoI * y[(size_t)InfectionState::Susceptible] * pop[(size_t)InfectionState::Infected]) /
sqrt(step_size) * si,
y[(size_t)InfectionState::Susceptible] / step_size);
0.0, y[(size_t)InfectionState::Susceptible] / step_size);

flows[get_flat_flow_index<InfectionState::Infected, InfectionState::Recovered>()] = std::min(
flows[get_flat_flow_index<InfectionState::Infected, InfectionState::Recovered>()] = std::clamp(
(1.0 / params.get<TimeInfected>()) * y[(size_t)InfectionState::Infected] +
sqrt((1.0 / params.get<TimeInfected>()) * y[(size_t)InfectionState::Infected]) / sqrt(step_size) * ir,
y[(size_t)InfectionState::Infected] / step_size);
0.0, y[(size_t)InfectionState::Infected] / step_size);
}

ScalarType step_size = 0.1; ///< A step size of the model with which the stochastic process is realized.
ScalarType step_size; ///< A step size of the model with which the stochastic process is realized.
mutable RandomNumberGenerator rng;

private:
Expand Down
14 changes: 7 additions & 7 deletions cpp/models/sde_sirs/model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,24 @@ class Model : public FlowModel<InfectionState, Populations<InfectionState>, Para
// take the minimum of the calculated flow and the source compartment, to ensure that
// no compartment attains negative values.

flows[get_flat_flow_index<InfectionState::Susceptible, InfectionState::Infected>()] = std::min(
flows[get_flat_flow_index<InfectionState::Susceptible, InfectionState::Infected>()] = std::clamp(
coeffStoI * y[(size_t)InfectionState::Susceptible] * pop[(size_t)InfectionState::Infected] +
sqrt(coeffStoI * y[(size_t)InfectionState::Susceptible] * pop[(size_t)InfectionState::Infected]) *
inv_sqrt_dt * si,
y[(size_t)InfectionState::Susceptible] / step_size);
0.0, y[(size_t)InfectionState::Susceptible] / step_size);

flows[get_flat_flow_index<InfectionState::Infected, InfectionState::Recovered>()] = std::min(
flows[get_flat_flow_index<InfectionState::Infected, InfectionState::Recovered>()] = std::clamp(
(1.0 / params.get<TimeInfected>()) * y[(size_t)InfectionState::Infected] +
sqrt((1.0 / params.get<TimeInfected>()) * y[(size_t)InfectionState::Infected]) * inv_sqrt_dt * ir,
y[(size_t)InfectionState::Infected] / step_size);
0.0, y[(size_t)InfectionState::Infected] / step_size);

flows[get_flat_flow_index<InfectionState::Recovered, InfectionState::Susceptible>()] = std::min(
flows[get_flat_flow_index<InfectionState::Recovered, InfectionState::Susceptible>()] = std::clamp(
(1.0 / params.get<TimeImmune>()) * y[(size_t)InfectionState::Recovered] +
sqrt((1.0 / params.get<TimeImmune>()) * y[(size_t)InfectionState::Recovered]) * inv_sqrt_dt * rs,
y[(size_t)InfectionState::Recovered] / step_size);
0.0, y[(size_t)InfectionState::Recovered] / step_size);
}

ScalarType step_size = 0.1; ///< A step size of the model with which the stochastic process is realized.
ScalarType step_size; ///< A step size of the model with which the stochastic process is realized.
mutable RandomNumberGenerator rng;

private:
Expand Down