diff options
| author | Sunil Shetye | 2018-07-13 23:47:42 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-07-15 07:11:58 +0530 |
| commit | 884d1b369dec2654d46c2dab31d2ae85b0be01ba (patch) | |
| tree | 07284f0a65cca09fd7811c9592c33f17b4d0f8ad /js | |
| parent | 6ee02952c836bb31e9b51783e6a16724fba64637 (diff) | |
| download | sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.gz sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.bz2 sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.zip | |
support for new standard_define
Diffstat (limited to 'js')
526 files changed, 532 insertions, 742 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index eee27067..3775c0b9 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -9,7 +9,7 @@ function CLKFROM() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; - this.x = standard_define([2,1],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle index e7091f3f..75776b33 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -58,8 +58,7 @@ p16 g2 sS'x' p17 -g2 -sS'model' +NsS'model' p18 g8 sS'typ' diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index d6305f03..c5fad0c4 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -10,7 +10,7 @@ function CLKGOTO() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [["A"],[sci2exp(1)]]; - this.x = standard_define([2,1],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle index ce176940..f6501445 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -68,8 +68,7 @@ p20 g2 sS'x' p21 -g2 -sS'model' +NsS'model' p22 g9 sS'model.ipar' diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index cc46d52d..c28ac482 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -16,7 +16,7 @@ function CLKGotoTagVisibility() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",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); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index e383d22b..5e227bec 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -90,8 +90,7 @@ p28 g9 sS'x' p29 -g9 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index c4866c99..9d311dd6 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -12,7 +12,7 @@ function DEMUX() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index c684bb7b..1ea8e3a7 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -68,8 +68,7 @@ p21 g4 sS'x' p22 -g14 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index d25f36d4..9202d190 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -12,7 +12,7 @@ function DEMUX_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index c684bb7b..1ea8e3a7 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -68,8 +68,7 @@ p21 g4 sS'x' p22 -g14 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 60d88fe9..54588d0e 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -16,7 +16,7 @@ function ESELECT_f() { this.model.nzcross = new ScilabDouble([0]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); this.exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 2e30dbad..347553e3 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -102,8 +102,7 @@ p31 g8 sS'x' p32 -g6 -sS'model' +NsS'model' p33 g2 s.
\ No newline at end of file diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 7dcc7136..b8d25027 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -11,7 +11,7 @@ function EXTRACTOR() { this.model.ipar = new ScilabDouble([this.ind]); this.exprs = [sci2exp(this.ind)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",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); } EXTRACTOR.prototype.details = function EXTRACTOR() { diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index 3e7ca0b1..d54d0fb3 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -64,8 +64,7 @@ p19 g13 sS'x' p20 -g4 -sS'model' +NsS'model' p21 g8 sS'model.ipar' diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 01d9188f..658831b1 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -15,7 +15,7 @@ function FROM() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index 9ddcfaaf..679be93c 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -89,8 +89,7 @@ p27 g6 sS'x' p28 -g6 -sS'model' +NsS'model' p29 g2 s.
\ No newline at end of file diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index b46464b5..15f0066f 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -18,7 +18,7 @@ function FROMMO() { mo.outputs = "n"; this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 87838f88..28322662 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -98,8 +98,7 @@ p30 g8 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index e3ed8c22..d83ec85d 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -15,7 +15,7 @@ function GOTO() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index 3b5c4c09..7ba2a3c3 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -98,8 +98,7 @@ p31 g2 sS'x' p32 -g2 -sS'model' +NsS'model' p33 g5 s.
\ No newline at end of file diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 81c8ec38..a2b2d18c 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -18,7 +18,7 @@ function GOTOMO() { mo.inputs = "p"; this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index 6d754d8b..cc8af0d9 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -107,8 +107,7 @@ p34 g2 sS'x' p35 -g2 -sS'model' +NsS'model' p36 g5 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index f92bd228..dc5fbfa0 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -16,7 +16,7 @@ function GotoTagVisibility() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",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); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index e383d22b..5e227bec 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -90,8 +90,7 @@ p28 g9 sS'x' p29 -g9 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 6fff7ad2..e2fc5b73 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -16,7 +16,7 @@ function GotoTagVisibilityMO() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",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); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index e383d22b..5e227bec 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -90,8 +90,7 @@ p28 g9 sS'x' p29 -g9 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 89fe6233..9ad6e505 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -14,7 +14,7 @@ function ISELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nout)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_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); } ISELECT_f.prototype.details = function ISELECT_f() { diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index 88aca371..ed8bf469 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -73,8 +73,7 @@ p22 g13 sS'x' p23 -g6 -sS'model' +NsS'model' p24 g9 sS'typ' diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index a396c439..d31861e2 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -22,7 +22,7 @@ function ISELECT_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",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); } ISELECT_m.prototype.details = function ISELECT_m() { diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index 2dd402c1..2fd47018 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -118,8 +118,7 @@ p37 g7 sS'x' p38 -g2 -sS'model' +NsS'model' p39 g4 sS'ot' diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 96a34c93..ece52555 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -11,7 +11,7 @@ function MUX() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index 5a8f8e63..b8a51212 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -68,8 +68,7 @@ p21 g15 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 838956f7..52bb4318 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -11,7 +11,7 @@ function MUX_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); - this.x = standard_define([0.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index 5a8f8e63..b8a51212 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -68,8 +68,7 @@ p21 g15 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g10 sS'model.ipar' diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 3859b45f..1e9ceb39 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -13,7 +13,7 @@ function M_SWITCH() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 7abc48ad..46a2872c 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -93,8 +93,7 @@ p28 g10 sS'x' p29 -g8 -sS'model' +NsS'model' p30 g2 sS'ot' diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 0f4cb761..8c56f5d1 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -11,7 +11,7 @@ function NRMSOM_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string(this.nin)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_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); } NRMSOM_f.prototype.details = function NRMSOM_f() { diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 0c0604b9..e0d55699 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -67,8 +67,7 @@ p20 g14 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g8 sS'typ' diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 8ddda3f3..0e348a7c 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -15,7 +15,7 @@ function RELAY_f() { this.model.dep_ut = new ScilabDouble([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_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); } RELAY_f.prototype.details = function RELAY_f() { diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index 72cd5255..9103134c 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -88,8 +88,7 @@ p27 g11 sS'x' p28 -g2 -sS'model' +NsS'model' p29 g4 s.
\ No newline at end of file diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index 90de2156..a78d2fdc 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -10,7 +10,7 @@ function SCALAR2VECTOR() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string([this.nout])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",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); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 79885755..95f52eb3 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -65,8 +65,7 @@ p20 g14 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g10 sS'typ' diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 09e4a5ce..ec241d1a 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -14,7 +14,7 @@ function SELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nin)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_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); } SELECT_f.prototype.details = function SELECT_f() { diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 1de760dd..00b654cc 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -75,8 +75,7 @@ p22 g15 sS'x' p23 -g4 -sS'model' +NsS'model' p24 g8 sS'typ' diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 6d89c729..ad79cc27 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -22,7 +22,7 @@ function SELECT_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",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); } SELECT_m.prototype.details = function SELECT_m() { diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index eb420b3f..f4d96d76 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -121,8 +121,7 @@ p38 g11 sS'x' p39 -g2 -sS'model' +NsS'model' p40 g4 sS'ot' diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 1660f2c7..dc97fdbc 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -17,7 +17,7 @@ function SWITCH2() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",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); } SWITCH2.prototype.details = function SWITCH2() { diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index cc082b2a..34ad8f7d 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -96,8 +96,7 @@ p29 g8 sS'x' p30 -g5 -sS'model' +NsS'model' p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index ee598779..211b8a1a 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -20,7 +20,7 @@ function SWITCH2_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",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); } SWITCH2_m.prototype.details = function SWITCH2_m() { diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 3e82ebb1..9bdd61dc 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -123,8 +123,7 @@ p38 g8 sS'x' p39 -g5 -sS'model' +NsS'model' p40 g2 sS'it[1-1]' diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index e427833b..151ec1a6 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -14,7 +14,7 @@ function SWITCH_f() { this.model.dep_ut = new ScilabDouble([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_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); } SWITCH_f.prototype.details = function SWITCH_f() { diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index a3d7a1eb..c9faffa8 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -85,8 +85,7 @@ p26 g9 sS'x' p27 -g6 -sS'model' +NsS'model' p28 g2 s.
\ No newline at end of file diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index 9ca93b6c..a28ddf88 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -44,7 +44,7 @@ function CCS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index fc35644a..e1251121 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -104,7 +104,7 @@ p33 g11 sS'x' p34 -g8 +g2 sS'model' p35 g2 diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 46e24d85..0896afe9 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -44,7 +44,7 @@ function CVS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index fc35644a..e1251121 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -104,7 +104,7 @@ p33 g11 sS'x' p34 -g8 +g2 sS'model' p35 g2 diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 87a25873..f6f5f7b8 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -18,7 +18,7 @@ function Capacitor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string([[this.C],[this.v]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = standard_define([2,1.1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 49807874..8afd2cda 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -103,8 +103,7 @@ p32 g12 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 s.
\ No newline at end of file diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index e2968411..d2f80fb1 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -17,7 +17,7 @@ function ConstantVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.V); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = standard_define([1.5,1.1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 7f12abce..7a66a82b 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -97,8 +97,7 @@ p30 g13 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index 752f7b9b..c0468b36 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -14,7 +14,7 @@ function CurrentSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index 01611a18..7cc82643 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -63,8 +63,7 @@ p18 g7 sS'x' p19 -g4 -sS'model' +NsS'model' p20 S'object' p21 diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index 8a7f0ebe..65e930f2 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -20,7 +20,7 @@ function Diode() { this.model.equations = new ScilabDouble([mo]); this.exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index 03c153b1..10292bf2 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -113,8 +113,7 @@ p34 g12 sS'x' p35 -g5 -sS'model' +NsS'model' p36 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index e9d19555..dc6565bc 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -13,7 +13,7 @@ function Ground() { this.model.equations = new ScilabDouble([mo]); this.exprs = ""; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new GroundBlock(this.x); diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index 7f41ea79..fd8415fa 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -62,8 +62,7 @@ p17 g8 sS'x' p18 -g4 -sS'model' +NsS'model' p19 S'object' p20 diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index d376d798..4f0a53fc 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -44,7 +44,7 @@ function Gyrator() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index b86e7d42..f219c232 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -116,7 +116,7 @@ p36 g8 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index c39d4793..962bfdcc 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -44,7 +44,7 @@ function IdealTransformer() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 81920d7d..1b921a73 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -114,7 +114,7 @@ p36 g14 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 3e303f91..13b55641 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -17,7 +17,7 @@ function Inductor() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.L); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = standard_define([2,0.9],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index bfc112c9..6d73f4a8 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -97,8 +97,7 @@ p30 g8 sS'x' p31 -g16 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 90f683f7..1cf40079 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -9,7 +9,7 @@ function MOTOR() { this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); this.exprs = ""; - 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); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index c2594170..9ea67544 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -50,13 +50,11 @@ p13 g8 sS'x' p14 -S'double' +NsS'model' p15 -sS'model' -p16 S'object' -p17 +p16 sS'typ' -p18 +p17 g8 s.
\ No newline at end of file diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 57be53ba..2b8792b1 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -24,7 +24,7 @@ function NMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",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); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index b98ca894..40c50c53 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -135,8 +135,7 @@ p38 g16 sS'x' p39 -g2 -sS'model' +NsS'model' p40 g4 s.
\ No newline at end of file diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 5f0586f9..f86ae303 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -44,7 +44,7 @@ function NPN() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index 61efb5cd..d473e586 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -146,7 +146,7 @@ p36 g8 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 56a1e584..00bbdc6a 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -18,7 +18,7 @@ function OpAmp() { this.model.rpar = new ScilabDouble(Z); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = standard_define([3,5],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,5]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index 1dc893ad..f8d3e7a6 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -105,8 +105,7 @@ p32 g18 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 s.
\ No newline at end of file diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 9c9fd1b2..81ffddc7 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -24,7 +24,7 @@ function PMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",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); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index b98ca894..40c50c53 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -135,8 +135,7 @@ p38 g16 sS'x' p39 -g2 -sS'model' +NsS'model' p40 g4 s.
\ No newline at end of file diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 2716a49b..38ed38e9 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -44,7 +44,7 @@ function PNP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index 61efb5cd..d473e586 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -146,7 +146,7 @@ p36 g8 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index fd73b916..b3cc63f8 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -14,7 +14,7 @@ function PotentialSensor() { mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,"",list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,"",list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; return new BasicBlock(this.x); diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index be456ea1..d78a09c2 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -62,8 +62,7 @@ p17 g7 sS'x' p18 -g4 -sS'model' +NsS'model' p19 S'object' p20 diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index 03cefee9..412b0f56 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -17,7 +17,7 @@ function Resistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string(this.R); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index e7c6f185..7e4c24cf 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -97,8 +97,7 @@ p30 g12 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index ffdbf7f7..30df974f 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -21,7 +21,7 @@ function SineVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",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); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index db0b4d82..569ed239 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -118,8 +118,7 @@ p35 g8 sS'x' p36 -g12 -sS'model' +NsS'model' p37 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index d91773cc..a6fe5f09 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -20,7 +20,7 @@ function Switch() { this.model.rpar = new ScilabDouble([Z]); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index 5f734625..a84cfd60 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -109,8 +109,7 @@ p34 g19 sS'x' p35 -g8 -sS'model' +NsS'model' p36 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 0caef248..7d1be7c6 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -18,7 +18,7 @@ function VVsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [string(this.FR)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index ea61b826..d2b9a6cb 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -101,8 +101,7 @@ p32 g11 sS'x' p33 -g2 -sS'model' +NsS'model' p34 g6 s.
\ No newline at end of file diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index bd77b219..5bf7a900 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -14,7 +14,7 @@ function VariableResistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index 2aeed4ce..af8c8af0 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -63,8 +63,7 @@ p18 g7 sS'x' p19 -g4 -sS'model' +NsS'model' p20 g10 sS'typ' diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 26f366ce..0308bd9a 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -14,7 +14,7 @@ function VoltageSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new VoltageSensorBlock(this.x); diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index 01611a18..7cc82643 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -63,8 +63,7 @@ p18 g7 sS'x' p19 -g4 -sS'model' +NsS'model' p20 S'object' p21 diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index ef8644eb..a5bf800a 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -18,7 +18,7 @@ function VsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.VA)],[string(this.FR)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index a82a09d8..89aeb7b9 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -103,8 +103,7 @@ p32 g11 sS'x' p33 -g2 -sS'model' +NsS'model' p34 g6 s.
\ No newline at end of file diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 447c5063..cf51bb95 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -9,7 +9,7 @@ function ANDLOG_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { diff --git a/js/Events/ANDLOG_f.pickle b/js/Events/ANDLOG_f.pickle index a0fc71ec..fdfefb34 100644 --- a/js/Events/ANDLOG_f.pickle +++ b/js/Events/ANDLOG_f.pickle @@ -42,8 +42,7 @@ p11 g7 sS'x' p12 -g9 -sS'model' +NsS'model' p13 S'object' p14 diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 2535c6ff..87658adc 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -9,7 +9,7 @@ function CLKSOMV_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_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); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { diff --git a/js/Events/CLKSOMV_f.pickle b/js/Events/CLKSOMV_f.pickle index 809d645f..4f194448 100644 --- a/js/Events/CLKSOMV_f.pickle +++ b/js/Events/CLKSOMV_f.pickle @@ -45,8 +45,7 @@ p12 g9 sS'x' p13 -g4 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 766a2f00..a6846cb5 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -9,7 +9,7 @@ function CLKSOM_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1]/1.2,this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],this.gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { diff --git a/js/Events/CLKSOM_f.pickle b/js/Events/CLKSOM_f.pickle index 809d645f..4f194448 100644 --- a/js/Events/CLKSOM_f.pickle +++ b/js/Events/CLKSOM_f.pickle @@ -45,8 +45,7 @@ p12 g9 sS'x' p13 -g4 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index 8611e847..5914708d 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -8,7 +8,7 @@ function CLKSPLIT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([false,false,false]); this.model.dep_ut = new ScilabDouble([false,false]); - this.x = standard_define([1,1]/3,this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } CLKSPLIT_f.prototype.details = function CLKSPLIT_f() { diff --git a/js/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle index 5ae4b378..fc3b9c64 100644 --- a/js/Events/CLKSPLIT_f.pickle +++ b/js/Events/CLKSPLIT_f.pickle @@ -39,8 +39,7 @@ p10 g7 sS'x' p11 -g9 -sS'model' +NsS'model' p12 S'object' p13 diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 98c39318..c2d17e73 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -11,7 +11,7 @@ function END_c() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.tf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",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); } END_c.prototype.details = function END_c() { diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle index c21c176c..6dde99ec 100644 --- a/js/Events/END_c.pickle +++ b/js/Events/END_c.pickle @@ -61,8 +61,7 @@ p18 g11 sS'x' p19 -g4 -sS'model' +NsS'model' p20 g7 sS'typ' diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 871a83f4..4d1ac134 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -13,7 +13,7 @@ function EVTDLY_c() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",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); } EVTDLY_c.prototype.details = function EVTDLY_c() { diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle index 55521043..05b5a38c 100644 --- a/js/Events/EVTDLY_c.pickle +++ b/js/Events/EVTDLY_c.pickle @@ -70,8 +70,7 @@ p21 g17 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g9 sS'typ' diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 21dce7f6..e170b269 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -13,7 +13,7 @@ function EVTDLY_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_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); } EVTDLY_f.prototype.details = function EVTDLY_f() { diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle index 21700f9b..2b1cdf63 100644 --- a/js/Events/EVTDLY_f.pickle +++ b/js/Events/EVTDLY_f.pickle @@ -70,8 +70,7 @@ p21 g17 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g9 sS'typ' diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 7080757c..00dd9f20 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -10,7 +10,7 @@ function EVTGEN_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.tt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_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); } EVTGEN_f.prototype.details = function EVTGEN_f() { diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle index ce268c69..df0c32d3 100644 --- a/js/Events/EVTGEN_f.pickle +++ b/js/Events/EVTGEN_f.pickle @@ -61,8 +61,7 @@ p17 g12 sS'x' p18 -g4 -sS'model' +NsS'model' p19 g7 sS'typ' diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 364b4be4..b37945aa 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -12,7 +12,7 @@ function EVTVARDLY() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.model.firing); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",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); } EVTVARDLY.prototype.details = function EVTVARDLY() { diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle index 388357c2..b6833454 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -61,8 +61,7 @@ p18 g11 sS'x' p19 -g4 -sS'model' +NsS'model' p20 g7 sS'typ' diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index f1b8662b..1a991818 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -11,7 +11,7 @@ function HALT_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.n); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_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); } HALT_f.prototype.details = function HALT_f() { diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle index d52d6b00..7f346c16 100644 --- a/js/Events/HALT_f.pickle +++ b/js/Events/HALT_f.pickle @@ -60,8 +60,7 @@ p17 g11 sS'x' p18 -g4 -sS'model' +NsS'model' p19 g7 sS'model.ipar' diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 952bbe7e..19ad6ce3 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -15,7 +15,7 @@ function IFTHEL_f() { this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; - this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index b9315ab4..24cd316f 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -98,8 +98,7 @@ p30 g6 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 89a580df..5500683b 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -15,7 +15,7 @@ function MFCLCK_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.dt)],[string(this.nn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_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); } MFCLCK_f.prototype.details = function MFCLCK_f() { diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle index 6ecf6b05..cabc0c72 100644 --- a/js/Events/MFCLCK_f.pickle +++ b/js/Events/MFCLCK_f.pickle @@ -90,8 +90,7 @@ p27 g12 sS'x' p28 -g2 -sS'model' +NsS'model' p29 g4 s.
\ No newline at end of file diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index e3a33535..31498c81 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -12,7 +12,7 @@ function M_freq() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",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); } M_freq.prototype.details = function M_freq() { diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle index 5ef62ea6..bda14450 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -105,8 +105,7 @@ p32 g13 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index 85cc3d75..1457a521 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -10,7 +10,7 @@ function VirtualCLK0() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = []; - this.x = standard_define([2,2],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle index 11feecbd..d35c048d 100644 --- a/js/Events/VirtualCLK0.pickle +++ b/js/Events/VirtualCLK0.pickle @@ -38,8 +38,7 @@ p9 g5 sS'x' p10 -g8 -sS'model' +NsS'model' p11 S'object' p12 diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 01cc316e..a4e0e47c 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -104,7 +104,7 @@ function freq_div() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { diff --git a/js/Events/freq_div.pickle b/js/Events/freq_div.pickle index 35055817..9b2944e4 100644 --- a/js/Events/freq_div.pickle +++ b/js/Events/freq_div.pickle @@ -188,7 +188,7 @@ p62 g4 sS'x' p63 -g4 +g8 sS'model' p64 g8 diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 0a38027e..985822af 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -29,7 +29,7 @@ function Bache() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index d6882307..2df2dbe9 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -144,8 +144,7 @@ p41 g15 sS'x' p42 -g8 -sS'model' +NsS'model' p43 g2 s.
\ No newline at end of file diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 7e220e74..626793c5 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -44,7 +44,7 @@ function Flowmeter() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle index 253671ff..761970c0 100644 --- a/js/Hydraulics/Flowmeter.pickle +++ b/js/Hydraulics/Flowmeter.pickle @@ -114,7 +114,7 @@ p36 g13 sS'x' p37 -g8 +g4 sS'model' p38 g4 diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 15d9712d..991c97f2 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -24,7 +24,7 @@ function PerteDP() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index 4040064e..9a6a7868 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -120,8 +120,7 @@ p35 g12 sS'x' p36 -g8 -sS'model' +NsS'model' p37 g2 sS'lambda' diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 806f8670..1fa51bff 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -18,7 +18,7 @@ function PuitsP() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index 44da3894..a9dafdc3 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -101,8 +101,7 @@ p30 g9 sS'x' p31 -g12 -sS'model' +NsS'model' p32 g2 sS'H0' diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 2e87d24f..f4907aaf 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -20,7 +20,7 @@ function SourceP() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index ec2ddf49..9cf7d20a 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -107,8 +107,7 @@ p32 g11 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 sS'H0' diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 044b38bc..c44ccdbf 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -20,7 +20,7 @@ function VanneReglante() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index d1fa2534..01b477cf 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -103,8 +103,7 @@ p32 g12 sS'x' p33 -g7 -sS'model' +NsS'model' p34 g2 s.
\ No newline at end of file diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 0689e2f5..6d81f4d7 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -14,7 +14,7 @@ function BITCLEAR() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index b1c2bf88..dd6af494 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -101,8 +101,7 @@ p32 g9 sS'x' p33 -g7 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index e6b8ea9b..383d7931 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -14,7 +14,7 @@ function BITSET() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index b1c2bf88..dd6af494 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -101,8 +101,7 @@ p32 g9 sS'x' p33 -g7 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 70802f2e..2e2eb015 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -16,7 +16,7 @@ function CONVERT() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",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); } CONVERT.prototype.details = function CONVERT() { diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index ad446663..2a3fa64a 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -104,8 +104,7 @@ p32 g10 sS'x' p33 -g5 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index fa98445a..b92a5905 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -89,7 +89,7 @@ function DFLIPFLOP() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle index 265b19d6..8f30eb1f 100644 --- a/js/IntegerOp/DFLIPFLOP.pickle +++ b/js/IntegerOp/DFLIPFLOP.pickle @@ -236,8 +236,7 @@ p77 g22 sS'x' p78 -g2 -sS'scs_m.objs[27-1]' +NsS'scs_m.objs[27-1]' p79 g2 sS'scs_m.objs[35-1]' diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 82f671af..9f99ed3d 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -34,7 +34,7 @@ function DLATCH() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle index 9e7002ba..519c7f47 100644 --- a/js/IntegerOp/DLATCH.pickle +++ b/js/IntegerOp/DLATCH.pickle @@ -124,8 +124,7 @@ p39 g11 sS'x' p40 -g6 -sS'model' +NsS'model' p41 S'object' p42 diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 0cf1fcea..afa6ea2e 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -15,7 +15,7 @@ function EXTRACTBITS() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index 94754555..351da178 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -111,8 +111,7 @@ p34 g2 sS'x' p35 -g10 -sS'model' +NsS'model' p36 g4 sS'ot' diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 7e781cf7..fde3f0aa 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -16,7 +16,7 @@ function INTMUL() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",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); } INTMUL.prototype.details = function INTMUL() { diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index b83d7e98..644e2bf3 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -102,8 +102,7 @@ p32 g11 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 69417c73..63b245c0 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -45,7 +45,7 @@ function JKFLIPFLOP() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index cbfae693..08628169 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -209,7 +209,7 @@ p68 g7 sS'x' p69 -g7 +g2 sS'model' p70 g2 diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 2f0cb139..7add8e96 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -17,7 +17,7 @@ function LOGIC() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",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); } LOGIC.prototype.details = function LOGIC() { diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index d39f0580..7f0a03e2 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -110,8 +110,7 @@ p35 g9 sS'x' p36 -g5 -sS'model' +NsS'model' p37 g2 sS'ot' diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 19741f29..561f2faa 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -17,7 +17,7 @@ function SHIFT() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",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); } SHIFT.prototype.details = function SHIFT() { diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index 076ec6f3..d71a0979 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -99,8 +99,7 @@ p31 g18 sS'x' p32 -g2 -sS'model' +NsS'model' p33 g4 sS'ot' diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 14eca627..b8b762cf 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -29,7 +29,7 @@ function SRFLIPFLOP() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index 30a56f4d..a1c8301d 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -160,7 +160,7 @@ p52 g13 sS'x' p53 -g13 +g2 sS'model' p54 g2 diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index e2890f53..1aac8643 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -11,7 +11,7 @@ function BIGSOM_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index d56a56dd..5b4d88ba 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -71,8 +71,7 @@ p22 g18 sS'x' p23 -g6 -sS'model' +NsS'model' p24 g10 sS'typ' diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 13a9fb3a..81066883 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -9,7 +9,7 @@ function CLINDUMMY_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { diff --git a/js/Linear/CLINDUMMY_f.pickle b/js/Linear/CLINDUMMY_f.pickle index 3927fc87..c620f0d2 100644 --- a/js/Linear/CLINDUMMY_f.pickle +++ b/js/Linear/CLINDUMMY_f.pickle @@ -39,8 +39,7 @@ p10 g6 sS'x' p11 -g9 -sS'x0' +NsS'x0' p12 g9 sS'typ' diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 90b97f0c..ff53605b 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -16,7 +16,7 @@ function CLR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",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); } CLR.prototype.details = function CLR() { diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index be2d6092..b238e029 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -116,8 +116,7 @@ p37 g23 sS'x' p38 -g8 -sS'model' +NsS'model' p39 g2 sS'nout' diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index c534851c..7caf5a3d 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -16,7 +16,7 @@ function CLR_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index be2d6092..b238e029 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -116,8 +116,7 @@ p37 g23 sS'x' p38 -g8 -sS'model' +NsS'model' p39 g2 sS'nout' diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 1d4e5cef..ecc80b33 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -18,7 +18,7 @@ function CLSS() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index ed38f3cd..b52f30c8 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -112,8 +112,7 @@ p33 g20 sS'x' p34 -g8 -sS'model' +NsS'model' p35 g2 s.
\ No newline at end of file diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 3780d2b7..c9dc7a15 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -18,7 +18,7 @@ function CLSS_f() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index b01fd687..95d63454 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -108,8 +108,7 @@ p31 g20 sS'x' p32 -g8 -sS'model' +NsS'model' p33 g2 s.
\ No newline at end of file diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 84764dd7..e199ccdd 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -18,7 +18,7 @@ function DELAYV_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_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); } DELAYV_f.prototype.details = function DELAYV_f() { diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index 9230a94e..30ddbeca 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -104,8 +104,7 @@ p32 g7 sS'x' p33 -g2 -sS'model' +NsS'model' p34 g4 s.
\ No newline at end of file diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 0f028358..fbcfac9b 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -9,7 +9,7 @@ function DERIV() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",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); } DERIV.prototype.details = function DERIV() { diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle index b0d27eb1..f2e5a169 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -45,8 +45,7 @@ p12 g6 sS'x' p13 -g9 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 9ac329a7..b597fbba 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -11,7 +11,7 @@ function DIFF_c() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",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); } DIFF_c.prototype.details = function DIFF_c() { diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 1fa364cb..57c006e4 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -89,8 +89,7 @@ p28 g6 sS'x' p29 -g8 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index f2dc4ece..32bce17a 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -17,7 +17,7 @@ function DLR() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",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); } DLR.prototype.details = function DLR() { diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index bbf917d6..00444412 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -119,8 +119,7 @@ p38 g2 sS'x' p39 -g10 -sS'model' +NsS'model' p40 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 4cb0a9b1..1182d540 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -17,7 +17,7 @@ function DLR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index e3dc7d2e..9c02362b 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -118,8 +118,7 @@ p37 g2 sS'x' p38 -g10 -sS'model' +NsS'model' p39 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 3a0f5694..31fa0860 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -17,7 +17,7 @@ function DLSS() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index 3ec224c7..098b35e0 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -115,8 +115,7 @@ p34 g2 sS'x' p35 -g10 -sS'model' +NsS'model' p36 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 6d89f7ad..8197a635 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -17,7 +17,7 @@ function DLSS_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index 48238692..a0a9e9ef 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -111,8 +111,7 @@ p32 g2 sS'x' p33 -g10 -sS'model' +NsS'model' p34 g4 s.
\ No newline at end of file diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index af9b793c..ed4b52e3 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -14,7 +14,7 @@ function DOLLAR() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",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); } DOLLAR.prototype.details = function DOLLAR() { diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index 711e00ae..f7c5f3ef 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -99,8 +99,7 @@ p30 g13 sS'x' p31 -g4 -sS'model' +NsS'model' p32 g6 sS'z' diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 8ebdf0ae..2d0d3cef 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -14,7 +14,7 @@ function DOLLAR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_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); } DOLLAR_f.prototype.details = function DOLLAR_f() { diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index 08fd26e2..a13815c6 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -83,8 +83,7 @@ p24 g10 sS'x' p25 -g2 -sS'model' +NsS'model' p26 g4 sS'z' diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index e3926dd6..d4ff905b 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -14,7 +14,7 @@ function DOLLAR_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",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); } DOLLAR_m.prototype.details = function DOLLAR_m() { diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index 711e00ae..f7c5f3ef 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -99,8 +99,7 @@ p30 g13 sS'x' p31 -g4 -sS'model' +NsS'model' p32 g6 sS'z' diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index d5b40e1e..c4b5b6bd 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -17,7 +17,7 @@ function GAINBLK() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [strcat(sci2exp(this.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",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); } GAINBLK.prototype.details = function GAINBLK() { diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index 605c804c..cb04b8b9 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -99,8 +99,7 @@ p31 g21 sS'x' p32 -g5 -sS'model' +NsS'model' p33 g2 sS'ot' diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 20248e22..96bb2408 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -13,7 +13,7 @@ function GAINBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [strcat(sci2exp(this.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_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); } GAINBLK_f.prototype.details = function GAINBLK_f() { diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 189e881e..5e42aab2 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -69,8 +69,7 @@ p20 g9 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g7 sS'typ' diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 0a58b8ee..e2840ef3 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -13,7 +13,7 @@ function GAIN_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_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); } GAIN_f.prototype.details = function GAIN_f() { diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index 3ad06e12..0482236e 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -70,8 +70,7 @@ p21 g9 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g7 sS'typ' diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index b3adbece..b49390be 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -14,7 +14,7 @@ function INTEGRAL() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",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); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 3fa2cfa6..29133f78 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -112,8 +112,7 @@ p33 g7 sS'x' p34 -g2 -sS'model' +NsS'model' p35 g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 7b027f9d..06315b43 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -11,7 +11,7 @@ function INTEGRAL_f() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = strcat(sci2exp(this.x0)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_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); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index 30ddf90c..616e0306 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -66,8 +66,7 @@ p19 g7 sS'x' p20 -g4 -sS'model' +NsS'model' p21 g9 sS'typ' diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index e202045f..78a33647 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -16,7 +16,7 @@ function INTEGRAL_m() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",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); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 972d2db9..3dec972a 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -125,8 +125,7 @@ p38 g9 sS'x' p39 -g2 -sS'model' +NsS'model' p40 g4 sS'ot' diff --git a/js/Linear/PID.js b/js/Linear/PID.js index bca0affb..43867618 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -36,7 +36,7 @@ function PID() { this.model.dep_ut = new ScilabDouble([false,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",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); } PID.prototype.details = function PID() { diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index 392781a3..eee87a0b 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -241,7 +241,7 @@ p78 g4 sS'x' p79 -g4 +g2 sS'model' p80 g2 diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 92437384..69f74e42 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -12,7 +12,7 @@ function REGISTER() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",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); } REGISTER.prototype.details = function REGISTER() { diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index a1ee7aa7..b62872a5 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -87,8 +87,7 @@ p27 g12 sS'x' p28 -g4 -sS'model' +NsS'model' p29 g6 s.
\ No newline at end of file diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 329bdc09..86ed6807 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -12,7 +12,7 @@ function REGISTER_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index 862af688..b26b470a 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -70,8 +70,7 @@ p21 g16 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g9 sS'typ' diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index 3332a6a8..c942c6c6 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -10,7 +10,7 @@ function SAMPHOLD() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",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); } SAMPHOLD.prototype.details = function SAMPHOLD() { diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle index 59f3bcea..f1cea574 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -51,8 +51,7 @@ p14 g6 sS'x' p15 -g8 -sS'model' +NsS'model' p16 S'object' p17 diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index c9b51b93..f9348de3 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -14,7 +14,7 @@ function SAMPHOLD_m() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index c99a685d..f07148fc 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -90,7 +90,7 @@ p28 g9 sS'x' p29 -g5 +g2 sS'model' p30 g2 diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index f44c2f5d..dca7f1d5 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -10,7 +10,7 @@ function SAMPLEHOLD_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_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); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle index 3ae36d40..e0302878 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -50,8 +50,7 @@ p13 g5 sS'x' p14 -g7 -sS'model' +NsS'model' p15 S'object' p16 diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index bbbf8327..93c287fd 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -11,7 +11,7 @@ function SOM_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_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); } SOM_f.prototype.details = function SOM_f() { diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index 3ae0ff70..bc3f8c1b 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -64,8 +64,7 @@ p19 g13 sS'x' p20 -g4 -sS'model' +NsS'model' p21 g9 sS'typ' diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 9967727b..6dcc14b0 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -13,7 +13,7 @@ function SUMMATION() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 710ffd4f..0b007c13 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -100,8 +100,7 @@ p31 g24 sS'x' p32 -g10 -sS'model' +NsS'model' p33 g2 sS'ot' diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index c56ea5a0..8db2a6cf 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -9,7 +9,7 @@ function SUM_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); this.exprs = []; - this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle index 515d7f3c..35edcc28 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -49,8 +49,7 @@ p14 g8 sS'x' p15 -g4 -sS'model' +NsS'model' p16 S'object' p17 diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 8bbaca6a..26b9d352 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -20,7 +20,7 @@ function TCLSS() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",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); } TCLSS.prototype.details = function TCLSS() { diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index 23368990..ae7a4f9f 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -114,8 +114,7 @@ p33 g22 sS'x' p34 -g8 -sS'model' +NsS'model' p35 g2 s.
\ No newline at end of file diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index bc5216cf..53257ece 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -20,7 +20,7 @@ function TCLSS_f() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_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); } TCLSS_f.prototype.details = function TCLSS_f() { diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index 23368990..ae7a4f9f 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -114,8 +114,7 @@ p33 g22 sS'x' p34 -g8 -sS'model' +NsS'model' p35 g2 s.
\ No newline at end of file diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index f3bc0687..2686f05e 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -15,7 +15,7 @@ function TIME_DELAY() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); - this.x = standard_define([3.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index abce5a99..8a2589c0 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -92,8 +92,7 @@ p28 g13 sS'x' p29 -g6 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index d3032318..9eade31c 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -15,7 +15,7 @@ function VARIABLE_DELAY() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",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); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 6aad7d01..5b8ff7e1 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -92,8 +92,7 @@ p28 g13 sS'x' p29 -g6 -sS'model' +NsS'model' p30 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 4d00c97b..f2c72fc8 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -22,7 +22,7 @@ function CUMSUM() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index 8e670128..c0cb6044 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -125,7 +125,7 @@ p39 g2 sS'x' p40 -g7 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 7cea4357..754734ad 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -22,7 +22,7 @@ function EXTRACT() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index e7b7e01e..458bbe66 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -137,7 +137,7 @@ p43 g2 sS'x' p44 -g7 +g4 sS'model' p45 g4 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index d5df2bef..39ee260c 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -22,7 +22,7 @@ function EXTTRI() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index 8e670128..c0cb6044 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -125,7 +125,7 @@ p39 g2 sS'x' p40 -g7 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index ada27447..00f0c105 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -22,7 +22,7 @@ function MATBKSL() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index c3f3b3f1..fa324f98 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -121,7 +121,7 @@ p39 g2 sS'x' p40 -g8 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index f251b068..69d1d3cb 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -22,7 +22,7 @@ function MATCATH() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index 2e41f8ac..18943849 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -115,7 +115,7 @@ p36 g2 sS'x' p37 -g7 +g4 sS'model' p38 g4 diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 5dded552..5b7a15a1 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -23,7 +23,7 @@ function MATCATV() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index a2c7e6f7..7cece1f7 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -118,7 +118,7 @@ p37 g2 sS'x' p38 -g7 +g4 sS'model' p39 g4 diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 72ab2633..fa3ebdba 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -22,7 +22,7 @@ function MATDET() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index 08c52aca..3f1e1ea3 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -120,7 +120,7 @@ p38 g2 sS'x' p39 -g7 +g4 sS'model' p40 g4 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 18f9e923..cc29553a 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -22,7 +22,7 @@ function MATDIAG() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index 08c52aca..3f1e1ea3 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -120,7 +120,7 @@ p38 g2 sS'x' p39 -g7 +g4 sS'model' p40 g4 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 30f1f5f6..312ac726 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -22,7 +22,7 @@ function MATDIV() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index c3f3b3f1..fa324f98 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -121,7 +121,7 @@ p39 g2 sS'x' p40 -g8 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 927932c6..da493fc3 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -22,7 +22,7 @@ function MATEIG() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATEIG.prototype.details = function MATEIG() { diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index a2639242..a5bf23fe 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -124,7 +124,7 @@ p39 g2 sS'x' p40 -g7 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index c4c3ca56..b691af6e 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -22,7 +22,7 @@ function MATEXPM() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index 08c52aca..3f1e1ea3 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -120,7 +120,7 @@ p38 g2 sS'x' p39 -g7 +g4 sS'model' p40 g4 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 9e8b7ebd..98e0464b 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -22,7 +22,7 @@ function MATINV() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index 08c52aca..3f1e1ea3 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -120,7 +120,7 @@ p38 g2 sS'x' p39 -g7 +g4 sS'model' p40 g4 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 174fec1b..acef2180 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -22,7 +22,7 @@ function MATLU() { this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index ba0a2e1f..4075ed38 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -117,8 +117,7 @@ p37 g2 sS'x' p38 -g7 -sS'model' +NsS'model' p39 g4 sS'ot' diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index ae7d4669..27946fc7 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -22,7 +22,7 @@ function MATMAGPHI() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index f4a3b3e8..596a3150 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -122,7 +122,7 @@ p39 g2 sS'x' p40 -g8 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 09afbea5..7965155b 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -11,7 +11,7 @@ function MATMUL() { this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index 53c54721..f103114f 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -115,7 +115,7 @@ p36 g8 sS'x' p37 -g10 +g2 sS'model' p38 g2 diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 3a7d53d3..7bc7e35c 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -22,7 +22,7 @@ function MATPINV() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index 08c52aca..3f1e1ea3 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -120,7 +120,7 @@ p38 g2 sS'x' p39 -g7 +g4 sS'model' p40 g4 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index f9546732..caacf2a8 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -22,7 +22,7 @@ function MATRESH() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index 3cfbb362..b19032b1 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -123,7 +123,7 @@ p38 g2 sS'x' p39 -g7 +g4 sS'model' p40 g4 diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index e20b6523..72933008 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -22,7 +22,7 @@ function MATSING() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATSING.prototype.details = function MATSING() { diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index a2639242..a5bf23fe 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -124,7 +124,7 @@ p39 g2 sS'x' p40 -g7 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index b62dfd04..534f137b 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -22,7 +22,7 @@ function MATSUM() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index 8e670128..c0cb6044 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -125,7 +125,7 @@ p39 g2 sS'x' p40 -g7 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 0ce87a9b..4e9f67fd 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -10,7 +10,7 @@ function MATTRAN() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index 170273d4..ebb878d9 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -92,7 +92,7 @@ p28 g9 sS'x' p29 -g5 +g2 sS'model' p30 g2 diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 93f29e8d..006ecac8 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -22,7 +22,7 @@ function MATZCONJ() { this.model.dep_ut = new ScilabDouble([true,false]); var label = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATZCONJ.prototype.details = function MATZCONJ() { diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle index 2f73e88e..4fbc246e 100644 --- a/js/MatrixOp/MATZCONJ.pickle +++ b/js/MatrixOp/MATZCONJ.pickle @@ -87,8 +87,7 @@ p26 g2 sS'x' p27 -g4 -sS'model' +NsS'model' p28 S'object' p29 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index cad93e6a..6f3fefa2 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -22,7 +22,7 @@ function MATZREIM() { this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index eddc8cd5..f4c90683 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -122,7 +122,7 @@ p39 g2 sS'x' p40 -g8 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 99c33112..aa1be9c2 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -22,7 +22,7 @@ function RICC() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 835cb977..7e6e9e48 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -119,7 +119,7 @@ p37 g2 sS'x' p38 -g8 +g4 sS'model' p39 g4 diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index fa95397e..806a4644 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -22,7 +22,7 @@ function ROOTCOEF() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index bac0fcfd..5680283a 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -123,7 +123,7 @@ p39 g2 sS'x' p40 -g7 +g4 sS'model' p41 g4 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index b948cf84..2cf99b8f 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -12,7 +12,7 @@ function SQRT() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index a4d1b2a1..71e72ba4 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -93,7 +93,7 @@ p29 g5 sS'x' p30 -g7 +g2 sS'model' p31 g2 diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 0f4dc30c..1e007c40 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -22,7 +22,7 @@ function SUBMAT() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 2505d213..6fd8e2e7 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -130,7 +130,7 @@ p39 g2 sS'x' p40 -g7 +g4 sS'model' p41 g4 diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 834a9e15..c6033345 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -24,7 +24,7 @@ function AUTOMAT() { this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle index f93dffcd..9e378404 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -169,8 +169,7 @@ p53 g9 sS'x' p54 -g2 -sS'model' +NsS'model' p55 g6 sS'Minitial' diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index b80aa2a1..99b36d13 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -11,7 +11,7 @@ function BACKLASH() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",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); } BACKLASH.prototype.details = function BACKLASH() { diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle index e07d65e3..8954d2a4 100644 --- a/js/Misc/BACKLASH.pickle +++ b/js/Misc/BACKLASH.pickle @@ -75,8 +75,7 @@ p22 g18 sS'x' p23 -g4 -sS'model' +NsS'model' p24 g8 sS'rpar[1-1]' diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 5b1111ec..f6557d8a 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -35,7 +35,7 @@ function BOUNCE() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",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); } BOUNCE.prototype.details = function BOUNCE() { diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle index 62455ca7..b6ea4fe5 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -136,7 +136,7 @@ p39 g7 sS'x' p40 -g13 +g7 sS'model' p41 g4 diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 3218aa73..6bb0fdba 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -32,7 +32,7 @@ function BOUNCEXY() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",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); } BOUNCEXY.prototype.details = function BOUNCEXY() { diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle index d0b7c403..5edd2bdd 100644 --- a/js/Misc/BOUNCEXY.pickle +++ b/js/Misc/BOUNCEXY.pickle @@ -155,8 +155,7 @@ p46 g14 sS'x' p47 -g4 -sS'model' +NsS'model' p48 g6 sS'z' diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index fc8529a9..16f5a301 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -18,7 +18,7 @@ function BPLATFORM() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",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); } BPLATFORM.prototype.details = function BPLATFORM() { diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle index 31705ba2..68beb7db 100644 --- a/js/Misc/BPLATFORM.pickle +++ b/js/Misc/BPLATFORM.pickle @@ -117,8 +117,7 @@ p34 g25 sS'x' p35 -g2 -sS'model' +NsS'model' p36 g4 s.
\ No newline at end of file diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 34958153..b7a389d6 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -29,7 +29,7 @@ function CBLOCK() { this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } CBLOCK.prototype.details = function CBLOCK() { diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index aeb5ed82..0a74c6cc 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -198,8 +198,7 @@ p55 g8 sS'x' p56 -g2 -sS'model' +NsS'model' p57 g5 sS'z' diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index ff7cd776..1ad467d5 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -13,7 +13,7 @@ function CBLOCK4() { this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } CBLOCK4.prototype.details = function CBLOCK4() { diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index 4d3566f0..1e002ba1 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -185,8 +185,7 @@ p49 g9 sS'x' p50 -g3 -sS'model' +NsS'model' p51 g6 sS'z' diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 7812d35e..a4363e39 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -14,7 +14,7 @@ function CONSTRAINT2_c() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",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); } CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() { diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle index ab82e036..eaa56c2e 100644 --- a/js/Misc/CONSTRAINT2_c.pickle +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -100,8 +100,7 @@ p31 g6 sS'x' p32 -g12 -sS'model' +NsS'model' p33 g2 s.
\ No newline at end of file diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 895c1f8b..53bdf8d2 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -12,7 +12,7 @@ function CONSTRAINT_c() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = "0"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",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); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index 081ea36e..988e7434 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.pickle @@ -68,8 +68,7 @@ p21 g12 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g8 sS'model.ipar' diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 82f8cb60..e1a5b693 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -15,7 +15,7 @@ function DEADBAND() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEADBAND\",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); } DEADBAND.prototype.details = function DEADBAND() { diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle index 64da890e..0326c662 100644 --- a/js/Misc/DEADBAND.pickle +++ b/js/Misc/DEADBAND.pickle @@ -87,8 +87,7 @@ p26 g12 sS'x' p27 -g7 -sS'model' +NsS'model' p28 g2 s.
\ No newline at end of file diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index ac82e092..9aed1d05 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -6,7 +6,7 @@ function DEBUG() { this.model.blocktype = new ScilabString(["d"]); this.exprs = list("","xcos_debug_gui(flag,block);"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEBUG\",sz(1),sz(2));"]); - this.x = standard_define([8,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([8,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEBUG.prototype.details = function DEBUG() { diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle index 16d1f01c..03123225 100644 --- a/js/Misc/DEBUG.pickle +++ b/js/Misc/DEBUG.pickle @@ -64,8 +64,7 @@ p19 g14 sS'x' p20 -g11 -sS'model' +NsS'model' p21 g9 sS'typ' diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index cd928692..cd42cc22 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -11,7 +11,7 @@ function DIFF_f() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_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); } DIFF_f.prototype.details = function DIFF_f() { diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle index 726d3c27..aa75c90b 100644 --- a/js/Misc/DIFF_f.pickle +++ b/js/Misc/DIFF_f.pickle @@ -70,8 +70,7 @@ p21 g8 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g10 sS'typ' diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index dca05409..2744411d 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -13,7 +13,7 @@ function EDGETRIGGER() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string(this.edge)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",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); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle index 6d5d505a..4177781f 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -70,8 +70,7 @@ p21 g13 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g9 sS'model.ipar' diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index c97300b6..8662ade4 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -78,7 +78,7 @@ function EDGE_TRIGGER() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle index 69db91d2..ad0be9c8 100644 --- a/js/Misc/EDGE_TRIGGER.pickle +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -171,7 +171,7 @@ p56 g6 sS'x' p57 -g6 +g10 sS'model' p58 g10 diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 5f1739ea..3ef0abeb 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -6,7 +6,7 @@ function ENDBLK() { scs_m_1.objs[2-1] = scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",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); } ENDBLK.prototype.details = function ENDBLK() { diff --git a/js/Misc/ENDBLK.pickle b/js/Misc/ENDBLK.pickle index 88f10dfc..832db352 100644 --- a/js/Misc/ENDBLK.pickle +++ b/js/Misc/ENDBLK.pickle @@ -91,7 +91,7 @@ p27 g7 sS'x' p28 -g7 +g4 sS'model' p29 g4 diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index a10233a3..0e95fcb4 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -119,8 +119,7 @@ p37 g7 sS'x' p38 -g10 -sS'model' +NsS'model' p39 g2 s.
\ No newline at end of file diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 845c47ca..7747092a 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -83,7 +83,7 @@ function Extract_Activation() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle index c30f31f0..5e5b2dec 100644 --- a/js/Misc/Extract_Activation.pickle +++ b/js/Misc/Extract_Activation.pickle @@ -118,8 +118,7 @@ p37 g8 sS'x' p38 -g4 -sS'model' +NsS'model' p39 g8 sS'lnk.to' diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 241ed150..444eb1ef 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -16,7 +16,7 @@ function HYSTHERESIS() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(rpar)],[string(sign(this.nzz))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",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); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle index d7daefca..72fa6b0d 100644 --- a/js/Misc/HYSTHERESIS.pickle +++ b/js/Misc/HYSTHERESIS.pickle @@ -94,8 +94,7 @@ p27 g11 sS'x' p28 -g8 -sS'model' +NsS'model' p29 g2 s.
\ No newline at end of file diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js index da3bf6ed..a54061e9 100644 --- a/js/Misc/IMPSPLIT_f.js +++ b/js/Misc/IMPSPLIT_f.js @@ -10,7 +10,7 @@ function IMPSPLIT_f() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.x = standard_define([1,1]/3,this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I","I"]; return new BasicBlock(this.x); diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle index 99827fe0..6db902d4 100644 --- a/js/Misc/IMPSPLIT_f.pickle +++ b/js/Misc/IMPSPLIT_f.pickle @@ -51,8 +51,7 @@ p14 g6 sS'x' p15 -g4 -sS'model' +NsS'model' p16 g8 sS'typ' diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index b7d0569c..e4b6fdb8 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -13,7 +13,7 @@ function LOGICAL_OP() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",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); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 27047612..07820007 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -106,8 +106,7 @@ p32 g8 sS'x' p33 -g10 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 0dadcc51..7d9a0f0d 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -27,7 +27,7 @@ function MBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",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); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 6054d6b8..7ee03132 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -237,8 +237,7 @@ p70 g29 sS'x' p71 -g8 -sS'model' +NsS'model' p72 g4 sS'tt' diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index e19c1b2f..bbf73395 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -14,7 +14,7 @@ function MEMORY_f() { this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_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); } MEMORY_f.prototype.details = function MEMORY_f() { diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index 80e99e9d..612a9cf1 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_f.pickle @@ -88,8 +88,7 @@ p27 g19 sS'x' p28 -g2 -sS'model' +NsS'model' p29 g4 sS'z' diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 2ceff438..05ec71a5 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -27,7 +27,7 @@ function MPBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",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); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index 0fadb8a9..dbcb3270 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -221,8 +221,7 @@ p70 g30 sS'x' p71 -g4 -sS'model' +NsS'model' p72 g6 sS'exprs.paramv' diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index e853f63d..06317e37 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -11,7 +11,7 @@ function PAL_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_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); this.x.graphics.id = scs.props.title[1-1]; return new BasicBlock(this.x); } diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle index 7e78d5e8..cdbc9270 100644 --- a/js/Misc/PAL_f.pickle +++ b/js/Misc/PAL_f.pickle @@ -63,7 +63,7 @@ p18 g9 sS'x' p19 -g15 +g4 sS'model' p20 g4 diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index c6264f51..a7d700fe 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -18,7 +18,7 @@ function PENDULUM_ANIM() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle index 31705ba2..68beb7db 100644 --- a/js/Misc/PENDULUM_ANIM.pickle +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -117,8 +117,7 @@ p34 g25 sS'x' p35 -g2 -sS'model' +NsS'model' p36 g4 s.
\ No newline at end of file diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 10022a5a..6e90735c 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -13,7 +13,7 @@ function RATELIMITER() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",sz(1),sz(2));"]); - this.x = standard_define([3.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle index d2922df3..4902b855 100644 --- a/js/Misc/RATELIMITER.pickle +++ b/js/Misc/RATELIMITER.pickle @@ -76,8 +76,7 @@ p23 g19 sS'x' p24 -g4 -sS'model' +NsS'model' p25 g9 sS'typ' diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 1bc6fdef..f4a8c7a4 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -12,7 +12,7 @@ function RELATIONALOP() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(ipar)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",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); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); } diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 474e3399..4757e6e6 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -110,8 +110,7 @@ p34 g8 sS'x' p35 -g10 -sS'model' +NsS'model' p36 g2 sS'ot' diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 86282c59..77d5ec8a 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -7,7 +7,7 @@ function SPLIT_f() { this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - this.x = standard_define([1,1]/3,this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } SPLIT_f.prototype.details = function SPLIT_f() { diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle index 2575c12c..efab595a 100644 --- a/js/Misc/SPLIT_f.pickle +++ b/js/Misc/SPLIT_f.pickle @@ -39,8 +39,7 @@ p10 g5 sS'x' p11 -g9 -sS'model' +NsS'model' p12 S'object' p13 diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index e9280aa1..459fa92e 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -19,7 +19,7 @@ function SUPER_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_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 SuperBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle index 965e905e..79df2b86 100644 --- a/js/Misc/SUPER_f.pickle +++ b/js/Misc/SUPER_f.pickle @@ -84,7 +84,7 @@ p25 g16 sS'x' p26 -g8 +g16 sS'model' p27 g2 diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index a75b4337..b59e7773 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -26,7 +26,7 @@ function c_block() { this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } c_block.prototype.details = function c_block() { diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index 609f4f1a..7f3ad20d 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -143,8 +143,7 @@ p43 g3 sS'x' p44 -g9 -sS'model' +NsS'model' p45 g5 s.
\ No newline at end of file diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 69e90760..967e4c44 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -17,7 +17,7 @@ function fortran_block() { this.funam = "forty"; var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } fortran_block.prototype.details = function fortran_block() { diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index 468f2187..ae20469d 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -122,8 +122,7 @@ p36 g3 sS'x' p37 -g13 -sS'model' +NsS'model' p38 g5 s.
\ No newline at end of file diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 5c35f244..2f3e5b02 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -9,7 +9,7 @@ function func_block() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = "v=sin(u);y=u*v"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",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); } func_block.prototype.details = function func_block() { diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle index 0f6235b8..e1643722 100644 --- a/js/Misc/func_block.pickle +++ b/js/Misc/func_block.pickle @@ -58,7 +58,7 @@ p17 g11 sS'x' p18 -g4 +g7 sS'model' p19 g7 diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 07044219..0fdb51e9 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -18,7 +18,7 @@ function generic_block() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index 03c75a64..849d6c9d 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -155,7 +155,7 @@ p42 g8 sS'x' p43 -g2 +g5 sS'model' p44 g5 diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 218ea693..2c6a2465 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -18,7 +18,7 @@ function generic_block2() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index 9d27db23..319e7b7a 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -163,7 +163,7 @@ p44 g8 sS'x' p45 -g2 +g5 sS'model' p46 g5 diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index c0a7e2b4..7069e702 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -14,7 +14,7 @@ function generic_block3() { this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index fafdff3f..c5385ec3 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -173,7 +173,7 @@ p45 g9 sS'x' p46 -g3 +g6 sS'model' p47 g6 diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index b0eb30c6..78a820fb 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -26,7 +26,7 @@ function scifunc_block() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",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); } scifunc_block.prototype.details = function scifunc_block() { diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index 96aa9782..a978a296 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -175,8 +175,7 @@ p51 g9 sS'x' p52 -g3 -sS'model' +NsS'model' p53 g6 sS'z' diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 002bef48..81aa97da 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -31,7 +31,7 @@ function scifunc_block_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } scifunc_block_m.prototype.details = function scifunc_block_m() { diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index 44d38606..4d8da05c 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -184,8 +184,7 @@ p54 g10 sS'x' p55 -g3 -sS'model' +NsS'model' p56 g6 sS'ot' diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 4aa265a4..5425305b 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -8,7 +8,7 @@ function ABSBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_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); } ABSBLK_f.prototype.details = function ABSBLK_f() { diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle index 1ef3fb82..71de1bca 100644 --- a/js/NonLinear/ABSBLK_f.pickle +++ b/js/NonLinear/ABSBLK_f.pickle @@ -42,8 +42,7 @@ p11 g6 sS'x' p12 -g8 -sS'model' +NsS'model' p13 S'object' p14 diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 496d0a87..72816ca7 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -12,7 +12,7 @@ function ABS_VALUE() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",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); } ABS_VALUE.prototype.details = function ABS_VALUE() { diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index 289fe0f7..e31d1d91 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -67,8 +67,7 @@ p20 g13 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g8 sS'typ' diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index cd2525a5..82d79ff8 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -9,7 +9,7 @@ function COSBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_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); } COSBLK_f.prototype.details = function COSBLK_f() { diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle index f3e87953..f0c888ff 100644 --- a/js/NonLinear/COSBLK_f.pickle +++ b/js/NonLinear/COSBLK_f.pickle @@ -44,8 +44,7 @@ p11 g7 sS'x' p12 -g5 -sS'model' +NsS'model' p13 S'object' p14 diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index d821aa28..b474db34 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -20,7 +20,7 @@ function DLRADAPT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_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); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index 53f09156..c072ce90 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -116,8 +116,7 @@ p33 g14 sS'x' p34 -g9 -sS'model' +NsS'model' p35 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 111b9833..5e0bc5b4 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -12,7 +12,7 @@ function EXPBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_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); } EXPBLK_f.prototype.details = function EXPBLK_f() { diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index dc13791b..7c9a0548 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -70,8 +70,7 @@ p20 g14 sS'x' p21 -g2 -sS'model' +NsS'model' p22 g8 sS'typ' diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 2159634f..0cb66b96 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -16,7 +16,7 @@ function EXPBLK_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",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); } EXPBLK_m.prototype.details = function EXPBLK_m() { diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index 2f63aefd..37d444a7 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -86,8 +86,7 @@ p26 g6 sS'x' p27 -g6 -sS'model' +NsS'model' p28 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index ef4d31b3..5a6f7046 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -10,7 +10,7 @@ function FSV_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_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); } FSV_f.prototype.details = function FSV_f() { diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle index e756a04e..60656cd6 100644 --- a/js/NonLinear/FSV_f.pickle +++ b/js/NonLinear/FSV_f.pickle @@ -48,8 +48,7 @@ p13 g9 sS'x' p14 -g7 -sS'model' +NsS'model' p15 S'object' p16 diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 0f25e1fd..5cb4604d 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -14,7 +14,7 @@ function INTRP2BLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_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); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle index c808353d..a21e3536 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -74,18 +74,17 @@ p21 g17 sS'x' p22 -S'double' +NsS'model' p23 -sS'model' -p24 g10 sS'model.ipar' -p25 +p24 g2 sS'typ' -p26 +p25 g17 sS'model.out' +p26 +S'double' p27 -g23 s.
\ No newline at end of file diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 03022c73..a990bbb1 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -12,7 +12,7 @@ function INTRPLBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_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); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle index e4d076d8..e482b97d 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -72,8 +72,7 @@ p21 g17 sS'x' p22 -g6 -sS'model' +NsS'model' p23 g10 sS'typ' diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index a3b6f8c1..1906beb7 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -10,7 +10,7 @@ function INVBLK() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",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); } INVBLK.prototype.details = function INVBLK() { diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle index e756a04e..60656cd6 100644 --- a/js/NonLinear/INVBLK.pickle +++ b/js/NonLinear/INVBLK.pickle @@ -48,8 +48,7 @@ p13 g9 sS'x' p14 -g7 -sS'model' +NsS'model' p15 S'object' p16 diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index c505c7f1..6383212c 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -10,7 +10,7 @@ function INVBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_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); } INVBLK_f.prototype.details = function INVBLK_f() { diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle index 3c2d269d..ddc91776 100644 --- a/js/NonLinear/INVBLK_f.pickle +++ b/js/NonLinear/INVBLK_f.pickle @@ -47,8 +47,7 @@ p12 g8 sS'x' p13 -g6 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 72669ba6..6dffed6f 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -12,7 +12,7 @@ function LOGBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = "%e"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_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); } LOGBLK_f.prototype.details = function LOGBLK_f() { diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle index becbf40c..952da34c 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -70,8 +70,7 @@ p20 g16 sS'x' p21 -g2 -sS'model' +NsS'model' p22 g8 sS'typ' diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index a423c30e..db6d365e 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -18,7 +18,7 @@ function LOOKUP2D() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOOKUP2D.prototype.details = function LOOKUP2D() { diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index f7203e42..e4356e53 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -136,8 +136,7 @@ p42 g11 sS'x' p43 -g8 -sS'model' +NsS'model' p44 g4 sS'graf' diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 62b500b3..08f1ddb5 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -23,7 +23,7 @@ function LOOKUP_c() { this.model.firing = new ScilabDouble([0]); this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_c\",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); } LOOKUP_c.prototype.details = function LOOKUP_c() { diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index b81270c8..b8a60f1d 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -9,7 +9,7 @@ function LOOKUP_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_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); } LOOKUP_f.prototype.details = function LOOKUP_f() { diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index 3b7a3227..7e9f98a5 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -72,8 +72,7 @@ p23 g16 sS'x' p24 -g4 -sS'model' +NsS'model' p25 g9 sS'n' diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 4e4cf002..56f8a8d3 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -10,7 +10,7 @@ function MAXMIN() { this.model.ipar = new ScilabDouble([0]); this.exprs = [string(transpose([2,1,1]))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",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); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); } diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index 2b7f21f2..a8f6f334 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -96,8 +96,7 @@ p29 g12 sS'x' p30 -g6 -sS'model' +NsS'model' p31 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 3ca90eb0..f258c935 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -11,7 +11,7 @@ function MAX_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_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); } MAX_f.prototype.details = function MAX_f() { diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle index d4bf1ac5..9471b916 100644 --- a/js/NonLinear/MAX_f.pickle +++ b/js/NonLinear/MAX_f.pickle @@ -51,8 +51,7 @@ p14 g10 sS'x' p15 -g8 -sS'model' +NsS'model' p16 S'object' p17 diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 7a157259..244a414d 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -11,7 +11,7 @@ function MIN_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_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); } MIN_f.prototype.details = function MIN_f() { diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle index d4bf1ac5..9471b916 100644 --- a/js/NonLinear/MIN_f.pickle +++ b/js/NonLinear/MIN_f.pickle @@ -51,8 +51,7 @@ p14 g10 sS'x' p15 -g8 -sS'model' +NsS'model' p16 S'object' p17 diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index bec8fe51..c7d70e81 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -12,7 +12,7 @@ function POWBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = string(this.a); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_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); } POWBLK_f.prototype.details = function POWBLK_f() { diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle index dd1ad090..3b71ccc3 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -70,8 +70,7 @@ p20 g16 sS'x' p21 -g2 -sS'model' +NsS'model' p22 g8 sS'model.ipar' diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 4f8ff4d5..c01104d4 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -11,7 +11,7 @@ function PRODUCT() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); return new Product(this.x); } PRODUCT.prototype.details = function PRODUCT() { diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index 5e4dd023..97be2d1c 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -69,8 +69,7 @@ p22 g15 sS'x' p23 -g4 -sS'model' +NsS'model' p24 g10 sS'model.ipar' diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 3e67f178..ee3954bc 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -7,7 +7,7 @@ function PROD_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - this.x = standard_define([1,1],this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } PROD_f.prototype.details = function PROD_f() { diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle index 3c98d962..cd57a97f 100644 --- a/js/NonLinear/PROD_f.pickle +++ b/js/NonLinear/PROD_f.pickle @@ -43,8 +43,7 @@ p12 g8 sS'x' p13 -g4 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index 785401c5..ff846e2b 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -13,7 +13,7 @@ function QUANT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.pas)],[string(this.meth)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_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); } QUANT_f.prototype.details = function QUANT_f() { diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle index 7de54b31..be4d0864 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -71,8 +71,7 @@ p21 g17 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g8 sS'model.ipar' diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 4f116bf3..4a34ff87 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -15,7 +15,7 @@ function SATURATION() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",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); } SATURATION.prototype.details = function SATURATION() { diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle index 64da890e..0326c662 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -87,8 +87,7 @@ p26 g12 sS'x' p27 -g7 -sS'model' +NsS'model' p28 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index d4061ca8..44776f9b 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -15,7 +15,7 @@ function SAT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_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); } SAT_f.prototype.details = function SAT_f() { diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle index 5463c231..ed5199b1 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -90,8 +90,7 @@ p27 g13 sS'x' p28 -g2 -sS'model' +NsS'model' p29 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index 316ac142..1649d7f7 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -12,7 +12,7 @@ function SIGNUM() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",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); } SIGNUM.prototype.details = function SIGNUM() { diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index 289fe0f7..e31d1d91 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -67,8 +67,7 @@ p20 g13 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g8 sS'typ' diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 621fe1dc..37304b71 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -9,7 +9,7 @@ function SINBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_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); } SINBLK_f.prototype.details = function SINBLK_f() { diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle index 08fc2768..aac36c43 100644 --- a/js/NonLinear/SINBLK_f.pickle +++ b/js/NonLinear/SINBLK_f.pickle @@ -44,8 +44,7 @@ p11 g6 sS'x' p12 -g8 -sS'model' +NsS'model' p13 S'object' p14 diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 9cc919cd..4693fb68 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -10,7 +10,7 @@ function TANBLK_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_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); } TANBLK_f.prototype.details = function TANBLK_f() { diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle index dac5e218..378aaddd 100644 --- a/js/NonLinear/TANBLK_f.pickle +++ b/js/NonLinear/TANBLK_f.pickle @@ -50,8 +50,7 @@ p13 g5 sS'x' p14 -g8 -sS'model' +NsS'model' p15 S'object' p16 diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 1b089e62..86ae4d56 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -9,7 +9,7 @@ function TrigFun() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = "sin"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle index 983ac5a2..4911d539 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -68,8 +68,7 @@ p21 g17 sS'x' p22 -g4 -sS'model' +NsS'model' p23 g8 sS'typ' diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index a6ce11f9..acdad630 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -11,7 +11,7 @@ function PDE() { var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,label,this.gr_i); return new BasicBlock(this.x); } PDE.prototype.details = function PDE() { diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle index d9e37bfa..ce730515 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -113,8 +113,7 @@ p36 g28 sS'x' p37 -g2 -sS'model' +NsS'model' p38 g6 s.
\ No newline at end of file diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 868cdb9c..b0ff73fa 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -20,7 +20,7 @@ function AFFICH_m() { this.model.label = new ScilabString([""]); this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",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 AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index 8e4f9dac..e5cb598b 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -117,8 +117,7 @@ p34 g16 sS'x' p35 -g7 -sS'model' +NsS'model' p36 g4 s.
\ No newline at end of file diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index c4997f64..36ba7645 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -15,7 +15,7 @@ function BARXY() { this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([1]); - this.x = standard_define([2,2],this.model,[],[]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],[]); this.x.graphics.in_implicit = ["E","E"]; this.x.graphics.out_implicit = []; this.x.graphics.exprs = [["-15"],["15"],["-15"],["15"],["1"]]; diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index 8f54bbe7..c9dd6830 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -109,8 +109,7 @@ p33 g5 sS'x' p34 -g8 -sS'model' +NsS'model' p35 g2 s.
\ No newline at end of file diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 5a80546d..69734b40 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -25,7 +25,7 @@ function CANIMXY() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",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); } CANIMXY.prototype.details = function CANIMXY() { diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index 8fa3a89c..ba9e069b 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -149,8 +149,7 @@ p42 g21 sS'x' p43 -g2 -sS'model' +NsS'model' p44 g14 sS'nbr_curves' diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 3e14c5a6..50797f91 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -25,7 +25,7 @@ function CANIMXY3D() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",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); } CANIMXY3D.prototype.details = function CANIMXY3D() { diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index ba83184c..6b9034e7 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -152,8 +152,7 @@ p43 g19 sS'x' p44 -g5 -sS'model' +NsS'model' p45 g12 sS'nbr_curves' diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 68a84e58..f4c165a3 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -16,7 +16,7 @@ function CEVENTSCOPE() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",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); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { diff --git a/js/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle index 64eb8f7d..44dbaeb6 100644 --- a/js/Sinks/CEVENTSCOPE.pickle +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -108,8 +108,7 @@ p32 g22 sS'x' p33 -g12 -sS'model' +NsS'model' p34 g5 s.
\ No newline at end of file diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index f9d59174..a4b1a91d 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -18,7 +18,7 @@ function CFSCOPE() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",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); } CFSCOPE.prototype.details = function CFSCOPE() { diff --git a/js/Sinks/CFSCOPE.pickle b/js/Sinks/CFSCOPE.pickle index 83bea367..e7fb7ed3 100644 --- a/js/Sinks/CFSCOPE.pickle +++ b/js/Sinks/CFSCOPE.pickle @@ -127,8 +127,7 @@ p36 g18 sS'x' p37 -g10 -sS'model' +NsS'model' p38 g5 s.
\ No newline at end of file diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index fc89a6e6..b1feb661 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -10,7 +10,7 @@ function CLKOUTV_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.prt); - this.x = standard_define([1,1],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { diff --git a/js/Sinks/CLKOUTV_f.pickle b/js/Sinks/CLKOUTV_f.pickle index 755b92c2..024022fb 100644 --- a/js/Sinks/CLKOUTV_f.pickle +++ b/js/Sinks/CLKOUTV_f.pickle @@ -130,7 +130,7 @@ p39 g28 sS'x' p40 -g2 +g5 sS'model' p41 g5 diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 95ee36ad..1a08f514 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -10,7 +10,7 @@ function CLKOUT_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.prt); - this.x = standard_define([1,1],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { diff --git a/js/Sinks/CLKOUT_f.pickle b/js/Sinks/CLKOUT_f.pickle index 12ffba1c..a3cfaa74 100644 --- a/js/Sinks/CLKOUT_f.pickle +++ b/js/Sinks/CLKOUT_f.pickle @@ -55,8 +55,7 @@ p15 g10 sS'x' p16 -g5 -sS'model' +NsS'model' p17 g7 sS'model.ipar' diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 2e58a087..741b0896 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -21,7 +21,7 @@ function CMAT3D() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",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); } CMAT3D.prototype.details = function CMAT3D() { diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index fe50b305..6bc64608 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -19,7 +19,7 @@ function CMATVIEW() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",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); } CMATVIEW.prototype.details = function CMATVIEW() { diff --git a/js/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle index 7893017c..dc9ed8b9 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -112,8 +112,7 @@ p35 g27 sS'x' p36 -g2 -sS'model' +NsS'model' p37 g4 sS'cmax' diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 924a4d4f..414fe77c 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -24,7 +24,7 @@ function CMSCOPE() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",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); } CMSCOPE.prototype.details = function CMSCOPE() { diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 83f9f0b5..8d063156 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -156,8 +156,7 @@ p45 g4 sS'x' p46 -g20 -sS'model' +NsS'model' p47 g7 s.
\ No newline at end of file diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 36819266..6206cf79 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -20,7 +20,7 @@ function CSCOPE() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",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); } CSCOPE.prototype.details = function CSCOPE() { diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index a8fcda26..780bc38d 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -133,8 +133,7 @@ p38 g29 sS'x' p39 -g5 -sS'model' +NsS'model' p40 g12 s.
\ No newline at end of file diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 5bbc625d..905a8ca5 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -24,7 +24,7 @@ function CSCOPXY() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",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); } CSCOPXY.prototype.details = function CSCOPXY() { diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index 98585da1..939dc0d9 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -146,8 +146,7 @@ p41 g33 sS'x' p42 -g2 -sS'model' +NsS'model' p43 g14 sS'nbr_curves' diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index e4995638..65f428f9 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -24,7 +24,7 @@ function CSCOPXY3D() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",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); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index ae5afc50..c73b1b9a 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -149,8 +149,7 @@ p42 g33 sS'x' p43 -g5 -sS'model' +NsS'model' p44 g12 sS'nbr_curves' diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index ab05fc00..40bface7 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -15,7 +15,7 @@ function OUTIMPL_f() { this.model.equations = new ScilabDouble([mo]); this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index a6a25290..bbe22d3b 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -89,8 +89,7 @@ p26 g7 sS'x' p27 -g7 -sS'model' +NsS'model' p28 g2 s.
\ No newline at end of file diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index e6dc0e39..279402e7 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -13,7 +13,7 @@ function OUT_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { diff --git a/js/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle index 03c970ad..315f8c62 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -67,8 +67,7 @@ p19 g12 sS'x' p20 -g2 -sS'model' +NsS'model' p21 g9 sS'model.ipar' diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 7dae3640..1d69b0ee 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -20,7 +20,7 @@ function TOWS_c() { this.model.dep_ut = new ScilabDouble([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TOWS_c\",sz(1),sz(2));"]); this.exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index b2ec6996..223cde63 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -114,8 +114,7 @@ p35 g8 sS'x' p36 -g5 -sS'model' +NsS'model' p37 g2 s.
\ No newline at end of file diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index b57a85ea..9b80381e 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -10,7 +10,7 @@ function TRASH_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_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); } TRASH_f.prototype.details = function TRASH_f() { diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle index 606695ab..1b2024f4 100644 --- a/js/Sinks/TRASH_f.pickle +++ b/js/Sinks/TRASH_f.pickle @@ -47,8 +47,7 @@ p12 g8 sS'x' p13 -g6 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 5e2ced67..a6b9a8d4 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -17,7 +17,7 @@ function WFILE_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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); } WFILE_f.prototype.details = function WFILE_f() { diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index fafc1645..28d5fec8 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -127,7 +127,7 @@ p37 g9 sS'x' p38 -g11 +g4 sS'model' p39 g4 diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 9cfcc038..272abc55 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -18,7 +18,7 @@ function WRITEAU_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [string(this.N),string(this.swap)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index 83272f8a..720f72bf 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -115,8 +115,7 @@ p35 g9 sS'x' p36 -g12 -sS'model' +NsS'model' p37 g4 s.
\ No newline at end of file diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 1a602fa9..0a69273f 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -18,7 +18,7 @@ function WRITEC_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index 9ff122d1..e49258fb 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -126,8 +126,7 @@ p36 g9 sS'x' p37 -g12 -sS'model' +NsS'model' p38 g4 s.
\ No newline at end of file diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index ed031ea4..cf2a40c4 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -11,7 +11,7 @@ function CLKINV_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { diff --git a/js/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle index fc4275e0..b7a2f895 100644 --- a/js/Sources/CLKINV_f.pickle +++ b/js/Sources/CLKINV_f.pickle @@ -58,8 +58,7 @@ p16 g11 sS'x' p17 -g4 -sS'model' +NsS'model' p18 g8 sS'model.ipar' diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index e5928680..4e80325c 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -10,7 +10,7 @@ function CLKIN_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.prt); - this.x = standard_define([1,1],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { diff --git a/js/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle index c480a912..b62f6681 100644 --- a/js/Sources/CLKIN_f.pickle +++ b/js/Sources/CLKIN_f.pickle @@ -55,8 +55,7 @@ p15 g11 sS'x' p16 -g4 -sS'model' +NsS'model' p17 g8 sS'model.ipar' diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index b48b2892..bee95b39 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -11,7 +11,7 @@ function CONST() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",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); } CONST.prototype.details = function CONST() { diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle index 79e16740..c98ada6d 100644 --- a/js/Sources/CONST.pickle +++ b/js/Sources/CONST.pickle @@ -66,8 +66,7 @@ p19 g15 sS'x' p20 -g2 -sS'model' +NsS'model' p21 g7 sS'model.sim' diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index f86e6d30..a10bc4ea 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -11,7 +11,7 @@ function CONST_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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); } CONST_f.prototype.details = function CONST_f() { diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle index 4f742b51..e1a85d88 100644 --- a/js/Sources/CONST_f.pickle +++ b/js/Sources/CONST_f.pickle @@ -67,8 +67,7 @@ p20 g16 sS'x' p21 -g4 -sS'model' +NsS'model' p22 g8 sS'typ' diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 12236b48..ce2b3c9e 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -14,7 +14,7 @@ function CONST_m() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = sci2exp(this.C); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",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); } CONST_m.prototype.details = function CONST_m() { diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle index 550ae682..2bb1d54b 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -85,8 +85,7 @@ p26 g8 sS'x' p27 -g6 -sS'model' +NsS'model' p28 g2 sS'ot' diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 47ca2a52..6d640617 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -20,7 +20,7 @@ function CURVE_c() { this.model.firing = new ScilabDouble([0]); this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",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); } CURVE_c.prototype.details = function CURVE_c() { diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index 2dcaa156..f55c24b3 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -16,7 +16,7 @@ function CURV_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_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); } CURV_f.prototype.details = function CURV_f() { diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle index 56f1b102..b35b21af 100644 --- a/js/Sources/CURV_f.pickle +++ b/js/Sources/CURV_f.pickle @@ -94,8 +94,7 @@ p31 g12 sS'x' p32 -g9 -sS'model' +NsS'model' p33 g2 s.
\ No newline at end of file diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index d0e462d0..9e08e0d8 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -15,7 +15,7 @@ function Counter() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",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); } Counter.prototype.details = function Counter() { diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle index cbddeb7d..edfb85ef 100644 --- a/js/Sources/Counter.pickle +++ b/js/Sources/Counter.pickle @@ -87,8 +87,7 @@ p26 g9 sS'x' p27 -g2 -sS'model' +NsS'model' p28 g4 s.
\ No newline at end of file diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index 1489096a..059510d1 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -8,7 +8,7 @@ function FROMWSB() { scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); - this.x = standard_define([5,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { diff --git a/js/Sources/FROMWSB.pickle b/js/Sources/FROMWSB.pickle index 6a6d8bcd..f5bb2608 100644 --- a/js/Sources/FROMWSB.pickle +++ b/js/Sources/FROMWSB.pickle @@ -97,7 +97,7 @@ p29 g6 sS'x' p30 -g6 +g4 sS'model' p31 g4 diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 85acbda6..04bec587 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -18,7 +18,7 @@ function FROMWS_c() { this.model.dep_ut = new ScilabDouble([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); this.exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; - this.x = standard_define([3.5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle index 817652dd..d8f82919 100644 --- a/js/Sources/FROMWS_c.pickle +++ b/js/Sources/FROMWS_c.pickle @@ -110,8 +110,7 @@ p33 g5 sS'x' p34 -g5 -sS'model' +NsS'model' p35 g2 s.
\ No newline at end of file diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index e99e4566..18cd6623 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -13,7 +13,7 @@ function GENSIN_f() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_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); } GENSIN_f.prototype.details = function GENSIN_f() { diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle index 222abe50..be7ae81b 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -75,8 +75,7 @@ p22 g8 sS'x' p23 -g4 -sS'model' +NsS'model' p24 g10 sS'typ' diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 9d78b143..3525e9f9 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -13,7 +13,7 @@ function GENSQR_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = string(this.Amplitude); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_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); } GENSQR_f.prototype.details = function GENSQR_f() { diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle index ddab6644..63864dbd 100644 --- a/js/Sources/GENSQR_f.pickle +++ b/js/Sources/GENSQR_f.pickle @@ -67,8 +67,7 @@ p19 g13 sS'x' p20 -g4 -sS'model' +NsS'model' p21 g9 sS'typ' diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 41a6cbeb..9baa8ad6 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -47,7 +47,7 @@ function GEN_SQR() { var F = 1; this.exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",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); } GEN_SQR.prototype.details = function GEN_SQR() { diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index 42a37c4c..6ecc8603 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -216,7 +216,7 @@ p68 g4 sS'x' p69 -g4 +g9 sS'model' p70 g9 diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index a87dfdbf..49e69a58 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -15,7 +15,7 @@ function Ground_g() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",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); } Ground_g.prototype.details = function Ground_g() { diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle index 5d502d5e..31b70cc4 100644 --- a/js/Sources/Ground_g.pickle +++ b/js/Sources/Ground_g.pickle @@ -60,8 +60,7 @@ p17 g4 sS'x' p18 -g10 -sS'model' +NsS'model' p19 S'object' p20 diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index c5260693..68194d33 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -15,7 +15,7 @@ function INIMPL_f() { this.prt = 1; this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle index 737ac91e..dab0db7c 100644 --- a/js/Sources/INIMPL_f.pickle +++ b/js/Sources/INIMPL_f.pickle @@ -89,8 +89,7 @@ p26 g7 sS'x' p27 -g7 -sS'model' +NsS'model' p28 g2 s.
\ No newline at end of file diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 2437d88b..e41a4589 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -12,7 +12,7 @@ function IN_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = sci2exp(prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle index c3788a09..17c25508 100644 --- a/js/Sources/IN_f.pickle +++ b/js/Sources/IN_f.pickle @@ -67,8 +67,7 @@ p20 g2 sS'x' p21 -g2 -sS'model' +NsS'model' p22 g9 sS'model.ipar' diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index f9d34251..39d78ead 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -13,7 +13,7 @@ function Modulo_Count() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.ini_c)],[string(this.base)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",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); } Modulo_Count.prototype.details = function Modulo_Count() { diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle index b331cc4a..e2d59cc5 100644 --- a/js/Sources/Modulo_Count.pickle +++ b/js/Sources/Modulo_Count.pickle @@ -66,8 +66,7 @@ p19 g12 sS'x' p20 -g4 -sS'model' +NsS'model' p21 g9 sS'model.ipar' diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 4d79196d..211419ba 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -42,7 +42,7 @@ function PULSE_SC() { var A = 1; this.exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",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); } PULSE_SC.prototype.details = function PULSE_SC() { diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index 91045067..3ae2c2c9 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -201,7 +201,7 @@ p63 g4 sS'x' p64 -g4 +g10 sS'model' p65 g10 diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 5d1ffec1..7bfaa4f7 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -16,7 +16,7 @@ function RAMP() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = [string(rpar)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",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); } RAMP.prototype.details = function RAMP() { diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle index 9b83ecf6..12e16900 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -90,8 +90,7 @@ p27 g17 sS'x' p28 -g2 -sS'model' +NsS'model' p29 g4 s.
\ No newline at end of file diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 1c215505..4ce8a189 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -17,7 +17,7 @@ function RAND_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_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); } RAND_f.prototype.details = function RAND_f() { diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle index 7e695747..d08c467e 100644 --- a/js/Sources/RAND_f.pickle +++ b/js/Sources/RAND_f.pickle @@ -96,8 +96,7 @@ p27 g20 sS'x' p28 -g8 -sS'model' +NsS'model' p29 g4 sS'nout' diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index c4c64ea4..43c8e648 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -26,7 +26,7 @@ function RAND_m() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",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); } RAND_m.prototype.details = function RAND_m() { diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle index 7e5ecfa1..af80c403 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -134,8 +134,7 @@ p41 g12 sS'x' p42 -g8 -sS'model' +NsS'model' p43 g4 sS'ot' diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 1cb14586..dca0220c 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -22,7 +22,7 @@ function READAU_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[fname],[string(this.N)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); - this.x = standard_define([5,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle index 429a17d5..be5d9571 100644 --- a/js/Sources/READAU_f.pickle +++ b/js/Sources/READAU_f.pickle @@ -130,8 +130,7 @@ p39 g2 sS'x' p40 -g12 -sS'model' +NsS'model' p41 g6 sS'nout' diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 9020963e..cef7c487 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -26,7 +26,7 @@ function READC_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle index 7c21df9c..a860907f 100644 --- a/js/Sources/READC_f.pickle +++ b/js/Sources/READC_f.pickle @@ -156,7 +156,7 @@ p44 g10 sS'x' p45 -g2 +g6 sS'model' p46 g6 diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 31d3047b..b04875bd 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -22,7 +22,7 @@ function RFILE_f() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_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); } RFILE_f.prototype.details = function RFILE_f() { diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle index a3cf5177..e41c7ec9 100644 --- a/js/Sources/RFILE_f.pickle +++ b/js/Sources/RFILE_f.pickle @@ -135,8 +135,7 @@ p39 g13 sS'x' p40 -g2 -sS'model' +NsS'model' p41 g9 sS'nout' diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 313fc0cc..6703c8db 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -10,7 +10,7 @@ function SAWTOOTH_f() { this.model.dep_ut = new ScilabDouble([false,true]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_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); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { diff --git a/js/Sources/SAWTOOTH_f.pickle b/js/Sources/SAWTOOTH_f.pickle index 0fd8076d..a0c6791b 100644 --- a/js/Sources/SAWTOOTH_f.pickle +++ b/js/Sources/SAWTOOTH_f.pickle @@ -47,8 +47,7 @@ p12 g9 sS'x' p13 -g4 -sS'model' +NsS'model' p14 S'object' p15 diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index 7322169b..c63e5823 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -15,7 +15,7 @@ function STEP() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[string(1)],[string(rpar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",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); } STEP.prototype.details = function STEP() { diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle index e522ccd5..30de5d1a 100644 --- a/js/Sources/STEP.pickle +++ b/js/Sources/STEP.pickle @@ -97,8 +97,7 @@ p30 g23 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index af1f38d7..7bbe4b80 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -48,7 +48,7 @@ function STEP_FUNCTION() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",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); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle index 0f17e3e0..e32b8734 100644 --- a/js/Sources/STEP_FUNCTION.pickle +++ b/js/Sources/STEP_FUNCTION.pickle @@ -161,7 +161,7 @@ p52 g4 sS'x' p53 -g4 +g9 sS'model' p54 g9 diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 4c5c67f3..7a00c63d 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -9,7 +9,7 @@ function SampleCLK() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = standard_define([2,2],this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { diff --git a/js/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle index 91e03ca2..4cace608 100644 --- a/js/Sources/SampleCLK.pickle +++ b/js/Sources/SampleCLK.pickle @@ -68,8 +68,7 @@ p20 g2 sS'x' p21 -g2 -sS'model' +NsS'model' p22 g10 sS'typ' diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index c8f61747..e2c9c722 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -12,7 +12,7 @@ function Sigbuilder() { scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { diff --git a/js/Sources/Sigbuilder.pickle b/js/Sources/Sigbuilder.pickle index b46e3a46..212b3c98 100644 --- a/js/Sources/Sigbuilder.pickle +++ b/js/Sources/Sigbuilder.pickle @@ -214,7 +214,7 @@ p67 g2 sS'x' p68 -g2 +g9 sS'model' p69 g9 diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 7cc4ac99..97bb2cdc 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -7,7 +7,7 @@ function TIME_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_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); } TIME_f.prototype.details = function TIME_f() { diff --git a/js/Sources/TIME_f.pickle b/js/Sources/TIME_f.pickle index edb635fb..1cf71889 100644 --- a/js/Sources/TIME_f.pickle +++ b/js/Sources/TIME_f.pickle @@ -38,8 +38,7 @@ p9 g5 sS'x' p10 -g7 -sS'model' +NsS'model' p11 S'object' p12 diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 2b93dbf4..581686c4 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -13,7 +13,7 @@ function TKSCALE() { this.model.dep_ut = new ScilabDouble([false,false]); this.exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",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); } TKSCALE.prototype.details = function TKSCALE() { diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle index 61242ea0..6a055e52 100644 --- a/js/Sources/TKSCALE.pickle +++ b/js/Sources/TKSCALE.pickle @@ -74,8 +74,7 @@ p21 g18 sS'x' p22 -g2 -sS'model' +NsS'model' p23 g10 sS'typ' 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 |