summaryrefslogtreecommitdiff
path: root/js/NonLinear
diff options
context:
space:
mode:
Diffstat (limited to 'js/NonLinear')
-rw-r--r--js/NonLinear/ABSBLK_f.js8
-rw-r--r--js/NonLinear/ABS_VALUE.js20
-rw-r--r--js/NonLinear/COSBLK_f.js8
-rw-r--r--js/NonLinear/DLRADAPT_f.js8
-rw-r--r--js/NonLinear/EXPBLK_f.js12
-rw-r--r--js/NonLinear/EXPBLK_m.js20
-rw-r--r--js/NonLinear/FSV_f.js8
-rw-r--r--js/NonLinear/INTRP2BLK_f.js6
-rw-r--r--js/NonLinear/INTRPLBLK_f.js8
-rw-r--r--js/NonLinear/INVBLK.js8
-rw-r--r--js/NonLinear/INVBLK_f.js8
-rw-r--r--js/NonLinear/LOGBLK_f.js12
-rw-r--r--js/NonLinear/LOOKUP2D.js6
-rw-r--r--js/NonLinear/LOOKUP_f.js8
-rw-r--r--js/NonLinear/MAXMIN.js18
-rw-r--r--js/NonLinear/MAX_f.js8
-rw-r--r--js/NonLinear/MIN_f.js8
-rw-r--r--js/NonLinear/POWBLK_f.js14
-rw-r--r--js/NonLinear/PRODUCT.js8
-rw-r--r--js/NonLinear/PROD_f.js6
-rw-r--r--js/NonLinear/QUANT_f.js24
-rw-r--r--js/NonLinear/SATURATION.js20
-rw-r--r--js/NonLinear/SAT_f.js10
-rw-r--r--js/NonLinear/SIGNUM.js20
-rw-r--r--js/NonLinear/SINBLK_f.js8
-rw-r--r--js/NonLinear/TANBLK_f.js8
-rw-r--r--js/NonLinear/TrigFun.js8
27 files changed, 150 insertions, 150 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index 42525187..2204f7fa 100644
--- a/js/NonLinear/ABSBLK_f.js
+++ b/js/NonLinear/ABSBLK_f.js
@@ -2,10 +2,10 @@
function ABSBLK_f() {
ABSBLK_f.prototype.define = function ABSBLK_f() {
this.model = scicos_model();
- this.model.sim = list(new ScilabString("absblk"),new ScilabDouble(1));
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["absblk"]), new ScilabDouble([1]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
gr_i = [];
this.x = standard_define([2,2],this.model,[],gr_i);
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index a82d06b9..116d1ad1 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -3,12 +3,12 @@ function ABS_VALUE() {
ABS_VALUE.prototype.define = function ABS_VALUE() {
nu = -1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("absolute_value"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(nu);
- this.model.out = new ScilabDouble(nu);
- this.model.nzcross = new ScilabDouble(nu);
- this.model.nmode = new ScilabDouble(nu);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["absolute_value"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([nu]);
+ this.model.out = new ScilabDouble([nu]);
+ this.model.nzcross = new ScilabDouble([nu]);
+ this.model.nmode = new ScilabDouble([nu]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [string([1])];
gr_i = [];
@@ -38,11 +38,11 @@ function ABS_VALUE() {
graphics.exprs = exprs;
if (ok) {
if (this.zcr!=0) {
- this.model.nmode = new ScilabDouble(-1);
- this.model.nzcross = new ScilabDouble(-1);
+ this.model.nmode = new ScilabDouble([-1]);
+ this.model.nzcross = new ScilabDouble([-1]);
} else {
- this.model.nmode = new ScilabDouble(0);
- this.model.nzcross = new ScilabDouble(0);
+ this.model.nmode = new ScilabDouble([0]);
+ this.model.nzcross = new ScilabDouble([0]);
}
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js
index 0ef60f6e..9ac5c564 100644
--- a/js/NonLinear/COSBLK_f.js
+++ b/js/NonLinear/COSBLK_f.js
@@ -3,10 +3,10 @@ function COSBLK_f() {
COSBLK_f.prototype.define = function COSBLK_f() {
in1 = 1;
this.model = scicos_model();
- this.model.sim = new ScilabString("cosblk");
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["cosblk"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
gr_i = [];
this.x = standard_define([2,2],this.model,[],gr_i);
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index 6a39a40b..9f080d2c 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -8,14 +8,14 @@ function DLRADAPT_f() {
this.last_u = [];
this.last_y = [[0],[0]];
this.model = scicos_model();
- this.model.sim = new ScilabString("dlradp");
+ this.model.sim = new ScilabString(["dlradp"]);
this.model.in1 = [[1],[1]];
- this.model.out = new ScilabDouble(1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.out = new ScilabDouble([1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.dstate = [[this.last_u],[this.last_y]];
this.model.rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]];
this.model.ipar = [[0],[2],[2]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]];
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index 2aa0a2c4..2847bcc3 100644
--- a/js/NonLinear/EXPBLK_f.js
+++ b/js/NonLinear/EXPBLK_f.js
@@ -4,11 +4,11 @@ function EXPBLK_f() {
in1 = 1;
this.a = math.E;
this.model = scicos_model();
- this.model.sim = new ScilabString("expblk");
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.rpar = new ScilabDouble(this.a);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["expblk"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.rpar = new ScilabDouble([this.a]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = ["%e"];
gr_i = [];
@@ -41,7 +41,7 @@ function EXPBLK_f() {
message("a^u : a must be positive");
} else {
graphics.exprs = exprs;
- this.model.rpar = new ScilabDouble(this.a);
+ this.model.rpar = new ScilabDouble([this.a]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index ee2f8fa0..e2cfa846 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -4,15 +4,15 @@ function EXPBLK_m() {
in1 = 1;
this.a = math.E;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("expblk_m"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
- this.model.rpar = new ScilabDouble(this.a);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["expblk_m"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.rpar = new ScilabDouble([this.a]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = ["%e"];
gr_i = [];
@@ -45,7 +45,7 @@ function EXPBLK_m() {
message("a^u : a must be positive");
} else {
graphics.exprs = exprs;
- this.model.rpar = new ScilabDouble(this.a);
+ this.model.rpar = new ScilabDouble([this.a]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index e0b8bb31..faf8b470 100644
--- a/js/NonLinear/FSV_f.js
+++ b/js/NonLinear/FSV_f.js
@@ -3,10 +3,10 @@ function FSV_f() {
FSV_f.prototype.define = function FSV_f() {
in1 = 1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("fsv"),new ScilabDouble(1));
- this.model.in1 = new ScilabDouble(in1);
- this.model.out = new ScilabDouble(in1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["fsv"]), new ScilabDouble([1]));
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.out = new ScilabDouble([in1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = " ";
gr_i = [];
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index eb655461..ef1ab80a 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -5,12 +5,12 @@ function INTRP2BLK_f() {
this.b = [[0],[1]];
this.c = [[0,1],[1,2]];
this.model = scicos_model();
- this.model.sim = list(new ScilabString("intrp2"),new ScilabDouble(1));
+ this.model.sim = list(new ScilabString(["intrp2"]), new ScilabDouble([1]));
this.model.in1 = [[1],[1]];
- this.model.out = new ScilabDouble(1);
+ this.model.out = new ScilabDouble([1]);
this.model.rpar = [[this.a],[this.b],[this.c.slice()]];
this.model.ipar = [[2],[2]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]];
gr_i = [];
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 935ed84f..84011cdd 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -4,11 +4,11 @@ function INTRPLBLK_f() {
this.a = [[0],[1]];
this.b = [[0],[1]];
this.model = scicos_model();
- this.model.sim = new ScilabString("intrpl");
- this.model.in1 = new ScilabDouble(1);
- this.model.out = new ScilabDouble(1);
+ this.model.sim = new ScilabString(["intrpl"]);
+ this.model.in1 = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([1]);
this.model.rpar = [[this.a],[this.b]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]];
gr_i = [];
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index 75116a85..74b5a1b1 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -3,10 +3,10 @@ function INVBLK() {
INVBLK.prototype.define = function INVBLK() {
in1 = -1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("invblk4"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(in1);
- this.model.out = new ScilabDouble(in1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["invblk4"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.out = new ScilabDouble([in1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = " ";
gr_i = [];
diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js
index 513f88b2..c49a8de8 100644
--- a/js/NonLinear/INVBLK_f.js
+++ b/js/NonLinear/INVBLK_f.js
@@ -3,10 +3,10 @@ function INVBLK_f() {
INVBLK_f.prototype.define = function INVBLK_f() {
in1 = -1;
this.model = scicos_model();
- this.model.sim = new ScilabString("invblk");
- this.model.in1 = new ScilabDouble(in1);
- this.model.out = new ScilabDouble(in1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["invblk"]);
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.out = new ScilabDouble([in1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = " ";
gr_i = [];
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index c29da31c..95afdc77 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -4,11 +4,11 @@ function LOGBLK_f() {
in1 = 1;
this.a = math.E;
this.model = scicos_model();
- this.model.sim = new ScilabString("logblk");
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.rpar = new ScilabDouble(this.a);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["logblk"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.rpar = new ScilabDouble([this.a]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = "%e";
gr_i = [];
@@ -42,7 +42,7 @@ function LOGBLK_f() {
} else {
if (ok) {
graphics.exprs = exprs;
- this.model.rpar = new ScilabDouble(this.a);
+ this.model.rpar = new ScilabDouble([this.a]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index 88be58d5..a4130d63 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -9,12 +9,12 @@ function LOOKUP2D() {
Graf = "n";
Nx = length(this.xx);
Ny = length(this.yy);
- this.model.sim = list(new ScilabString("lookup2d"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["lookup2d"]), new ScilabDouble([4]));
this.model.in1 = [[1],[1]];
- this.model.out = new ScilabDouble(1);
+ this.model.out = new ScilabDouble([1]);
this.model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]];
this.model.ipar = [[Nx],[Ny],[this.Method]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf);
gr_i = [];
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index 7ba988cc..bebd414e 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -2,11 +2,11 @@
function LOOKUP_f() {
LOOKUP_f.prototype.define = function LOOKUP_f() {
this.model = scicos_model();
- this.model.sim = new ScilabString("lookup");
- this.model.in1 = new ScilabDouble(1);
- this.model.out = new ScilabDouble(1);
+ this.model.sim = new ScilabString(["lookup"]);
+ this.model.in1 = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([1]);
this.model.rpar = [[-2],[-1],[1],[2],[-1],[1],[-1],[1]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
gr_i = [];
this.x = standard_define([2,2],this.model,[],gr_i);
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index f4b1686c..a40a5f0b 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -2,12 +2,12 @@
function MAXMIN() {
MAXMIN.prototype.define = function MAXMIN() {
this.model = scicos_model();
- this.model.sim = list(new ScilabString("minmax"),new ScilabDouble(4));
- this.model.out = new ScilabDouble(1);
- this.model.in1 = new ScilabDouble(-1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["minmax"]), new ScilabDouble([4]));
+ this.model.out = new ScilabDouble([1]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
- this.model.ipar = new ScilabDouble(0);
+ this.model.ipar = new ScilabDouble([0]);
exprs = [string(transpose([2,1,1]))];
gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
@@ -56,13 +56,13 @@ function MAXMIN() {
}
}
if (ok) {
- this.model.nzcross = new ScilabDouble(this.zcr);
+ this.model.nzcross = new ScilabDouble([this.zcr]);
if (this.nin==1) {
- this.model.nmode = new ScilabDouble(abs(this.zcr));
+ this.model.nmode = new ScilabDouble([abs(this.zcr)]);
} else {
- this.model.nmode = new ScilabDouble(this.zcr);
+ this.model.nmode = new ScilabDouble([this.zcr]);
}
- this.model.ipar = new ScilabDouble(this.mm);
+ this.model.ipar = new ScilabDouble([this.mm]);
if (this.mm==1) {
label = "MIN";
} else {
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index d5819afc..242d9ccc 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -3,11 +3,11 @@ function MAX_f() {
MAX_f.prototype.define = function MAX_f() {
in1 = -1;
this.model = scicos_model();
- this.model.sim = new ScilabString("maxblk");
- this.model.in1 = new ScilabDouble(in1);
- this.model.out = new ScilabDouble(1);
+ this.model.sim = new ScilabString(["maxblk"]);
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.out = new ScilabDouble([1]);
this.model.dstate = [[0],[0]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = " ";
gr_i = [];
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index 62ee772a..a0582914 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -3,11 +3,11 @@ function MIN_f() {
MIN_f.prototype.define = function MIN_f() {
in1 = -1;
this.model = scicos_model();
- this.model.sim = new ScilabString("minblk");
- this.model.in1 = new ScilabDouble(in1);
- this.model.out = new ScilabDouble(1);
+ this.model.sim = new ScilabString(["minblk"]);
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.out = new ScilabDouble([1]);
this.model.dstate = [[0],[0]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = sci2exp(in1);
gr_i = [];
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index 2725027e..b094c25a 100644
--- a/js/NonLinear/POWBLK_f.js
+++ b/js/NonLinear/POWBLK_f.js
@@ -4,11 +4,11 @@ function POWBLK_f() {
in1 = 1;
this.a = 1.5;
this.model = scicos_model();
- this.model.sim = new ScilabString("powblk");
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.rpar = new ScilabDouble(this.a);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["powblk"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.rpar = new ScilabDouble([this.a]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = string(this.a);
gr_i = [];
@@ -39,10 +39,10 @@ function POWBLK_f() {
}
graphics.exprs = exprs;
if (this.a==int(this.a)) {
- this.model.ipar = new ScilabDouble(this.a);
+ this.model.ipar = new ScilabDouble([this.a]);
this.model.rpar = [];
} else {
- this.model.rpar = new ScilabDouble(this.a);
+ this.model.rpar = new ScilabDouble([this.a]);
this.model.ipar = [];
}
this.model.firing = [];
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 049d4f4a..fea149d1 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -3,11 +3,11 @@ function PRODUCT() {
PRODUCT.prototype.define = function PRODUCT() {
this.sgn = [[1],[-1]];
this.model = scicos_model();
- this.model.sim = list(new ScilabString("product"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["product"]), new ScilabDouble([4]));
this.model.in1 = [[-1],[-1]];
- this.model.out = new ScilabDouble(-1);
+ this.model.out = new ScilabDouble([-1]);
this.model.ipar = this.sgn;
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = sci2exp(this.sgn);
gr_i = [];
@@ -60,7 +60,7 @@ function PRODUCT() {
[model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]);
}
if (ok) {
- this.model.ipar = new ScilabDouble(this.sgn);
+ this.model.ipar = new ScilabDouble([this.sgn]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index 711db852..943af598 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -2,10 +2,10 @@
function PROD_f() {
PROD_f.prototype.define = function PROD_f() {
this.model = scicos_model();
- this.model.sim = list(new ScilabString("prod"),new ScilabDouble(2));
+ this.model.sim = list(new ScilabString(["prod"]), new ScilabDouble([2]));
this.model.in1 = [[-1],[-1]];
- this.model.out = new ScilabDouble(-1);
- this.model.blocktype = new ScilabString("c");
+ this.model.out = new ScilabDouble([-1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
this.x = standard_define([1,1],this.model,[],[]);
return new BasicBlock(this.x);
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index 0b55fd58..cc2cc43c 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -4,12 +4,12 @@ function QUANT_f() {
this.pas = 0.1;
this.meth = 1;
this.model = scicos_model();
- this.model.sim = new ScilabString("qzrnd");
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.rpar = new ScilabDouble(this.pas);
- this.model.ipar = new ScilabDouble(this.meth);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["qzrnd"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.rpar = new ScilabDouble([this.pas]);
+ this.model.ipar = new ScilabDouble([this.meth]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string(this.pas)],[string(this.meth)]];
gr_i = [];
@@ -42,17 +42,17 @@ function QUANT_f() {
message("Quantization Type must be from 1 to 4");
} else {
rpar = this.pas;
- this.model.rpar = new ScilabDouble(rpar);
- this.model.ipar = new ScilabDouble(this.meth);
+ this.model.rpar = new ScilabDouble([rpar]);
+ this.model.ipar = new ScilabDouble([this.meth]);
switch (this.meth) {
case 1:
- this.model.sim = new ScilabString("qzrnd");
+ this.model.sim = new ScilabString(["qzrnd"]);
case 2:
- this.model.sim = new ScilabString("qztrn");
+ this.model.sim = new ScilabString(["qztrn"]);
case 3:
- this.model.sim = new ScilabString("qzflr");
+ this.model.sim = new ScilabString(["qzflr"]);
case 4:
- this.model.sim = new ScilabString("qzcel");
+ this.model.sim = new ScilabString(["qzcel"]);
}
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index ac51562b..1b9ed2e5 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -5,13 +5,13 @@ function SATURATION() {
this.maxp = 1;
rpar = [[this.maxp],[this.minp]];
this.model = scicos_model();
- this.model.sim = list(new ScilabString("satur"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(1);
- this.model.nzcross = new ScilabDouble(2);
- this.model.nmode = new ScilabDouble(1);
- this.model.out = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["satur"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([1]);
+ this.model.nzcross = new ScilabDouble([2]);
+ this.model.nmode = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([1]);
this.model.rpar = rpar;
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]];
gr_i = [];
@@ -48,11 +48,11 @@ function SATURATION() {
rpar = [[this.maxp],[this.minp]];
this.model.rpar = rpar;
if (this.zeroc!=0) {
- this.model.nzcross = new ScilabDouble(2);
- this.model.nmode = new ScilabDouble(1);
+ this.model.nzcross = new ScilabDouble([2]);
+ this.model.nmode = new ScilabDouble([1]);
} else {
- this.model.nzcross = new ScilabDouble(0);
- this.model.nmode = new ScilabDouble(0);
+ this.model.nzcross = new ScilabDouble([0]);
+ this.model.nmode = new ScilabDouble([0]);
}
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index d7d1dfc0..b04e7d09 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -6,12 +6,12 @@ function SAT_f() {
slope = 1;
rpar = [[this.minp],[this.maxp],[slope]];
this.model = scicos_model();
- this.model.sim = list(new ScilabString("lusat"),new ScilabDouble(1));
- this.model.in1 = new ScilabDouble(1);
- this.model.nzcross = new ScilabDouble(2);
- this.model.out = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["lusat"]), new ScilabDouble([1]));
+ this.model.in1 = new ScilabDouble([1]);
+ this.model.nzcross = new ScilabDouble([2]);
+ this.model.out = new ScilabDouble([1]);
this.model.rpar = [[this.minp],[this.maxp],[slope]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]];
gr_i = [];
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index 13d20f58..fcef07ab 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -3,12 +3,12 @@ function SIGNUM() {
SIGNUM.prototype.define = function SIGNUM() {
nu = -1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("signum"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(nu);
- this.model.out = new ScilabDouble(nu);
- this.model.nzcross = new ScilabDouble(nu);
- this.model.nmode = new ScilabDouble(nu);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["signum"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([nu]);
+ this.model.out = new ScilabDouble([nu]);
+ this.model.nzcross = new ScilabDouble([nu]);
+ this.model.nmode = new ScilabDouble([nu]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [string([1])];
gr_i = [];
@@ -38,11 +38,11 @@ function SIGNUM() {
graphics.exprs = exprs;
if (ok) {
if (this.zcr!=0) {
- this.model.nmode = new ScilabDouble(-1);
- this.model.nzcross = new ScilabDouble(-1);
+ this.model.nmode = new ScilabDouble([-1]);
+ this.model.nzcross = new ScilabDouble([-1]);
} else {
- this.model.nmode = new ScilabDouble(0);
- this.model.nzcross = new ScilabDouble(0);
+ this.model.nmode = new ScilabDouble([0]);
+ this.model.nzcross = new ScilabDouble([0]);
}
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js
index be034737..4235da70 100644
--- a/js/NonLinear/SINBLK_f.js
+++ b/js/NonLinear/SINBLK_f.js
@@ -2,10 +2,10 @@
function SINBLK_f() {
SINBLK_f.prototype.define = function SINBLK_f() {
this.model = scicos_model();
- this.model.sim = new ScilabString("sinblk");
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["sinblk"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = " ";
gr_i = [];
diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js
index c422297a..80e107cb 100644
--- a/js/NonLinear/TANBLK_f.js
+++ b/js/NonLinear/TANBLK_f.js
@@ -3,10 +3,10 @@ function TANBLK_f() {
TANBLK_f.prototype.define = function TANBLK_f() {
in1 = -1;
this.model = scicos_model();
- this.model.sim = new ScilabString("tanblk");
- this.model.in1 = new ScilabDouble(in1);
- this.model.out = new ScilabDouble(in1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["tanblk"]);
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.out = new ScilabDouble([in1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = sci2exp(in1);
gr_i = [];
diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js
index de52d12e..2e9e3965 100644
--- a/js/NonLinear/TrigFun.js
+++ b/js/NonLinear/TrigFun.js
@@ -2,10 +2,10 @@
function TrigFun() {
TrigFun.prototype.define = function TrigFun() {
this.model = scicos_model();
- this.model.sim = list(new ScilabString("sin_blk"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["sin_blk"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = "sin";
gr_i = [];
generated by cgit (git 2.34.1) at 2025-03-13 07:24:14 +0000