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/Linear | |
| parent | 6ee02952c836bb31e9b51783e6a16724fba64637 (diff) | |
| download | sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.gz sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.bz2 sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.zip | |
support for new standard_define
Diffstat (limited to 'js/Linear')
70 files changed, 70 insertions, 103 deletions
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 |