diff options
Diffstat (limited to 'Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs')
-rw-r--r-- | Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs | 248 |
1 files changed, 158 insertions, 90 deletions
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs index 5fbe676f93e..8f6a399f617 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketcindyliboutr.cs @@ -14,7 +14,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/> // -println("ketcindylibout(20180612 loaded"); +println("ketcindylibout(20181029 loaded"); //help:start(); @@ -1296,6 +1296,7 @@ Writecsv(nmL,dataorg,file,optionorg):=( closefile(SCEOUTPUT); ); +////%HatchdataR start//// HatchdataR(nm,iostr,pltlist):=HatchdataR(nm,iostr,pltlist,[]); HatchdataR(nm,iostr,pltlist,optionorg):=( //17.09.18 //help:HatchdataR("1","ii",[["gr1"],["gr2","n"]]); @@ -1359,7 +1360,7 @@ HatchdataR(nm,iostr,pltlist,optionorg):=( //17.09.18 tmp=[tmp1,tmp2]; tmp=concat(tmp,reL); cmdL=concat(cmdL,[ - "Setscaling",[SCALEY], + "Setscaling",[SCALEX,SCALEY], //181020 "Setunitlen",[Dq+ULEN+Dq], name+"=Hatchdata",tmp, //16.12.23 "WriteOutData",[Dq+fname+Dq,Dq+name+Dq,name] @@ -1380,7 +1381,9 @@ HatchdataR(nm,iostr,pltlist,optionorg):=( //17.09.18 ); ); ); +////%HatchdataR end//// +////%PlotdataR start//// PlotdataR(name1,func,var):=PlotdataR(name1,PathR,func,var); PlotdataR(name1,Arg1,Arg2,Arg3):=( if(islist(Arg3), @@ -1454,6 +1457,7 @@ PlotdataR(name1,path,func,variable,optionorg):=( tmp2; ); ); +////%PlotdataR end//// PlotdiscR(nm,fun,varrng):=PlotdiscR(nm,fun,varrng,[]); PlotdiscR(nm,fun,varrng,options):=( @@ -1609,34 +1613,34 @@ Boxplot(nm,dataorg,ypos,dy,optionorg):=( pstr="["; tmp1=[bp_1,ypos-dy/2]; tmp2=[bp_1,ypos+dy/2]; - Listplot(name+text(1),[tmp1,tmp2],["Msg=no"]); + Listplot(name+text(1),[tmp1,tmp2],concat(options,["Msg=no"])); pstr=pstr+Dq+"sg"+name+text(1)+Dq+","; tmp1=[bp_2,ypos-dy]; tmp2=[bp_2,ypos+dy]; tmp3=[bp_4,ypos+dy]; tmp4=[bp_4,ypos-dy]; - Listplot(name+text(2),[tmp1,tmp2,tmp3,tmp4,tmp1],["Msg=no"]); + Listplot(name+text(2),[tmp1,tmp2,tmp3,tmp4,tmp1],append(options,"Msg=no")); pstr=pstr+Dq+"sg"+name+text(2)+Dq+","; tmp1=[bp_5,ypos-dy/2]; tmp2=[bp_5,ypos+dy/2]; - Listplot(name+text(3),[tmp1,tmp2],["Msg=no"]); + Listplot(name+text(3),[tmp1,tmp2],append(options,"Msg=no")); pstr=pstr+Dq+"sg"+name+text(3)+Dq+","; tmp1=[bp_3,ypos-dy]; tmp2=[bp_3,ypos+dy]; - Listplot(name+text(4),[tmp1,tmp2],["dr,2","Msg=no"]); + Listplot(name+text(4),[tmp1,tmp2],concat(options,["dr,2","Msg=no"])); pstr=pstr+Dq+"sg"+name+text(4)+Dq+","; tmp1=[bp_1,ypos]; tmp2=[bp_2,ypos]; - Listplot(name+text(5),[tmp1,tmp2],["da","Msg=no"]); + Listplot(name+text(5),[tmp1,tmp2],concat(options,["da","Msg=no"])); pstr=pstr+Dq+"sg"+name+text(5)+Dq+","; tmp1=[bp_4,ypos]; tmp2=[bp_5,ypos]; - Listplot(name+text(6),[tmp1,tmp2],["da","Msg=no"]); + Listplot(name+text(6),[tmp1,tmp2],concat(options,["da","Msg=no"])); pstr=pstr+Dq+"sg"+name+text(6)+Dq+","; out=bp_(6..length(bp)); if(length(out)>0, out=apply(out,[#,ypos]); - Pointdata(name+text(1),out,[0,"Size=4"]); + Pointdata(name+text(1),out,concat(options,[0,"Size=4"])); ); pstr=substring(pstr,0,length(pstr)-1)+"]"; println("generate totally "+name); @@ -1824,43 +1828,53 @@ Histplot(nm,dataorg,optionorg):=( ); ); -Scatterplot(nm,file):=Scatterplot(nm,file,[]); -Scatterplot(nm,file,optionorg):=( -//help:Scatterplot("1",path+filename); -//help:Scatterplot(options=["Reg=yes",A,B,C,"Size"=4"]); - regional(tmp,tmp1,tmp2,fname,name,reg,eqL,reL,cdysize, - options,dtx,dty,nn,mx,my,sx,sy,sxy,rr,aa,bb,size); +////%Scatterplot start//// +Scatterplot(nm,file):=Scatterplot(nm,file,[],[]); +Scatterplot(nm,file,options):=Scatterplot(nm,file,options,[]); +Scatterplot(nm,file,optionorg,optionsreg):=( +//help:Scatterplot("1",(path+)filename); +//help:Scatterplot("2",ptlist,["Size=2"],["da","Color=blue"]); +//help:Scatterplot("3",ptlist,["Reg=n"]); +//help:Scatterplot(options=["Reg=n","Size=3","Color="]); +//help:Scatterplot(options1=["Reg=y(n)",pointstyle]); +//help:Scatterplot(options2=[position([]), linestyle]); + regional(tmp,tmp1,tmp2,fname,name,reg,eqL,strL,cdysize, + options,dtx,dty,nn,mx,my,sx,sy,sxy,rr,aa,bb,size,pos); name="sc"+nm; options=optionorg; tmp=divoptions(options); eqL=tmp_5; - reL=tmp_6; - options=remove(options,reL); - cdysize=select(options,indexof(#,"size->")>0); - options=remove(options,cdysize); - size=4; - reg="yes"; + options=remove(options,tmp_6); + strL=tmp_7; //181013(2lines) + options=remove(options,strL); + size=3; + reg="y"; forall(eqL, tmp=indexof(#,"="); tmp1=Toupper(substring(#,0,1)); tmp2=substring(#,tmp,length(#)); if(tmp1=="R", - reg=tmp2; + reg=substring(tmp2,0,1); options=remove(options,[#]); ); if(tmp1=="S", size=parse(tmp2); options=remove(options,[#]); + options=append(options,"Size="+text(size));//181013 ); ); - if(indexof(file,".")==0, - fname=file+".csv"; + if(isstring(file), //181013 + if(indexof(file,".")==0, + fname=file+".csv"; + , + fname=file; + ); + tmp=Readcsv(fname,strL);//181013from , - fname=file; + tmp=file; ); - Readcsv(nm,fname); - tmp=concat(options,cdysize); - Pointdata(name,parse("rc"+nm),append(tmp,"Size="+text(size))); + parse("rc"+nm+"="+tmp); //181013to + Pointdata(name,parse("rc"+nm),options); tmp=parse("rc"+nm); dtx=apply(tmp,#_1); dty=apply(tmp,#_2); @@ -1873,29 +1887,44 @@ Scatterplot(nm,file,optionorg):=( rr=sxy/sx/sy; aa=sxy/sx^2; bb=my-aa*mx; + tmp1=optionsreg; + tmp=divoptions(tmp1); + reL=tmp_6; //181013(2lines) + tmp1=remove(tmp1,reL); + tmp1=append(tmp1,"Num=1"); + pos=[]; + if(length(reL)>0, + pos=reL_1; + ); tmp=Assign("a*x+b",["a",aa,"b",bb]); - if(reg!="no", - Plotdata(name,tmp,"x",append(options,"Num=2")); + if(reg!="n", + Plotdata(name,tmp,"x",tmp1); ); - if(length(reL)>=2, - Framedata2(name,[reL_1,reL_2]); - if(length(reL)>2, - tmp="r="+textformat(rr,3)+",\ y="; - tmp=tmp+textformat(aa,3)+"x"; - if(bb>0,tmp=tmp+"+",tmp=tmp+"-"); - tmp=tmp+textformat(abs(bb),3); - Expr([reL_3,"e",tmp]); - ); + if(length(pos)>0, //181013from + tmp="r="+textformat(rr,3)+",\ y="; + tmp=tmp+textformat(aa,3)+"x"; + if(bb>0,tmp=tmp+"+",tmp=tmp+"-"); + tmp=tmp+textformat(abs(bb),3); + Expr([pos,"e",tmp]); //181013to ); [mx,my,sx,sy,sxy,rr,bb,aa]; ); +////%Scatterplot end//// -Rulerscale(pt,hscale,vscale):=Rulerscale(pt,hscale,vscale,0.1); -Rulerscale(pt,hscale,vscale,tick):=( +////%Rulerscale start//// +Rulerscale(pt,hscale,vscale):=Rulerscale(pt,hscale,vscale,0.1,[]);//180722from +Rulerscale(Arg1,Arg2,Arg3,Arg4):=( + if(!islist(Arg4), + Rulerscale(Arg1,Arg2,Arg3,Arg4,[]); + , + Rulerscale(Arg1,Arg2,Arg3,0.2,Arg4); + ); +);//180722to +Rulerscale(pt,hscale,vscale,tick,options):=(//180722 //help:Rulerscale(A,["r",0,5,1],["s2",0,2,4]); //help:Rulerscale(A,["r",0,5,1],["f",10,"a",20,"w2","b"]); //help:Rulerscale(A,["r",0,5,1],["r",0,10,1],0.2); - regional(pA,pos,mrk,dir,tmp,tmp1,tmp2,tmp3); + regional(pA,pos,mrk,dir,mag,tmp,tmp1,tmp2,tmp3); pA=Lcrd(pt); if(length(hscale)>0, pos=[]; mrk=[]; dir=[]; @@ -1906,9 +1935,10 @@ Rulerscale(pt,hscale,vscale,tick):=( tmp1=hscale_2; tmp2=hscale_3; tmp3=hscale_4; + if(length(hscale)>4,mag=hscale_5,mag=1); //181014 tmp=floor((tmp2-tmp1)/tmp3); - pos=apply(0..tmp,tmp1+#*tmp3); - mrk=apply(pos,text(#)); + pos=apply(0..tmp,tmp1+#*tmp3);//181014 + mrk=apply(pos,text(#*mag)); dir=apply(1..length(pos),"s2"); , forall(2..(length(hscale)-2), @@ -1939,10 +1969,10 @@ Rulerscale(pt,hscale,vscale,tick):=( ); pos=apply(pos,[#,pA_2]); forall(1..length(pos), - Expr([pos_#,dir_#,mrk_#]); + Expr([pos_#,dir_#,mrk_#],options); tmp1=pos_#; - tmp2=pos_#-[0,tick/SCALEY]; - Listplot("rsh"+text(#),[tmp1,tmp2],["Msg=no"]); + tmp2=pos_#-Unscaling([0,tick]); //181017 + Listplot("rsh"+text(#),[tmp1,tmp2],concat(options,["Msg=no"])); ); ); if(length(vscale)>0, @@ -1954,9 +1984,10 @@ Rulerscale(pt,hscale,vscale,tick):=( tmp1=vscale_2; tmp2=vscale_3; tmp3=vscale_4; + if(length(vscale)>4,mag=vscale_5,mag=1); //181014 tmp=floor((tmp2-tmp1)/tmp3); pos=apply(0..tmp,tmp1+#*tmp3); - mrk=apply(pos,text(#)); + mrk=apply(pos,text(#*mag)); //181014 dir=apply(1..length(pos),"w2"); , forall(2..(length(vscale)-2), @@ -1987,13 +2018,14 @@ Rulerscale(pt,hscale,vscale,tick):=( ); pos=apply(pos,[pA_1,#]); forall(1..length(pos), - Expr([pos_#,dir_#,mrk_#]); + Expr([pos_#,dir_#,mrk_#],options); tmp1=pos_#; - tmp2=pos_#-[tick/SCALEX,0]; - Listplot("rsv"+text(#),[tmp1,tmp2],["Msg=no"]); + tmp2=pos_#-Unscaling([tick,0]); //181017 + Listplot("rsv"+text(#),[tmp1,tmp2],concat(options,["Msg=no"])); ); ); ); +////%Rulerscale end//// MkprecommandS():=MkprecommandS(6); MkprecommandS(prec):=( @@ -2244,7 +2276,7 @@ Dotfilldata(nm,iostr,pltlist,optionorg):=( tmp=[tmp1,tmp2]; tmp=concat(tmp,dense); cmdL=concat(cmdL,[ - "Setscaling",[SCALEY], + "Setscaling",[SCALEX,SCALEY], //181020 "Setunitlen",[Dq+ULEN+Dq], name+"=Dotfilldata",tmp, "WriteOutData",[Dq+fname+Dq,Dq+name+Dq,name], @@ -3537,15 +3569,15 @@ Mkviewobj(pathorg,fnameorg,cmdLorg,optionorg):=( cmdlist=MkprecommandR(); cmdlist=concat(cmdlist,["Openobj",[Dq+path+fname+Dq]]); cmdlist=concat(cmdlist,cmdL); - tmp=["Closeobj()",[],"ans="+Dq+"||||"+Dq,[]];//16.12.26 + tmp=["Closeobj()",[],""+Dq+"||||"+Dq,[]];//16.12.26 cmdlist=concat(cmdlist,tmp); tmp=append(options,"Cat=y"); tmp1=apply(tmp,Toupper(substring(#,0,1))); // 16.04.23from tmp1=select(tmp1,#=="W"); if(length(tmp1)==0, tmp=append(tmp,"Wait=5"); - );// 16.04.23until - CalcbyR("ans",cmdlist,tmp); + );// 16.04.23to + CalcbyR("",cmdlist,tmp); //180902 wait(WaitUnit*100); // 16.03.18 , vtx=cmdL_1; @@ -3587,14 +3619,20 @@ Mkviewobj(pathorg,fnameorg,cmdLorg,optionorg):=( ); ); -SetObj(str):=Objname(str,["m","v"]); //17.01.12 -SetObj(str,options):=Objname(str,options); //17.01.12 -Objnameoptions(str,options):=Objname(str,options);// 16.11.29 -Objname(str):=Objname(str,["m","v"]); // 16.11.29 -Objname(str,optionsorg):=( -//help:Objname("sample"); -//help:Objname(options=["m","v"]); +//Objname(str):=Objname(str,["m","v"]); //180906from +//Objname(str,options):=Setobj(str,options); +Setobj():=Setobj(Fhead,["m","v"]); //180901 +Setobj(Arg1):=( + if(isstring(Arg1), + Setobj(Arg1,["m","v"]); //17.01.12 + , + Setobj(Fhead,Arg1); //180902 + ); +); +Setobj(str,optionsorg):=( //180906to +//help:Setobj(["m","v"]); //help:Setobj("sample"); +//help:Setobj("sample",options); //help:Setobj(options=["m","v"]); regional(options); if(length(str)>0, @@ -3606,7 +3644,7 @@ Objname(str,optionsorg):=( , OCOPTION=["m","v"]; ); //17.12.23until - println([OCNAME,OCOPTION]); + println("generate OBJCMD. name="+OCNAME+", option="+OCOPTION); ); Mkobjcmd(nm,fd):=Mkobjcmd(nm,fd,[40,40,"+"]); @@ -4204,7 +4242,7 @@ Mkobjsymbcmd(path,symborg,size,rot,dir,pos,optionorg):=( tmp2=append(tmp2,tmp); ); parse("oc"+symborg+"="+tmp2); - println("cmd seq oc"+symborg+" generated"); // 16.06.10until +// println("cmd seq oc"+symborg+" generated"); // 16.06.10until OBJCMD=concat(OBJCMD,out);//16.11.29 out; ); @@ -4820,6 +4858,9 @@ ConvertFdtoC(Fd,name):=( FdC=concat(FdC,[tmp1_6]); ); +Startsurf():=StartsurfC(); +Startsurf(Arg):=StartsurfC(Arg); +Startsurf(restr,Nplist,Dsizelist,Epslist):=StartsurfC(restr,Nplist,Dsizelist,Epslist); StartsurfC():=StartsurfC("",[50,50],[1500,500,200],[0.01,0.1]);//180611renewed StartsurfC(Arg):=( regional(tmp); @@ -4839,11 +4880,11 @@ StartsurfC(Arg):=( ); ); StartsurfC(restr,Nplist,Dsizelist,Epslist):=(//180501 -//help:StartsurfC(); -//help:StartsurfC("reset"); -//help::StartsurfC([0.01,0.1]); -//help:StartsurfC([50,50],[1500,500,200],[0.01,0.1]); -//help:StartsurfC([50],[1500,500],[0.01,0.1]); +//help:Startsurf(); +//help:Startsurf("reset"); +//help::Startsurf([0.01,0.1]); +//help:Startsurf([50,50],[1500,500,200],[0.01,0.1]); +//help:Startsurf([50],[1500,500],[0.01,0.1]); regional(divL,sizeL,epsL); CommandListC=[];//180608(2lines) FuncListC=[]; @@ -5721,8 +5762,6 @@ CalcbyC(name,path,cmd,optionorg):=( waiting=40; wfile=Fhead+name+"end.txt"; //180517 hfile=Fhead+name+"header.h"; - println(Dirwork); - println(hfile); mfile=Fhead+name+".c"; wflg=0; forall(eqL, @@ -5815,7 +5854,9 @@ CalcbyC(name,path,cmd,optionorg):=( ExeccmdC(nm):=ExeccmdC(nm,[],["do"]); //180531 ExeccmdC(nm,options):=ExeccmdC(nm,options,["do"]); ExeccmdC(nm,optionorg,optionhorg):=( -//help:ExeccmdC("1",["m/r","Wait=30"],["do"]); +//help:ExeccmdC("1",options1,options2); +//help:ExeccmdC(options1=["dr(/da/do)","m/r","Wait=30"]); +//help:ExeccmdC(options2=["do(/nodisp/da/do)"]); regional(options,optionsh,name2,name3,waiting,dirbkup, eqL,reL,strL,fname,tmp,tmp1,tmp2,flg,wflg,varL); fname=Fhead+nm+".txt"; @@ -5861,6 +5902,7 @@ ExeccmdC(nm,optionorg,optionhorg):=( if(wflg==1,tmp1=append(options,"m")); if(wflg==-1,tmp1=append(options,"r")); tmp1=append(tmp1,"Wait="+text(waiting)); + tmp1=append(tmp1,"Disp=n"); //181024 CommandListC=prepend(" char fnameall[]="+Dqq(fname)+";",CommandListC); CommandListC=prepend(" printf("+Dqq("%s\n")+","+Dqq(Fhead)+");",CommandListC); //180608 tmp=select(CommandListC,indexof(#,"outputend")>0); @@ -5874,7 +5916,7 @@ ExeccmdC(nm,optionorg,optionhorg):=( if(ErrFlag==1, err("CommandListC is empty or execcmd is not completed"); , - varL=ReadOutData(fname); + varL=ReadOutData(fname,["Disp=n"]); //181029 GLIST=append(GLIST,"ReadOutData("+Dqq(fname)+")"); tmp1=select(varL,indexof(#,"h3d")==0); tmp2=remove(varL,tmp1); @@ -5906,13 +5948,15 @@ ExeccmdC(nm,optionorg,optionhorg):=( varL; ); +Sfbdparadata(nm,fd):=SfbdparadataC(nm,fd); +Sfbdparadata(nm,fd,options):=SfbdparadataC(nm,fd,options); +Sfbdparadata(nm,fdorg,optionorg,optionsh):=SfbdparadataC(nm,fdorg,optionorg,optionsh); SfbdparadataC(nm,fd):= SfbdparadataC(nm,fd,[],["nodisp"]); SfbdparadataC(nm,fd,options):= SfbdparadataC(nm,fd,options,["nodisp"]); SfbdparadataC(nm,fdorg,optionorg,optionsh):=( -//help:SfbdparadataC("1",Fd); -//help:SfbdparadataC(options2=["c(default)/r/m"]); +//help:Sfbdparadata("1",Fd); regional(funnm,fd,options,name2,name3,name2h,name3h,waiting, eqL,reL,strL,fname,tmp,tmp1,tmp2,flg,wflg,cmdflg); if(ChNumber==0,ChNumber=Ch); @@ -5989,7 +6033,7 @@ SfbdparadataC(nm,fdorg,optionorg,optionsh):=( if(ErrFlag==1, err("Sfbdparadata not completed"); , - ReadOutData(fname); + ReadOutData(fname,["Disp=n"]); //181029 GLIST=append(GLIST,"ReadOutData("+Dqq(fname)+")"); if(islist(parse(name3)), tmp1=name2+"=Projpara("+Dqq(name3)+",["; @@ -6017,14 +6061,16 @@ SfbdparadataC(nm,fdorg,optionorg,optionsh):=( ); ); +Crvsfparadata(nm,fk,sfbd,fd):=CrvsfparadataC(nm,fk,sfbd,fd); +Crvsfparadata(nm,fk,sfbd,fd,options):=CrvsfparadataC(nm,fk,sfbd,fd,options); +Crvsfparadata(nm,Fk,sfbdorg,fdorg,optionorg,optionsh):= + CrvsfparadataC(nm,Fk,sfbdorg,fdorg,optionorg,optionsh); CrvsfparadataC(nm,fk,sfbd,fd):= CrvsfparadataC(nm,fk,sfbd,fd,[],["nodisp"]); CrvsfparadataC(nm,fk,sfbd,fd,options):= - SfbdparadataC(nm,fk,sfbd,fd,options,["nodisp"]); + CrvsfparadataC(nm,fk,sfbd,fd,options,["nodisp"]); CrvsfparadataC(nm,Fk,sfbdorg,fdorg,optionorg,optionsh):=( -//help:CrvsfparadataC("1","ax3d","sfbd3d1",Fd); -//help:CrvsfparadataC(options2=["c(default)/r/m"]); -//help:CrvsfparadataC(optionsh=["nodisp"]); +//help:Crvsfparadata("1","ax3d","sfbd3d1",Fd); regional(funnm,sfbd,fd,options,name2,name3,name2h,name3h,waiting, eqL,reL,strL,fname,tmp,tmp1,tmp2,flg,wflg,flg,ii,jj,eps,cmdlfg); eps=10^(-5); @@ -6117,7 +6163,7 @@ CrvsfparadataC(nm,Fk,sfbdorg,fdorg,optionorg,optionsh):=( if(ErrFlag==1, err("Crvsfparadata not completed"); , - ReadOutData(fname); + ReadOutData(fname,["Disp=n"]); //181029 GLIST=append(GLIST,"ReadOutData("+Dqq(fname)+")"); if(islist(parse(name3)), tmp1=name2+"=Projpara("+Dqq(name3)+",["; @@ -6145,12 +6191,16 @@ CrvsfparadataC(nm,Fk,sfbdorg,fdorg,optionorg,optionsh):=( ); ); +Crv3onsfparadata(nm,crv3d,sfbd,fd):=Crv3onsfparadataC(nm,crv3d,sfbd,fd); +Crv3onsfparadata(nm,crv3d,sfbd,fd,options):=Crv3onsfparadataC(nm,crv3d,sfbd,fd,options); +Crv3onsfparadata(nm,crv3d,sfbdorg,fdorg,optionorg,optionsh):= + Crv3onsfparadataC(nm,crv3d,sfbdorg,fdorg,optionorg,optionsh); Crv3onsfparadataC(nm,crv3d,sfbd,fd):= Crv3onsfparadataC(nm,crv3d,sfbd,fd,[],["nodisp"]); Crv3onsfparadataC(nm,crv3d,sfbd,fd,options):= Crv3onsfparadataC(nm,crv3d,sfbd,fd,options,["nodisp"]); Crv3onsfparadataC(nm,crv3d,sfbdorg,fdorg,optionorg,optionsh):=( -//help:Crv3onsfparadataC("1","sc3","sfbd3d1",fd); +//help:Crv3onsfparadata("1","sc3","sfbd3d1",fd); regional(funnm,sfbd,fd,options,name3,name3h,name2,name2h,waiting, eqL,reL,strL,fname,tmp,tmp1,tmp2,flg,wflg,flg,ii,jj,eps,cmdflg); tmp1=replace(crv3d,"3d","2d"); @@ -6249,7 +6299,7 @@ Crv3onsfparadataC(nm,crv3d,sfbdorg,fdorg,optionorg,optionsh):=( if(ErrFlag==1, err("Crvonsfparadata not completed"); , - ReadOutData(fname); + ReadOutData(fname,["Disp=n"]); GLIST=append(GLIST,"ReadOutData("+Dqq(fname)+")"); if(islist(parse(name3)), tmp1=name2+"=Projpara("+Dqq(name3)+",["; @@ -6277,12 +6327,16 @@ Crv3onsfparadataC(nm,crv3d,sfbdorg,fdorg,optionorg,optionsh):=( ); ); +Crv2onsfparadata(nm,crv2d,sfbd,fd):=Crv2onsfparadataC(nm,crv2d,sfbd,fd); +Crv2onsfparadata(nm,crv2d,sfbd,fd,options):=Crv2onsfparadataC(nm,crv2d,sfbd,fd,options); +Crv2onsfparadata(nm,crv2d,sfbd,fdorg,options,optionsh):= + Crv2onsfparadataC(nm,crv2d,sfbd,fdorg,options,optionsh); Crv2onsfparadataC(nm,crv2d,sfbd,fd):= Crv2onsfparadataC(nm,crv2d,sfbd,fd,["c"],["do"]); Crv2onsfparadataC(nm,crv2d,sfbd,fd,options):= Crv2onsfparadataC(nm,crv2d,sfbd,fd,options,["do"]); Crv2onsfparadataC(nm,crv2d,sfbd,fdorg,options,optionsh):=( -//help:Crv2onsfparadataC("1","gp1","sfbd3d1",fd); +//help:Crv2onsfparadata("1","gp1","sfbd3d1",fd); regional(fd,uname,vname,str,tmpfun,ii,jj,crv3d,tmp,tmp1,tmp2); Changestyle3d(crv2d,["nodisp"]); crv3d=crv2d+"3d"; @@ -6304,12 +6358,16 @@ Crv2onsfparadataC(nm,crv2d,sfbd,fdorg,options,optionsh):=( Crv3onsfparadataC(nm,crv3d,sfbd,fdorg,options,optionsh); ); +Wireparadata(nm,sfbd,fd,wr1,wr2):=WireparadataC(nm,sfbd,fd,wr1,wr2); +Wireparadata(nm,sfbd,fd,wr1,wr2,options):=WireparadataC(nm,sfbd,fd,wr1,wr2,options); +Wireparadata(nm,sfbd,fdorg,wr1,wr2,optionorg,optionsh):= + WireparadataC(nm,sfbd,fdorg,wr1,wr2,optionorg,optionsh); WireparadataC(nm,sfbd,fd,wr1,wr2):= WireparadataC(nm,sfbd,fd,wr1,wr2,[],["nodisp"]); WireparadataC(nm,sfbd,fd,wr1,wr2,options):= WireparadataC(nm,sfbd,fd,wr1,wr2,options,["nodisp"]); WireparadataC(nm,sfbd,fdorg,wr1,wr2,optionorg,optionsh):=( -//help:WireparadataC("1","sfbd3d1",fd,5,5); +//help:Wireparadata("1","sfbd3d1",fd,5,5); regional(funnm,fd,options,name2,name3,name2h,name3h,waiting, eqL,reL,strL,fname,fnameh,tmp,tmp1,tmp2,flg,wflg,flg,ii,jj,eps,udata,vdata,cmdflg); eps=10^(-5); @@ -6396,6 +6454,7 @@ WireparadataC(nm,sfbd,fdorg,wr1,wr2,optionorg,optionsh):=( tmp=replace(tmp,"fname","fnameall"); cmdL_8=tmp; cmdL_7=" readoutdata3(fnameall,"+Dqq(sfbd)+",sfbd);"; cmdL=append(cmdL," outputend(dirfname);"); + cmdL=remove(cmdL,[cmdL_3,cmdL_4]); //180827 CommandListC=concat(CommandListC,cmdL); //180531to , if(wflg==1,tmp1=append(options,"m")); @@ -6407,7 +6466,7 @@ WireparadataC(nm,sfbd,fdorg,wr1,wr2,optionorg,optionsh):=( if(ErrFlag==1, err("Wireparadata not completed"); , - ReadOutData(fname); + ReadOutData(fname,["Disp=n"]); GLIST=append(GLIST,"ReadOutData("+Dqq(fname)+")"); ReadOutData(fnameh); GLIST=append(GLIST,"ReadOutData("+Dqq(fnameh)+")"); @@ -6437,6 +6496,10 @@ WireparadataC(nm,sfbd,fdorg,wr1,wr2,optionorg,optionsh):=( ); ); +Intersectcrvsf(nm,crv,fd):=IntersectcrvsfC(nm,crv,fd); +Intersectcrvsf(nm,crv,fd,Arg):=IntersectcrvsfC(nm,crv,fd,Arg); +Intersectcrvsf(nm,crv3d,fdorg,bdyeq,optionorg):= + IntersectcrvsfC(nm,crv3d,fdorg,bdyeq,optionorg); IntersectcrvsfC(nm,crv,fd):=IntersectcrvsfC(nm,crv,fd,"",[]); IntersectcrvsfC(nm,crv,fd,Arg):=( if(isstring(Arg), @@ -6446,7 +6509,7 @@ IntersectcrvsfC(nm,crv,fd,Arg):=( ); ); IntersectcrvsfC(nm,crv3d,fdorg,bdyeq,optionorg):=( -//help:IntersectcrvsfC("1",curve,fd); +//help:Intersectcrvsf("1",curve,fd); regional(fd,funnm,name,crv,fd,options,reL,fname,crvfname,argR, waiting,tmp,tmp1,tmp2,flg,wflg,pts,cmdflg); fd=ConvertFdtoC(fdorg); @@ -6527,20 +6590,24 @@ IntersectcrvsfC(nm,crv3d,fdorg,bdyeq,optionorg):=( if(ErrFlag==1, err("Intersectcrvsf not completed"); , - ReadOutData(fname); + ReadOutData(fname,["Disp=n"]); //181029 ); println("generate "+name); parse(name); ); ); +Sfcutparadata(nm,cutfunL,sfbd,fd):=SfcutparadataC(nm,cutfunL,sfbd,fd); +Sfcutparadata(nm,cutfunL,sfbd,fd,options):=SfcutparadataC(nm,cutfunL,sfbd,fd,options); +Sfcutparadata(nm,cutfunLorg,sfbd,fdorg,optionorg,optionsh):= + SfcutparadataC(nm,cutfunLorg,sfbd,fdorg,optionorg,optionsh); SfcutparadataC(nm,cutfunL,sfbd,fd):=(//180505 SfcutparadataC(nm,cutfunL,sfbd,fd,[],["nodisp"]); ); SfcutparadataC(nm,cutfunL,sfbd,fd,options):= SfcutparadataC(nm,cutfunL,sfbd,fd,options,["nodisp"]); SfcutparadataC(nm,cutfunLorg,sfbd,fdorg,optionorg,optionsh):=( -//help:SfcutparadataC("1","2*x+3*y+z=1","sfbd3d",fd); +//help:Sfcutparadata("1","2*x+3*y+z=1","sfbd3d",fd); regional(funnm,cutfunL,fd,options,name2,name3,name2h,name3h,waiting, eqL,reL,strL,fname,fnameh,tmp,tmp1,tmp2,flg,wflg,flg,ii,jj,eps,cmdflg); eps=10^(-5); @@ -6608,6 +6675,7 @@ SfcutparadataC(nm,cutfunLorg,sfbd,fdorg,optionorg,optionsh):=( tmp=replace(tmp,"fname","fnameall"); cmdL_6=tmp; cmdL_5=" readoutdata3(fnameall,"+Dqq(sfbd)+",sfbd);"; cmdL=append(cmdL," outputend(dirfname);"); + cmdL=remove(cmdL,[cmdL_1,cmdL_2]); //180827 CommandListC=concat(CommandListC,cmdL); //180531to , if(wflg==1,tmp1=append(options,"m")); @@ -6619,7 +6687,7 @@ SfcutparadataC(nm,cutfunLorg,sfbd,fdorg,optionorg,optionsh):=( if(ErrFlag==1, err("Sfcutparadata not completed"); , - ReadOutData(fname); + ReadOutData(fname,["Disp=n"]); //1810209 GLIST=append(GLIST,"ReadOutData("+Dqq(fname)+")"); ReadOutData(fnameh); GLIST=append(GLIST,"ReadOutData("+Dqq(fnameh)+")"); |