summaryrefslogtreecommitdiff
path: root/js/IntegerOp
diff options
context:
space:
mode:
authorSunil Shetye2018-07-09 18:10:31 +0530
committerSunil Shetye2018-07-10 11:24:53 +0530
commit9b18945e2e2348db85595fb096a1e1eba04f9baf (patch)
treebb13cffc501f152b1d33870bdeff6f274aecbf7b /js/IntegerOp
parentf19304a4fe99556c5ddc35024c818d00ffe7e23a (diff)
downloadsci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.tar.gz
sci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.tar.bz2
sci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.zip
remove type from list
Diffstat (limited to 'js/IntegerOp')
-rw-r--r--js/IntegerOp/BITCLEAR.js26
-rw-r--r--js/IntegerOp/BITSET.js26
-rw-r--r--js/IntegerOp/CONVERT.js274
-rw-r--r--js/IntegerOp/DFLIPFLOP.js8
-rw-r--r--js/IntegerOp/DLATCH.js8
-rw-r--r--js/IntegerOp/EXTRACTBITS.js82
-rw-r--r--js/IntegerOp/INTMUL.js50
-rw-r--r--js/IntegerOp/JKFLIPFLOP.js10
-rw-r--r--js/IntegerOp/LOGIC.js18
-rw-r--r--js/IntegerOp/SHIFT.js48
-rw-r--r--js/IntegerOp/SRFLIPFLOP.js10
11 files changed, 280 insertions, 280 deletions
diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js
index fdf24c73..10177959 100644
--- a/js/IntegerOp/BITCLEAR.js
+++ b/js/IntegerOp/BITCLEAR.js
@@ -2,15 +2,15 @@
function BITCLEAR() {
BITCLEAR.prototype.define = function BITCLEAR() {
this.model = scicos_model();
- this.model.sim = list(new ScilabString("bit_clear_32"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(1);
- this.model.in2 = new ScilabDouble(1);
- this.model.out = new ScilabDouble(1);
- this.model.out2 = new ScilabDouble(1);
- this.model.intyp = new ScilabDouble(3);
- this.model.outtyp = new ScilabDouble(3);
- this.model.opar = list(new ScilabDouble(int32(0)));
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["bit_clear_32"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([1]);
+ this.model.in2 = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.intyp = new ScilabDouble([3]);
+ this.model.outtyp = new ScilabDouble([3]);
+ this.model.opar = list(new ScilabDouble([int32(0)]));
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(3)],[sci2exp(0)]];
gr_i = [];
@@ -51,7 +51,7 @@ function BITCLEAR() {
this.bit = uint32(this.bit);
n = (2^32-1)-2^this.bit;
n = uint32(n);
- this.model.sim = list(new ScilabString("bit_clear_32"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["bit_clear_32"]), new ScilabDouble([4]));
}
} else if ((this.Datatype==4)||(this.Datatype==7)) {
if (this.bit>15||this.bit<0) {
@@ -61,7 +61,7 @@ function BITCLEAR() {
this.bit = uint16(this.bit);
n = (2^16-1)-2^this.bit;
n = uint16(n);
- this.model.sim = list(new ScilabString("bit_clear_16"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["bit_clear_16"]), new ScilabDouble([4]));
}
} else if ((this.Datatype==5)||(this.Datatype==8)) {
if (this.bit>7||this.bit<0) {
@@ -71,7 +71,7 @@ function BITCLEAR() {
this.bit = uint8(this.bit);
n = (2^8-1)-2^this.bit;
n = uint8(n);
- this.model.sim = list(new ScilabString("bit_clear_8"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["bit_clear_8"]), new ScilabDouble([4]));
}
} else {
block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",this.Datatype),msprintf("Must be in the interval %s.","[3, 8]"));
@@ -85,7 +85,7 @@ function BITCLEAR() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(n));
+ this.model.opar = list(new ScilabDouble([n]));
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js
index 84ced0bb..72d334a9 100644
--- a/js/IntegerOp/BITSET.js
+++ b/js/IntegerOp/BITSET.js
@@ -2,15 +2,15 @@
function BITSET() {
BITSET.prototype.define = function BITSET() {
this.model = scicos_model();
- this.model.sim = list(new ScilabString("bit_set_32"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(1);
- this.model.in2 = new ScilabDouble(1);
- this.model.out = new ScilabDouble(1);
- this.model.out2 = new ScilabDouble(1);
- this.model.intyp = new ScilabDouble(3);
- this.model.outtyp = new ScilabDouble(3);
- this.model.opar = list(new ScilabDouble(uint32(0)));
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = list(new ScilabString(["bit_set_32"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([1]);
+ this.model.in2 = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.intyp = new ScilabDouble([3]);
+ this.model.outtyp = new ScilabDouble([3]);
+ this.model.opar = list(new ScilabDouble([uint32(0)]));
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(3)],[sci2exp(0)]];
gr_i = [];
@@ -52,7 +52,7 @@ function BITSET() {
this.bit = uint32(this.bit);
n = 2^this.bit;
n = uint32(n);
- this.model.sim = list(new ScilabString("bit_set_32"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["bit_set_32"]), new ScilabDouble([4]));
} else if ((this.Datatype==4)||(this.Datatype==7)) {
if (this.bit>15||this.bit<0) {
block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Index of Bit",this.bit),msprintf("Must be in the interval %s.","[0, 15]"));
@@ -61,7 +61,7 @@ function BITSET() {
this.bit = uint16(this.bit);
n = 2^this.bit;
n = uint16(n);
- this.model.sim = list(new ScilabString("bit_set_16"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["bit_set_16"]), new ScilabDouble([4]));
} else if ((this.Datatype==5)||(this.Datatype==8)) {
if (this.bit>7||this.bit<0) {
block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Index of Bit",this.bit),msprintf("Must be in the interval %s.","[0, 7]"));
@@ -70,7 +70,7 @@ function BITSET() {
this.bit = uint8(this.bit);
n = 2^this.bit;
n = uint8(n);
- this.model.sim = list(new ScilabString("bit_set_8"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["bit_set_8"]), new ScilabDouble([4]));
} else {
block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",this.Datatype),msprintf("Must be in the interval %s.","[3, 8]"));
ok = false;
@@ -83,7 +83,7 @@ function BITSET() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(n));
+ this.model.opar = list(new ScilabDouble([n]));
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js
index b6a29de9..9b1f363f 100644
--- a/js/IntegerOp/CONVERT.js
+++ b/js/IntegerOp/CONVERT.js
@@ -3,16 +3,16 @@ function CONVERT() {
CONVERT.prototype.define = function CONVERT() {
sgn = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("convert"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.out2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(3);
+ this.model.sim = list(new ScilabString(["convert"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([3]);
this.model.rpar = [];
- this.model.ipar = new ScilabDouble(sgn);
- this.model.blocktype = new ScilabString("c");
+ this.model.ipar = new ScilabDouble([sgn]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]];
gr_i = [];
@@ -59,308 +59,308 @@ function CONVERT() {
block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Output Type",this.ot),msprintf("Must be in the interval %s.","[1, 8]"));
ok = false;
}
- this.model.sim = list(new ScilabString("convert"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["convert"]), new ScilabDouble([4]));
if ((this.it==this.ot)) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
} else {
if ((this.np==0)) {
if ((this.it==1)) {
if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(2);
+ this.model.ipar = new ScilabDouble([2]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(3);
+ this.model.ipar = new ScilabDouble([3]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(4);
+ this.model.ipar = new ScilabDouble([4]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(5);
+ this.model.ipar = new ScilabDouble([5]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(6);
+ this.model.ipar = new ScilabDouble([6]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(7);
+ this.model.ipar = new ScilabDouble([7]);
}
} else if ((this.it==3)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(8);
+ this.model.ipar = new ScilabDouble([8]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(9);
+ this.model.ipar = new ScilabDouble([9]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(10);
+ this.model.ipar = new ScilabDouble([10]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(11);
+ this.model.ipar = new ScilabDouble([11]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(12);
+ this.model.ipar = new ScilabDouble([12]);
}
} else if ((this.it==4)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(13);
+ this.model.ipar = new ScilabDouble([13]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(14);
+ this.model.ipar = new ScilabDouble([14]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(15);
+ this.model.ipar = new ScilabDouble([15]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(16);
+ this.model.ipar = new ScilabDouble([16]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(17);
+ this.model.ipar = new ScilabDouble([17]);
}
} else if ((this.it==5)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(18);
+ this.model.ipar = new ScilabDouble([18]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(19);
+ this.model.ipar = new ScilabDouble([19]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(20);
+ this.model.ipar = new ScilabDouble([20]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(21);
+ this.model.ipar = new ScilabDouble([21]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(22);
+ this.model.ipar = new ScilabDouble([22]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
}
} else if ((this.it==6)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(23);
+ this.model.ipar = new ScilabDouble([23]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(24);
+ this.model.ipar = new ScilabDouble([24]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(25);
+ this.model.ipar = new ScilabDouble([25]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(26);
+ this.model.ipar = new ScilabDouble([26]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(27);
+ this.model.ipar = new ScilabDouble([27]);
}
} else if ((this.it==7)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(28);
+ this.model.ipar = new ScilabDouble([28]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(29);
+ this.model.ipar = new ScilabDouble([29]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(30);
+ this.model.ipar = new ScilabDouble([30]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(31);
+ this.model.ipar = new ScilabDouble([31]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(32);
+ this.model.ipar = new ScilabDouble([32]);
}
} else if ((this.it==8)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(33);
+ this.model.ipar = new ScilabDouble([33]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(34);
+ this.model.ipar = new ScilabDouble([34]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(35);
+ this.model.ipar = new ScilabDouble([35]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(36);
+ this.model.ipar = new ScilabDouble([36]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(37);
+ this.model.ipar = new ScilabDouble([37]);
}
}
} else if ((this.np==1)) {
if ((this.it==1)) {
if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(38);
+ this.model.ipar = new ScilabDouble([38]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(39);
+ this.model.ipar = new ScilabDouble([39]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(40);
+ this.model.ipar = new ScilabDouble([40]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(41);
+ this.model.ipar = new ScilabDouble([41]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(42);
+ this.model.ipar = new ScilabDouble([42]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(43);
+ this.model.ipar = new ScilabDouble([43]);
}
} else if ((this.it==3)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(8);
+ this.model.ipar = new ScilabDouble([8]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(44);
+ this.model.ipar = new ScilabDouble([44]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(45);
+ this.model.ipar = new ScilabDouble([45]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(46);
+ this.model.ipar = new ScilabDouble([46]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(47);
+ this.model.ipar = new ScilabDouble([47]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(48);
+ this.model.ipar = new ScilabDouble([48]);
}
} else if ((this.it==4)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(13);
+ this.model.ipar = new ScilabDouble([13]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(14);
+ this.model.ipar = new ScilabDouble([14]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(49);
+ this.model.ipar = new ScilabDouble([49]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(50);
+ this.model.ipar = new ScilabDouble([50]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(51);
+ this.model.ipar = new ScilabDouble([51]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(52);
+ this.model.ipar = new ScilabDouble([52]);
}
} else if ((this.it==5)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(18);
+ this.model.ipar = new ScilabDouble([18]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(19);
+ this.model.ipar = new ScilabDouble([19]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(20);
+ this.model.ipar = new ScilabDouble([20]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(53);
+ this.model.ipar = new ScilabDouble([53]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(54);
+ this.model.ipar = new ScilabDouble([54]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(55);
+ this.model.ipar = new ScilabDouble([55]);
}
} else if ((this.it==6)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(23);
+ this.model.ipar = new ScilabDouble([23]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(56);
+ this.model.ipar = new ScilabDouble([56]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(57);
+ this.model.ipar = new ScilabDouble([57]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(58);
+ this.model.ipar = new ScilabDouble([58]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(59);
+ this.model.ipar = new ScilabDouble([59]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(60);
+ this.model.ipar = new ScilabDouble([60]);
}
} else if ((this.it==7)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(28);
+ this.model.ipar = new ScilabDouble([28]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(29);
+ this.model.ipar = new ScilabDouble([29]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(61);
+ this.model.ipar = new ScilabDouble([61]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(62);
+ this.model.ipar = new ScilabDouble([62]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(31);
+ this.model.ipar = new ScilabDouble([31]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(63);
+ this.model.ipar = new ScilabDouble([63]);
}
} else if ((this.it==8)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(33);
+ this.model.ipar = new ScilabDouble([33]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(34);
+ this.model.ipar = new ScilabDouble([34]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(35);
+ this.model.ipar = new ScilabDouble([35]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(64);
+ this.model.ipar = new ScilabDouble([64]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(36);
+ this.model.ipar = new ScilabDouble([36]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(37);
+ this.model.ipar = new ScilabDouble([37]);
}
}
} else if ((this.np==2)) {
if ((this.it==1)) {
if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(65);
+ this.model.ipar = new ScilabDouble([65]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(66);
+ this.model.ipar = new ScilabDouble([66]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(67);
+ this.model.ipar = new ScilabDouble([67]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(68);
+ this.model.ipar = new ScilabDouble([68]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(69);
+ this.model.ipar = new ScilabDouble([69]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(70);
+ this.model.ipar = new ScilabDouble([70]);
}
} else if ((this.it==3)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(8);
+ this.model.ipar = new ScilabDouble([8]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(71);
+ this.model.ipar = new ScilabDouble([71]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(72);
+ this.model.ipar = new ScilabDouble([72]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(73);
+ this.model.ipar = new ScilabDouble([73]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(74);
+ this.model.ipar = new ScilabDouble([74]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(75);
+ this.model.ipar = new ScilabDouble([75]);
}
} else if ((this.it==4)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(13);
+ this.model.ipar = new ScilabDouble([13]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(14);
+ this.model.ipar = new ScilabDouble([14]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(76);
+ this.model.ipar = new ScilabDouble([76]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(77);
+ this.model.ipar = new ScilabDouble([77]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(78);
+ this.model.ipar = new ScilabDouble([78]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(79);
+ this.model.ipar = new ScilabDouble([79]);
}
} else if ((this.it==5)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(18);
+ this.model.ipar = new ScilabDouble([18]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(19);
+ this.model.ipar = new ScilabDouble([19]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(20);
+ this.model.ipar = new ScilabDouble([20]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(80);
+ this.model.ipar = new ScilabDouble([80]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(81);
+ this.model.ipar = new ScilabDouble([81]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(82);
+ this.model.ipar = new ScilabDouble([82]);
}
} else if ((this.it==6)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(23);
+ this.model.ipar = new ScilabDouble([23]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(83);
+ this.model.ipar = new ScilabDouble([83]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(84);
+ this.model.ipar = new ScilabDouble([84]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(85);
+ this.model.ipar = new ScilabDouble([85]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(86);
+ this.model.ipar = new ScilabDouble([86]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(87);
+ this.model.ipar = new ScilabDouble([87]);
}
} else if ((this.it==7)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(28);
+ this.model.ipar = new ScilabDouble([28]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(29);
+ this.model.ipar = new ScilabDouble([29]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(88);
+ this.model.ipar = new ScilabDouble([88]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(89);
+ this.model.ipar = new ScilabDouble([89]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(31);
+ this.model.ipar = new ScilabDouble([31]);
} else if ((this.ot==8)) {
- this.model.ipar = new ScilabDouble(90);
+ this.model.ipar = new ScilabDouble([90]);
}
} else if ((this.it==8)) {
if ((this.ot==1)) {
- this.model.ipar = new ScilabDouble(33);
+ this.model.ipar = new ScilabDouble([33]);
} else if ((this.ot==3)) {
- this.model.ipar = new ScilabDouble(34);
+ this.model.ipar = new ScilabDouble([34]);
} else if ((this.ot==4)) {
- this.model.ipar = new ScilabDouble(35);
+ this.model.ipar = new ScilabDouble([35]);
} else if ((this.ot==5)) {
- this.model.ipar = new ScilabDouble(91);
+ this.model.ipar = new ScilabDouble([91]);
} else if ((this.ot==6)) {
- this.model.ipar = new ScilabDouble(36);
+ this.model.ipar = new ScilabDouble([36]);
} else if ((this.ot==7)) {
- this.model.ipar = new ScilabDouble(37);
+ this.model.ipar = new ScilabDouble([37]);
}
}
}
diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js
index b8c6a7a5..9ffb7bd8 100644
--- a/js/IntegerOp/DFLIPFLOP.js
+++ b/js/IntegerOp/DFLIPFLOP.js
@@ -77,17 +77,17 @@ function DFLIPFLOP() {
scs_m.objs[43-1] = scicos_link(xx=[[253.72572],[312.19705],[312.19705]],yy=[[309.29537],[309.29537],[299.28749]],id="drawlink",thick=[0,0],ct=[5,-1],from=[41,2,0],to=[32,1,1]);
scs_m.objs[44-1] = scicos_link(xx=[[279.98293],[279.98293],[325.53038],[325.53038]],yy=[[372.50232],[315.89455],[315.89455],[299.28749]],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,2,0],to=[32,2,1]);
this.model = scicos_model();
- this.model.sim = new ScilabString("csuper");
+ this.model.sim = new ScilabString(["csuper"]);
this.model.in1 = [[1],[1],[1]];
this.model.in2 = [[1],[1],[1]];
this.model.out = [[1],[1]];
this.model.out2 = [[1],[1]];
this.model.intyp = [5,1,1];
this.model.outtyp = [5,5];
- this.model.blocktype = new ScilabString("h");
- this.model.firing = new ScilabBoolean(false);
+ this.model.blocktype = new ScilabString(["h"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [true,false];
- this.model.rpar = new ScilabDouble(scs_m);
+ this.model.rpar = new ScilabDouble([scs_m]);
gr_i = [];
this.x = standard_define([2,3],this.model,[],gr_i);
return new BasicBlock(this.x);
diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js
index 43c4d012..67da711f 100644
--- a/js/IntegerOp/DLATCH.js
+++ b/js/IntegerOp/DLATCH.js
@@ -22,17 +22,17 @@ function DLATCH() {
scs_m.objs[18-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[325.09603,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
scs_m.objs[19-1] = scicos_link(xx=[[305.09603],[325.09603]],yy=[[280.83282],[280.83282]],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[18,1,1]);
this.model = scicos_model();
- this.model.sim = new ScilabString("csuper");
+ this.model.sim = new ScilabString(["csuper"]);
this.model.in1 = [[1],[1]];
this.model.in2 = [[1],[1]];
this.model.out = [[1],[1]];
this.model.out2 = [[1],[1]];
this.model.intyp = [5,-1];
this.model.outtyp = [5,5];
- this.model.blocktype = new ScilabString("h");
- this.model.firing = new ScilabBoolean(false);
+ this.model.blocktype = new ScilabString(["h"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [true,false];
- this.model.rpar = new ScilabDouble(scs_m);
+ this.model.rpar = new ScilabDouble([scs_m]);
gr_i = [];
this.x = standard_define([2,3],this.model,[],gr_i);
return new BasicBlock(this.x);
diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js
index 74a7c6c0..767bb11e 100644
--- a/js/IntegerOp/EXTRACTBITS.js
+++ b/js/IntegerOp/EXTRACTBITS.js
@@ -3,15 +3,15 @@ function EXTRACTBITS() {
EXTRACTBITS.prototype.define = function EXTRACTBITS() {
numb = [];
this.model = scicos_model();
- this.model.sim = list(new ScilabString("extract_bit_32_UH0"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(1);
- this.model.in2 = new ScilabDouble(1);
- this.model.out = new ScilabDouble(1);
- this.model.out2 = new ScilabDouble(1);
- this.model.intyp = new ScilabDouble(3);
- this.model.outtyp = new ScilabDouble(3);
+ this.model.sim = list(new ScilabString(["extract_bit_32_UH0"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([1]);
+ this.model.in2 = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.intyp = new ScilabDouble([3]);
+ this.model.outtyp = new ScilabDouble([3]);
this.model.ipar = [0,numb];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]];
gr_i = [];
@@ -87,41 +87,41 @@ function EXTRACTBITS() {
case 1:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_32_UH0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_UH0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 3:
- this.model.sim = list(new ScilabString("extract_bit_32_UH1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_UH1"]), new ScilabDouble([4]));
case 6:
- this.model.sim = list(new ScilabString("extract_bit_u32_UH1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u32_UH1"]), new ScilabDouble([4]));
}
}
case 2:
- this.model.sim = list(new ScilabString("extract_bit_32_LH"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_LH"]), new ScilabDouble([4]));
case 3:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_32_MSB0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_MSB0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 3:
- this.model.sim = list(new ScilabString("extract_bit_32_MSB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_MSB1"]), new ScilabDouble([4]));
case 6:
- this.model.sim = list(new ScilabString("extract_bit_u32_MSB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u32_MSB1"]), new ScilabDouble([4]));
}
}
case 4:
- this.model.sim = list(new ScilabString("extract_bit_32_LSB"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_LSB"]), new ScilabDouble([4]));
case 5:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_32_RB0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_RB0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 3:
- this.model.sim = list(new ScilabString("extract_bit_32_RB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_32_RB1"]), new ScilabDouble([4]));
case 6:
- this.model.sim = list(new ScilabString("extract_bit_u32_RB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u32_RB1"]), new ScilabDouble([4]));
}
}
}
@@ -134,41 +134,41 @@ function EXTRACTBITS() {
case 1:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_16_UH0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_UH0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 4:
- this.model.sim = list(new ScilabString("extract_bit_16_UH1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_UH1"]), new ScilabDouble([4]));
case 7:
- this.model.sim = list(new ScilabString("extract_bit_u16_UH1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u16_UH1"]), new ScilabDouble([4]));
}
}
case 2:
- this.model.sim = list(new ScilabString("extract_bit_16_LH"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_LH"]), new ScilabDouble([4]));
case 3:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_16_MSB0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_MSB0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 4:
- this.model.sim = list(new ScilabString("extract_bit_16_MSB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_MSB1"]), new ScilabDouble([4]));
case 7:
- this.model.sim = list(new ScilabString("extract_bit_u16_MSB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u16_MSB1"]), new ScilabDouble([4]));
}
}
case 4:
- this.model.sim = list(new ScilabString("extract_bit_16_LSB"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_LSB"]), new ScilabDouble([4]));
case 5:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_16_RB0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_RB0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 4:
- this.model.sim = list(new ScilabString("extract_bit_16_RB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_16_RB1"]), new ScilabDouble([4]));
case 7:
- this.model.sim = list(new ScilabString("extract_bit_u16_RB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u16_RB1"]), new ScilabDouble([4]));
}
}
}
@@ -181,41 +181,41 @@ function EXTRACTBITS() {
case 1:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_8_UH0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_UH0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 5:
- this.model.sim = list(new ScilabString("extract_bit_8_UH1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_UH1"]), new ScilabDouble([4]));
case 8:
- this.model.sim = list(new ScilabString("extract_bit_u8_UH1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u8_UH1"]), new ScilabDouble([4]));
}
}
case 2:
- this.model.sim = list(new ScilabString("extract_bit_8_LH"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_LH"]), new ScilabDouble([4]));
case 3:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_8_MSB0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_MSB0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 5:
- this.model.sim = list(new ScilabString("extract_bit_8_MSB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_MSB1"]), new ScilabDouble([4]));
case 8:
- this.model.sim = list(new ScilabString("extract_bit_u8_MSB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u8_MSB1"]), new ScilabDouble([4]));
}
}
case 4:
- this.model.sim = list(new ScilabString("extract_bit_8_LSB"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_LSB"]), new ScilabDouble([4]));
case 5:
switch (this.scal) {
case 0:
- this.model.sim = list(new ScilabString("extract_bit_8_RB0"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_RB0"]), new ScilabDouble([4]));
case 1:
switch (this.Datatype) {
case 5:
- this.model.sim = list(new ScilabString("extract_bit_8_RB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_8_RB1"]), new ScilabDouble([4]));
case 8:
- this.model.sim = list(new ScilabString("extract_bit_u8_RB1"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["extract_bit_u8_RB1"]), new ScilabDouble([4]));
}
}
}
diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js
index e3328f4a..ebfeaa11 100644
--- a/js/IntegerOp/INTMUL.js
+++ b/js/IntegerOp/INTMUL.js
@@ -3,16 +3,16 @@ function INTMUL() {
INTMUL.prototype.define = function INTMUL() {
sgn = 0;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("matmul_i32"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_i32"]), new ScilabDouble([4]));
this.model.in1 = [[-1],[-2]];
- this.model.out = new ScilabDouble(-1);
+ this.model.out = new ScilabDouble([-1]);
this.model.in2 = [[-2],[-3]];
- this.model.out2 = new ScilabDouble(-3);
+ this.model.out2 = new ScilabDouble([-3]);
this.model.intyp = [3,3];
- this.model.outtyp = new ScilabDouble(3);
+ this.model.outtyp = new ScilabDouble([3]);
this.model.rpar = [];
- this.model.ipar = new ScilabDouble(sgn);
- this.model.blocktype = new ScilabString("c");
+ this.model.ipar = new ScilabDouble([sgn]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(3)],[sci2exp(0)]];
gr_i = [];
@@ -48,51 +48,51 @@ function INTMUL() {
ok = false;
} else if (this.Datatype==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.Datatype==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.Datatype==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.Datatype==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.Datatype==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.Datatype==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]));
}
} else {
block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",ot),msprintf("Must be in the interval %s.","[3, 8]"));
@@ -104,7 +104,7 @@ function INTMUL() {
[model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
}
if (ok) {
- this.model.ipar = new ScilabDouble(this.np);
+ this.model.ipar = new ScilabDouble([this.np]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index 91ed0354..6e754e7b 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -33,17 +33,17 @@ function JKFLIPFLOP() {
scs_m.objs[21-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[466.2036,169.25363],sz=[20,20],flip=true,theta=0,exprs="2",pin=22,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
scs_m.objs[22-1] = scicos_link(xx=[[446.2036],[466.2036]],yy=[[179.25363],[179.25363]],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[21,1,1]);
this.model = scicos_model();
- this.model.sim = new ScilabString("csuper");
+ this.model.sim = new ScilabString(["csuper"]);
this.model.in1 = [[1],[1],[1]];
this.model.in2 = [[1],[1],[1]];
this.model.out = [[1],[1]];
this.model.out2 = [[1],[1]];
this.model.intyp = [5,1,5];
this.model.outtyp = [5,5];
- this.model.blocktype = new ScilabString("h");
- this.model.firing = new ScilabBoolean(false);
+ this.model.blocktype = new ScilabString(["h"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [true,false];
- this.model.rpar = new ScilabDouble(scs_m);
+ this.model.rpar = new ScilabDouble([scs_m]);
gr_i = [];
this.x = standard_define([2,3],this.model,[],gr_i);
return new BasicBlock(this.x);
@@ -83,7 +83,7 @@ function JKFLIPFLOP() {
}
if (ok) {
xx.graphics.exprs[1-1] = this.exprs0;
- this.model.odstate[1] = new ScilabDouble(this.init);
+ this.model.odstate[1] = new ScilabDouble([this.init]);
xx.model = this.model;
arg1.model.rpar.objs[path-1] = xx;
break;
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index 4e1e2c01..a05eadf5 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -3,17 +3,17 @@ function LOGIC() {
LOGIC.prototype.define = function LOGIC() {
this.mat = [[0],[0],[0],[1]];
this.model = scicos_model();
- this.model.sim = list(new ScilabString("logic"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["logic"]), new ScilabDouble([4]));
this.model.in1 = [[1],[1]];
this.model.in2 = [[1],[1]];
- this.model.out = new ScilabDouble(1);
- this.model.out2 = new ScilabDouble(1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.out = new ScilabDouble([1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.intyp = [5,5];
- this.model.outtyp = new ScilabDouble(5);
- this.model.opar = list(new ScilabDouble(int8(this.mat)));
- this.model.blocktype = new ScilabString("c");
- this.model.firing = new ScilabBoolean(false);
+ this.model.outtyp = new ScilabDouble([5]);
+ this.model.opar = list(new ScilabDouble([int8(this.mat)]));
+ this.model.blocktype = new ScilabString(["c"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(this.mat)],[sci2exp(0)]];
gr_i = [];
@@ -65,7 +65,7 @@ function LOGIC() {
if (ok) {
graphics.exprs = exprs;
this.mat = int8(this.mat);
- this.model.opar = list(new ScilabDouble(this.mat));
+ this.model.opar = list(new ScilabDouble([this.mat]));
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js
index b223a951..3df9033c 100644
--- a/js/IntegerOp/SHIFT.js
+++ b/js/IntegerOp/SHIFT.js
@@ -4,16 +4,16 @@ function SHIFT() {
sgn = [[0],[0]];
OPER = 0;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("shift_32_LA"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(-1);
- this.model.out = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.out2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(3);
- this.model.outtyp = new ScilabDouble(3);
+ this.model.sim = list(new ScilabString(["shift_32_LA"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([3]);
+ this.model.outtyp = new ScilabDouble([3]);
this.model.rpar = [];
this.model.ipar = sgn;
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]];
gr_i = [];
@@ -54,63 +54,63 @@ function SHIFT() {
if (this.nb>0) {
switch (this.np) {
case 0:
- this.model.sim = list(new ScilabString("shift_32_LA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_32_LA"]), new ScilabDouble([4]));
case 1:
- this.model.sim = list(new ScilabString("shift_32_LC"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_32_LC"]), new ScilabDouble([4]));
}
} else if (this.nb<0) {
switch (this.np) {
case 0:
switch (this.Datatype) {
case 3:
- this.model.sim = list(new ScilabString("shift_32_RA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_32_RA"]), new ScilabDouble([4]));
case 6:
- this.model.sim = list(new ScilabString("shift_u32_RA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_u32_RA"]), new ScilabDouble([4]));
}
case 1:
- this.model.sim = list(new ScilabString("shift_32_RC"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_32_RC"]), new ScilabDouble([4]));
}
}
} else if ((this.Datatype==4||this.Datatype==7)) {
if (this.nb>0) {
switch (this.np) {
case 0:
- this.model.sim = list(new ScilabString("shift_16_LA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_16_LA"]), new ScilabDouble([4]));
case 1:
- this.model.sim = list(new ScilabString("shift_16_LC"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_16_LC"]), new ScilabDouble([4]));
}
} else if (this.nb<0) {
switch (this.np) {
case 0:
switch (this.Datatype) {
case 4:
- this.model.sim = list(new ScilabString("shift_16_RA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_16_RA"]), new ScilabDouble([4]));
case 7:
- this.model.sim = list(new ScilabString("shift_u16_RA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_u16_RA"]), new ScilabDouble([4]));
}
case 1:
- this.model.sim = list(new ScilabString("shift_16_RC"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_16_RC"]), new ScilabDouble([4]));
}
}
} else if ((this.Datatype==5||this.Datatype==8)) {
if (this.nb>0) {
switch (this.np) {
case 0:
- this.model.sim = list(new ScilabString("shift_8_LA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_8_LA"]), new ScilabDouble([4]));
case 1:
- this.model.sim = list(new ScilabString("shift_8_LC"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_8_LC"]), new ScilabDouble([4]));
}
} else if (this.nb<0) {
switch (this.np) {
case 0:
switch (this.Datatype) {
case 5:
- this.model.sim = list(new ScilabString("shift_8_RA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_8_RA"]), new ScilabDouble([4]));
case 8:
- this.model.sim = list(new ScilabString("shift_u8_RA"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_u8_RA"]), new ScilabDouble([4]));
}
case 1:
- this.model.sim = list(new ScilabString("shift_8_RC"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["shift_8_RC"]), new ScilabDouble([4]));
}
}
} else {
@@ -121,7 +121,7 @@ function SHIFT() {
[model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]);
}
if (ok) {
- this.model.ipar = new ScilabDouble(this.nb);
+ this.model.ipar = new ScilabDouble([this.nb]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index 712c5b72..81c949c8 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -17,17 +17,17 @@ function SRFLIPFLOP() {
scs_m.objs[13-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list());
scs_m.objs[14-1] = scicos_link(xx=[[363.03733],[383.03733]],yy=[[248.584],[248.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]);
this.model = scicos_model();
- this.model.sim = new ScilabString("csuper");
+ this.model.sim = new ScilabString(["csuper"]);
this.model.in1 = [[1],[1]];
this.model.in2 = [[1],[1]];
this.model.out = [[1],[1]];
this.model.out2 = [[1],[1]];
this.model.intyp = [5,5];
this.model.outtyp = [5,5];
- this.model.blocktype = new ScilabString("h");
- this.model.firing = new ScilabBoolean(false);
+ this.model.blocktype = new ScilabString(["h"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [true,false];
- this.model.rpar = new ScilabDouble(scs_m);
+ this.model.rpar = new ScilabDouble([scs_m]);
gr_i = [];
this.x = standard_define([2,3],this.model,[],gr_i);
return new BasicBlock(this.x);
@@ -67,7 +67,7 @@ function SRFLIPFLOP() {
}
if (ok) {
xx.graphics.exprs[1-1] = this.exprs0;
- this.model.odstate[1] = new ScilabDouble(this.init);
+ this.model.odstate[1] = new ScilabDouble([this.init]);
xx.model = this.model;
arg1.model.rpar.objs[path-1] = xx;
break;
generated by cgit (git 2.34.1) at 2025-03-13 06:24:30 +0000