diff options
Diffstat (limited to 'data_structures/generic_block3.js')
-rw-r--r-- | data_structures/generic_block3.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/data_structures/generic_block3.js b/data_structures/generic_block3.js index 745149c..82804f0 100644 --- a/data_structures/generic_block3.js +++ b/data_structures/generic_block3.js @@ -7,7 +7,7 @@ function generic_block3 () { var funtyp = 4; model.sim=list(function_name,funtyp); - model.in = new ScilabDouble([1]); + model.in1 = new ScilabDouble([1]); model.in2 = new ScilabDouble([1]); model.intyp = new ScilabDouble([1]); model.out = new ScilabDouble([1]); @@ -15,8 +15,9 @@ function generic_block3 () { model.outtyp = new ScilabDouble([1]); model.dep_ut = new ScilabBoolean([true,false]); - var label = [[function_name;sci2exp(funtyp);sci2exp([model.in,model.in2]);sci2exp(model.intyp);sci2exp([model.out,model.out2])sci2exp(model.outtyp);sci2exp(model.evtin);sci2exp(model.evtout);sci2exp(model.state);sci2exp(model.dstate);sci2exp(model.odstate);sci2exp(model.rpar);sci2exp(model.ipar);sci2exp(model.opar);sci2exp(model.nmode);sci2exp(model.nzcross);sci2exp(model.firing);"y";"n"]]; + var label = [[function_name;sci2exp(funtyp);sci2exp([model.in1,model.in2]);sci2exp(model.intyp);sci2exp([model.out,model.out2])sci2exp(model.outtyp);sci2exp(model.evtin);sci2exp(model.evtout);sci2exp(model.state);sci2exp(model.dstate);sci2exp(model.odstate);sci2exp(model.rpar);sci2exp(model.ipar);sci2exp(model.opar);sci2exp(model.nmode);sci2exp(model.nzcross);sci2exp(model.firing);"y";"n"]]; var gr_i = []; this.x=new standard_define(new ScilabDouble([4,2]),model,label,gr_i); + return new BasicBlock(this.x) } |