From e9a460e3097d589b96b14d98a3923ac37edce0e6 Mon Sep 17 00:00:00 2001 From: "George G. Vega Yon" Date: Wed, 6 Dec 2023 13:57:06 -0700 Subject: [PATCH] Printing variants count --- epiworld.hpp | 10 +++++++++- include/epiworld/model-meat-print.hpp | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/epiworld.hpp b/epiworld.hpp index a75502370..a6630bf28 100644 --- a/epiworld.hpp +++ b/epiworld.hpp @@ -9004,6 +9004,14 @@ inline const Model & Model::print(bool lite) const } + auto nvariants = db.get_n_viruses() - n_viruses_model; + if (nvariants > 0) + { + + printf_epiworld(" ...and %li more variants...\n", nvariants); + + } + if (viruses.size() == 0u) { printf_epiworld(" (none)\n"); @@ -18352,7 +18360,7 @@ inline ModelSEIRDCONN & ModelSEIRDCONN::initial_states( ) { Model::initial_states_fun = - create_init_function_seir(proportions_) + create_init_function_seird(proportions_) ; return *this; diff --git a/include/epiworld/model-meat-print.hpp b/include/epiworld/model-meat-print.hpp index a5a419aa9..41dc154f6 100644 --- a/include/epiworld/model-meat-print.hpp +++ b/include/epiworld/model-meat-print.hpp @@ -184,6 +184,14 @@ inline const Model & Model::print(bool lite) const } + auto nvariants = db.get_n_viruses() - n_viruses_model; + if (nvariants > 0) + { + + printf_epiworld(" ...and %li more variants...\n", nvariants); + + } + if (viruses.size() == 0u) { printf_epiworld(" (none)\n");