diff options
Diffstat (limited to 'js/Linear/SUMMATION.js')
| -rw-r--r-- | js/Linear/SUMMATION.js | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 996168f6..279d1bfb 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -3,13 +3,13 @@ function SUMMATION() { SUMMATION.prototype.define = function SUMMATION() { this.sgn = [[1],[-1]]; this.model = scicos_model(); - this.model.sim = list(new ScilabString("summation"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation"]), new ScilabDouble([4])); this.model.in1 = [[-1],[-1]]; - this.model.out = new ScilabDouble(-1); + this.model.out = new ScilabDouble([-1]); this.model.in2 = [[-2],[-2]]; - this.model.out2 = new ScilabDouble(-2); + this.model.out2 = new ScilabDouble([-2]); this.model.ipar = this.sgn; - this.model.blocktype = new ScilabString("c"); + this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; exprs = sci2exp(this.sgn); gr_i = []; @@ -81,54 +81,54 @@ function SUMMATION() { it = this.Datatype*ones(1,size(in1,1)); ot = this.Datatype; if (this.Datatype==1) { - this.model.sim = list(new ScilabString("summation"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation"]), new ScilabDouble([4])); } else if (this.Datatype==2) { - this.model.sim = list(new ScilabString("summation_z"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_z"]), new ScilabDouble([4])); } else if (((this.Datatype<1)||(this.Datatype>8))) { message("Datatype is not supported"); ok = false; } else { if (this.satur==0) { if (this.Datatype==3) { - this.model.sim = list(new ScilabString("summation_i32n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i32n"]), new ScilabDouble([4])); } else if (this.Datatype==4) { - this.model.sim = list(new ScilabString("summation_i16n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i16n"]), new ScilabDouble([4])); } else if (this.Datatype==5) { - this.model.sim = list(new ScilabString("summation_i8n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i8n"]), new ScilabDouble([4])); } else if (this.Datatype==6) { - this.model.sim = list(new ScilabString("summation_ui32n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui32n"]), new ScilabDouble([4])); } else if (this.Datatype==7) { - this.model.sim = list(new ScilabString("summation_ui16n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui16n"]), new ScilabDouble([4])); } else if (this.Datatype==8) { - this.model.sim = list(new ScilabString("summation_ui8n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui8n"]), new ScilabDouble([4])); } } else if (this.satur==1) { if (this.Datatype==3) { - this.model.sim = list(new ScilabString("summation_i32s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i32s"]), new ScilabDouble([4])); } else if (this.Datatype==4) { - this.model.sim = list(new ScilabString("summation_i16s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i16s"]), new ScilabDouble([4])); } else if (this.Datatype==5) { - this.model.sim = list(new ScilabString("summation_i8s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i8s"]), new ScilabDouble([4])); } else if (this.Datatype==6) { - this.model.sim = list(new ScilabString("summation_ui32s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui32s"]), new ScilabDouble([4])); } else if (this.Datatype==7) { - this.model.sim = list(new ScilabString("summation_ui16s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui16s"]), new ScilabDouble([4])); } else if (this.Datatype==8) { - this.model.sim = list(new ScilabString("summation_ui8s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui8s"]), new ScilabDouble([4])); } } else if (this.satur==2) { if (this.Datatype==3) { - this.model.sim = list(new ScilabString("summation_i32e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i32e"]), new ScilabDouble([4])); } else if (this.Datatype==4) { - this.model.sim = list(new ScilabString("summation_i16e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i16e"]), new ScilabDouble([4])); } else if (this.Datatype==5) { - this.model.sim = list(new ScilabString("summation_i8e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_i8e"]), new ScilabDouble([4])); } else if (this.Datatype==6) { - this.model.sim = list(new ScilabString("summation_ui32e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui32e"]), new ScilabDouble([4])); } else if (this.Datatype==7) { - this.model.sim = list(new ScilabString("summation_ui16e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui16e"]), new ScilabDouble([4])); } else if (this.Datatype==8) { - this.model.sim = list(new ScilabString("summation_ui8e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["summation_ui8e"]), new ScilabDouble([4])); } } } @@ -136,8 +136,8 @@ function SUMMATION() { [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],it),list([nout,nout2],ot),[],[]); } if (ok) { - this.model.rpar = new ScilabDouble(this.satur); - this.model.ipar = new ScilabDouble(this.sgn); + this.model.rpar = new ScilabDouble([this.satur]); + this.model.ipar = new ScilabDouble([this.sgn]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; |