diff options
Diffstat (limited to 'js/Misc')
73 files changed, 73 insertions, 101 deletions
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' |