From c6c5ff528967642d8b96794ab9b99e9f133d6498 Mon Sep 17 00:00:00 2001 From: Vaclav Petras Date: Fri, 1 Dec 2023 09:00:55 -0500 Subject: [PATCH] Pest-host-use table is now pest-host table --- main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.cpp b/main.cpp index e92d959..3a2af56 100644 --- a/main.cpp +++ b/main.cpp @@ -1044,7 +1044,7 @@ int main(int argc, char* argv[]) ? std::stoi(opt.mortality_frequency_n->answer) : 0; } - config.create_pest_host_use_table_from_parameters(1); + config.create_pest_host_table_from_parameters(1); if (opt.survival_rate_month->answer) config.survival_rate_month = std::stoi(opt.survival_rate_month->answer); @@ -1319,17 +1319,17 @@ int main(int argc, char* argv[]) std::vector> host_pools; host_pools.reserve(num_runs); std::vector< - std::unique_ptr>> - pest_host_use_tables; - pest_host_use_tables.reserve(num_runs); + std::unique_ptr>> + pest_host_tables; + pest_host_tables.reserve(num_runs); std::vector< std::unique_ptr>> competency_tables; competency_tables.reserve(num_runs); for (unsigned run = 0; run < num_runs; ++run) { - pest_host_use_tables.emplace_back( - new pops::PestHostUseTable( + pest_host_tables.emplace_back( + new pops::PestHostTable( config, models[run].environment())); competency_tables.emplace_back( new pops::CompetencyTable( @@ -1360,7 +1360,7 @@ int main(int argc, char* argv[]) std::vector tmp = {host_pools[run].get()}; multi_host_pools.emplace_back(tmp, config); - multi_host_pools[run].set_pest_host_use_table(*pest_host_use_tables[run]); + multi_host_pools[run].set_pest_host_table(*pest_host_tables[run]); multi_host_pools[run].set_competency_table(*competency_tables[run]); pest_pools.emplace_back(