From 6e346dc5337e4a53f8268744c372ca694a9563f0 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Fri, 24 Aug 2018 12:33:20 +0530 Subject: CLKSOMV_f, PROD_f, and SUM_f are types of RoundBlock --- combined.js | 12 ++++++------ js/Events/CLKSOMV_f.js | 4 ++-- js/Linear/SUM_f.js | 4 ++-- js/NonLinear/PROD_f.js | 4 ++-- sci2jsyacc.py | 3 +++ 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/combined.js b/combined.js index 4db00945..fafc2710 100644 --- a/combined.js +++ b/combined.js @@ -3192,7 +3192,7 @@ function CLKSOMV_f() { this.model.dep_ut = new ScilabBoolean([false,false]); var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); - return new BasicBlock(this.x); + return new RoundBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { return this.x; @@ -3201,7 +3201,7 @@ function CLKSOMV_f() { alert("parameters cannot be modified"); } CLKSOMV_f.prototype.set = function CLKSOMV_f() { - return new BasicBlock(this.x); + return new RoundBlock(this.x); } } /* autogenerated from "macros/Events/CLKSOM_f.sci" */ @@ -8462,7 +8462,7 @@ function SUM_f() { var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); var exprs = []; this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(exprs),gr_i); - return new BasicBlock(this.x); + return new RoundBlock(this.x); } SUM_f.prototype.details = function SUM_f() { return this.x; @@ -8471,7 +8471,7 @@ function SUM_f() { alert("parameters cannot be modified"); } SUM_f.prototype.set = function SUM_f() { - return new BasicBlock(this.x); + return new RoundBlock(this.x); } } /* autogenerated from "macros/Linear/TCLSS.sci" */ @@ -15968,7 +15968,7 @@ function PROD_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); - return new BasicBlock(this.x); + return new RoundBlock(this.x); } PROD_f.prototype.details = function PROD_f() { return this.x; @@ -15977,7 +15977,7 @@ function PROD_f() { alert("parameters cannot be modified"); } PROD_f.prototype.set = function PROD_f() { - return new BasicBlock(this.x); + return new RoundBlock(this.x); } } /* autogenerated from "macros/NonLinear/QUANT_f.sci" */ diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index b5a02ef9..a2ddd4dc 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -10,7 +10,7 @@ function CLKSOMV_f() { this.model.dep_ut = new ScilabBoolean([false,false]); var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); - return new BasicBlock(this.x); + return new RoundBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { return this.x; @@ -19,6 +19,6 @@ function CLKSOMV_f() { alert("parameters cannot be modified"); } CLKSOMV_f.prototype.set = function CLKSOMV_f() { - return new BasicBlock(this.x); + return new RoundBlock(this.x); } } diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 289364dd..4fec2bf4 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -10,7 +10,7 @@ function SUM_f() { var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); var exprs = []; this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(exprs),gr_i); - return new BasicBlock(this.x); + return new RoundBlock(this.x); } SUM_f.prototype.details = function SUM_f() { return this.x; @@ -19,6 +19,6 @@ function SUM_f() { alert("parameters cannot be modified"); } SUM_f.prototype.set = function SUM_f() { - return new BasicBlock(this.x); + return new RoundBlock(this.x); } } diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 807a8fd2..1c7ba910 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -8,7 +8,7 @@ function PROD_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); - return new BasicBlock(this.x); + return new RoundBlock(this.x); } PROD_f.prototype.details = function PROD_f() { return this.x; @@ -17,6 +17,6 @@ function PROD_f() { alert("parameters cannot be modified"); } PROD_f.prototype.set = function PROD_f() { - return new BasicBlock(this.x); + return new RoundBlock(this.x); } } diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 24743129..403d9944 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -84,12 +84,15 @@ BLOCK_TYPE = { 'BIGSOM_f': 'BigSom', 'CLKINV_f': 'EventInBlock', 'CLKOUTV_f': 'EventOutBlock', + 'CLKSOMV_f': 'RoundBlock', 'Ground': 'GroundBlock', 'IN_f': 'ExplicitInBlock', 'INIMPL_f': 'ImplicitInBlock', 'OUT_f': 'ExplicitOutBlock', 'OUTIMPL_f': 'ImplicitOutBlock', + 'PROD_f': 'RoundBlock', 'PRODUCT': 'Product', + 'SUM_f': 'RoundBlock', 'SUMMATION': 'Summation', 'SUPER_f': 'SuperBlock', 'TEXT_f': 'TextBlock', -- cgit