diff options
Diffstat (limited to 'js/MatrixOp/MATMUL.js')
-rw-r--r-- | js/MatrixOp/MATMUL.js | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 9cf4bd3e..4a0d6a2f 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -2,13 +2,13 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { this.model = scicos_model(); - this.model.sim = list(new ScilabString("matmul_m"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4])); this.model.in1 = [[-1],[-2]]; this.model.in2 = [[-2],[-3]]; - this.model.out = new ScilabDouble(-1); - this.model.out2 = new ScilabDouble(-3); + this.model.out = new ScilabDouble([-1]); + this.model.out2 = new ScilabDouble([-3]); this.model.dep_ut = [true,false]; - this.model.ipar = new ScilabDouble(1); + this.model.ipar = new ScilabDouble([1]); label = [sci2exp(this.model.ipar)]; gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); @@ -34,7 +34,7 @@ function MATMUL() { label = graphics.exprs; this.model = this.x.model; if (this.model.ipar==[]) { - this.model.ipar = new ScilabDouble(1); + this.model.ipar = new ScilabDouble([1]); } if (size(label,"*")==1) { label[2-1] = sci2exp(1); @@ -63,72 +63,72 @@ function MATMUL() { TABMAX = [[0],[0],[(2^31)-1],[(2^15)-1],[(2^7)-1],[(2^32)-1],[(2^16)-1],[(2^8)-1]]; if (this.rule==2) { if (this.np==0) { - this.model.sim = list(new ScilabString("matmul2_m"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul2_m"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matmul2_s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul2_s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matmul2_e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul2_e"]), new ScilabDouble([4])); } } else if (this.rule==3) { if (this.np==0) { - this.model.sim = list(new ScilabString("matbyscal"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matbyscal"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matbyscal_s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matbyscal_s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matbyscal_e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matbyscal_e"]), new ScilabDouble([4])); } } else { if ((this.dtype==1)) { - this.model.sim = list(new ScilabString("matmul_m"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4])); } else if ((this.dtype==2)) { - this.model.sim = list(new ScilabString("matzmul_m"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matzmul_m"]), new ScilabDouble([4])); } else if (this.dtype==3) { if (this.np==0) { - this.model.sim = list(new ScilabString("matmul_i32n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i32n"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matmul_i32s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i32s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matmul_i32e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i32e"]), new ScilabDouble([4])); } } else if (this.dtype==4) { if (this.np==0) { - this.model.sim = list(new ScilabString("matmul_i16n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i16n"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matmul_i16s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i16s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matmul_i16e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i16e"]), new ScilabDouble([4])); } } else if (this.dtype==5) { if (this.np==0) { - this.model.sim = list(new ScilabString("matmul_i8n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i8n"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matmul_i8s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i8s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matmul_i8e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_i8e"]), new ScilabDouble([4])); } } else if (this.dtype==6) { if (this.np==0) { - this.model.sim = list(new ScilabString("matmul_ui32n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui32n"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matmul_ui32s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui32s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matmul_ui32e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui32e"]), new ScilabDouble([4])); } } else if (this.dtype==7) { if (this.np==0) { - this.model.sim = list(new ScilabString("matmul_ui16n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui16n"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matmul_ui16s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui16s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matmul_ui16e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui16e"]), new ScilabDouble([4])); } } else if (this.dtype==8) { if (this.np==0) { - this.model.sim = list(new ScilabString("matmul_ui8n"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui8n"]), new ScilabDouble([4])); } else if (this.np==1) { - this.model.sim = list(new ScilabString("matmul_ui8s"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui8s"]), new ScilabDouble([4])); } else { - this.model.sim = list(new ScilabString("matmul_ui8e"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["matmul_ui8e"]), new ScilabDouble([4])); } } } @@ -149,7 +149,7 @@ function MATMUL() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { label = exprs; - this.model.ipar = new ScilabDouble(this.rule); + this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = [[kmin],[kmax]]; graphics.exprs = label; this.x.graphics = graphics; |