summaryrefslogtreecommitdiff
path: root/js/NonLinear
diff options
context:
space:
mode:
Diffstat (limited to 'js/NonLinear')
-rw-r--r--js/NonLinear/ABSBLK_f.js2
-rw-r--r--js/NonLinear/ABS_VALUE.js2
-rw-r--r--js/NonLinear/EXPBLK_m.js2
-rw-r--r--js/NonLinear/FSV_f.js2
-rw-r--r--js/NonLinear/INTRP2BLK_f.js2
-rw-r--r--js/NonLinear/INVBLK.js2
-rw-r--r--js/NonLinear/LOOKUP2D.js2
-rw-r--r--js/NonLinear/MAXMIN.js2
-rw-r--r--js/NonLinear/PRODUCT.js2
-rw-r--r--js/NonLinear/PROD_f.js2
-rw-r--r--js/NonLinear/SATURATION.js2
-rw-r--r--js/NonLinear/SAT_f.js2
-rw-r--r--js/NonLinear/SIGNUM.js2
-rw-r--r--js/NonLinear/TrigFun.js2
14 files changed, 14 insertions, 14 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index 3d5ab9ed..42525187 100644
--- a/js/NonLinear/ABSBLK_f.js
+++ b/js/NonLinear/ABSBLK_f.js
@@ -2,7 +2,7 @@
function ABSBLK_f() {
ABSBLK_f.prototype.define = function ABSBLK_f() {
this.model = scicos_model();
- this.model.sim = list("absblk",1);
+ 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");
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index fa386164..a82d06b9 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -3,7 +3,7 @@ function ABS_VALUE() {
ABS_VALUE.prototype.define = function ABS_VALUE() {
nu = -1;
this.model = scicos_model();
- this.model.sim = list("absolute_value",4);
+ 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);
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index cb002f76..ee2f8fa0 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -4,7 +4,7 @@ function EXPBLK_m() {
in1 = 1;
this.a = math.E;
this.model = scicos_model();
- this.model.sim = list("expblk_m",4);
+ 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);
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index 957153ed..e0b8bb31 100644
--- a/js/NonLinear/FSV_f.js
+++ b/js/NonLinear/FSV_f.js
@@ -3,7 +3,7 @@ function FSV_f() {
FSV_f.prototype.define = function FSV_f() {
in1 = 1;
this.model = scicos_model();
- this.model.sim = list("fsv",1);
+ 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");
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index 9c16b0e5..eb655461 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -5,7 +5,7 @@ function INTRP2BLK_f() {
this.b = [[0],[1]];
this.c = [[0,1],[1,2]];
this.model = scicos_model();
- this.model.sim = list("intrp2",1);
+ this.model.sim = list(new ScilabString("intrp2"),new ScilabDouble(1));
this.model.in1 = [[1],[1]];
this.model.out = new ScilabDouble(1);
this.model.rpar = [[this.a],[this.b],[this.c.slice()]];
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index b212b08b..75116a85 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -3,7 +3,7 @@ function INVBLK() {
INVBLK.prototype.define = function INVBLK() {
in1 = -1;
this.model = scicos_model();
- this.model.sim = list("invblk4",4);
+ 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");
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index bc8e4d59..88be58d5 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -9,7 +9,7 @@ function LOOKUP2D() {
Graf = "n";
Nx = length(this.xx);
Ny = length(this.yy);
- this.model.sim = list("lookup2d",4);
+ this.model.sim = list(new ScilabString("lookup2d"),new ScilabDouble(4));
this.model.in1 = [[1],[1]];
this.model.out = new ScilabDouble(1);
this.model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]];
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index 1b4004c0..f4b1686c 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -2,7 +2,7 @@
function MAXMIN() {
MAXMIN.prototype.define = function MAXMIN() {
this.model = scicos_model();
- this.model.sim = list("minmax",4);
+ 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");
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 8e3f9a39..049d4f4a 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -3,7 +3,7 @@ function PRODUCT() {
PRODUCT.prototype.define = function PRODUCT() {
this.sgn = [[1],[-1]];
this.model = scicos_model();
- this.model.sim = list("product",4);
+ this.model.sim = list(new ScilabString("product"),new ScilabDouble(4));
this.model.in1 = [[-1],[-1]];
this.model.out = new ScilabDouble(-1);
this.model.ipar = this.sgn;
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index cf325e3e..711db852 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -2,7 +2,7 @@
function PROD_f() {
PROD_f.prototype.define = function PROD_f() {
this.model = scicos_model();
- this.model.sim = list("prod",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");
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index a6f2ac2b..ac51562b 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -5,7 +5,7 @@ function SATURATION() {
this.maxp = 1;
rpar = [[this.maxp],[this.minp]];
this.model = scicos_model();
- this.model.sim = list("satur",4);
+ 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);
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index f0122f8a..d7d1dfc0 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -6,7 +6,7 @@ function SAT_f() {
slope = 1;
rpar = [[this.minp],[this.maxp],[slope]];
this.model = scicos_model();
- this.model.sim = list("lusat",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);
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index 274537ab..13d20f58 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -3,7 +3,7 @@ function SIGNUM() {
SIGNUM.prototype.define = function SIGNUM() {
nu = -1;
this.model = scicos_model();
- this.model.sim = list("signum",4);
+ 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);
diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js
index 5459db52..de52d12e 100644
--- a/js/NonLinear/TrigFun.js
+++ b/js/NonLinear/TrigFun.js
@@ -2,7 +2,7 @@
function TrigFun() {
TrigFun.prototype.define = function TrigFun() {
this.model = scicos_model();
- this.model.sim = list("sin_blk",4);
+ 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");