diff options
Diffstat (limited to 'js/Sources')
-rw-r--r-- | js/Sources/STEP.js | 22 | ||||
-rw-r--r-- | js/Sources/STEP.pickle | 58 |
2 files changed, 40 insertions, 40 deletions
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index e8e19127..c4aa813e 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -26,7 +26,7 @@ function STEP() { this.set_param_popup_title = msprintf("Set %s block parameters","STEP_FUNCTION"); var options = { temps:["Step Time",this.temps], - in1:["Initial Value",this.in1], + in:["Initial Value",this.in], fi:["Final Value",this.fi], } return options; @@ -36,21 +36,21 @@ function STEP() { while (true) { var ok = true; this.temps = arguments[0]["temps"]; - this.in1 = arguments[0]["in1"]; + this.in = arguments[0]["in"]; this.fi = arguments[0]["fi"]; - var exprs = [arguments[0]["temps"], arguments[0]["in1"], arguments[0]["fi"]]; + var exprs = [arguments[0]["temps"], arguments[0]["in"], arguments[0]["fi"]]; if (!ok) { break; } - this.in1 = this.in1.slice(); + this.in = this.in.slice(); this.fi = this.fi.slice(); - if (size(this.in1,"*")!=size(this.fi,"*")) { - if (size(this.in1,"*")==1) { - this.in1 = this.in1*ones(this.fi); + if (size(this.in,"*")!=size(this.fi,"*")) { + if (size(this.in,"*")==1) { + this.in = this.in*ones(this.fi); } else if (size(this.fi,"*")==1) { - this.fi = this.fi*ones(this.in1); + this.fi = this.fi*ones(this.in); } else { - block_parameter_error(msprintf("\'Initial Value\' and \'Final Value\': incompatible sizes: %d and %d.",size(this.in1,"*"),size(this.fi,"*")),"Same sizes expected."); + block_parameter_error(msprintf("\'Initial Value\' and \'Final Value\': incompatible sizes: %d and %d.",size(this.in,"*"),size(this.fi,"*")),"Same sizes expected."); var ok = false; } } @@ -67,7 +67,7 @@ function STEP() { if (this.temps==0) { var rpar = [[this.fi],[this.fi]]; } else { - var rpar = [[this.in1],[this.fi]]; + var rpar = [[this.in],[this.fi]]; } this.model.rpar = new ScilabDouble(rpar); this.graphics.exprs = new ScilabDouble([exprs]); @@ -85,7 +85,7 @@ function STEP() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); this.temps = ary[0]; - this.in1 = ary[1]; + this.in = ary[1]; this.fi = ary[2]; } STEP.prototype.getContainer = function STEP() { return new BasicBlock(this.x); } diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle index d750f79c..bb59932e 100644 --- a/js/Sources/STEP.pickle +++ b/js/Sources/STEP.pickle @@ -17,54 +17,54 @@ p7 atp8 Rp9 .(dp0 -S'graphics' +S'graphics.exprs' p1 -S'object' +NsS'rpar' p2 -sS'rpar' -p3 S'matrix' -p4 +p3 sS'x.model' +p4 +NsS'in' p5 -NsS'model.out' +S'string' p6 -S'double' +sS'model.out' p7 -sS'x.graphics' +S'double' p8 -g2 -sS'model.evtin' +sS'x.graphics' p9 -g7 -sS'model.firing' +S'object' p10 -g7 -sS'model.sim' +sS'model.evtin' p11 -S'list' +g8 +sS'model.firing' p12 -sS'model.evtout' +g8 +sS'model.sim' p13 -g7 -sS'model.out2' +S'list' p14 -g7 -sS'in1' +sS'model.evtout' p15 -S'string' +g8 +sS'model.out2' p16 +g8 sS'model.rpar' p17 -g4 +g3 sS'model.outtyp' p18 -g7 -sS'graphics.exprs' +g8 +sS'graphics' p19 -NsS'fi' +g10 +sS'fi' p20 -g16 +g6 sS'typ' p21 S'vector' @@ -75,14 +75,14 @@ S'boolean' p24 sS'model.blocktype' p25 -g16 +g6 sS'model.dep_ut' p26 S'vector_boolean' p27 sS'exprs' p28 -g4 +g3 sS'gr_i' p29 g22 @@ -94,5 +94,5 @@ p31 g22 sS'model' p32 -g2 +g10 s.
\ No newline at end of file |