diff options
Diffstat (limited to 'js/MatrixOp')
52 files changed, 435 insertions, 579 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 085f2dd6..4d00c97b 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -5,7 +5,7 @@ function CUMSUM() { var function_name = "cumsum_m"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function CUMSUM() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -85,7 +82,7 @@ function CUMSUM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -96,10 +93,7 @@ function CUMSUM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index 8d65b461..8e670128 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 1278000e..7cea4357 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -5,7 +5,7 @@ function EXTRACT() { var function_name = "extract"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -41,10 +41,7 @@ function EXTRACT() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -86,7 +83,7 @@ function EXTRACT() { } } this.model.ipar = new ScilabDouble([this.a],[this.b],[ma],[mb]); - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [ma,mb]; var funtyp = 4; if (ok) { @@ -97,9 +94,6 @@ function EXTRACT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index be86bc15..e7b7e01e 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -36,66 +36,66 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'b' -p28 +p27 g2 sS'model.state' -p29 +p28 g2 +sS'model.in' +p29 +g7 sS'graphics.exprs' p30 NsS'ma' @@ -122,7 +122,7 @@ S'boolean' p38 sS'model.blocktype' p39 -g19 +g18 sS'mb' p40 g7 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 754a7f70..d5df2bef 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -5,7 +5,7 @@ function EXTTRI() { var function_name = "extrilz"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function EXTTRI() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -82,7 +79,7 @@ function EXTTRI() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -93,10 +90,7 @@ function EXTTRI() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index 1f0d8fe7..8e670128 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -36,63 +36,63 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' @@ -113,7 +113,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 7a73236f..ada27447 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -5,7 +5,7 @@ function MATBKSL() { var function_name = "mat_bksl"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-2]); @@ -37,10 +37,7 @@ function MATBKSL() { MATBKSL.prototype.set = function MATBKSL() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATBKSL() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATBKSL() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index 4b73461e..c3f3b3f1 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -31,64 +31,64 @@ g4 sS'it' p6 g2 -sS'model.intyp' -p7 -g2 sS'funtyp' -p8 +p7 S'double' -p9 +p8 sS'model.out' -p10 -g9 +p9 +g8 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 S'matrix' +p12 +sS'model.intyp' p13 -sS'model.in1' -p14 -g13 +g2 sS'label' -p15 +p14 g2 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 -g9 +p23 +g8 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 -g9 +p26 +g8 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' @@ -109,7 +109,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 @@ -121,11 +121,11 @@ p39 g2 sS'x' p40 -g9 +g8 sS'model' p41 g4 sS'ot' p42 -g9 +g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 02be8cf8..f251b068 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -5,7 +5,7 @@ function MATCATH() { var function_name = "mat_cath"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); @@ -37,9 +37,6 @@ function MATCATH() { MATCATH.prototype.set = function MATCATH() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; @@ -62,9 +59,6 @@ function MATCATH() { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index d890df42..2e41f8ac 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -82,15 +82,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g12 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 7325fb09..5dded552 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -7,7 +7,7 @@ function MATCATV() { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in2 = new ScilabDouble([-1],[-1]); - this.model.in1 = new ScilabDouble([-2],[-3]); + this.model.in = new ScilabDouble([-2],[-3]); this.model.intyp = new ScilabDouble([-1,-1]); this.model.out = new ScilabDouble([0]); this.model.out2 = new ScilabDouble([-1]); @@ -38,9 +38,6 @@ function MATCATV() { MATCATV.prototype.set = function MATCATV() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; @@ -63,9 +60,6 @@ function MATCATV() { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index 6a100159..a2c7e6f7 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -82,15 +82,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g12 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 5393e6ee..72ab2633 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -5,7 +5,7 @@ function MATDET() { var function_name = "mat_det"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -37,10 +37,7 @@ function MATDET() { MATDET.prototype.set = function MATDET() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATDET() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATDET() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index e844f514..18f9e923 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -5,7 +5,7 @@ function MATDIAG() { var function_name = "mat_diag"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATDIAG() { MATDIAG.prototype.set = function MATDIAG() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATDIAG() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATDIAG() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 5639c8ed..30f1f5f6 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -5,7 +5,7 @@ function MATDIV() { var function_name = "mat_div"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-3],[-3]); this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATDIV() { MATDIV.prototype.set = function MATDIV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATDIV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATDIV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index 4b73461e..c3f3b3f1 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -31,64 +31,64 @@ g4 sS'it' p6 g2 -sS'model.intyp' -p7 -g2 sS'funtyp' -p8 +p7 S'double' -p9 +p8 sS'model.out' -p10 -g9 +p9 +g8 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 S'matrix' +p12 +sS'model.intyp' p13 -sS'model.in1' -p14 -g13 +g2 sS'label' -p15 +p14 g2 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 -g9 +p23 +g8 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 -g9 +p26 +g8 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' @@ -109,7 +109,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 @@ -121,11 +121,11 @@ p39 g2 sS'x' p40 -g9 +g8 sS'model' p41 g4 sS'ot' p42 -g9 +g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 6ab752ec..927932c6 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -5,7 +5,7 @@ function MATEIG() { var function_name = "mat_vps"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function MATEIG() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -94,10 +91,7 @@ function MATEIG() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index 3ab460e6..a2639242 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 1c08ba1b..c4c3ca56 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -5,7 +5,7 @@ function MATEXPM() { var function_name = "mat_expm"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATEXPM() { MATEXPM.prototype.set = function MATEXPM() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATEXPM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATEXPM() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 1708660f..9e8b7ebd 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -5,7 +5,7 @@ function MATINV() { var function_name = "mat_inv"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -37,10 +37,7 @@ function MATINV() { MATINV.prototype.set = function MATINV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATINV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATINV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 527120df..174fec1b 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -5,7 +5,7 @@ function MATLU() { var function_name = "mat_lu"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1],[-1]); @@ -37,9 +37,6 @@ function MATLU() { MATLU.prototype.set = function MATLU() { this.typ = inverse(arguments[0]["typ"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -62,7 +59,7 @@ function MATLU() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); + var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index 16367e49..ba0a2e1f 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -47,7 +47,7 @@ p11 sS'model.in2' p12 g7 -sS'model.in1' +sS'model.intyp' p13 g7 sS'x.graphics' @@ -76,18 +76,18 @@ g2 sS'model.out2' p23 g11 -sS'model.intyp' -p24 -g7 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g2 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 5374bd5f..ae7d4669 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -5,7 +5,7 @@ function MATMAGPHI() { var function_name = "matz_abs"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); @@ -37,9 +37,6 @@ function MATMAGPHI() { MATMAGPHI.prototype.set = function MATMAGPHI() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -75,10 +72,7 @@ function MATMAGPHI() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 52acca8a..f4a3b3e8 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -82,15 +82,15 @@ g10 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g8 sS'model.outtyp' -p27 +p26 g2 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g8 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 1aa8eeac..09afbea5 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -3,7 +3,7 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-2]); + this.model.in = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-3]); @@ -30,7 +30,6 @@ function MATMUL() { this.rule = parseFloat(arguments[0]["rule"]) this.np = parseFloat(arguments[0]["np"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; this.graphics = this.x.graphics; var label = this.graphics.exprs; this.model = this.x.model; @@ -158,7 +157,6 @@ function MATMUL() { this.graphics.exprs = new ScilabDouble([label]); this.x.graphics = this.graphics; this.x.model = this.model; - var arg1 = this.x; break; } } diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index cc0f48ba..53c54721 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -52,40 +52,40 @@ sS'model.in2' p13 S'matrix' p14 -sS'model.in1' -p15 -g14 sS'x.graphics' -p16 +p15 g2 sS'kmin' -p17 +p16 g10 sS'label' -p18 +p17 g8 sS'np' -p19 +p18 g10 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'label[2-1]' -p22 +p21 g5 sS'model.out2' -p23 +p22 g10 sS'in1' -p24 +p23 g14 sS'model.rpar' -p25 +p24 g14 sS'kmax' -p26 +p25 g10 +sS'model.in' +p26 +g14 sS'graphics' p27 g2 diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index df098edd..3a7d53d3 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -5,7 +5,7 @@ function MATPINV() { var function_name = "mat_pinv"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-2]); @@ -37,10 +37,7 @@ function MATPINV() { MATPINV.prototype.set = function MATPINV() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -61,7 +58,7 @@ function MATPINV() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -72,9 +69,6 @@ function MATPINV() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index 692445f6..08c52aca 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -32,62 +32,62 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 g2 sS'model.evtin' -p15 +p14 g2 sS'model.firing' -p16 +p15 g2 sS'function_name' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'model.evtout' -p21 +p20 g2 sS'arg1.graphics' -p22 +p21 g4 sS'model.out2' -p23 +p22 g7 sS'in1' -p24 +p23 g2 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' @@ -108,7 +108,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g18 +g17 sS'model.dep_ut' p36 g2 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 3b9cb604..f9546732 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -5,7 +5,7 @@ function MATRESH() { var function_name = "mat_reshape"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -41,9 +41,6 @@ function MATRESH() { this.l1 = arguments[0]["l1"] this.out = arguments[0]["out"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -100,9 +97,6 @@ function MATRESH() { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index 202e6e77..3cfbb362 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -80,18 +80,18 @@ g4 sS'model.out2' p23 g7 -sS'model.in1' -p24 -g7 sS'model.rpar' -p25 +p24 g2 sS'model.outtyp' -p26 +p25 g7 sS'model.state' -p27 +p26 g2 +sS'model.in' +p27 +g7 sS'graphics.exprs' p28 NsS'model.ipar' diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index d372a251..e20b6523 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -5,7 +5,7 @@ function MATSING() { var function_name = "mat_sing"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -39,9 +39,6 @@ function MATSING() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -97,10 +94,7 @@ function MATSING() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index 3ab460e6..a2639242 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index f6e5631a..b62dfd04 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -5,7 +5,7 @@ function MATSUM() { var function_name = "mat_sum"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -39,9 +39,6 @@ function MATSUM() { this.typ = inverse(arguments[0]["typ"]) this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -88,7 +85,7 @@ function MATSUM() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var funtyp = 4; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); @@ -98,10 +95,7 @@ function MATSUM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index 8d65b461..8e670128 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -84,15 +84,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g7 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index f66776ed..0ce87a9b 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -3,7 +3,7 @@ function MATTRAN() { MATTRAN.prototype.define = function MATTRAN() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["mattran_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); @@ -27,10 +27,7 @@ function MATTRAN() { this.typ = inverse(arguments[0]["typ"]) this.rule = arguments[0]["rule"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==1) { label[2-1] = sci2exp(1); } @@ -55,7 +52,7 @@ function MATTRAN() { message("Datatype is not supported"); var ok = false; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -66,9 +63,6 @@ function MATTRAN() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index 7ed2495a..170273d4 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -43,32 +43,32 @@ p9 sS'model.in2' p10 g5 -sS'model.in1' -p11 -g5 sS'label' -p12 +p11 g9 sS'function_name' -p13 +p12 S'string' -p14 +p13 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'arg1.graphics' -p17 +p16 g2 sS'label[2-1]' -p18 -g14 +p17 +g13 sS'model.out2' -p19 +p18 g5 sS'in1' -p20 +p19 g9 +sS'model.in' +p20 +g5 sS'graphics.exprs' p21 NsS'typ' diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 9f91eda7..93f29e8d 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -5,7 +5,7 @@ function MATZCONJ() { var function_name = "matz_conj"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1]); @@ -34,7 +34,6 @@ function MATZCONJ() { return options; } MATZCONJ.prototype.set = function MATZCONJ() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle index eee96938..2f73e88e 100644 --- a/js/MatrixOp/MATZCONJ.pickle +++ b/js/MatrixOp/MATZCONJ.pickle @@ -29,7 +29,7 @@ g4 sS'model.in2' p6 g4 -sS'model.in1' +sS'model.intyp' p7 g4 sS'label' @@ -55,18 +55,18 @@ g2 sS'model.out2' p16 g4 -sS'model.intyp' -p17 -g4 sS'model.rpar' -p18 +p17 g2 sS'model.outtyp' -p19 +p18 g4 sS'model.state' -p20 +p19 g2 +sS'model.in' +p20 +g4 sS'model.ipar' p21 g2 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 0758fecb..cad93e6a 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -5,7 +5,7 @@ function MATZREIM() { var function_name = "matz_reim"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); @@ -37,9 +37,6 @@ function MATZREIM() { MATZREIM.prototype.set = function MATZREIM() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -75,10 +72,7 @@ function MATZREIM() { } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 7ac4c77e..eddc8cd5 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -82,15 +82,15 @@ g10 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g8 sS'model.outtyp' -p27 +p26 g2 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g8 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 50c61ec1..99c33112 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -5,7 +5,7 @@ function RICC() { var function_name = "ricc_m"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.in2 = new ScilabDouble([-1],[-1],[-1]); this.model.intyp = new ScilabDouble([1,1,1]); this.model.out = new ScilabDouble([-1]); @@ -39,10 +39,7 @@ function RICC() { this.tpe = arguments[0]["tpe"] this.mod = arguments[0]["mod"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -51,7 +48,7 @@ function RICC() { if (!ok) { break; } - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var it = [1,1,1]; var ot = 1; @@ -63,9 +60,6 @@ function RICC() { if (ok) { this.model.ipar = new ScilabDouble([this.tpe],[this.mod]); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 7e047045..835cb977 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -82,15 +82,15 @@ g2 sS'model.rpar' p25 g2 -sS'model.in1' -p26 -g12 sS'model.outtyp' -p27 +p26 g8 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g12 sS'graphics.exprs' p29 NsS'model.ipar' diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index de51409f..fa95397e 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -5,7 +5,7 @@ function ROOTCOEF() { var function_name = "root_coef"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-2]); @@ -39,10 +39,7 @@ function ROOTCOEF() { this.typ = inverse(arguments[0]["typ"]) this.inp = arguments[0]["inp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -74,9 +71,6 @@ function ROOTCOEF() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index 5138a17a..bac0fcfd 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -34,63 +34,63 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' @@ -111,7 +111,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index db55a22b..b948cf84 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -3,7 +3,7 @@ function SQRT() { SQRT.prototype.define = function SQRT() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["mat_sqrt"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -27,10 +27,7 @@ function SQRT() { SQRT.prototype.set = function SQRT() { this.typ = inverse(arguments[0]["typ"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.typ,this.exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { @@ -46,7 +43,7 @@ function SQRT() { } var it = this.typ; var ot = this.typ; - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { @@ -57,9 +54,6 @@ function SQRT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index bb5d0c7b..a4d1b2a1 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -28,46 +28,46 @@ sS'it' p4 S'vector' p5 -sS'model.intyp' +sS'funtyp' p6 S'double' p7 -sS'funtyp' -p8 -g7 sS'model.out' -p9 +p8 g7 sS'out' -p10 +p9 g5 sS'model.in2' -p11 +p10 g7 -sS'model.in1' -p12 +sS'model.intyp' +p11 g7 sS'label' -p13 +p12 g5 sS'function_name' -p14 +p13 S'string' -p15 +p14 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'arg1.graphics' -p18 +p17 g2 sS'model.out2' -p19 +p18 g7 sS'in1' -p20 +p19 g5 sS'model.outtyp' +p20 +g7 +sS'model.in' p21 g7 sS'graphics.exprs' diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index c114440e..0f4dc30c 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -5,7 +5,7 @@ function SUBMAT() { var function_name = "submat"; var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -47,10 +47,7 @@ function SUBMAT() { this.d = arguments[0]["d"] this.inp = arguments[0]["inp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; if (size(label,"*")==5) { label[6-1] = sci2exp([1,1]); } @@ -103,9 +100,6 @@ function SUBMAT() { var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 61bc9841..2505d213 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -42,74 +42,74 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 +sS'model.in' +p28 +g7 sS'graphics.exprs' p29 NsS'model.ipar' p30 -g15 +g14 sS'typ' p31 g2 sS'label[6-1]' p32 -g19 +g18 sS'arg1.model' p33 NsS'ok' @@ -118,7 +118,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g19 +g18 sS'model.dep_ut' p37 g2 |