summaryrefslogtreecommitdiff
path: root/js/Threshold
diff options
context:
space:
mode:
Diffstat (limited to 'js/Threshold')
-rw-r--r--js/Threshold/GENERAL_f.js7
-rw-r--r--js/Threshold/GENERAL_f.pickle36
-rw-r--r--js/Threshold/NEGTOPOS_f.js3
-rw-r--r--js/Threshold/NEGTOPOS_f.pickle22
-rw-r--r--js/Threshold/POSTONEG_f.js3
-rw-r--r--js/Threshold/POSTONEG_f.pickle20
-rw-r--r--js/Threshold/ZCROSS_f.js7
-rw-r--r--js/Threshold/ZCROSS_f.pickle44
8 files changed, 67 insertions, 75 deletions
diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js
index 210e3760..0eaab256 100644
--- a/js/Threshold/GENERAL_f.js
+++ b/js/Threshold/GENERAL_f.js
@@ -7,7 +7,7 @@ function GENERAL_f() {
this.model = scicos_model();
this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1]));
this.model.nzcross = new ScilabDouble([this.in1]);
- this.model.in1 = new ScilabDouble([this.in1]);
+ this.model.in = new ScilabDouble([this.in1]);
this.model.evtout = new ScilabDouble([ones(this.out,1)]);
this.model.rpar = new ScilabDouble([0],[0],[0],[0]);
this.model.blocktype = new ScilabString(["z"]);
@@ -32,12 +32,9 @@ function GENERAL_f() {
this.in1 = parseFloat(arguments[0]["in1"])
this.out = parseFloat(arguments[0]["out"])
this.exprs = arguments[0]["exprs"]
- this.x = arg1;
- this.graphics = arg1.graphics;
this.exprs = this.graphics.exprs;
- this.model = arg1.model;
var rpar = this.model.rpar;
- this.in1 = this.model.in1;
+ this.in1 = this.model.in;
this.out = this.model.evtout;
var nin = sum(this.in1);
var nout = sum(this.out);
diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle
index 6b56ff54..877fbe9c 100644
--- a/js/Threshold/GENERAL_f.pickle
+++ b/js/Threshold/GENERAL_f.pickle
@@ -42,41 +42,41 @@ p9
g8
sS'nin1'
p10
-NsS'model.in1'
+NsS'rp'
p11
g8
-sS'rp'
-p12
-g8
sS'x.graphics'
-p13
+p12
g2
sS'typ'
-p14
+p13
S'vector'
-p15
+p14
sS'model.firing'
-p16
+p15
g8
sS'model.sim'
-p17
+p16
S'list'
-p18
+p17
sS'model.evtout'
-p19
+p18
g8
sS'nin'
-p20
+p19
g8
sS'rp.slice(1-1,nout1).slice(1-1,2*n)'
-p21
+p20
g8
sS'in1'
-p22
+p21
g8
sS'model.rpar'
-p23
+p22
g5
+sS'model.in'
+p23
+g8
sS'graphics.exprs'
p24
NsS'nout1'
@@ -90,7 +90,7 @@ S'string'
p28
sS'model.dep_ut'
p29
-g15
+g14
sS'n'
p30
g8
@@ -99,10 +99,10 @@ p31
g5
sS'gr_i'
p32
-g15
+g14
sS'y'
p33
-g15
+g14
sS'x'
p34
g8
diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js
index 9079f107..1e5f07dc 100644
--- a/js/Threshold/NEGTOPOS_f.js
+++ b/js/Threshold/NEGTOPOS_f.js
@@ -4,7 +4,7 @@ function NEGTOPOS_f() {
this.model = scicos_model();
this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1]));
this.model.nzcross = new ScilabDouble([1]);
- this.model.in1 = new ScilabDouble([1]);
+ this.model.in = new ScilabDouble([1]);
this.model.evtout = new ScilabDouble([1]);
this.model.rpar = new ScilabDouble([-1],[-1],[0],[-1]);
this.model.blocktype = new ScilabString(["z"]);
@@ -23,7 +23,6 @@ function NEGTOPOS_f() {
return options;
}
NEGTOPOS_f.prototype.set = function NEGTOPOS_f() {
- this.x = arg1;
this.x.model.firing = -1;
return new BasicBlock(this.x);
}
diff --git a/js/Threshold/NEGTOPOS_f.pickle b/js/Threshold/NEGTOPOS_f.pickle
index c9626baf..0a4ba0f4 100644
--- a/js/Threshold/NEGTOPOS_f.pickle
+++ b/js/Threshold/NEGTOPOS_f.pickle
@@ -19,7 +19,7 @@ S'model.sim'
p1
S'list'
p2
-sS'model.in1'
+sS'model.evtout'
p3
S'double'
p4
@@ -33,23 +33,23 @@ g4
sS'model.nzcross'
p8
g4
-sS'model.evtout'
-p9
-g4
sS'model.rpar'
-p10
+p9
S'matrix'
-p11
+p10
sS'gr_i'
-p12
+p11
S'vector'
-p13
+p12
sS'model.dep_ut'
+p13
+g12
+sS'model.in'
p14
-g13
+g4
sS'y'
p15
-g13
+g12
sS'x'
p16
g4
@@ -59,7 +59,7 @@ S'object'
p18
sS'typ'
p19
-g13
+g12
sS'model.firing'
p20
g4
diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js
index db0e654e..5cd1be0a 100644
--- a/js/Threshold/POSTONEG_f.js
+++ b/js/Threshold/POSTONEG_f.js
@@ -5,7 +5,7 @@ function POSTONEG_f() {
this.model = scicos_model();
this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1]));
this.model.nzcross = new ScilabDouble([1]);
- this.model.in1 = new ScilabDouble([1]);
+ this.model.in = new ScilabDouble([1]);
this.model.evtout = new ScilabDouble([1]);
this.model.rpar = new ScilabDouble([-1],[-1],[-1],[0]);
this.model.blocktype = new ScilabString(["z"]);
@@ -24,7 +24,6 @@ function POSTONEG_f() {
return options;
}
POSTONEG_f.prototype.set = function POSTONEG_f() {
- this.x = arg1;
this.x.model.firing = [-1];
return new BasicBlock(this.x);
}
diff --git a/js/Threshold/POSTONEG_f.pickle b/js/Threshold/POSTONEG_f.pickle
index 6e98a2b8..761812c7 100644
--- a/js/Threshold/POSTONEG_f.pickle
+++ b/js/Threshold/POSTONEG_f.pickle
@@ -19,7 +19,7 @@ S'model.sim'
p1
S'list'
p2
-sS'model.in1'
+sS'model.evtout'
p3
S'double'
p4
@@ -34,22 +34,22 @@ p8
sS'model.nzcross'
p9
g4
-sS'model.evtout'
-p10
-g4
sS'model.rpar'
-p11
+p10
S'matrix'
-p12
+p11
sS'rpar'
-p13
-g12
+p12
+g11
sS'gr_i'
-p14
+p13
g8
sS'model.dep_ut'
-p15
+p14
g8
+sS'model.in'
+p15
+g4
sS'y'
p16
g8
diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js
index 288e89e9..1e6e117a 100644
--- a/js/Threshold/ZCROSS_f.js
+++ b/js/Threshold/ZCROSS_f.js
@@ -5,7 +5,7 @@ function ZCROSS_f() {
this.in1 = 1;
this.model = scicos_model();
this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1]));
- this.model.in1 = new ScilabDouble([this.in1]);
+ this.model.in = new ScilabDouble([this.in1]);
this.model.nzcross = new ScilabDouble([this.in1]);
this.model.evtout = new ScilabDouble([1]);
this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]);
@@ -28,10 +28,7 @@ function ZCROSS_f() {
ZCROSS_f.prototype.set = function ZCROSS_f() {
this.in1 = parseFloat(arguments[0]["in1"])
this.exprs = arguments[0]["exprs"]
- this.x = arg1;
- this.graphics = arg1.graphics;
this.exprs = this.graphics.exprs;
- this.model = arg1.model;
while (true) {
[ok,this.in1,this.exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),this.exprs);
if (!ok) {
@@ -47,7 +44,7 @@ function ZCROSS_f() {
}
this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in1)-kk,1)]);
this.graphics.exprs = new ScilabDouble([this.exprs]);
- this.model.in1 = new ScilabDouble([this.in1]);
+ this.model.in = new ScilabDouble([this.in1]);
this.model.nzcross = new ScilabDouble([this.in1]);
this.model.firing = new ScilabDouble([-1]);
this.x.graphics = this.graphics;
diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle
index 95285053..71c16f55 100644
--- a/js/Threshold/ZCROSS_f.pickle
+++ b/js/Threshold/ZCROSS_f.pickle
@@ -30,38 +30,38 @@ S'matrix'
p5
sS'x.model'
p6
-NsS'model.in1'
+NsS'x.graphics'
p7
-S'double'
-p8
-sS'x.graphics'
-p9
g2
sS'typ'
-p10
+p8
S'vector'
-p11
+p9
sS'model.firing'
-p12
-g8
+p10
+S'double'
+p11
sS'model.sim'
-p13
+p12
S'list'
-p14
+p13
sS'model.evtout'
-p15
-g8
+p14
+g11
sS'in1'
-p16
-g8
+p15
+g11
sS'model.rpar'
-p17
+p16
g5
+sS'model.in'
+p17
+g11
sS'graphics.exprs'
p18
NsS'model.nzcross'
p19
-g8
+g11
sS'model.blocktype'
p20
S'string'
@@ -71,19 +71,19 @@ p22
g21
sS'model.dep_ut'
p23
-g11
+g9
sS'exprs'
p24
-g8
+g11
sS'gr_i'
p25
-g11
+g9
sS'y'
p26
-g11
+g9
sS'x'
p27
-g8
+g11
sS'model'
p28
g2
generated by cgit (git 2.34.1) at 2025-03-13 06:02:10 +0000