diff options
Diffstat (limited to 'js/Linear')
-rw-r--r-- | js/Linear/CLR.js | 2 | ||||
-rw-r--r-- | js/Linear/CLR_f.js | 2 | ||||
-rw-r--r-- | js/Linear/CLSS.js | 2 | ||||
-rw-r--r-- | js/Linear/CLSS_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DELAYV_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DELAY_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DIFF_c.js | 2 | ||||
-rw-r--r-- | js/Linear/DLR.js | 2 | ||||
-rw-r--r-- | js/Linear/DLR_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DLSS.js | 2 | ||||
-rw-r--r-- | js/Linear/DLSS_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DOLLAR.js | 2 | ||||
-rw-r--r-- | js/Linear/DOLLAR_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DOLLAR_m.js | 2 | ||||
-rw-r--r-- | js/Linear/GAINBLK.js | 2 | ||||
-rw-r--r-- | js/Linear/INTEGRAL.js | 2 | ||||
-rw-r--r-- | js/Linear/INTEGRAL_m.js | 2 | ||||
-rw-r--r-- | js/Linear/PID.js | 2 | ||||
-rw-r--r-- | js/Linear/REGISTER.js | 2 | ||||
-rw-r--r-- | js/Linear/SUMMATION.js | 2 | ||||
-rw-r--r-- | js/Linear/TCLSS.js | 2 | ||||
-rw-r--r-- | js/Linear/TCLSS_f.js | 2 | ||||
-rw-r--r-- | js/Linear/TIME_DELAY.js | 2 | ||||
-rw-r--r-- | js/Linear/VARIABLE_DELAY.js | 2 |
24 files changed, 24 insertions, 24 deletions
diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index a985ba29..7e901467 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -37,7 +37,7 @@ function CLR() { PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",[["Numerator (s)"],["Denominator (s)"]],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),exprs); if (!ok) { break; } diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 3f029025..dbd940cf 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -37,7 +37,7 @@ function CLR_f() { PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",[["Numerator (s)"],["Denominator (s)"]],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),exprs); if (!ok) { break; } diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 7b142963..536b730f 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -35,7 +35,7 @@ function CLSS() { } model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.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); + [ok,this.A,this.B,this.C,this.D,this.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; } diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index d1efb421..89e505b9 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -35,7 +35,7 @@ function CLSS_f() { } model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.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); + [ok,this.A,this.B,this.C,this.D,this.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; } diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 4f04acee..17697190 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -36,7 +36,7 @@ function DELAYV_f() { this.zz0 = z0.slice(1-1,$-1); told = z0[$-1]; while (true) { - [ok,this.nin,this.zz0,this.T,exprs] = scicos_getvalue("Set delay parameters",[["Number of inputs"],["Register initial condition"],["Max delay"]],list("vec",1,"vec",-1,"vec",1),exprs); + [ok,this.nin,this.zz0,this.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; } diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 62b730f2..276cdfcb 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -92,7 +92,7 @@ function DELAY_f() { evtdly_exprs = evtdly.graphics.exprs; exprs = [[evtdly_exprs[1-1]],[register_exprs]]; while (true) { - [ok,this.dt,this.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); + [ok,this.dt,this.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; } diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index c8cd5202..506ae581 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -26,7 +26,7 @@ function DIFF_c() { model = arg1.model; while (true) { ask_again = false; - [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",[["Initial state"],["Initial Derivative"]],list("vec",-1,"vec",-1),exprs); + [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),exprs); if (!ok) { break; } diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 2cb1afd8..84f9a2e7 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -35,7 +35,7 @@ function DLR() { PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",[["Numerator (z)"],["Denominator (z)"]],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),exprs); if (!ok) { break; } diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 9b06c9e1..73628389 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -35,7 +35,7 @@ function DLR_f() { PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",[["Numerator (z)"],["Denominator (z)"]],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),exprs); if (!ok) { break; } diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 43fddcd5..ee40563b 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -34,7 +34,7 @@ function DLSS() { } model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.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); + [ok,this.A,this.B,this.C,this.D,this.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; } diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index f90a3df0..0f1cf562 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -34,7 +34,7 @@ function DLSS_f() { } model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.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); + [ok,this.A,this.B,this.C,this.D,this.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; } diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 950b9b02..a175c80a 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -31,7 +31,7 @@ function DOLLAR() { exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",[["initial condition"],["Inherit (no:0, yes:1)"]],list("mat",[-1,-2],"vec",-1),exprs); + [ok,this.a,this.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; } diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index a892a191..b331cb5d 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -31,7 +31,7 @@ function DOLLAR_f() { exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",[["initial condition"],["Inherit (no:0, yes:1)"]],list("vec",-1,"vec",-1),exprs); + [ok,this.a,this.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; } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index a4c52390..593bdede 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -31,7 +31,7 @@ function DOLLAR_m() { exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",[["initial condition"],["Inherit (no:0, yes:1)"]],list("mat",[-1,-2],"vec",-1),exprs); + [ok,this.a,this.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; } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index f3dc5f21..975b991c 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -34,7 +34,7 @@ function GAINBLK() { exprs = [[exprs],[sci2exp(0)]]; } while (true) { - [ok,this.gain,this.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); + [ok,this.gain,this.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; } diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 281555c3..47b5cd21 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -29,7 +29,7 @@ function INTEGRAL() { exprs = graphics.exprs; model = arg1.model; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.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); + [ok,this.x0,this.reinit,this.satur,this.maxp,this.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; } diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index ba1620bc..3072add5 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -30,7 +30,7 @@ function INTEGRAL_m() { exprs = graphics.exprs; model = arg1.model; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.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); + [ok,this.x0,this.reinit,this.satur,this.maxp,this.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; } diff --git a/js/Linear/PID.js b/js/Linear/PID.js index af3d8d97..733b9978 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -87,7 +87,7 @@ function PID() { d_old = xx3.model.rpar; y = 0; while (true) { - [ok,this.p,this.i,this.d,this.exprs0] = scicos_getvalue("Set PID parameters",[["Proportional"],["Integral"],["Derivation"]],list("vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.p,this.i,this.d,this.exprs0] = scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),exprs); if (!ok) { break; } diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 6abd8f6d..d3d55660 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -29,7 +29,7 @@ function REGISTER() { exprs = [[exprs],[sci2exp(1)]]; } while (true) { - [ok,this.z0,this.it,exprs] = scicos_getvalue("Set delay parameters",[["Register initial condition"],["Datatype (1=double 3=int32 ...)"]],list("vec",-1,"vec",1),exprs); + [ok,this.z0,this.it,exprs] = scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),exprs); if (!ok) { break; } diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index b6df0e3d..dcf3534d 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -32,7 +32,7 @@ function SUMMATION() { exprs = [[exprs],[sci2exp(0)]]; } while (true) { - [ok,this.Datatype,this.sgn,this.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); + [ok,this.Datatype,this.sgn,this.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; } diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index de30ee06..15403b63 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -37,7 +37,7 @@ function TCLSS() { exprs = exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.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); + [ok,this.A,this.B,this.C,this.D,this.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; } diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 8261306c..a180df56 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -37,7 +37,7 @@ function TCLSS_f() { exprs = exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.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); + [ok,this.A,this.B,this.C,this.D,this.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; } diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 47984ef6..f10c9d60 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -30,7 +30,7 @@ function TIME_DELAY() { model = arg1.model; nin = model.in1[1-1]; while (true) { - [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",[["Delay"],["initial input"],["Buffer size"]],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { break; } diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index e90443a8..9943a423 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -30,7 +30,7 @@ function VARIABLE_DELAY() { model = arg1.model; nin = model.in1[1-1]; while (true) { - [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",[["Max delay"],["initial input"],["Buffer size"]],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { break; } |