fix: equal; add: tv
This commit is contained in:
parent
b0ea8a801e
commit
b2282592d1
1 changed files with 30 additions and 25 deletions
55
guoyi.run
55
guoyi.run
|
@ -91,26 +91,26 @@ if (argnumber<6)
|
||||||
else
|
else
|
||||||
set rsmp %6;
|
set rsmp %6;
|
||||||
loop 1 5
|
loop 1 5
|
||||||
if ('rsmp' >= 4)
|
if ('rsmp' >= 4)
|
||||||
set dosym 1;
|
set dosym 1;
|
||||||
set rsmp 'rsmp'-4;
|
set rsmp 'rsmp'-4;
|
||||||
else
|
else
|
||||||
if ('rsmp' >= 2)
|
if ('rsmp' >= 2)
|
||||||
set doboot 1;
|
set doboot 1;
|
||||||
set rsmp 'rsmp'-2;
|
set rsmp 'rsmp'-2;
|
||||||
else
|
else
|
||||||
if ('rsmp' >= 1)
|
if ('rsmp' >= 1)
|
||||||
set dojak 1;
|
set dojak 1;
|
||||||
set rsmp 'rsmp'-1;
|
set rsmp 'rsmp'-1;
|
||||||
else
|
else
|
||||||
if ('rsmp' >=0.2)
|
if ('rsmp' >= 0.2)
|
||||||
set dobrs 1;
|
set dobrs 1;
|
||||||
set rsmp 'rsmp'-0.2;
|
set rsmp 'rsmp'-0.2;
|
||||||
else
|
else
|
||||||
if ('rsmp' >=0.1)
|
if ('rsmp' >= 0.1)
|
||||||
set dorbrs 1;
|
set dorbrs 1;
|
||||||
set rsmp 'rsmp'-0.1;
|
set rsmp 'rsmp'-0.1;
|
||||||
end end end end end
|
end end end end end
|
||||||
stop
|
stop
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -166,15 +166,15 @@ end end
|
||||||
/*handle search*/
|
/*handle search*/
|
||||||
if (ntax<=25)
|
if (ntax<=25)
|
||||||
if ('doeiw')
|
if ('doeiw')
|
||||||
search=2;
|
set search 2;
|
||||||
else
|
else
|
||||||
search=1;
|
set search 1;
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if (ntax<75)
|
if (ntax<75)
|
||||||
search=2
|
set search 2;
|
||||||
else
|
else
|
||||||
search=3
|
set search 3;
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -319,6 +319,10 @@ end end end
|
||||||
var: contree;
|
var: contree;
|
||||||
set contree ntrees;
|
set contree ntrees;
|
||||||
|
|
||||||
|
/*Store consensus tree to tree vault*/
|
||||||
|
tv>/;
|
||||||
|
tchoose 0.'npars';
|
||||||
|
|
||||||
/*Get rbr/br/jak/boot/sym support and get consensus tree*/
|
/*Get rbr/br/jak/boot/sym support and get consensus tree*/
|
||||||
ttags=;
|
ttags=;
|
||||||
ttags]; /*in one line*/
|
ttags]; /*in one line*/
|
||||||
|
@ -349,7 +353,8 @@ if ('dobremer')
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
/*choose final tree*/
|
/*Choose final tree*/
|
||||||
|
tv<;
|
||||||
tchoose/;
|
tchoose/;
|
||||||
|
|
||||||
/*adjust to zero following Pablo Goloboff*/
|
/*adjust to zero following Pablo Goloboff*/
|
||||||
|
|
Loading…
Reference in a new issue