diff options
Diffstat (limited to 'js/Electrical')
48 files changed, 50 insertions, 69 deletions
diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index 9ca93b6c..a28ddf88 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -44,7 +44,7 @@ function CCS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index fc35644a..e1251121 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -104,7 +104,7 @@ p33 g11 sS'x' p34 -g8 +g2 sS'model' p35 g2 diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 46e24d85..0896afe9 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -44,7 +44,7 @@ function CVS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index fc35644a..e1251121 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -104,7 +104,7 @@ p33 g11 sS'x' p34 -g8 +g2 sS'model' p35 g2 diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 87a25873..f6f5f7b8 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -18,7 +18,7 @@ function Capacitor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string([[this.C],[this.v]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = standard_define([2,1.1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 49807874..8afd2cda 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -103,8 +103,7 @@ p32 g12 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 s.
\ No newline at end of file diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index e2968411..d2f80fb1 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -17,7 +17,7 @@ function ConstantVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.V); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = standard_define([1.5,1.1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 7f12abce..7a66a82b 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -97,8 +97,7 @@ p30 g13 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index 752f7b9b..c0468b36 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -14,7 +14,7 @@ function CurrentSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index 01611a18..7cc82643 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -63,8 +63,7 @@ p18 g7 sS'x' p19 -g4 -sS'model' +NsS'model' p20 S'object' p21 diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index 8a7f0ebe..65e930f2 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -20,7 +20,7 @@ function Diode() { this.model.equations = new ScilabDouble([mo]); this.exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index 03c153b1..10292bf2 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -113,8 +113,7 @@ p34 g12 sS'x' p35 -g5 -sS'model' +NsS'model' p36 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index e9d19555..dc6565bc 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -13,7 +13,7 @@ function Ground() { this.model.equations = new ScilabDouble([mo]); this.exprs = ""; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new GroundBlock(this.x); diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index 7f41ea79..fd8415fa 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -62,8 +62,7 @@ p17 g8 sS'x' p18 -g4 -sS'model' +NsS'model' p19 S'object' p20 diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index d376d798..4f0a53fc 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -44,7 +44,7 @@ function Gyrator() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index b86e7d42..f219c232 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -116,7 +116,7 @@ p36 g8 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index c39d4793..962bfdcc 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -44,7 +44,7 @@ function IdealTransformer() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 81920d7d..1b921a73 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -114,7 +114,7 @@ p36 g14 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 3e303f91..13b55641 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -17,7 +17,7 @@ function Inductor() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.L); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = standard_define([2,0.9],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index bfc112c9..6d73f4a8 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -97,8 +97,7 @@ p30 g8 sS'x' p31 -g16 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 90f683f7..1cf40079 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -9,7 +9,7 @@ function MOTOR() { this.model.dep_ut = new ScilabDouble([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); this.exprs = ""; - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index c2594170..9ea67544 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -50,13 +50,11 @@ p13 g8 sS'x' p14 -S'double' +NsS'model' p15 -sS'model' -p16 S'object' -p17 +p16 sS'typ' -p18 +p17 g8 s.
\ No newline at end of file diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 57be53ba..2b8792b1 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -24,7 +24,7 @@ function NMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index b98ca894..40c50c53 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -135,8 +135,7 @@ p38 g16 sS'x' p39 -g2 -sS'model' +NsS'model' p40 g4 s.
\ No newline at end of file diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 5f0586f9..f86ae303 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -44,7 +44,7 @@ function NPN() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index 61efb5cd..d473e586 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -146,7 +146,7 @@ p36 g8 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 56a1e584..00bbdc6a 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -18,7 +18,7 @@ function OpAmp() { this.model.rpar = new ScilabDouble(Z); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = standard_define([3,5],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,5]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index 1dc893ad..f8d3e7a6 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -105,8 +105,7 @@ p32 g18 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 s.
\ No newline at end of file diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 9c9fd1b2..81ffddc7 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -24,7 +24,7 @@ function PMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index b98ca894..40c50c53 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -135,8 +135,7 @@ p38 g16 sS'x' p39 -g2 -sS'model' +NsS'model' p40 g4 s.
\ No newline at end of file diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 2716a49b..38ed38e9 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -44,7 +44,7 @@ function PNP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index 61efb5cd..d473e586 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -146,7 +146,7 @@ p36 g8 sS'x' p37 -g10 +g4 sS'model' p38 g4 diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index fd73b916..b3cc63f8 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -14,7 +14,7 @@ function PotentialSensor() { mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,"",list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,"",list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; return new BasicBlock(this.x); diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index be456ea1..d78a09c2 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -62,8 +62,7 @@ p17 g7 sS'x' p18 -g4 -sS'model' +NsS'model' p19 S'object' p20 diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index 03cefee9..412b0f56 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -17,7 +17,7 @@ function Resistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string(this.R); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index e7c6f185..7e4c24cf 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -97,8 +97,7 @@ p30 g12 sS'x' p31 -g8 -sS'model' +NsS'model' p32 g2 s.
\ No newline at end of file diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index ffdbf7f7..30df974f 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -21,7 +21,7 @@ function SineVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index db0b4d82..569ed239 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -118,8 +118,7 @@ p35 g8 sS'x' p36 -g12 -sS'model' +NsS'model' p37 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index d91773cc..a6fe5f09 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -20,7 +20,7 @@ function Switch() { this.model.rpar = new ScilabDouble([Z]); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index 5f734625..a84cfd60 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -109,8 +109,7 @@ p34 g19 sS'x' p35 -g8 -sS'model' +NsS'model' p36 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 0caef248..7d1be7c6 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -18,7 +18,7 @@ function VVsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [string(this.FR)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index ea61b826..d2b9a6cb 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -101,8 +101,7 @@ p32 g11 sS'x' p33 -g2 -sS'model' +NsS'model' p34 g6 s.
\ No newline at end of file diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index bd77b219..5bf7a900 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -14,7 +14,7 @@ function VariableResistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index 2aeed4ce..af8c8af0 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -63,8 +63,7 @@ p18 g7 sS'x' p19 -g4 -sS'model' +NsS'model' p20 g10 sS'typ' diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 26f366ce..0308bd9a 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -14,7 +14,7 @@ function VoltageSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new VoltageSensorBlock(this.x); diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index 01611a18..7cc82643 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -63,8 +63,7 @@ p18 g7 sS'x' p19 -g4 -sS'model' +NsS'model' p20 S'object' p21 diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index ef8644eb..a5bf800a 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -18,7 +18,7 @@ function VsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.VA)],[string(this.FR)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index a82a09d8..89aeb7b9 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -103,8 +103,7 @@ p32 g11 sS'x' p33 -g2 -sS'model' +NsS'model' p34 g6 s.
\ No newline at end of file |