Skip to content

Commit

Permalink
Correct iterator types (#111)
Browse files Browse the repository at this point in the history
  • Loading branch information
pratikunterwegs authored Dec 2, 2022
1 parent 37a10d9 commit ed14e79
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/iterative_solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Eigen::ArrayXd solve_final_size_iterative(
const double tolerance = 1e-6, double step_rate = 1.9,
const bool adapt_step = true) {
// count number of demography groups
size_t nDim = demography_vector.size();
int nDim = demography_vector.size();

Eigen::ArrayXi zeros(nDim);
zeros.fill(0);
Expand Down Expand Up @@ -72,7 +72,7 @@ Eigen::ArrayXd solve_final_size_iterative(
const Eigen::VectorXd &epi_final_size,
Eigen::VectorXd &&epi_final_size_return) {
Eigen::VectorXd s = contact_matrix_ * (-epi_final_size);
for (size_t i = 0; i < contact_matrix_.rows(); ++i) {
for (int i = 0; i < contact_matrix_.rows(); ++i) {
if (zeros[i] == 1) {
epi_final_size_return[i] = 0;
continue;
Expand Down
6 changes: 3 additions & 3 deletions src/newton_solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Eigen::ArrayXd solve_final_size_newton(const Eigen::MatrixXd &contact_matrix,
const int iterations = 10000,
const double tolerance = 1e-6) {
// count number of demography groups
size_t nDim = demography_vector.size();
int nDim = demography_vector.size();

Eigen::ArrayXi zeros(nDim);
zeros.fill(0);
Expand All @@ -43,14 +43,14 @@ Eigen::ArrayXd solve_final_size_newton(const Eigen::MatrixXd &contact_matrix,
epi_final_size.fill(0.5);

Eigen::MatrixXd contact_matrix_ = contact_matrix;
for (size_t i = 0; i < contact_matrix.rows(); ++i) {
for (int i = 0; i < contact_matrix.rows(); ++i) {
// Check if value should be 0 for (limited) performance increase
if (demography_vector(i) == 0 || susceptibility(i) == 0 ||
contact_matrix.row(i).sum() == 0) {
zeros[i] = 1;
epi_final_size[i] = 0;
}
for (size_t j = 0; j < contact_matrix.cols(); ++j) {
for (int j = 0; j < contact_matrix.cols(); ++j) {
if (zeros[j] == 1) {
contact_matrix_(i, j) = 0;
} else {
Expand Down

0 comments on commit ed14e79

Please sign in to comment.