diff options
author | AMIT KUMAR YADAV | 2016-06-21 11:43:19 +0530 |
---|---|---|
committer | AMIT KUMAR YADAV | 2016-06-21 11:43:19 +0530 |
commit | 0a3788d46553caffc5240d6010e5a8e1703c5aaf (patch) | |
tree | 5dd13856ea95554c13f701a528f7b871d1060fd6 /data_structures/scifunc_block_m.js | |
parent | fa438a1d06e474d9fb03a8749457707529551a80 (diff) | |
download | xcos-on-web-0a3788d46553caffc5240d6010e5a8e1703c5aaf.tar.gz xcos-on-web-0a3788d46553caffc5240d6010e5a8e1703c5aaf.tar.bz2 xcos-on-web-0a3788d46553caffc5240d6010e5a8e1703c5aaf.zip |
Fixed some edge cases
Diffstat (limited to 'data_structures/scifunc_block_m.js')
-rw-r--r-- | data_structures/scifunc_block_m.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/data_structures/scifunc_block_m.js b/data_structures/scifunc_block_m.js index 6aa53f3..20d082c 100644 --- a/data_structures/scifunc_block_m.js +++ b/data_structures/scifunc_block_m.js @@ -1,7 +1,7 @@ function scifunc_block_m () { - var in = 1; + var in1 = 1; var out = 1; @@ -22,9 +22,9 @@ function scifunc_block_m () { var it = 1; var model = scicos_model(); - model.sim=list("scifunc",3); - model.in=new ScilabDouble([in]); - model.in2.push(new ScilabDouble([in])); + model.sim=list(new ScilabString(["scifunc"]),new ScilabDouble([3])); + model.in1.push(new ScilabDouble([in1])); + model.in2.push(new ScilabDouble([in1])); model.intyp=new ScilabDouble([it]); model.out=new ScilabDouble([out]); model.out2.push(new ScilabDouble([out])); @@ -40,11 +40,12 @@ function scifunc_block_m () { model.firing=auto; model.dep_ut = new ScilabBoolean([true,false]); - var exprs = [list([sci2exp([in,in])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)]; + var exprs = list([sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout); strcat(sci2exp(x0));strcat(sci2exp(z0)); var strcat(sci2exp(rpar));sci2exp(auto);sci2exp(0)],list("y1 = sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); var gr_i = []; this.x=new standard_define(new ScilabDouble([4,2]),model,exprs,gr_i); + return new BasicBlock(this.x) } |