diff --git a/guoyi.run b/guoyi.run index b37376e..338d27b 100644 --- a/guoyi.run +++ b/guoyi.run @@ -3,7 +3,7 @@ macro=; log %7.tnt.log; /*Arguments*/ -if ( (argnumber == 0) | (argnumber >7) ) +if ( (argnumber == 0) || (argnumber >7) ) silent -console; quote - /----------------------------------------------------\; quote - | GUOYI TNT SCRIPT 2022-2023 MIT |; @@ -57,7 +57,7 @@ if(argnumber>2 ) end end end - if ((eqstring [ %3 iw ]) | (eqstring [ %3 eiw ])) + if ((eqstring [ %3 iw ]) || (eqstring [ %3 eiw ])) if (argnumber>=4) piwe=%4; else @@ -195,7 +195,7 @@ end /*Search trees*/ if(argnumber>2) - if(eqstring [ %3 ew ] | eqstring [ %3 iw ] ) + if(eqstring [ %3 ew ] || eqstring [ %3 iw ] ) if (ntax<=25) ienum; else @@ -323,19 +323,19 @@ if (argnumber<=5) sub 7; hold +7000; bbreak=fill; bsupport!!0; else - if((%6==1) | (%6==3) | (%6==5) | (%6==7) | (%6==9) | (%6==11) | (%6==13) | (%6==15)) + if((%6==1) || (%6==3) || (%6==5) || (%6==7) || (%6==9) || (%6==11) || (%6==13) || (%6==15)) resample jak replications 1000 from 0; end - if((%6==2) | (%6==3) | (%6==6) | (%6==7) | (%6==10) | (%6==11) | (%6==14) | (%6==15)) + if((%6==2) || (%6==3) || (%6==6) || (%6==7) || (%6==10) || (%6==11) || (%6==14) || (%6==15)) resample boot replications 1000 from 0; end - if((%6==8) | (%6==9) | (%6==10) | (%6==11) | (%6==12) | (%6==13) | (%6==14) | (%6==15)) + if((%6==8) || (%6==9) || (%6==10) || (%6==11) || (%6==12) || (%6==13) || (%6==14) || (%6==15)) resample sym replications 1000 from 0; end - if((%6==4) | (%6==5) | (%6==6) | (%6==7) | (%6==12) | (%6==13) | (%6==14) | (%6==15)) + if((%6==4) || (%6==5) || (%6==6) || (%6==7) || (%6==12) || (%6==13) || (%6==14) || (%6==15)) sub 1; hold +1000; bbreak=fill; sub 3; hold +3000; bbreak=fill; sub 5; hold +5000; bbreak=fill;