From 8ce53461fe09f5102deeaedbb87bfc0d4f996ed2 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Mon, 16 Jul 2018 18:13:55 +0530 Subject: move the options in the loop --- js/Linear/BIGSOM_f.js | 6 +++--- js/Linear/CLR.js | 8 ++++---- js/Linear/CLR_f.js | 8 ++++---- js/Linear/CLSS.js | 14 +++++++------- js/Linear/CLSS_f.js | 14 +++++++------- js/Linear/DELAYV_f.js | 10 +++++----- js/Linear/DELAY_f.js | 8 ++++---- js/Linear/DIFF_c.js | 8 ++++---- js/Linear/DLR.js | 8 ++++---- js/Linear/DLR_f.js | 8 ++++---- js/Linear/DLSS.js | 14 +++++++------- js/Linear/DLSS_f.js | 14 +++++++------- js/Linear/DOLLAR.js | 8 ++++---- js/Linear/DOLLAR_f.js | 8 ++++---- js/Linear/DOLLAR_m.js | 8 ++++---- js/Linear/GAINBLK.js | 8 ++++---- js/Linear/GAINBLK_f.js | 6 +++--- js/Linear/GAIN_f.js | 6 +++--- js/Linear/INTEGRAL.js | 14 +++++++------- js/Linear/INTEGRAL_f.js | 6 +++--- js/Linear/INTEGRAL_m.js | 14 +++++++------- js/Linear/PID.js | 10 +++++----- js/Linear/REGISTER.js | 8 ++++---- js/Linear/REGISTER_f.js | 6 +++--- js/Linear/SAMPHOLD_m.js | 6 +++--- js/Linear/SUMMATION.js | 10 +++++----- js/Linear/TCLSS.js | 14 +++++++------- js/Linear/TCLSS_f.js | 14 +++++++------- js/Linear/TIME_DELAY.js | 10 +++++----- js/Linear/VARIABLE_DELAY.js | 10 +++++----- 30 files changed, 143 insertions(+), 143 deletions(-) (limited to 'js/Linear') diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 7eab70db..eddff7f0 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -23,11 +23,11 @@ function BIGSOM_f() { return options; } BIGSOM_f.prototype.set = function BIGSOM_f() { - this.sgn = inverse(arguments[0]["sgn"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.sgn,this.exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),this.exprs); + var ok = true; + this.sgn = inverse(arguments[0]["sgn"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 96bce872..498db2d9 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -30,9 +30,6 @@ function CLR() { return options; } CLR.prototype.set = function CLR() { - this.num = arguments[0]["num"] - this.den = arguments[0]["den"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; @@ -42,7 +39,10 @@ function CLR() { var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),this.exprs); + var ok = true; + this.num = arguments[0]["num"]; + this.den = arguments[0]["den"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index c6a4f351..c97910fd 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -30,9 +30,6 @@ function CLR_f() { return options; } CLR_f.prototype.set = function CLR_f() { - this.num = arguments[0]["num"] - this.den = arguments[0]["den"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; @@ -42,7 +39,10 @@ function CLR_f() { var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),this.exprs); + var ok = true; + this.num = arguments[0]["num"]; + this.den = arguments[0]["den"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index bd2aa780..e21f6f1b 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -35,18 +35,18 @@ function CLSS() { return options; } CLSS.prototype.set = function CLSS() { - this.A = parseFloat(arguments[0]["A"]) - this.B = parseFloat(arguments[0]["B"]) - this.C = parseFloat(arguments[0]["C"]) - this.D = parseFloat(arguments[0]["D"]) - this.x0 = parseFloat(arguments[0]["x0"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,this.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)"),this.exprs); + var ok = true; + this.A = parseFloat(arguments[0]["A"]); + this.B = parseFloat(arguments[0]["B"]); + this.C = parseFloat(arguments[0]["C"]); + this.D = parseFloat(arguments[0]["D"]); + this.x0 = parseFloat(arguments[0]["x0"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index d8232101..44bbfe9a 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -35,18 +35,18 @@ function CLSS_f() { return options; } CLSS_f.prototype.set = function CLSS_f() { - this.A = parseFloat(arguments[0]["A"]) - this.B = parseFloat(arguments[0]["B"]) - this.C = parseFloat(arguments[0]["C"]) - this.D = parseFloat(arguments[0]["D"]) - this.x0 = parseFloat(arguments[0]["x0"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,this.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)"),this.exprs); + var ok = true; + this.A = parseFloat(arguments[0]["A"]); + this.B = parseFloat(arguments[0]["B"]); + this.C = parseFloat(arguments[0]["C"]); + this.D = parseFloat(arguments[0]["D"]); + this.x0 = parseFloat(arguments[0]["x0"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 7677921c..516a768a 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -33,17 +33,17 @@ function DELAYV_f() { return options; } DELAYV_f.prototype.set = function DELAYV_f() { - this.nin = parseFloat(arguments[0]["nin"]) - this.zz0 = inverse(arguments[0]["zz0"]) - this.T = parseFloat(arguments[0]["T"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; this.nin = this.model.in[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); var told = z0[$-1]; while (true) { - [ok,this.nin,this.zz0,this.T,this.exprs] = scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),this.exprs); + var ok = true; + this.nin = parseFloat(arguments[0]["nin"]); + this.zz0 = inverse(arguments[0]["zz0"]); + this.T = parseFloat(arguments[0]["T"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 32549d82..29c1728a 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -76,9 +76,6 @@ function DELAY_f() { return options; } DELAY_f.prototype.set = function DELAY_f() { - this.dt = arguments[0]["dt"] - this.z0 = arguments[0]["z0"] - this.exprs = inverse(arguments[0]["exprs"]) var ppath = list(0,0); if (typeof(o)=="Block"&&o.gui=="REGISTER_f") { ppath[1-1] = i; @@ -97,7 +94,10 @@ function DELAY_f() { var evtdly_exprs = evtdly.graphics.exprs; this.exprs = [[evtdly_exprs[1-1]],[register_exprs]]; while (true) { - [ok,this.dt,this.z0,this.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),this.exprs); + var ok = true; + this.dt = arguments[0]["dt"]; + this.z0 = arguments[0]["z0"]; + this.exprs = inverse(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 8167fd08..90f18fe0 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -25,13 +25,13 @@ function DIFF_c() { return options; } DIFF_c.prototype.set = function DIFF_c() { - this.x0 = inverse(arguments[0]["x0"]) - this.xd0 = inverse(arguments[0]["xd0"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { var ask_again = false; - [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),this.exprs); + var ok = true; + this.x0 = inverse(arguments[0]["x0"]); + this.xd0 = inverse(arguments[0]["xd0"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 301fee22..8c49bb7a 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -31,16 +31,16 @@ function DLR() { return options; } DLR.prototype.set = function DLR() { - this.num = arguments[0]["num"] - this.den = arguments[0]["den"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),this.exprs); + var ok = true; + this.num = arguments[0]["num"]; + this.den = arguments[0]["den"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 382213dc..89555f7c 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -31,16 +31,16 @@ function DLR_f() { return options; } DLR_f.prototype.set = function DLR_f() { - this.num = arguments[0]["num"] - this.den = arguments[0]["den"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),this.exprs); + var ok = true; + this.num = arguments[0]["num"]; + this.den = arguments[0]["den"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 686c712e..2199795a 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -34,18 +34,18 @@ function DLSS() { return options; } DLSS.prototype.set = function DLSS() { - this.A = parseFloat(arguments[0]["A"]) - this.B = parseFloat(arguments[0]["B"]) - this.C = parseFloat(arguments[0]["C"]) - this.D = parseFloat(arguments[0]["D"]) - this.x0 = parseFloat(arguments[0]["x0"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,this.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)"),this.exprs); + var ok = true; + this.A = parseFloat(arguments[0]["A"]); + this.B = parseFloat(arguments[0]["B"]); + this.C = parseFloat(arguments[0]["C"]); + this.D = parseFloat(arguments[0]["D"]); + this.x0 = parseFloat(arguments[0]["x0"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index a1f27482..6c4d8d62 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -34,18 +34,18 @@ function DLSS_f() { return options; } DLSS_f.prototype.set = function DLSS_f() { - this.A = parseFloat(arguments[0]["A"]) - this.B = parseFloat(arguments[0]["B"]) - this.C = parseFloat(arguments[0]["C"]) - this.D = parseFloat(arguments[0]["D"]) - this.x0 = parseFloat(arguments[0]["x0"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,this.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)"),this.exprs); + var ok = true; + this.A = parseFloat(arguments[0]["A"]); + this.B = parseFloat(arguments[0]["B"]); + this.C = parseFloat(arguments[0]["C"]); + this.D = parseFloat(arguments[0]["D"]); + this.x0 = parseFloat(arguments[0]["x0"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 6541259b..e8a5e691 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -28,15 +28,15 @@ function DOLLAR() { return options; } DOLLAR.prototype.set = function DOLLAR() { - this.a = arguments[0]["a"] - this.inh = parseFloat(arguments[0]["inh"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),this.exprs); + var ok = true; + this.a = arguments[0]["a"]; + this.inh = parseFloat(arguments[0]["inh"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 2d580656..34b17900 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -28,15 +28,15 @@ function DOLLAR_f() { return options; } DOLLAR_f.prototype.set = function DOLLAR_f() { - this.a = arguments[0]["a"] - this.inh = parseFloat(arguments[0]["inh"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("vec",-1,"vec",-1),this.exprs); + var ok = true; + this.a = arguments[0]["a"]; + this.inh = parseFloat(arguments[0]["inh"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index e33e3d33..6648cf45 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -28,15 +28,15 @@ function DOLLAR_m() { return options; } DOLLAR_m.prototype.set = function DOLLAR_m() { - this.a = arguments[0]["a"] - this.inh = parseFloat(arguments[0]["inh"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),this.exprs); + var ok = true; + this.a = arguments[0]["a"]; + this.inh = parseFloat(arguments[0]["inh"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 69ba2837..4299056b 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -31,15 +31,15 @@ function GAINBLK() { return options; } GAINBLK.prototype.set = function GAINBLK() { - this.gain = parseFloat(arguments[0]["gain"]) - this.over = arguments[0]["over"] - this.exprs = inverse(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==1) { this.exprs = [[this.exprs],[sci2exp(0)]]; } while (true) { - [ok,this.gain,this.over,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),this.exprs); + var ok = true; + this.gain = parseFloat(arguments[0]["gain"]); + this.over = arguments[0]["over"]; + this.exprs = inverse(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 2b768006..200dd3ee 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -26,11 +26,11 @@ function GAINBLK_f() { return options; } GAINBLK_f.prototype.set = function GAINBLK_f() { - this.gain = parseFloat(arguments[0]["gain"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); + var ok = true; + this.gain = parseFloat(arguments[0]["gain"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 026f9ccb..bdf478e3 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -26,11 +26,11 @@ function GAIN_f() { return options; } GAIN_f.prototype.set = function GAIN_f() { - this.gain = parseFloat(arguments[0]["gain"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); + var ok = true; + this.gain = parseFloat(arguments[0]["gain"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index b2aabccd..881a01b5 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -32,15 +32,15 @@ function INTEGRAL() { return options; } INTEGRAL.prototype.set = function INTEGRAL() { - this.x0 = inverse(arguments[0]["x0"]) - this.reinit = parseFloat(arguments[0]["reinit"]) - this.satur = parseFloat(arguments[0]["satur"]) - this.maxp = parseFloat(arguments[0]["maxp"]) - this.lowp = arguments[0]["lowp"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.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),this.exprs); + var ok = true; + this.x0 = inverse(arguments[0]["x0"]); + this.reinit = parseFloat(arguments[0]["reinit"]); + this.satur = parseFloat(arguments[0]["satur"]); + this.maxp = parseFloat(arguments[0]["maxp"]); + this.lowp = arguments[0]["lowp"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index ba635b5b..46bc238b 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -23,11 +23,11 @@ function INTEGRAL_f() { return options; } INTEGRAL_f.prototype.set = function INTEGRAL_f() { - this.x0 = parseFloat(arguments[0]["x0"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),this.exprs); + var ok = true; + this.x0 = parseFloat(arguments[0]["x0"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index a3e59a09..15b3d3c5 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -33,15 +33,15 @@ function INTEGRAL_m() { return options; } INTEGRAL_m.prototype.set = function INTEGRAL_m() { - this.x0 = arguments[0]["x0"] - this.reinit = parseFloat(arguments[0]["reinit"]) - this.satur = parseFloat(arguments[0]["satur"]) - this.maxp = parseFloat(arguments[0]["maxp"]) - this.lowp = parseFloat(arguments[0]["lowp"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.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]),this.exprs); + var ok = true; + this.x0 = arguments[0]["x0"]; + this.reinit = parseFloat(arguments[0]["reinit"]); + this.satur = parseFloat(arguments[0]["satur"]); + this.maxp = parseFloat(arguments[0]["maxp"]); + this.lowp = parseFloat(arguments[0]["lowp"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 5e6e980e..3bb0299f 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -51,10 +51,6 @@ function PID() { return options; } PID.prototype.set = function PID() { - this.p = arguments[0]["p"] - this.i = arguments[0]["i"] - this.d = arguments[0]["d"] - this.exprs0 = arguments[0]["exprs0"] var ppath = list(0,0,0); if (typeof(o)=="Link") { if (from.gui=="GAINBLK") { @@ -90,7 +86,11 @@ function PID() { var d_old = xx3.model.rpar; var 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),this.exprs); + var ok = true; + this.p = arguments[0]["p"]; + this.i = arguments[0]["i"]; + this.d = arguments[0]["d"]; + this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index f4e7e926..8334361f 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -26,15 +26,15 @@ function REGISTER() { return options; } REGISTER.prototype.set = function REGISTER() { - this.z0 = parseFloat(arguments[0]["z0"]) - this.it = arguments[0]["it"] - this.exprs = inverse(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,1)==1) { this.exprs = [[this.exprs],[sci2exp(1)]]; } while (true) { - [ok,this.z0,this.it,this.exprs] = scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),this.exprs); + var ok = true; + this.z0 = parseFloat(arguments[0]["z0"]); + this.it = arguments[0]["it"]; + this.exprs = inverse(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index b593af07..86c7e1ef 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -24,11 +24,11 @@ function REGISTER_f() { return options; } REGISTER_f.prototype.set = function REGISTER_f() { - this.z0 = parseFloat(arguments[0]["z0"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.z0,this.exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),this.exprs); + var ok = true; + this.z0 = parseFloat(arguments[0]["z0"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index efc1adcc..7260e0e0 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -27,12 +27,12 @@ function SAMPHOLD_m() { return options; } SAMPHOLD_m.prototype.set = function SAMPHOLD_m() { - this.it = arguments[0]["it"] - this.exprs = arguments[0]["exprs"] this.x.model.firing = []; var label = this.graphics.exprs; while (true) { - [ok,this.it,this.exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); + var ok = true; + this.it = arguments[0]["it"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 905cc973..11251563 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -28,10 +28,6 @@ function SUMMATION() { return options; } SUMMATION.prototype.set = function SUMMATION() { - this.Datatype = arguments[0]["Datatype"] - this.sgn = inverse(arguments[0]["sgn"]) - this.satur = arguments[0]["satur"] - this.exprs = inverse(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,1)==1) { this.exprs = [[sci2exp(1)],[this.exprs],[sci2exp(0)]]; @@ -39,7 +35,11 @@ function SUMMATION() { this.exprs = [[this.exprs],[sci2exp(0)]]; } while (true) { - [ok,this.Datatype,this.sgn,this.satur,this.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),this.exprs); + var ok = true; + this.Datatype = arguments[0]["Datatype"]; + this.sgn = inverse(arguments[0]["sgn"]); + this.satur = arguments[0]["satur"]; + this.exprs = inverse(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 56aa6d16..7be300d4 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -37,18 +37,18 @@ function TCLSS() { return options; } TCLSS.prototype.set = function TCLSS() { - this.A = parseFloat(arguments[0]["A"]) - this.B = parseFloat(arguments[0]["B"]) - this.C = parseFloat(arguments[0]["C"]) - this.D = parseFloat(arguments[0]["D"]) - this.x0 = parseFloat(arguments[0]["x0"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,this.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)"),this.exprs); + var ok = true; + this.A = parseFloat(arguments[0]["A"]); + this.B = parseFloat(arguments[0]["B"]); + this.C = parseFloat(arguments[0]["C"]); + this.D = parseFloat(arguments[0]["D"]); + this.x0 = parseFloat(arguments[0]["x0"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index e224fbf0..db3d2625 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -37,18 +37,18 @@ function TCLSS_f() { return options; } TCLSS_f.prototype.set = function TCLSS_f() { - this.A = parseFloat(arguments[0]["A"]) - this.B = parseFloat(arguments[0]["B"]) - this.C = parseFloat(arguments[0]["C"]) - this.D = parseFloat(arguments[0]["D"]) - this.x0 = parseFloat(arguments[0]["x0"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,this.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)"),this.exprs); + var ok = true; + this.A = parseFloat(arguments[0]["A"]); + this.B = parseFloat(arguments[0]["B"]); + this.C = parseFloat(arguments[0]["C"]); + this.D = parseFloat(arguments[0]["D"]); + this.x0 = parseFloat(arguments[0]["x0"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 6898b79a..1edc0c4a 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -30,14 +30,14 @@ function TIME_DELAY() { return options; } TIME_DELAY.prototype.set = function TIME_DELAY() { - this.T = parseFloat(arguments[0]["T"]) - this.init = parseFloat(arguments[0]["init"]) - this.N = parseFloat(arguments[0]["N"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { - [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.T = parseFloat(arguments[0]["T"]); + this.init = parseFloat(arguments[0]["init"]); + this.N = parseFloat(arguments[0]["N"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 1a0c4bfc..02c8efe1 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -30,14 +30,14 @@ function VARIABLE_DELAY() { return options; } VARIABLE_DELAY.prototype.set = function VARIABLE_DELAY() { - this.T = parseFloat(arguments[0]["T"]) - this.init = parseFloat(arguments[0]["init"]) - this.N = parseFloat(arguments[0]["N"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { - [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.T = parseFloat(arguments[0]["T"]); + this.init = parseFloat(arguments[0]["init"]); + this.N = parseFloat(arguments[0]["N"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } -- cgit