Skip to content

Commit

Permalink
Remove the redundant variable.
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaskf committed Apr 8, 2024
1 parent 9bbbfc8 commit d400e9a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
6 changes: 0 additions & 6 deletions model/modelmixture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion model/modelmixture.h
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@ class ModelMixture: virtual public ModelMarkov, public vector<ModelMarkov*> {

protected:

bool optimizing_submodels;
bool optimizing_gtr;

/** number of optimization steps, default: ncategory*2 */
Expand Down

0 comments on commit d400e9a

Please sign in to comment.