summaryrefslogtreecommitdiff
path: root/js/Electrical
diff options
context:
space:
mode:
Diffstat (limited to 'js/Electrical')
-rw-r--r--js/Electrical/CCS.js2
-rw-r--r--js/Electrical/CVS.js2
-rw-r--r--js/Electrical/Capacitor.js2
-rw-r--r--js/Electrical/ConstantVoltage.js2
-rw-r--r--js/Electrical/CurrentSensor.js2
-rw-r--r--js/Electrical/Diode.js2
-rw-r--r--js/Electrical/Ground.js2
-rw-r--r--js/Electrical/Gyrator.js2
-rw-r--r--js/Electrical/IdealTransformer.js2
-rw-r--r--js/Electrical/Inductor.js2
-rw-r--r--js/Electrical/MOTOR.js2
-rw-r--r--js/Electrical/NMOS.js2
-rw-r--r--js/Electrical/NPN.js2
-rw-r--r--js/Electrical/OpAmp.js2
-rw-r--r--js/Electrical/PMOS.js2
-rw-r--r--js/Electrical/PNP.js2
-rw-r--r--js/Electrical/PotentialSensor.js2
-rw-r--r--js/Electrical/Resistor.js2
-rw-r--r--js/Electrical/SineVoltage.js2
-rw-r--r--js/Electrical/Switch.js2
-rw-r--r--js/Electrical/VVsourceAC.js2
-rw-r--r--js/Electrical/VariableResistor.js2
-rw-r--r--js/Electrical/VoltageSensor.js2
-rw-r--r--js/Electrical/VsourceAC.js2
24 files changed, 24 insertions, 24 deletions
diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js
index d42829ae..236ab983 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 = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(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.js b/js/Electrical/CVS.js
index 845ee04d..bf5c66f3 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 = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(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/Capacitor.js b/js/Electrical/Capacitor.js
index c542eb02..a890eedf 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 = new standard_define(new ScilabDouble([2,1.1]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,new ScilabString([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.js b/js/Electrical/ConstantVoltage.js
index b63e2cc1..bebb9c4e 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 = new standard_define(new ScilabDouble([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,new ScilabString([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/CurrentSensor.js b/js/Electrical/CurrentSensor.js
index a2f3b791..a3370ccd 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/Diode.js b/js/Electrical/Diode.js
index a25b513d..b6bdc083 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 = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([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/Ground.js b/js/Electrical/Ground.js
index 6674fde9..6e22af8e 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 = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([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/Gyrator.js b/js/Electrical/Gyrator.js
index 9aeea7ab..fa5879d8 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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.js b/js/Electrical/IdealTransformer.js
index f1df4307..2d7284b9 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(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/Inductor.js b/js/Electrical/Inductor.js
index 1028683b..e2efde59 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 = new standard_define(new ScilabDouble([2,0.9]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,new ScilabString([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/MOTOR.js b/js/Electrical/MOTOR.js
index 6ab8def6..e681218e 100644
--- a/js/Electrical/MOTOR.js
+++ b/js/Electrical/MOTOR.js
@@ -9,7 +9,7 @@ function MOTOR() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]);
this.exprs = "";
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([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/NMOS.js b/js/Electrical/NMOS.js
index ce637283..9976ae99 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/NPN.js b/js/Electrical/NPN.js
index cd19be1e..665dbda0 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/OpAmp.js b/js/Electrical/OpAmp.js
index e93e98cd..469ab014 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 = new standard_define(new ScilabDouble([3,5]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,5]),this.model,new ScilabString([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/PMOS.js b/js/Electrical/PMOS.js
index b0f62361..f031f236 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/PNP.js b/js/Electrical/PNP.js
index 676cf5fd..ef2e280b 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/PotentialSensor.js b/js/Electrical/PotentialSensor.js
index f5c9b76f..ae77c13a 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 = new standard_define(new ScilabDouble([2,2]),this.model,"",list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([""]),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/Resistor.js b/js/Electrical/Resistor.js
index ef2dcf5e..383e2735 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 = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([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/SineVoltage.js b/js/Electrical/SineVoltage.js
index 87b6e622..f4c18f51 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/Switch.js b/js/Electrical/Switch.js
index ff334d1c..35407ac3 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([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.js b/js/Electrical/VVsourceAC.js
index 60dfb33b..49e9325c 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(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.js b/js/Electrical/VariableResistor.js
index 40e446e7..2c884ba0 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/VoltageSensor.js b/js/Electrical/VoltageSensor.js
index 3434e243..7ad9fe30 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(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/VsourceAC.js b/js/Electrical/VsourceAC.js
index 72276f83..549b2b5e 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 = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0));
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0));
this.x.graphics.in_implicit = ["I"];
this.x.graphics.out_implicit = ["I"];
return new BasicBlock(this.x);
generated by cgit (git 2.34.1) at 2025-03-13 00:45:02 +0000