From b2282592d1edf007b4be2512f6eb0beed9dfb959 Mon Sep 17 00:00:00 2001 From: Kuoi Date: Tue, 10 Oct 2023 00:35:15 +0800 Subject: [PATCH] fix: equal; add: tv --- guoyi.run | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/guoyi.run b/guoyi.run index 6f37fc7..e0723cf 100644 --- a/guoyi.run +++ b/guoyi.run @@ -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*/