Skip to content
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.

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

Multi host2 #188

Merged
merged 69 commits into from
Jan 30, 2024
Merged

Multi host2 #188

merged 69 commits into from
Jan 30, 2024

Conversation

ChrisJones687
Copy link
Member

No description provided.

PoPSModel::StandardMultiHostPool multi_host_pool({&host_pool}, config);
multi_host_pool.set_pest_host_table(pest_host_table);
multi_host_pool.set_competency_table(competency_table);
std::vector<std::unique_ptr<PoPSModel::StandardSingleHostPool>> host_pool_vector;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<std::unique_ptr<PoPSModel::StandardSingleHostPool>> host_pool_vector;
std::vector<PoPSModel::StandardSingleHostPool> host_pool_vector;

src/pops.cpp Outdated
Comment on lines 275 to 293
host_pool_vector.emplace_back(new PoPSModel::StandardSingleHostPool(
mt,
susceptible,
exposed,
config.latency_period_steps,
infected,
total_exposed,
resistant,
mortality_tracker,
mortality,
total_hosts,
model.environment(),
config.generate_stochasticity,
config.reproductive_rate,
config.establishment_stochasticity,
config.establishment_probability,
config.rows,
config.cols,
spatial_indices));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
host_pool_vector.emplace_back(new PoPSModel::StandardSingleHostPool(
mt,
susceptible,
exposed,
config.latency_period_steps,
infected,
total_exposed,
resistant,
mortality_tracker,
mortality,
total_hosts,
model.environment(),
config.generate_stochasticity,
config.reproductive_rate,
config.establishment_stochasticity,
config.establishment_probability,
config.rows,
config.cols,
spatial_indices));
host_pool_vector.emplace_back(
mt,
susceptible,
exposed,
config.latency_period_steps,
infected,
total_exposed,
resistant,
mortality_tracker,
mortality,
total_hosts,
model.environment(),
config.generate_stochasticity,
config.reproductive_rate,
config.establishment_stochasticity,
config.establishment_probability,
config.rows,
config.cols,
spatial_indices);

@ChrisJones687 ChrisJones687 marked this pull request as ready for review January 30, 2024 12:51
@ChrisJones687 ChrisJones687 merged commit b70235a into main Jan 30, 2024
4 of 6 checks passed
@ChrisJones687 ChrisJones687 deleted the multi-host2 branch January 30, 2024 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants