summaryrefslogtreecommitdiff
path: root/js/Threshold
diff options
context:
space:
mode:
Diffstat (limited to 'js/Threshold')
-rw-r--r--js/Threshold/GENERAL_f.js2
-rw-r--r--js/Threshold/GENERAL_f.pickle3
-rw-r--r--js/Threshold/NEGTOPOS_f.js2
-rw-r--r--js/Threshold/NEGTOPOS_f.pickle3
-rw-r--r--js/Threshold/POSTONEG_f.js2
-rw-r--r--js/Threshold/POSTONEG_f.pickle3
-rw-r--r--js/Threshold/ZCROSS_f.js2
-rw-r--r--js/Threshold/ZCROSS_f.pickle3
8 files changed, 8 insertions, 12 deletions
diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js
index 0eaab256..9c9c75b0 100644
--- a/js/Threshold/GENERAL_f.js
+++ b/js/Threshold/GENERAL_f.js
@@ -15,7 +15,7 @@ function GENERAL_f() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_f\",sz(1),sz(2));"]);
- this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
GENERAL_f.prototype.details = function GENERAL_f() {
diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle
index 877fbe9c..2c84e44a 100644
--- a/js/Threshold/GENERAL_f.pickle
+++ b/js/Threshold/GENERAL_f.pickle
@@ -105,8 +105,7 @@ p33
g14
sS'x'
p34
-g8
-sS'model'
+NsS'model'
p35
g2
sS'nout'
diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js
index 1e5f07dc..01615bf8 100644
--- a/js/Threshold/NEGTOPOS_f.js
+++ b/js/Threshold/NEGTOPOS_f.js
@@ -11,7 +11,7 @@ function NEGTOPOS_f() {
this.model.firing = new ScilabDouble([-1]);
this.model.dep_ut = new ScilabDouble([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,[],this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
return new BasicBlock(this.x);
}
NEGTOPOS_f.prototype.details = function NEGTOPOS_f() {
diff --git a/js/Threshold/NEGTOPOS_f.pickle b/js/Threshold/NEGTOPOS_f.pickle
index 0a4ba0f4..25a489a1 100644
--- a/js/Threshold/NEGTOPOS_f.pickle
+++ b/js/Threshold/NEGTOPOS_f.pickle
@@ -52,8 +52,7 @@ p15
g12
sS'x'
p16
-g4
-sS'model'
+NsS'model'
p17
S'object'
p18
diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js
index 5cd1be0a..aa370d13 100644
--- a/js/Threshold/POSTONEG_f.js
+++ b/js/Threshold/POSTONEG_f.js
@@ -12,7 +12,7 @@ function POSTONEG_f() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.model.firing = new ScilabDouble([-1]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,[],this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
return new BasicBlock(this.x);
}
POSTONEG_f.prototype.details = function POSTONEG_f() {
diff --git a/js/Threshold/POSTONEG_f.pickle b/js/Threshold/POSTONEG_f.pickle
index 761812c7..a46b9221 100644
--- a/js/Threshold/POSTONEG_f.pickle
+++ b/js/Threshold/POSTONEG_f.pickle
@@ -55,8 +55,7 @@ p16
g8
sS'x'
p17
-g4
-sS'model'
+NsS'model'
p18
S'object'
p19
diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js
index 1e6e117a..5ebd8928 100644
--- a/js/Threshold/ZCROSS_f.js
+++ b/js/Threshold/ZCROSS_f.js
@@ -14,7 +14,7 @@ function ZCROSS_f() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.exprs = strcat(sci2exp(this.in1));
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
ZCROSS_f.prototype.details = function ZCROSS_f() {
diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle
index 71c16f55..36c5e933 100644
--- a/js/Threshold/ZCROSS_f.pickle
+++ b/js/Threshold/ZCROSS_f.pickle
@@ -83,8 +83,7 @@ p26
g9
sS'x'
p27
-g11
-sS'model'
+NsS'model'
p28
g2
s. \ No newline at end of file