Skip to content

Commit 0b2fbb6

Browse files
committed
Fix don't hide GTR option if CAT subst rates
Assume -m GTRGAMMA if non-GTR model override Fixes #257
1 parent a310090 commit 0b2fbb6

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/app/store/Run.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,6 @@ class SubstitutionMatrix extends Option {
392392
this.run.dataType === 'binary' ||
393393
this.run.dataType === 'protein' ||
394394
this.run.dataType === 'multistate' ||
395-
((this.run.dataType === 'dna' ||
396-
this.run.dataType === 'rna' ||
397-
this.run.dataType === 'nucleotide') &&
398-
this.run.substitutionRate.isCAT) ||
399395
this.run.usesRaxmlNg
400396
);
401397
}
@@ -455,6 +451,12 @@ class SubstitutionRate extends Option {
455451
this.run.usesRaxmlNg
456452
);
457453
}
454+
@computed get cmdValue() {
455+
if (this.run.substitutionMatrix.notGTR) {
456+
return 'GAMMA';
457+
}
458+
return this.value;
459+
}
458460
@computed get isCAT() {
459461
return this.value === 'CAT';
460462
}
@@ -1056,7 +1058,7 @@ class Run extends StoreBase {
10561058
let model =
10571059
this.substitutionAscertainment.cmdValue +
10581060
this.substitutionMatrix.cmdValue +
1059-
this.substitutionRate.value +
1061+
this.substitutionRate.cmdValue +
10601062
this.substitutionI.cmdValue;
10611063
if (this.dataType === 'protein') {
10621064
model += this.alignments[0].aaMatrixName;

0 commit comments

Comments
 (0)