diff options
author | Sunil Shetye | 2018-07-09 17:07:46 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-10 11:24:53 +0530 |
commit | f19304a4fe99556c5ddc35024c818d00ffe7e23a (patch) | |
tree | f795b52492d1962f66c2f84f575ce5074b0668a8 /js/MatrixOp | |
parent | cbc375d9bc42bc29eeb919a020dfbf15921d3cf0 (diff) | |
download | sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.tar.gz sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.tar.bz2 sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.zip |
handle list separately
Diffstat (limited to 'js/MatrixOp')
-rw-r--r-- | js/MatrixOp/CUMSUM.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/EXTRACT.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/EXTTRI.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATBKSL.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATCATH.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATCATV.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATDET.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATDIAG.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATDIV.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATEIG.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATEXPM.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATINV.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATLU.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATMAGPHI.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATMUL.js | 54 | ||||
-rw-r--r-- | js/MatrixOp/MATPINV.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATRESH.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATSING.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATSUM.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATTRAN.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/MATZCONJ.js | 2 | ||||
-rw-r--r-- | js/MatrixOp/MATZREIM.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/RICC.js | 2 | ||||
-rw-r--r-- | js/MatrixOp/ROOTCOEF.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/SQRT.js | 4 | ||||
-rw-r--r-- | js/MatrixOp/SUBMAT.js | 4 |
26 files changed, 75 insertions, 75 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index fab59e4e..4757f5cb 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -4,7 +4,7 @@ function CUMSUM() { this.model = scicos_model(); function_name = "cumsum_m"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -92,7 +92,7 @@ function CUMSUM() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 0ddee0c2..96f0f745 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -4,7 +4,7 @@ function EXTRACT() { this.model = scicos_model(); function_name = "extract"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -91,7 +91,7 @@ function EXTRACT() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index e2591656..a27d03b7 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -4,7 +4,7 @@ function EXTTRI() { this.model = scicos_model(); function_name = "extrilz"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -89,7 +89,7 @@ function EXTTRI() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 48a7dd6b..7a603424 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -4,7 +4,7 @@ function MATBKSL() { this.model = scicos_model(); function_name = "mat_bksl"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-1]]; this.model.in2 = [[-2],[-3]]; this.model.intyp = [1,1]; @@ -66,7 +66,7 @@ function MATBKSL() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 31889bf1..01fb0d32 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -4,7 +4,7 @@ function MATCATH() { this.model = scicos_model(); function_name = "mat_cath"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-1]]; this.model.in2 = [[-2],[-3]]; this.model.intyp = [1,1]; @@ -57,7 +57,7 @@ function MATCATH() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { funtyp = 4; - this.model.sim = list("mat_cath",funtyp); + this.model.sim = list(new ScilabString("mat_cath"),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 41205c93..13e3f7ef 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -5,7 +5,7 @@ function MATCATV() { this.model = scicos_model(); function_name = "mat_catv"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in2 = [[-1],[-1]]; this.model.in1 = [[-2],[-3]]; this.model.intyp = [-1,-1]; @@ -58,7 +58,7 @@ function MATCATV() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { funtyp = 4; - this.model.sim = list("mat_catv",funtyp); + this.model.sim = list(new ScilabString("mat_catv"),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index d06fcb58..8dd414c2 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -4,7 +4,7 @@ function MATDET() { this.model = scicos_model(); function_name = "mat_det"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATDET() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 41cac0d7..10277c65 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -4,7 +4,7 @@ function MATDIAG() { this.model = scicos_model(); function_name = "mat_diag"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATDIAG() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 91442543..76b03fad 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -4,7 +4,7 @@ function MATDIV() { this.model = scicos_model(); function_name = "mat_div"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-2]]; this.model.in2 = [[-3],[-3]]; this.model.intyp = [1,1]; @@ -66,7 +66,7 @@ function MATDIV() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 2b8e6b7f..9ae3054b 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -4,7 +4,7 @@ function MATEIG() { this.model = scicos_model(); function_name = "mat_vps"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -90,7 +90,7 @@ function MATEIG() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index e9aa1f53..ab53af01 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -4,7 +4,7 @@ function MATEXPM() { this.model = scicos_model(); function_name = "mat_expm"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATEXPM() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 40d54de2..319c28ad 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -4,7 +4,7 @@ function MATINV() { this.model = scicos_model(); function_name = "mat_inv"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATINV() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 41a6989a..24a703f5 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -4,7 +4,7 @@ function MATLU() { this.model = scicos_model(); function_name = "mat_lu"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATLU() { } if (ok) { funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = this.lab; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 85bdcd7c..b03027d3 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -4,7 +4,7 @@ function MATMAGPHI() { this.model = scicos_model(); function_name = "matz_abs"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(2); @@ -71,7 +71,7 @@ function MATMAGPHI() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 955f4d7a..9cf4bd3e 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -2,7 +2,7 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { this.model = scicos_model(); - this.model.sim = list("matmul_m",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); @@ -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("matmul2_m",4); + this.model.sim = list(new ScilabString("matmul2_m"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul2_s",4); + this.model.sim = list(new ScilabString("matmul2_s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul2_e",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("matbyscal",4); + this.model.sim = list(new ScilabString("matbyscal"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matbyscal_s",4); + this.model.sim = list(new ScilabString("matbyscal_s"),new ScilabDouble(4)); } else { - this.model.sim = list("matbyscal_e",4); + this.model.sim = list(new ScilabString("matbyscal_e"),new ScilabDouble(4)); } } else { if ((this.dtype==1)) { - this.model.sim = list("matmul_m",4); + this.model.sim = list(new ScilabString("matmul_m"),new ScilabDouble(4)); } else if ((this.dtype==2)) { - this.model.sim = list("matzmul_m",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("matmul_i32n",4); + this.model.sim = list(new ScilabString("matmul_i32n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i32s",4); + this.model.sim = list(new ScilabString("matmul_i32s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i32e",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("matmul_i16n",4); + this.model.sim = list(new ScilabString("matmul_i16n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i16s",4); + this.model.sim = list(new ScilabString("matmul_i16s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i16e",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("matmul_i8n",4); + this.model.sim = list(new ScilabString("matmul_i8n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i8s",4); + this.model.sim = list(new ScilabString("matmul_i8s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i8e",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("matmul_ui32n",4); + this.model.sim = list(new ScilabString("matmul_ui32n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui32s",4); + this.model.sim = list(new ScilabString("matmul_ui32s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui32e",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("matmul_ui16n",4); + this.model.sim = list(new ScilabString("matmul_ui16n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui16s",4); + this.model.sim = list(new ScilabString("matmul_ui16s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui16e",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("matmul_ui8n",4); + this.model.sim = list(new ScilabString("matmul_ui8n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui8s",4); + this.model.sim = list(new ScilabString("matmul_ui8s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui8e",4); + this.model.sim = list(new ScilabString("matmul_ui8e"),new ScilabDouble(4)); } } } diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index f77d1db0..842e7082 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -4,7 +4,7 @@ function MATPINV() { this.model = scicos_model(); function_name = "mat_pinv"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATPINV() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index ff814632..363a21c2 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -4,7 +4,7 @@ function MATRESH() { this.model = scicos_model(); function_name = "mat_reshape"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -95,7 +95,7 @@ function MATRESH() { } if (ok) { funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 00867c61..99f10974 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -4,7 +4,7 @@ function MATSING() { this.model = scicos_model(); function_name = "mat_sing"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -93,7 +93,7 @@ function MATSING() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index fda1ba97..a3388ca8 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -4,7 +4,7 @@ function MATSUM() { this.model = scicos_model(); function_name = "mat_sum"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -94,7 +94,7 @@ function MATSUM() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 26aaeca5..aede44ad 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -2,7 +2,7 @@ function MATTRAN() { MATTRAN.prototype.define = function MATTRAN() { this.model = scicos_model(); - this.model.sim = list("mattran_m",4); + this.model.sim = list(new ScilabString("mattran_m"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.out = new ScilabDouble(-2); @@ -60,7 +60,7 @@ function MATTRAN() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index fb995ca6..7eaa6a4b 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -4,7 +4,7 @@ function MATZCONJ() { this.model = scicos_model(); function_name = "matz_conj"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(2); diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 4b42c962..eb526f90 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -4,7 +4,7 @@ function MATZREIM() { this.model = scicos_model(); function_name = "matz_reim"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(2); @@ -71,7 +71,7 @@ function MATZREIM() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 9a96442c..2f7d2abb 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -4,7 +4,7 @@ function RICC() { this.model = scicos_model(); function_name = "ricc_m"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-1],[-1]]; this.model.in2 = [[-1],[-1],[-1]]; this.model.intyp = [1,1,1]; diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 94e09951..15f060df 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -4,7 +4,7 @@ function ROOTCOEF() { this.model = scicos_model(); function_name = "root_coef"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -68,7 +68,7 @@ function ROOTCOEF() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index cddf98f2..9809545e 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -2,7 +2,7 @@ function SQRT() { SQRT.prototype.define = function SQRT() { this.model = scicos_model(); - this.model.sim = list("mat_sqrt",4); + this.model.sim = list(new ScilabString("mat_sqrt"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -51,7 +51,7 @@ function SQRT() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 5db415ed..5b1a1e1c 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -4,7 +4,7 @@ function SUBMAT() { this.model = scicos_model(); function_name = "submat"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -97,7 +97,7 @@ function SUBMAT() { label = exprs; if (ok) { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; |