fix: wc related; polish: var string
This commit is contained in:
parent
b763809491
commit
76c422d958
1 changed files with 25 additions and 23 deletions
48
guoyi.run
48
guoyi.run
|
@ -41,8 +41,8 @@ end
|
||||||
/*Var for handling args*/
|
/*Var for handling args*/
|
||||||
var:
|
var:
|
||||||
dojak doboot dosym dobrs dorbrs rsmp dobremer
|
dojak doboot dosym dobrs dorbrs rsmp dobremer
|
||||||
dostr domjr dohlf
|
dostr domjr dohlf contype
|
||||||
doew doiw doeiw dowt wttype
|
doew doiw doeiw dowt wtstring wttype
|
||||||
kvalue
|
kvalue
|
||||||
search;
|
search;
|
||||||
|
|
||||||
|
@ -54,15 +54,16 @@ set search 0;
|
||||||
|
|
||||||
/*handle weighting type*/
|
/*handle weighting type*/
|
||||||
if (argnumber>=3)
|
if (argnumber>=3)
|
||||||
if (eqstring [ %3 ew ])
|
set wtstring $%3;
|
||||||
|
if (eqstring [ $wtstring ew ])
|
||||||
set doew 1;
|
set doew 1;
|
||||||
set wttype 1;
|
set wttype 1;
|
||||||
else
|
else
|
||||||
if (eqstring [ %3 iw ])
|
if (eqstring [ $wtstring iw ])
|
||||||
set doiw 1;
|
set doiw 1;
|
||||||
set wttype 2;
|
set wttype 2;
|
||||||
else
|
else
|
||||||
if (eqstring [ %3 eiw ])
|
if (eqstring [ $wtstring eiw ])
|
||||||
set doeiw 1;
|
set doeiw 1;
|
||||||
set wttype 3;
|
set wttype 3;
|
||||||
else
|
else
|
||||||
|
@ -124,26 +125,27 @@ end
|
||||||
|
|
||||||
/*handle consensus type*/
|
/*handle consensus type*/
|
||||||
if (argnumber>=6)
|
if (argnumber>=6)
|
||||||
|
set contype $%5;
|
||||||
if ('dobremer')
|
if ('dobremer')
|
||||||
set dostr 1;
|
set dostr 1;
|
||||||
if (eqstring [ %5 str ])
|
if (eqstring [ $contype str ])
|
||||||
else
|
else
|
||||||
if (eqstring [ %5 mjr ])
|
if (eqstring [ $contype mjr ])
|
||||||
errmsg Bremer support or any bremer support variations must use strict consensus;
|
errmsg Bremer support or any bremer support variations must use strict consensus;
|
||||||
else
|
else
|
||||||
if (eqstring [ %5 hlf ])
|
if (eqstring [ $contype hlf ])
|
||||||
errmsg Bremer support or any bremer support variations must use strict consensus;
|
errmsg Bremer support or any bremer support variations must use strict consensus;
|
||||||
else
|
else
|
||||||
errmsg Consensus type must be str mjr or hlf;
|
errmsg Consensus type must be str mjr or hlf;
|
||||||
end end end
|
end end end
|
||||||
else
|
else
|
||||||
if (eqstring [ %5 str ])
|
if (eqstring [ $contype str ])
|
||||||
set dostr 1;
|
set dostr 1;
|
||||||
else
|
else
|
||||||
if (eqstring [ %5 mjr ])
|
if (eqstring [ $contype mjr ])
|
||||||
set domjr 1;
|
set domjr 1;
|
||||||
else
|
else
|
||||||
if (eqstring [ %5 hlf ])
|
if (eqstring [ $contype hlf ])
|
||||||
set dohlf 1;
|
set dohlf 1;
|
||||||
else
|
else
|
||||||
errmsg Consensus type must be str mjr or hlf;
|
errmsg Consensus type must be str mjr or hlf;
|
||||||
|
@ -151,10 +153,11 @@ if (argnumber>=6)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if (argnumber==5)
|
if (argnumber==5)
|
||||||
if ((eqstring [ %5 mjr ]) || (eqstring [ %5 hlf ]))
|
set contype $%5;
|
||||||
|
if ((eqstring [ $contype mjr ]) || (eqstring [ $contype hlf ]))
|
||||||
errmsg Bremer support or any bremer support variations must use strict consensus;
|
errmsg Bremer support or any bremer support variations must use strict consensus;
|
||||||
else
|
else
|
||||||
if (eqstring [ %5 str ])
|
if (eqstring [ $contype str ])
|
||||||
set dostr 1;
|
set dostr 1;
|
||||||
else
|
else
|
||||||
errmsg Consensus type must be str mjr or hlf;
|
errmsg Consensus type must be str mjr or hlf;
|
||||||
|
@ -432,8 +435,16 @@ set themax maxsteps;
|
||||||
set TL length[0];
|
set TL length[0];
|
||||||
set CI 'themin'/'TL'; /*CI=1 means no homoplasy*/
|
set CI 'themin'/'TL'; /*CI=1 means no homoplasy*/
|
||||||
set RI ('themax'-'TL')/('themax'-'themin'); /*RI=1 character fits perfetcly*/
|
set RI ('themax'-'TL')/('themax'-'themin'); /*RI=1 character fits perfetcly*/
|
||||||
report=;
|
|
||||||
|
|
||||||
|
/*Report CI/RI/TL */
|
||||||
|
log %7.report.log;
|
||||||
|
macfloat 3;
|
||||||
|
quote Consistency Index (CI) is 'CI';
|
||||||
|
quote Retention Index (RI) is 'RI';
|
||||||
|
quote Tree Length (TL) is 'TL';
|
||||||
|
log/;
|
||||||
|
|
||||||
|
watch-;
|
||||||
/*Generate ss file for winclada*/
|
/*Generate ss file for winclada*/
|
||||||
log %7.winclada.ss;
|
log %7.winclada.ss;
|
||||||
/*get basic info*/
|
/*get basic info*/
|
||||||
|
@ -461,15 +472,6 @@ runc!
|
||||||
tntprintf("proc/;\n");
|
tntprintf("proc/;\n");
|
||||||
!
|
!
|
||||||
log/;
|
log/;
|
||||||
|
|
||||||
|
|
||||||
/*Report CI/RI/TL */
|
|
||||||
log %7.report.log;
|
|
||||||
macfloat 3;
|
|
||||||
quote Consistency Index (CI) is 'CI';
|
|
||||||
quote Retention Index (RI) is 'RI';
|
|
||||||
quote Tree Length (TL) is 'TL';
|
|
||||||
log/;
|
|
||||||
log + %7.tnt.log;
|
log + %7.tnt.log;
|
||||||
|
|
||||||
/*Report*/
|
/*Report*/
|
||||||
|
|
Loading…
Reference in a new issue