diff options
Diffstat (limited to 'js/Sources')
61 files changed, 61 insertions, 85 deletions
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' |