summaryrefslogtreecommitdiff
path: root/js/Linear/DLSS.js
diff options
context:
space:
mode:
authorSunil Shetye2018-07-12 23:16:08 +0530
committerSunil Shetye2018-07-13 10:21:08 +0530
commit214ade87a6cef2bf55f9b9f2848ffafc02f37f18 (patch)
tree50fdfe7b1e8850622825e362ca865be3f0911009 /js/Linear/DLSS.js
parenta2bfd6050ab2b5b6bbede92393b1f61d4ecc25aa (diff)
downloadsci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.tar.gz
sci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.tar.bz2
sci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.zip
add more global variables
Diffstat (limited to 'js/Linear/DLSS.js')
-rw-r--r--js/Linear/DLSS.js17
1 files changed, 9 insertions, 8 deletions
diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js
index 10a7659b..da2bcd88 100644
--- a/js/Linear/DLSS.js
+++ b/js/Linear/DLSS.js
@@ -15,9 +15,9 @@ function DLSS() {
this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabDouble([false,false]);
- var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]);
- this.x = standard_define([4,2],this.model,exprs,gr_i);
+ this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]);
+ this.x = standard_define([4,2],this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
DLSS.prototype.details = function DLSS() {
@@ -39,15 +39,16 @@ function DLSS() {
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.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
- if (size(exprs,"*")==7) {
- var exprs = exprs[[1:4,7]-1];
+ this.exprs = this.graphics.exprs;
+ if (size(this.exprs,"*")==7) {
+ this.exprs = this.exprs[[1:4,7]-1];
}
this.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,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);
if (!ok) {
break;
}
@@ -80,7 +81,7 @@ function DLSS() {
this.graphics = tmpvar1[1];
var ok = tmpvar1[2];
if (ok) {
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]];
if (this.D!=[]) {
if (norm(this.D,1)!=0) {