diff --git a/src/main/java/elntranslator/ELNTConnectingPoint.java b/src/main/java/elntranslator/ELNTConnectingPoint.java
index 92c5d1cbccd6bc398ee06d9b9a47d2b0ad37c183..5bb09510b0b472362d09a001085463f91d2626b9 100644
--- a/src/main/java/elntranslator/ELNTConnectingPoint.java
+++ b/src/main/java/elntranslator/ELNTConnectingPoint.java
@@ -46,13 +46,14 @@ package elntranslator;
* @author Irina Kit Yan LEE
*/
-public class ELNTConnectingPoint{
+public class ELNTConnectingPoint {
private String name;
- private ELNTConnector ownerConnector ;
+ private ELNTConnector ownerConnector;
private ELNTComponent ownerComponent;
- public ELNTConnectingPoint(ELNTComponent _ownerComponent, String _name) {
+ public ELNTConnectingPoint(String _name, ELNTComponent _ownerComponent) {
+ name = _name;
ownerComponent = _ownerComponent;
}
@@ -63,6 +64,10 @@ public class ELNTConnectingPoint{
public ELNTConnector getConnector() {
return ownerConnector;
}
+
+ public void setOwnerConnector(ELNTConnector _ownerConnector) {
+ ownerConnector = _ownerConnector;
+ }
public ELNTComponent getComponent() {
return ownerComponent;
diff --git a/src/main/java/elntranslator/toELN/ModuleCode.java b/src/main/java/elntranslator/toELN/ModuleCode.java
index b43d78d8962967e2443fa1510e6263f97f487c30..6eafd44ae4dd3dafcc08ba121b31a604fb0e7abb 100644
--- a/src/main/java/elntranslator/toELN/ModuleCode.java
+++ b/src/main/java/elntranslator/toELN/ModuleCode.java
@@ -344,7 +344,7 @@ public class ModuleCode {
for (int j = 0; j < capacitors.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + capacitors.get(i).getName() + "." + capacitors.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(capacitors.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(capacitors.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(capacitors.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -360,7 +360,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(capacitors.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(capacitors.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(capacitors.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -384,7 +384,7 @@ public class ModuleCode {
for (int j = 0; j < idealTransformers.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + idealTransformers.get(i).getName() + "." + idealTransformers.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(idealTransformers.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(idealTransformers.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(idealTransformers.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -400,7 +400,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(idealTransformers.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(idealTransformers.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(idealTransformers.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -424,7 +424,7 @@ public class ModuleCode {
for (int j = 0; j < isources.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + isources.get(i).getName() + "." + isources.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(isources.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(isources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(isources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -440,7 +440,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(isources.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(isources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(isources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -464,7 +464,7 @@ public class ModuleCode {
for (int j = 0; j < vsources.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + vsources.get(i).getName() + "." + vsources.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(vsources.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(vsources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(vsources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -480,7 +480,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(vsources.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(vsources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(vsources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -504,7 +504,7 @@ public class ModuleCode {
for (int j = 0; j < inductors.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + inductors.get(i).getName() + "." + inductors.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(inductors.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(inductors.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(inductors.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -520,7 +520,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(inductors.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(inductors.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(inductors.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -544,7 +544,7 @@ public class ModuleCode {
for (int j = 0; j < resistors.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + resistors.get(i).getName() + "." + resistors.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(resistors.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(resistors.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(resistors.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -560,7 +560,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(resistors.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(resistors.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(resistors.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -584,7 +584,7 @@ public class ModuleCode {
for (int j = 0; j < transmissionLines.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + transmissionLines.get(i).getName() + "." + transmissionLines.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(transmissionLines.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(transmissionLines.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(transmissionLines.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -600,7 +600,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(transmissionLines.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(transmissionLines.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(transmissionLines.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -624,7 +624,7 @@ public class ModuleCode {
for (int j = 0; j < vccss.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + vccss.get(i).getName() + "." + vccss.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(vccss.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(vccss.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(vccss.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -640,7 +640,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(vccss.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(vccss.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(vccss.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -664,7 +664,7 @@ public class ModuleCode {
for (int j = 0; j < vcvss.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + vcvss.get(i).getName() + "." + vcvss.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(vcvss.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(vcvss.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(vcvss.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -680,7 +680,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(vcvss.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(vcvss.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(vcvss.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -704,7 +704,7 @@ public class ModuleCode {
for (int j = 0; j < TDF_isinks.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + TDF_isinks.get(i).getName() + "." + TDF_isinks.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(TDF_isinks.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(TDF_isinks.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(TDF_isinks.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -720,7 +720,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(TDF_isinks.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(TDF_isinks.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(TDF_isinks.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -744,7 +744,7 @@ public class ModuleCode {
for (int j = 0; j < TDF_isources.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + TDF_isources.get(i).getName() + "." + TDF_isources.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(TDF_isources.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(TDF_isources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(TDF_isources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -760,7 +760,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(TDF_isources.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(TDF_isources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(TDF_isources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -784,7 +784,7 @@ public class ModuleCode {
for (int j = 0; j < TDF_vsinks.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + TDF_vsinks.get(i).getName() + "." + TDF_vsinks.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(TDF_vsinks.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(TDF_vsinks.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(TDF_vsinks.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -800,7 +800,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(TDF_vsinks.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(TDF_vsinks.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(TDF_vsinks.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -824,7 +824,7 @@ public class ModuleCode {
for (int j = 0; j < TDF_vsources.get(i).getConnectingPoint().size(); j++) {
corpsModule = corpsModule + "\t\t" + TDF_vsources.get(i).getName() + "." + TDF_vsources.get(i).getConnectingPoint().get(j).getName() + "(";
for (int k = 0; k < connectors.size(); k++) {
- if (connectors.get(k).get_p1().getComponent().equals(TDF_vsources.get(i))) {
+ if (connectors.get(k).get_p1().getName().equals(TDF_vsources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p1().getComponent().equals(TDF_vsources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -840,7 +840,7 @@ public class ModuleCode {
}
}
}
- if (connectors.get(k).get_p2().getComponent().equals(TDF_vsources.get(i))) {
+ if (connectors.get(k).get_p2().getName().equals(TDF_vsources.get(i).getConnectingPoint().get(j).getName()) && connectors.get(k).get_p2().getComponent().equals(TDF_vsources.get(i))) {
if (!connectors.get(k).getName().equals("")) {
corpsModule = corpsModule + connectors.get(k).getName() + ");" + CR;
} else {
@@ -863,11 +863,11 @@ public class ModuleCode {
corpsModule = corpsModule + "\t}" + CR2 + "private:" + CR;
for (int i = 0; i < nodes.size(); i++) {
- corpsModule = corpsModule + "\tsca_eln::sca_node " + nodes.get(i).getName() + CR;
+ corpsModule = corpsModule + "\tsca_eln::sca_node " + nodes.get(i).getName() + ";" + CR;
}
for (int i = 0; i < nodeRefs.size(); i++) {
- corpsModule = corpsModule + "\tsca_eln::sca_node_ref " + nodeRefs.get(i).getName() + CR;
+ corpsModule = corpsModule + "\tsca_eln::sca_node_ref " + nodeRefs.get(i).getName() + ";" + CR;
}
corpsModule = corpsModule + "};" + CR2 + "#endif" + " // " + module.getName().toUpperCase() + "_H";
diff --git a/src/main/java/ui/ELNPanelTranslator.java b/src/main/java/ui/ELNPanelTranslator.java
index 7ae2b1ca1df3cac29cba52fc6a3ff7081672bbe3..a02e0e6ac1c6c02d48119622526138b5973763ca 100644
--- a/src/main/java/ui/ELNPanelTranslator.java
+++ b/src/main/java/ui/ELNPanelTranslator.java
@@ -170,14 +170,25 @@ public class ELNPanelTranslator {
ELNConnectingPoint cp0 = (ELNConnectingPoint) capacitor.getTGConnectingPointAtIndex(0);
ELNConnectingPoint cp1 = (ELNConnectingPoint) capacitor.getTGConnectingPointAtIndex(1);
+ System.out.println(((ELNConnectingPoint) capacitor.getTGConnectingPointAtIndex(0)).getName());
+ System.out.println(((ELNConnectingPoint) capacitor.getTGConnectingPointAtIndex(1)).getName());
+ System.out.println(cp0.getName());
+ System.out.println(cp1.getName());
+
ELNTComponentCapacitor elnCapacitor = new ELNTComponentCapacitor(name, val, q0, unit0, unit1, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnCapacitor, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnCapacitor, cp1.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnCapacitor);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnCapacitor);
+ System.out.println(elncp0.getName());
+ System.out.println(elncp1.getName());
+
elnCapacitor.addConnectingPoint(elncp0);
elnCapacitor.addConnectingPoint(elncp1);
+ System.out.println(elnCapacitor.getConnectingPoint().get(0).getName());
+ System.out.println(elnCapacitor.getConnectingPoint().get(1).getName());
+
elnMap.put(capacitor, elnCapacitor);
elnModule.addCapacitor(elnCapacitor);
elnComponents.add(elnCapacitor);
@@ -194,9 +205,9 @@ public class ELNPanelTranslator {
ELNTComponentCurrentSinkTDF elnTDF_isink = new ELNTComponentCurrentSinkTDF(name, scale,elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnTDF_isink, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnTDF_isink, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnTDF_isink, cp2.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnTDF_isink);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnTDF_isink);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnTDF_isink);
elnTDF_isink.addConnectingPoint(elncp0);
elnTDF_isink.addConnectingPoint(elncp1);
@@ -218,9 +229,9 @@ public class ELNPanelTranslator {
ELNTComponentCurrentSourceTDF elnTDF_isource = new ELNTComponentCurrentSourceTDF(name, scale, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnTDF_isource, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnTDF_isource, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnTDF_isource, cp2.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnTDF_isource);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnTDF_isource);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnTDF_isource);
elnTDF_isource.addConnectingPoint(elncp0);
elnTDF_isource.addConnectingPoint(elncp1);
@@ -243,10 +254,10 @@ public class ELNPanelTranslator {
ELNTComponentIdealTransformer elnIdealTransformer = new ELNTComponentIdealTransformer(name, ratio, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnIdealTransformer, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnIdealTransformer, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnIdealTransformer, cp2.getName());
- ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(elnIdealTransformer, cp3.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnIdealTransformer);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnIdealTransformer);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnIdealTransformer);
+ ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(cp3.getName(), elnIdealTransformer);
elnIdealTransformer.addConnectingPoint(elncp0);
elnIdealTransformer.addConnectingPoint(elncp1);
@@ -277,8 +288,8 @@ public class ELNPanelTranslator {
ELNTComponentIndependentCurrentSource elnISource = new ELNTComponentIndependentCurrentSource(name, initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmpliture, delay, unit0, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnISource, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnISource, cp1.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnISource);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnISource);
elnISource.addConnectingPoint(elncp0);
elnISource.addConnectingPoint(elncp1);
@@ -307,8 +318,8 @@ public class ELNPanelTranslator {
ELNTComponentIndependentVoltageSource elnVSource = new ELNTComponentIndependentVoltageSource(name, initValue, offset, amplitude, frequency, phase, acAmplitude, acPhase, acNoiseAmpliture, delay, unit0, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnVSource, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnVSource, cp1.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnVSource);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnVSource);
elnVSource.addConnectingPoint(elncp0);
elnVSource.addConnectingPoint(elncp1);
@@ -331,8 +342,8 @@ public class ELNPanelTranslator {
ELNTComponentInductor elnInductor = new ELNTComponentInductor(name, val, phi0, unit0, unit1, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnInductor, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnInductor, cp1.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnInductor);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnInductor);
elnInductor.addConnectingPoint(elncp0);
elnInductor.addConnectingPoint(elncp1);
@@ -365,8 +376,8 @@ public class ELNPanelTranslator {
ELNTComponentResistor elnResistor = new ELNTComponentResistor(name, val, unit, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnResistor, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnResistor, cp1.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnResistor);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnResistor);
elnResistor.addConnectingPoint(elncp0);
elnResistor.addConnectingPoint(elncp1);
@@ -392,10 +403,10 @@ public class ELNPanelTranslator {
ELNTComponentTransmissionLine elnTransmissionLine = new ELNTComponentTransmissionLine(name, z0, delta0, delay, unit0, unit2, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnTransmissionLine, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnTransmissionLine, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnTransmissionLine, cp2.getName());
- ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(elnTransmissionLine, cp3.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnTransmissionLine);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnTransmissionLine);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnTransmissionLine);
+ ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(cp3.getName(), elnTransmissionLine);
elnTransmissionLine.addConnectingPoint(elncp0);
elnTransmissionLine.addConnectingPoint(elncp1);
@@ -420,10 +431,10 @@ public class ELNPanelTranslator {
ELNTComponentVoltageControlledCurrentSource elnVCCS = new ELNTComponentVoltageControlledCurrentSource(name, val, unit, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnVCCS, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnVCCS, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnVCCS, cp2.getName());
- ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(elnVCCS, cp3.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnVCCS);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnVCCS);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnVCCS);
+ ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(cp3.getName(), elnVCCS);
elnVCCS.addConnectingPoint(elncp0);
elnVCCS.addConnectingPoint(elncp1);
@@ -447,10 +458,10 @@ public class ELNPanelTranslator {
ELNTComponentVoltageControlledVoltageSource elnVCVS = new ELNTComponentVoltageControlledVoltageSource(name, val, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnVCVS, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnVCVS, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnVCVS, cp2.getName());
- ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(elnVCVS, cp3.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnVCVS);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnVCVS);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnVCVS);
+ ELNTConnectingPoint elncp3 = new ELNTConnectingPoint(cp3.getName(), elnVCVS);
elnVCVS.addConnectingPoint(elncp0);
elnVCVS.addConnectingPoint(elncp1);
@@ -473,9 +484,9 @@ public class ELNPanelTranslator {
ELNTComponentVoltageSinkTDF elnTDF_vsink = new ELNTComponentVoltageSinkTDF(name, scale, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnTDF_vsink, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnTDF_vsink, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnTDF_vsink, cp2.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnTDF_vsink);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnTDF_vsink);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnTDF_vsink);
elnTDF_vsink.addConnectingPoint(elncp0);
elnTDF_vsink.addConnectingPoint(elncp1);
@@ -497,9 +508,9 @@ public class ELNPanelTranslator {
ELNTComponentVoltageSourceTDF elnTDF_vsource = new ELNTComponentVoltageSourceTDF(name, scale, elnModule);
- ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(elnTDF_vsource, cp0.getName());
- ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(elnTDF_vsource, cp1.getName());
- ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(elnTDF_vsource, cp2.getName());
+ ELNTConnectingPoint elncp0 = new ELNTConnectingPoint(cp0.getName(), elnTDF_vsource);
+ ELNTConnectingPoint elncp1 = new ELNTConnectingPoint(cp1.getName(), elnTDF_vsource);
+ ELNTConnectingPoint elncp2 = new ELNTConnectingPoint(cp2.getName(), elnTDF_vsource);
elnTDF_vsource.addConnectingPoint(elncp0);
elnTDF_vsource.addConnectingPoint(elncp1);
@@ -578,8 +589,8 @@ public class ELNPanelTranslator {
ELNTComponent avowner_p1 = elnMap.get(owner_p1);
ELNTComponent avowner_p2 = elnMap.get(owner_p2);
- ELNTConnectingPoint avConnectingPoint1 = new ELNTConnectingPoint(avowner_p1, p1Name);
- ELNTConnectingPoint avConnectingPoint2 = new ELNTConnectingPoint(avowner_p2, p2Name);
+ ELNTConnectingPoint avConnectingPoint1 = new ELNTConnectingPoint(p1Name, avowner_p1);
+ ELNTConnectingPoint avConnectingPoint2 = new ELNTConnectingPoint(p2Name, avowner_p2);
ELNTConnector avconnector = new ELNTConnector(avConnectingPoint1, avConnectingPoint2, name);