summaryrefslogtreecommitdiff
path: root/js/Linear/TCLSS.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Linear/TCLSS.js')
-rw-r--r--js/Linear/TCLSS.js17
1 files changed, 9 insertions, 8 deletions
diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js
index 2ffcd2c6..d65a0170 100644
--- a/js/Linear/TCLSS.js
+++ b/js/Linear/TCLSS.js
@@ -18,9 +18,9 @@ function TCLSS() {
this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabDouble([false,true]);
- 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),\"TCLSS\",sz(1),sz(2));"]);
- this.x = standard_define([3,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),\"TCLSS\",sz(1),sz(2));"]);
+ this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
TCLSS.prototype.details = function TCLSS() {
@@ -42,15 +42,16 @@ function TCLSS() {
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;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
- if (size(exprs,"*")==7) {
- var exprs = exprs[[1:4,7]-1];
+ 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,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,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);
if (!ok) {
break;
}
@@ -73,7 +74,7 @@ function TCLSS() {
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) {