From 0047c3bea1d86b12a08544f6f0833c63e77f6eac Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 11 Jul 2018 15:19:38 +0530 Subject: support vector also --- js/Misc/scifunc_block_m.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'js/Misc/scifunc_block_m.js') diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 494f6450..3b54ace1 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -19,16 +19,16 @@ function scifunc_block_m() { this.model.out = new ScilabDouble([out]); this.model.out2 = new ScilabDouble([out]); this.model.outtyp = new ScilabDouble([it]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([0]); this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); var 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)"," "," "," ")); var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -99,9 +99,9 @@ function scifunc_block_m() { var ok = tmpvar1[2]; if (ok) { var auto = this.auto0; - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); if (this.model.ipar!=0) { this.model.opar = new ScilabDouble([this.model.ipar]); this.model.ipar = new ScilabDouble([0]); -- cgit