distinguish between functions and arrays

maintain a list of functions

6 files changed, 48 insertions, 48 deletions

diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js
index de996d4f..bb5e1ebe 100644
--- a/js/Electrical/CCS.js
+++ b/js/Electrical/CCS.js
@@ -12,21 +12,21 @@ MO=[];
 P=[[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
 PortName=[["Iin"],["p"],["n"]];
 for (i=1;i<=size(P,"r");i+=1) {
-if (P(i,3)==1) {
+if (P[i-1][3-1]==1) {
 Typein=[[Typein],["E"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==2) {
+if (P[i-1][3-1]==2) {
 Typein=[[Typein],["I"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==-1) {
+if (P[i-1][3-1]==-1) {
 Typeout=[[Typeout],["E"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
-if (P(i,3)==-2) {
+if (P[i-1][3-1]==-2) {
 Typeout=[[Typeout],["I"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
 }
 model=scicos_model();
diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js
index 372998d0..ddeeecfd 100644
--- a/js/Electrical/CVS.js
+++ b/js/Electrical/CVS.js
@@ -12,21 +12,21 @@ MO=[];
 P=[[2,50,1,0],[70,98,2,0],[70,2,-2,0]];
 PortName=[["vin"],["p"],["n"]];
 for (i=1;i<=size(P,"r");i+=1) {
-if (P(i,3)==1) {
+if (P[i-1][3-1]==1) {
 Typein=[[Typein],["E"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==2) {
+if (P[i-1][3-1]==2) {
 Typein=[[Typein],["I"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==-1) {
+if (P[i-1][3-1]==-1) {
 Typeout=[[Typeout],["E"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
-if (P(i,3)==-2) {
+if (P[i-1][3-1]==-2) {
 Typeout=[[Typeout],["I"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
 }
 model=scicos_model();
diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js
index e276a4fa..7d3990ee 100644
--- a/js/Electrical/Gyrator.js
+++ b/js/Electrical/Gyrator.js
@@ -12,21 +12,21 @@ MO=[];
 P=[[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
 PortName=[["p1"],["n1"],["p2"],["n2"]];
 for (i=1;i<=size(P,"r");i+=1) {
-if (P(i,3)==1) {
+if (P[i-1][3-1]==1) {
 Typein=[[Typein],["E"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==2) {
+if (P[i-1][3-1]==2) {
 Typein=[[Typein],["I"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==-1) {
+if (P[i-1][3-1]==-1) {
 Typeout=[[Typeout],["E"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
-if (P(i,3)==-2) {
+if (P[i-1][3-1]==-2) {
 Typeout=[[Typeout],["I"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
 }
 model=scicos_model();
diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js
index e2eb30c2..07982301 100644
--- a/js/Electrical/IdealTransformer.js
+++ b/js/Electrical/IdealTransformer.js
@@ -12,21 +12,21 @@ MO=[];
 P=[[2.5,90,2,0],[2.5,10,2,0],[97.5,90,-2,0],[97.5,10,-2,0]];
 PortName=[["p1"],["n1"],["p2"],["n2"]];
 for (i=1;i<=size(P,"r");i+=1) {
-if (P(i,3)==1) {
+if (P[i-1][3-1]==1) {
 Typein=[[Typein],["E"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==2) {
+if (P[i-1][3-1]==2) {
 Typein=[[Typein],["I"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==-1) {
+if (P[i-1][3-1]==-1) {
 Typeout=[[Typeout],["E"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
-if (P(i,3)==-2) {
+if (P[i-1][3-1]==-2) {
 Typeout=[[Typeout],["I"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
 }
 model=scicos_model();
diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js
index 57b98315..27fa4fb4 100644
--- a/js/Electrical/NPN.js
+++ b/js/Electrical/NPN.js
@@ -12,21 +12,21 @@ MO=[];
 P=[[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
 PortName=[["C"],["B"],["E"]];
 for (i=1;i<=size(P,"r");i+=1) {
-if (P(i,3)==1) {
+if (P[i-1][3-1]==1) {
 Typein=[[Typein],["E"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==2) {
+if (P[i-1][3-1]==2) {
 Typein=[[Typein],["I"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==-1) {
+if (P[i-1][3-1]==-1) {
 Typeout=[[Typeout],["E"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
-if (P(i,3)==-2) {
+if (P[i-1][3-1]==-2) {
 Typeout=[[Typeout],["I"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
 }
 model=scicos_model();
diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js
index 8ffce6fc..f9023be7 100644
--- a/js/Electrical/PNP.js
+++ b/js/Electrical/PNP.js
@@ -12,21 +12,21 @@ MO=[];
 P=[[100,90,-2,0],[0,50,2,0],[100,10,-2,0]];
 PortName=[["C"],["B"],["E"]];
 for (i=1;i<=size(P,"r");i+=1) {
-if (P(i,3)==1) {
+if (P[i-1][3-1]==1) {
 Typein=[[Typein],["E"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==2) {
+if (P[i-1][3-1]==2) {
 Typein=[[Typein],["I"]];
-MI=[[MI],[PortName(i)]];
+MI=[[MI],[PortName[i-1]]];
 }
-if (P(i,3)==-1) {
+if (P[i-1][3-1]==-1) {
 Typeout=[[Typeout],["E"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
-if (P(i,3)==-2) {
+if (P[i-1][3-1]==-2) {
 Typeout=[[Typeout],["I"]];
-MO=[[MO],[PortName(i)]];
+MO=[[MO],[PortName[i-1]]];
 }
 }
 model=scicos_model();