diff options
Diffstat (limited to 'js/IntegerOp')
| -rw-r--r-- | js/IntegerOp/DFLIPFLOP.js | 6 | ||||
| -rw-r--r-- | js/IntegerOp/DLATCH.js | 6 | ||||
| -rw-r--r-- | js/IntegerOp/EXTRACTBITS.js | 2 | ||||
| -rw-r--r-- | js/IntegerOp/INTMUL.js | 2 | ||||
| -rw-r--r-- | js/IntegerOp/JKFLIPFLOP.js | 6 | ||||
| -rw-r--r-- | js/IntegerOp/LOGIC.js | 2 | ||||
| -rw-r--r-- | js/IntegerOp/SHIFT.js | 2 | ||||
| -rw-r--r-- | js/IntegerOp/SRFLIPFLOP.js | 6 |
8 files changed, 16 insertions, 16 deletions
diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 9ffb7bd8..08cf972a 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -79,9 +79,9 @@ function DFLIPFLOP() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1],[1]); + this.model.out = new ScilabDouble([1],[1]); + this.model.out2 = new ScilabDouble([1],[1]); this.model.intyp = [5,1,1]; this.model.outtyp = [5,5]; this.model.blocktype = new ScilabString(["h"]); diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 67da711f..ee249fb4 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -24,9 +24,9 @@ function DLATCH() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1]); + this.model.out = new ScilabDouble([1],[1]); + this.model.out2 = new ScilabDouble([1],[1]); this.model.intyp = [5,-1]; this.model.outtyp = [5,5]; this.model.blocktype = new ScilabString(["h"]); diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 70a1785b..65367a6f 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -232,7 +232,7 @@ function EXTRACTBITS() { } if (ok) { graphics.exprs = exprs; - this.model.ipar = [[int(this.bit.slice())],[int(numb.slice())]]; + this.model.ipar = new ScilabDouble([int(this.bit.slice())],[int(numb.slice())]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 1c55465e..ac189f0f 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -6,7 +6,7 @@ function INTMUL() { this.model.sim = list(new ScilabString(["matmul_i32"]), new ScilabDouble([4])); this.model.in1 = [[-1],[-2]]; this.model.out = new ScilabDouble([-1]); - this.model.in2 = [[-2],[-3]]; + this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out2 = new ScilabDouble([-3]); this.model.intyp = [3,3]; this.model.outtyp = new ScilabDouble([3]); diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 6e754e7b..9f677d25 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -35,9 +35,9 @@ function JKFLIPFLOP() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1],[1]); + this.model.out = new ScilabDouble([1],[1]); + this.model.out2 = new ScilabDouble([1],[1]); this.model.intyp = [5,1,5]; this.model.outtyp = [5,5]; this.model.blocktype = new ScilabString(["h"]); diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 523fdcae..362462ee 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -5,7 +5,7 @@ function LOGIC() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["logic"]), new ScilabDouble([4])); this.model.in1 = [[1],[1]]; - this.model.in2 = [[1],[1]]; + this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index f291982a..799bee21 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -12,7 +12,7 @@ function SHIFT() { this.model.intyp = new ScilabDouble([3]); this.model.outtyp = new ScilabDouble([3]); this.model.rpar = []; - this.model.ipar = sgn; + this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 81c949c8..4b222944 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -19,9 +19,9 @@ function SRFLIPFLOP() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1]); + this.model.out = new ScilabDouble([1],[1]); + this.model.out2 = new ScilabDouble([1],[1]); this.model.intyp = [5,5]; this.model.outtyp = [5,5]; this.model.blocktype = new ScilabString(["h"]); |