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.pickle17
-rw-r--r--js/Threshold/NEGTOPOS_f.js2
-rw-r--r--js/Threshold/NEGTOPOS_f.pickle17
-rw-r--r--js/Threshold/POSTONEG_f.js2
-rw-r--r--js/Threshold/POSTONEG_f.pickle17
-rw-r--r--js/Threshold/ZCROSS_f.js2
-rw-r--r--js/Threshold/ZCROSS_f.pickle13
8 files changed, 38 insertions, 34 deletions
diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js
index 9c9c75b0..60c2ac11 100644
--- a/js/Threshold/GENERAL_f.js
+++ b/js/Threshold/GENERAL_f.js
@@ -12,7 +12,7 @@ function GENERAL_f() {
this.model.rpar = new ScilabDouble([0],[0],[0],[0]);
this.model.blocktype = new ScilabString(["z"]);
this.model.firing = new ScilabDouble([-ones(this.out,1)]);
- this.model.dep_ut = new ScilabDouble([true,false]);
+ this.model.dep_ut = new ScilabBoolean([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 = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle
index 2c84e44a..678deb91 100644
--- a/js/Threshold/GENERAL_f.pickle
+++ b/js/Threshold/GENERAL_f.pickle
@@ -90,25 +90,26 @@ S'string'
p28
sS'model.dep_ut'
p29
-g14
-sS'n'
+S'vector_boolean'
p30
+sS'n'
+p31
g8
sS'exprs'
-p31
+p32
g5
sS'gr_i'
-p32
+p33
g14
sS'y'
-p33
+p34
g14
sS'x'
-p34
-NsS'model'
p35
+NsS'model'
+p36
g2
sS'nout'
-p36
+p37
g8
s. \ No newline at end of file
diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js
index 01615bf8..6c140a45 100644
--- a/js/Threshold/NEGTOPOS_f.js
+++ b/js/Threshold/NEGTOPOS_f.js
@@ -9,7 +9,7 @@ function NEGTOPOS_f() {
this.model.rpar = new ScilabDouble([-1],[-1],[0],[-1]);
this.model.blocktype = new ScilabString(["z"]);
this.model.firing = new ScilabDouble([-1]);
- this.model.dep_ut = new ScilabDouble([true,false]);
+ this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]);
this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
return new BasicBlock(this.x);
diff --git a/js/Threshold/NEGTOPOS_f.pickle b/js/Threshold/NEGTOPOS_f.pickle
index 25a489a1..9ec9e406 100644
--- a/js/Threshold/NEGTOPOS_f.pickle
+++ b/js/Threshold/NEGTOPOS_f.pickle
@@ -43,23 +43,24 @@ S'vector'
p12
sS'model.dep_ut'
p13
-g12
-sS'model.in'
+S'vector_boolean'
p14
+sS'model.in'
+p15
g4
sS'y'
-p15
+p16
g12
sS'x'
-p16
-NsS'model'
p17
-S'object'
+NsS'model'
p18
-sS'typ'
+S'object'
p19
+sS'typ'
+p20
g12
sS'model.firing'
-p20
+p21
g4
s. \ No newline at end of file
diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js
index aa370d13..1ea900af 100644
--- a/js/Threshold/POSTONEG_f.js
+++ b/js/Threshold/POSTONEG_f.js
@@ -9,7 +9,7 @@ function POSTONEG_f() {
this.model.evtout = new ScilabDouble([1]);
this.model.rpar = new ScilabDouble([-1],[-1],[-1],[0]);
this.model.blocktype = new ScilabString(["z"]);
- this.model.dep_ut = new ScilabDouble([true,false]);
+ this.model.dep_ut = new ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
diff --git a/js/Threshold/POSTONEG_f.pickle b/js/Threshold/POSTONEG_f.pickle
index a46b9221..47d2f4e3 100644
--- a/js/Threshold/POSTONEG_f.pickle
+++ b/js/Threshold/POSTONEG_f.pickle
@@ -46,23 +46,24 @@ p13
g8
sS'model.dep_ut'
p14
-g8
-sS'model.in'
+S'vector_boolean'
p15
+sS'model.in'
+p16
g4
sS'y'
-p16
+p17
g8
sS'x'
-p17
-NsS'model'
p18
-S'object'
+NsS'model'
p19
-sS'typ'
+S'object'
p20
+sS'typ'
+p21
g8
sS'model.firing'
-p21
+p22
g8
s. \ No newline at end of file
diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js
index 5ebd8928..ec218c09 100644
--- a/js/Threshold/ZCROSS_f.js
+++ b/js/Threshold/ZCROSS_f.js
@@ -11,7 +11,7 @@ function ZCROSS_f() {
this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]);
this.model.blocktype = new ScilabString(["z"]);
this.model.firing = new ScilabDouble([-1]);
- this.model.dep_ut = new ScilabDouble([true,false]);
+ this.model.dep_ut = new ScilabBoolean([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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle
index 36c5e933..30afed6c 100644
--- a/js/Threshold/ZCROSS_f.pickle
+++ b/js/Threshold/ZCROSS_f.pickle
@@ -71,19 +71,20 @@ p22
g21
sS'model.dep_ut'
p23
-g9
-sS'exprs'
+S'vector_boolean'
p24
+sS'exprs'
+p25
g11
sS'gr_i'
-p25
+p26
g9
sS'y'
-p26
+p27
g9
sS'x'
-p27
-NsS'model'
p28
+NsS'model'
+p29
g2
s. \ No newline at end of file