Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/model/Source.java

src/controller/InputController.java

@@ -25,6 +25,7 @@ public static InputController getInstance() {
     private final ArrayList<VoltageSource> voltageSources = new ArrayList<>();
     private final ArrayList<Element> elements = new ArrayList<>();
     private final ArrayList<Source> sources = new ArrayList<>();
+    private Branch finalSuperiorBranch;
 
     private double deltaV = 0;
     private double deltaI = 0;
@@ -354,6 +355,10 @@ public double getTranTime() {
         return tranTime;
     }
 
+    public Branch getFinalSuperiorBranch() { return finalSuperiorBranch; }
+
+    public void setFinalSuperiorBranch(Branch finalSuperiorBranch) { this.finalSuperiorBranch = finalSuperiorBranch; }
+
     public void setAllNodesNotVisited() {
         for (Node node : nodes) {
             node.setNotVisited();

src/model/Branch.java

@@ -1,17 +1,40 @@
 package model;
 
+import java.util.ArrayList;
+
 public class Branch {
     protected final String name;
     protected Node nodeP;
     protected Node nodeN;
+    private Branch superiorBranch;
+    private ArrayList<Branch> subBranches = new ArrayList<>();
+    private int width;
+    private int height;
 
     public Branch(String name, Node nodeP, Node nodeN) {
         this.name = name;
         this.nodeP = nodeP;
         this.nodeN = nodeN;
-    }
+        this.superiorBranch = null;
 
-    public String getName() {
-        return name;
     }
+
+
+    public void setWidth(int width) { this.width = width; }
+
+    public void setHeight(int height) { this.height = height; }
+
+    public void setSuperiorBranch(Branch superiorBranch) { this.superiorBranch = superiorBranch; }
+
+    public void setSubBranches(ArrayList<Branch> subBranches) { this.subBranches = subBranches; }
+
+    public ArrayList<Branch> getSubBranches() { return subBranches; }
+
+    public Branch getSuperiorBranch() { return superiorBranch; }
+
+    public String getName() { return name; }
+
+    public int getWidth() { return width; }
+
+    public int getHeight() { return height; }
 }

src/model/Element.java

@@ -14,6 +14,8 @@ public Element(String name, Node nodeP, Node nodeN) {
         this.current = 0;
         this.helpCurrent = 0;
         this.currents = new ArrayList<>();
+        setHeight(1);
+        setWidth(1);
     }
 
     public void updateElementCurrent() {

src/model/Source.java

@@ -2,14 +2,10 @@
 
 import enums.Type;
 
-import java.util.ArrayList;
-
 public class Source extends Branch {
-    protected ArrayList<Double> currents;
 
     public Source(String name, Node nodeP, Node nodeN) {
         super(name, nodeP, nodeN);
-        currents = new ArrayList<>();
     }
 
     public double getVoltage(Node node) {
@@ -40,10 +36,6 @@ public Type getType() {
         return Type.SOURCE;
     }
 
-    public ArrayList<Double> getCurrents() {
-        return currents;
-    }
-
     @Override
     public String toString() {
         return  name + "        " +

src/view/fxml/DrawCircuit.java

@@ -16,10 +16,12 @@
 public abstract class DrawCircuit {
     private static double drawCircuitStep;
     private static final Pane circuitPane = new Pane();
+    private static final InputController controller = InputController.getInstance();
+
 
     private static final Image resistor = new Image("view/img/element/Resistor.png");
     private static final Image capacitor = new Image("view/img/element/Capacitor.png");
-    private static  final Image inductor = new Image("view/img/element/Inductor.png");
+    private static final Image inductor = new Image("view/img/element/Inductor.png");
     private static final Image diode = new Image("view/img/element/Diode.png");
     private static final Image gnd = new Image("view/img/element/Ground.png");
     private static final Image vSource = new Image("view/img/element/VSource.png");
@@ -36,6 +38,11 @@ public static Pane drawCircuit() {
                 circuitPane.getChildren().add(new Circle(getXY(i), getXY(j), 1));
             }
         }
+
+
+        setTheFinalSuperiorBranch();
+
+
         putGround();
         putImage(resistor, 9, 3);
         putImage(capacitor, 10, 4);
@@ -56,6 +63,40 @@ public static Pane drawCircuit() {
         return circuitPane;
     }
 
+
+    private static void setTheFinalSuperiorBranch()
+    {
+        ArrayList<Branch>   allBranches = new ArrayList<>();
+
+        for (Source source : controller.getSources()) {
+            allBranches.add(source);
+        }
+
+        for (Element element : controller.getElements()) {
+            allBranches.add(element);
+        }
+
+
+        while (allBranches.size() != 1)
+        {
+
+
+
+
+        }
+
+
+
+        controller.setFinalSuperiorBranch(allBranches.get(0));
+
+    }
+
+    private static void incorporateParallelBranchesToNewBranch()
+    {
+
+    }
+
+
     private static ArrayList<Branch> getBranches(Node node1, Node node2) {
         ArrayList<Branch> branches = new ArrayList<>();
         for (Element element : node1.getElements()) {