From cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Mon, 18 Jun 2018 17:30:31 +0530 Subject: use format string --- js/Linear/BIGSOM_f.js | 4 ++-- js/Linear/CLSS.js | 4 ++-- js/Linear/CLSS_f.js | 4 ++-- js/Linear/DELAYV_f.js | 4 ++-- js/Linear/DELAY_f.js | 6 +++--- js/Linear/DIFF_c.js | 4 ++-- js/Linear/DLSS.js | 4 ++-- js/Linear/DLSS_f.js | 4 ++-- js/Linear/DOLLAR.js | 4 ++-- js/Linear/DOLLAR_f.js | 4 ++-- js/Linear/DOLLAR_m.js | 4 ++-- js/Linear/GAINBLK.js | 4 ++-- js/Linear/GAINBLK_f.js | 4 ++-- js/Linear/GAIN_f.js | 4 ++-- js/Linear/INTEGRAL.js | 4 ++-- js/Linear/INTEGRAL_f.js | 4 ++-- js/Linear/INTEGRAL_m.js | 4 ++-- js/Linear/PID.js | 6 +++--- js/Linear/REGISTER.js | 4 ++-- js/Linear/REGISTER_f.js | 4 ++-- js/Linear/SAMPHOLD_m.js | 4 ++-- js/Linear/SUMMATION.js | 4 ++-- js/Linear/TCLSS.js | 4 ++-- js/Linear/TCLSS_f.js | 4 ++-- js/Linear/TIME_DELAY.js | 4 ++-- js/Linear/VARIABLE_DELAY.js | 4 ++-- 26 files changed, 54 insertions(+), 54 deletions(-) (limited to 'js/Linear') diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 3ae036bd..98c7469e 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -25,7 +25,7 @@ exprs=graphics.exprs; while (true) { [ok,sgn,exprs]=scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),exprs); if (!ok) { -break +break; } in1=-ones(size(sgn,"*"),1); [model,graphics,ok]=check_io(model,graphics,in1,-1,[],[]); @@ -34,7 +34,7 @@ model.rpar=sgn.slice(); graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 83e919c0..4db8b5da 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -35,7 +35,7 @@ model=arg1.model; while (true) { [ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { -break +break; } out=size(C,1); if (out==0) { @@ -79,7 +79,7 @@ model.state=x0.slice(); model.rpar=rpar; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 7327f301..c924074f 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -35,7 +35,7 @@ model=arg1.model; while (true) { [ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { -break +break; } out=size(C,1); if (out==0) { @@ -69,7 +69,7 @@ model.state=x0.slice(); model.rpar=rpar; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 5b5aa629..3a1687b8 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -36,7 +36,7 @@ told=z0[$-1]; while (true) { [ok,nin,zz0,T,exprs]=scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),exprs); if (!ok) { -break +break; } if (size(zz0,"*")<2) { message("Register length must be at least 2"); @@ -55,7 +55,7 @@ model.dstate=[zz0.slice(),told]; model.rpar=T/(size(zz0,"*")); x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 8840226c..c891093b 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -79,7 +79,7 @@ if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") { ppath[2-1]=i; } if (and(ppath!=list(0,0))) { -break +break; } } x=arg1; @@ -92,7 +92,7 @@ exprs=[evtdly_exprs(1),register_exprs]; while (true) { [ok,dt,z0,exprs]=scicos_getvalue(["This block implements as a discretized delay","it is consist of a shift register and a clock","value of the delay is given by;","the discretization time step multiplied by the","number-1 of state of the register"],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs); if (!ok) { -break +break; } mess=[]; if (prod(size(z0))<1) { @@ -118,7 +118,7 @@ register.model.dstate=z0.slice(); newpar[$+1-1]=ppath[1-1]; } x.model.rpar.objs[ppath[1-1]-1]=register; -break +break; } } needcompile=0; diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 44b2403c..e0025a4d 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -26,7 +26,7 @@ while (true) { ask_again=false; [ok,x0,xd0,exprs]=scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),exprs); if (!ok) { -break +break; } x0=x0.slice(); N=size(x0,"*"); @@ -47,7 +47,7 @@ model.out=[N]; model.in1=N; x.graphics=graphics; x.model=model; -break +break; } } x.model.firing=[]; diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 86d01b39..79ef159f 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -34,7 +34,7 @@ model=arg1.model; while (true) { [ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { -break +break; } out=size(C,1); if (out==0) { @@ -78,7 +78,7 @@ model.dstate=x0.slice(); model.rpar=rpar; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 4a938f82..d7d4f2f5 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -34,7 +34,7 @@ model=arg1.model; while (true) { [ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { -break +break; } out=size(C,1); if (out==0) { @@ -68,7 +68,7 @@ model.dstate=x0.slice(); model.rpar=rpar; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 0606a81a..88405a1d 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -31,7 +31,7 @@ exprs[2-1]="0"; while (true) { [ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); if (!ok) { -break +break; } out=[size(a,1),size(a,2)]; if (out==0) { @@ -83,7 +83,7 @@ if (ok) { graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index c8b43d21..c08d6216 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -31,7 +31,7 @@ exprs[2-1]="0"; while (true) { [ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("vec",-1,"vec",-1),exprs); if (!ok) { -break +break; } out=size(a,"*"); if (out==0) { @@ -48,7 +48,7 @@ model.in1=in1; model.out=out; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 4fc5bfdc..b25fa881 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -31,7 +31,7 @@ exprs[2-1]="0"; while (true) { [ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); if (!ok) { -break +break; } out=[size(a,1),size(a,2)]; if (out==0) { @@ -83,7 +83,7 @@ if (ok) { graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 91aa29f8..c5113bc0 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -34,7 +34,7 @@ exprs=[exprs,sci2exp(0)]; while (true) { [ok,gain,over,exprs]=scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),exprs); if (!ok) { -break +break; } if (gain==[]) { message("Gain must have at least one element"); @@ -139,7 +139,7 @@ if (ok) { graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index fcaeb6bd..08505007 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -27,7 +27,7 @@ model=arg1.model; while (true) { [ok,gain,exprs]=scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); if (!ok) { -break +break; } if (gain==[]) { message("Gain must have at least one element"); @@ -39,7 +39,7 @@ graphics.exprs=exprs; model.rpar=gain.slice(); x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index f9ccb8d3..4996bc20 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -27,7 +27,7 @@ model=arg1.model; while (true) { [ok,gain,exprs]=scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); if (!ok) { -break +break; } if (gain==[]) { message("Gain must have at least one element"); @@ -39,7 +39,7 @@ graphics.exprs=exprs; model.rpar=gain.slice(); x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 36c20ca9..d2eb1397 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -29,7 +29,7 @@ model=arg1.model; while (true) { [ok,x0,reinit,satur,maxp,lowp,exprs]=scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),exprs); if (!ok) { -break +break; } x0=x0.slice(); maxp=maxp.slice(); @@ -73,7 +73,7 @@ if (ok) { graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index a887ff21..b3711642 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -25,13 +25,13 @@ model=arg1.model; while (true) { [ok,x0,exprs]=scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),exprs); if (!ok) { -break +break; } graphics.exprs=exprs; model.state=x0; x.graphics=graphics; x.model=model; -break +break; } x.model.firing=[]; } diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index d6832af8..07d0343a 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -30,7 +30,7 @@ model=arg1.model; while (true) { [ok,x0,reinit,satur,maxp,lowp,exprs]=scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs); if (!ok) { -break +break; } if (isreal(x0)) { Datatype=1; @@ -116,7 +116,7 @@ if (ok) { graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 1c7e2748..f4822015 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -69,7 +69,7 @@ ppath[3-1]=o.to(1); } } if (and(ppath!=list(0,0,0))) { -break +break; } } } @@ -87,7 +87,7 @@ y=0; while (true) { [ok,p,i,d,exprs0]=scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),exprs); if (!ok) { -break +break; } if (ok) { xx1.graphics.exprs=exprs0(1); @@ -99,7 +99,7 @@ xx3.model.rpar=d; arg1.model.rpar.objs[ppath[1-1]-1]=xx1; arg1.model.rpar.objs[ppath[2-1]-1]=xx2; arg1.model.rpar.objs[ppath[3-1]-1]=xx3; -break +break; } } needcompile=0; diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index b116b37e..a7822b9a 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -29,7 +29,7 @@ exprs=[exprs,sci2exp(1)]; while (true) { [ok,z0,it,exprs]=scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),exprs); if (!ok) { -break +break; } if (prod(size(z0))<1) { message("Register length must be at least 1"); @@ -74,7 +74,7 @@ if (ok) { graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 53cde263..d9a3cbdb 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -26,7 +26,7 @@ model=arg1.model; while (true) { [ok,z0,exprs]=scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),exprs); if (!ok) { -break +break; } if (prod(size(z0))<1) { message("Register length must be at least 1"); @@ -37,7 +37,7 @@ graphics.exprs=exprs; model.dstate=z0; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 39cfca2b..bcbcc7cd 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -29,7 +29,7 @@ model=arg1.model; while (true) { [ok,it,exprs]=scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); if (!ok) { -break +break; } if (((it<1)||(it>8))) { message("Datatype is not supported"); @@ -43,7 +43,7 @@ graphics.exprs=exprs; arg1.graphics=graphics; arg1.model=model; x=arg1; -break +break; } } } diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 11c383e3..a1ada670 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -32,7 +32,7 @@ exprs=[exprs,sci2exp(0)]; while (true) { [ok,Datatype,sgn,satur,exprs]=scicos_getvalue("Set sum block parameters",["Datatype (1=real double 2=complex 3=int32 ...)","Number of inputs or sign vector (of +1, -1)","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",-1,"vec",1),exprs); if (!ok) { -break +break; } sgn=sgn.slice(); if ((satur!=0&&satur!=1&&satur!=2)) { @@ -130,7 +130,7 @@ model.ipar=sgn; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 18727be9..a680df19 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -37,7 +37,7 @@ exprs=exprs[[1:4,7]-1]; while (true) { [ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { -break +break; } out=size(C,1); if (out==0) { @@ -76,7 +76,7 @@ model.sim=list("tcsltj4",4); } x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index f98490df..503e2963 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -37,7 +37,7 @@ exprs=exprs[[1:4,7]-1]; while (true) { [ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { -break +break; } out=size(C,1); if (out==0) { @@ -76,7 +76,7 @@ model.sim=list("tcsltj",1); } x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index da7fe84b..86b22984 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -30,7 +30,7 @@ nin=model.in1(1); while (true) { [ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (N<2) { message("Buffer must be larger than 2"); @@ -50,7 +50,7 @@ model.ipar=N; model.dep_ut=[false,true]; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 49139bf0..2f74eab3 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -30,7 +30,7 @@ nin=model.in1(1); while (true) { [ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (N<2) { message("Buffer must be larger than 2"); @@ -49,7 +49,7 @@ model.rpar=[T,init]; model.ipar=N; x.graphics=graphics; x.model=model; -break +break; } } } -- cgit