malacology/TNT_Script
1
0
Fork 0
Code Issues Pull requests Projects Releases 12 Wiki Activity

fix: equal; add: tv

Browse source
This commit is contained in:
kuoi 2023-10-10 00:35:15 +08:00
parent b0ea8a801e
commit b2282592d1
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
guoyi.run
View file

@ -91,26 +91,26 @@ if (argnumber<6)
else
set rsmp %6;
loop 1 5
if ('rsmp' >= 4)
set dosym 1;
set rsmp 'rsmp'-4;
else
if ('rsmp' >= 2)
set doboot 1;
set rsmp 'rsmp'-2;
else
if ('rsmp' >= 1)
set dojak 1;
set rsmp 'rsmp'-1;
else
if ('rsmp' >=0.2)
set dobrs 1;
set rsmp 'rsmp'-0.2;
else
if ('rsmp' >=0.1)
set dorbrs 1;
set rsmp 'rsmp'-0.1;
end end end end end
if ('rsmp' >= 4)
set dosym 1;
set rsmp 'rsmp'-4;
else
if ('rsmp' >= 2)
set doboot 1;
set rsmp 'rsmp'-2;
else
if ('rsmp' >= 1)
set dojak 1;
set rsmp 'rsmp'-1;
else
if ('rsmp' >= 0.2)
set dobrs 1;
set rsmp 'rsmp'-0.2;
else
if ('rsmp' >= 0.1)
set dorbrs 1;
set rsmp 'rsmp'-0.1;
end end end end end
stop
end
@ -166,15 +166,15 @@ end end
/*handle search*/
if (ntax<=25)
if ('doeiw')
search=2;
set search 2;
else
search=1;
set search 1;
end
else
if (ntax<75)
search=2
set search 2;
else
search=3
set search 3;
end
end
@ -319,6 +319,10 @@ end end end
var: contree;
set contree ntrees;
/*Store consensus tree to tree vault*/
tv>/;
tchoose 0.'npars';
/*Get rbr/br/jak/boot/sym support and get consensus tree*/
ttags=;
ttags]; /*in one line*/
@ -349,7 +353,8 @@ if ('dobremer')
end
/*choose final tree*/
/*Choose final tree*/
tv<;
tchoose/;
/*adjust to zero following Pablo Goloboff*/