summaryrefslogtreecommitdiff
path: root/js/Electrical
diff options
context:
space:
mode:
authorSunil Shetye2018-07-11 10:44:34 +0530
committerSunil Shetye2018-07-11 15:21:08 +0530
commitaabd535925f24c6203eb1a0dcc5b28d9670133de (patch)
tree73c1021fb17dfdf86f088d930311a007cb3f2120 /js/Electrical
parentdc097af448d4ed55d685c5e87c8cffb70b7fb20a (diff)
downloadsci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.tar.gz
sci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.tar.bz2
sci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.zip
show type for matrix also
Diffstat (limited to 'js/Electrical')
-rw-r--r--js/Electrical/Capacitor.js2
-rw-r--r--js/Electrical/CurrentSensor.js2
-rw-r--r--js/Electrical/Diode.js4
-rw-r--r--js/Electrical/Gyrator.js2
-rw-r--r--js/Electrical/MOTOR.js2
-rw-r--r--js/Electrical/NPN.js2
-rw-r--r--js/Electrical/PNP.js2
-rw-r--r--js/Electrical/SineVoltage.js4
-rw-r--r--js/Electrical/VoltageSensor.js2
-rw-r--r--js/Electrical/VsourceAC.js4
10 files changed, 13 insertions, 13 deletions
diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js
index a096cc88..49409fff 100644
--- a/js/Electrical/Capacitor.js
+++ b/js/Electrical/Capacitor.js
@@ -4,7 +4,7 @@ function Capacitor() {
this.model = scicos_model();
this.C = 0.01;
this.v = 0;
- this.model.rpar = [[this.C],[this.v]];
+ this.model.rpar = new ScilabDouble([this.C],[this.v]);
this.model.sim = new ScilabString(["Capacitor"]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js
index 012f2595..b95e8505 100644
--- a/js/Electrical/CurrentSensor.js
+++ b/js/Electrical/CurrentSensor.js
@@ -3,7 +3,7 @@ function CurrentSensor() {
CurrentSensor.prototype.define = function CurrentSensor() {
this.model = scicos_model();
this.model.in1 = new ScilabDouble([1]);
- this.model.out = [[1],[1]];
+ this.model.out = new ScilabDouble([1],[1]);
this.model.sim = new ScilabString(["CurrentSensor"]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js
index 1b0e2795..db1b958e 100644
--- a/js/Electrical/Diode.js
+++ b/js/Electrical/Diode.js
@@ -6,7 +6,7 @@ function Diode() {
this.Maxexp = 15;
this.R = 1.e8;
this.model = scicos_model();
- this.model.rpar = [[this.Ids],[this.Vt],[this.Maxexp],[this.R]];
+ this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]);
this.model.in1 = new ScilabDouble([1]);
this.model.out = new ScilabDouble([1]);
this.model.sim = new ScilabString(["Diode"]);
@@ -51,7 +51,7 @@ function Diode() {
if (!ok) {
break;
}
- this.model.rpar = [[this.Ids],[this.Vt],[this.Maxexp],[this.R]];
+ this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]);
this.model.equations.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R));
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js
index 4f664525..044faa10 100644
--- a/js/Electrical/Gyrator.js
+++ b/js/Electrical/Gyrator.js
@@ -34,7 +34,7 @@ function Gyrator() {
this.model.sim = new ScilabString([ModelName]);
mo.inputs = MI;
mo.outputs = MO;
- this.model.rpar = PrametersValue;
+ this.model.rpar = new ScilabDouble(PrametersValue);
mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
exprs = [["1"],["1"]];
gr_i = [];
diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js
index f9fce6ce..952bb049 100644
--- a/js/Electrical/MOTOR.js
+++ b/js/Electrical/MOTOR.js
@@ -2,7 +2,7 @@
function MOTOR() {
MOTOR.prototype.define = function MOTOR() {
this.model = scicos_model();
- this.model.out = [[1],[1]];
+ this.model.out = new ScilabDouble([1],[1]);
this.model.in1 = [1];
this.model.sim = new ScilabString(["motor"]);
this.model.blocktype = new ScilabString(["c"]);
diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js
index 8f903938..6f6d2bb6 100644
--- a/js/Electrical/NPN.js
+++ b/js/Electrical/NPN.js
@@ -34,7 +34,7 @@ function NPN() {
this.model.sim = new ScilabString([ModelName]);
mo.inputs = MI;
mo.outputs = MO;
- this.model.rpar = PrametersValue;
+ this.model.rpar = new ScilabDouble(PrametersValue);
mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
gr_i = [];
diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js
index 99b0ccae..1fe8176c 100644
--- a/js/Electrical/PNP.js
+++ b/js/Electrical/PNP.js
@@ -34,7 +34,7 @@ function PNP() {
this.model.sim = new ScilabString([ModelName]);
mo.inputs = MI;
mo.outputs = MO;
- this.model.rpar = PrametersValue;
+ this.model.rpar = new ScilabDouble(PrametersValue);
mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName));
exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]];
gr_i = [];
diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js
index 8e0943c7..6906c803 100644
--- a/js/Electrical/SineVoltage.js
+++ b/js/Electrical/SineVoltage.js
@@ -9,7 +9,7 @@ function SineVoltage() {
this.frq = 1;
this.offset = 0;
this.start = 0;
- this.model.rpar = [[this.V],[this.ph],[this.frq],[this.offset],[this.start]];
+ this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]);
this.model.sim = new ScilabString(["SineVoltage"]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
@@ -54,7 +54,7 @@ function SineVoltage() {
if (!ok) {
break;
}
- this.model.rpar = [[this.V],[this.ph],[this.frq],[this.offset],[this.start]];
+ this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]);
this.model.equations.parameters[2] = list(new ScilabDouble([this.V]), new ScilabDouble([this.ph]), new ScilabDouble([this.frq]), new ScilabDouble([this.offset]), new ScilabDouble([this.start]));
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js
index af2cf818..b234f79a 100644
--- a/js/Electrical/VoltageSensor.js
+++ b/js/Electrical/VoltageSensor.js
@@ -3,7 +3,7 @@ function VoltageSensor() {
VoltageSensor.prototype.define = function VoltageSensor() {
this.model = scicos_model();
this.model.in1 = new ScilabDouble([1]);
- this.model.out = [[1],[1]];
+ this.model.out = new ScilabDouble([1],[1]);
this.model.sim = new ScilabString(["VoltageSensor"]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js
index f9895aa9..6c975081 100644
--- a/js/Electrical/VsourceAC.js
+++ b/js/Electrical/VsourceAC.js
@@ -6,7 +6,7 @@ function VsourceAC() {
this.model.out = [1];
this.VA = 220;
this.FR = 50;
- this.model.rpar = [[this.VA],[this.FR]];
+ this.model.rpar = new ScilabDouble([this.VA],[this.FR]);
this.model.sim = new ScilabString(["VsourceAC"]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
@@ -45,7 +45,7 @@ function VsourceAC() {
if (!ok) {
break;
}
- this.model.rpar = [[this.VA],[this.FR]];
+ this.model.rpar = new ScilabDouble([this.VA],[this.FR]);
this.model.equations.parameters[2] = list(new ScilabDouble([this.VA]), new ScilabDouble([this.FR]));
graphics.exprs = exprs;
this.x.graphics = graphics;