From d400e9aeddfeb7ef681e9f6608816eefb8929d44 Mon Sep 17 00:00:00 2001 From: Thomas Wong Date: Mon, 8 Apr 2024 14:33:15 +1000 Subject: [PATCH] Remove the redundant variable. --- model/modelmixture.cpp | 6 ------ model/modelmixture.h | 1 - 2 files changed, 7 deletions(-) diff --git a/model/modelmixture.cpp b/model/modelmixture.cpp index 8cd4e9d6f..e762a747b 100644 --- a/model/modelmixture.cpp +++ b/model/modelmixture.cpp @@ -1191,7 +1191,6 @@ ModelSubst* createModel(string model_str, ModelsBlock *models_block, ModelMixture::ModelMixture(PhyloTree *tree) : ModelMarkov(tree) { prop = NULL; fix_prop = true; - optimizing_submodels = false; optimizing_gtr = false; } @@ -1201,7 +1200,6 @@ ModelMixture::ModelMixture(string orig_model_name, string model_name, string mod { prop = NULL; fix_prop = true; - optimizing_submodels = false; optimizing_gtr = false; optimize_steps = 0; initMixture(orig_model_name, model_name, model_list, models_block, freq, freq_params, tree, optimize_weights); @@ -1241,7 +1239,6 @@ void ModelMixture::initMixture(string orig_model_name, string model_name, string DoubleVector freq_rates; DoubleVector freq_weights; fix_prop = false; - optimizing_submodels = false; optimizing_gtr = false; if (freq == FREQ_MIXTURE) { @@ -2168,8 +2165,6 @@ bool ModelMixture::isMixtureSameQ() { double ModelMixture::optimizeParameters(double gradient_epsilon) { - optimizing_submodels = true; - int dim = getNDim(); double score = 0.0; IntVector params; @@ -2218,7 +2213,6 @@ double ModelMixture::optimizeParameters(double gradient_epsilon) { } else { score = ModelMarkov::optimizeParameters(gradient_epsilon); } - optimizing_submodels = false; // optimize a gtr matrix if specified (enters main routine) -JD if (Params::getInstance().optimize_linked_gtr) { diff --git a/model/modelmixture.h b/model/modelmixture.h index 3075e24b2..d564d146e 100644 --- a/model/modelmixture.h +++ b/model/modelmixture.h @@ -324,7 +324,6 @@ class ModelMixture: virtual public ModelMarkov, public vector { protected: - bool optimizing_submodels; bool optimizing_gtr; /** number of optimization steps, default: ncategory*2 */