File tree 1 file changed +7
-5
lines changed
1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -392,10 +392,6 @@ class SubstitutionMatrix extends Option {
392
392
this . run . dataType === 'binary' ||
393
393
this . run . dataType === 'protein' ||
394
394
this . run . dataType === 'multistate' ||
395
- ( ( this . run . dataType === 'dna' ||
396
- this . run . dataType === 'rna' ||
397
- this . run . dataType === 'nucleotide' ) &&
398
- this . run . substitutionRate . isCAT ) ||
399
395
this . run . usesRaxmlNg
400
396
) ;
401
397
}
@@ -455,6 +451,12 @@ class SubstitutionRate extends Option {
455
451
this . run . usesRaxmlNg
456
452
) ;
457
453
}
454
+ @computed get cmdValue ( ) {
455
+ if ( this . run . substitutionMatrix . notGTR ) {
456
+ return 'GAMMA' ;
457
+ }
458
+ return this . value ;
459
+ }
458
460
@computed get isCAT ( ) {
459
461
return this . value === 'CAT' ;
460
462
}
@@ -1056,7 +1058,7 @@ class Run extends StoreBase {
1056
1058
let model =
1057
1059
this . substitutionAscertainment . cmdValue +
1058
1060
this . substitutionMatrix . cmdValue +
1059
- this . substitutionRate . value +
1061
+ this . substitutionRate . cmdValue +
1060
1062
this . substitutionI . cmdValue ;
1061
1063
if ( this . dataType === 'protein' ) {
1062
1064
model += this . alignments [ 0 ] . aaMatrixName ;
You can’t perform that action at this time.
0 commit comments