Majorly refactored, node grid is fully implemented. About to attempt active path locking.

1 files changed, 19 insertions, 12 deletions

diff --git a/src/jcgp/population/Output.java b/src/jcgp/population/Output.java
index ccecae0..b7c6128 100644
--- a/src/jcgp/population/Output.java
+++ b/src/jcgp/population/Output.java
@@ -2,15 +2,18 @@ package jcgp.population;
 
 import java.util.ArrayList;
 
-public class Output implements MutableElement {
+import javafx.beans.property.SimpleObjectProperty;
+
+public class Output extends Gene implements MutableElement {
 	
-	private Connection source;
+	private SimpleObjectProperty<Connection> source;
 	private Chromosome chromosome;
 	private int index;
 	
 	public Output(Chromosome chromosome, int index) {
 		this.chromosome = chromosome;
 		this.index = index;
+		this.source = new SimpleObjectProperty<Connection>();
 	}
 
 	public Object calculate() {
@@ -19,8 +22,8 @@ public class Output implements MutableElement {
 	}
 
 	@Override
-	public void setConnection(Connection newConnection) {
-		source = newConnection;
+	public void setConnection(int index, Connection newConnection) {
+		source.set(newConnection);
 		chromosome.recomputeActiveNodes();
 	}
 
@@ -29,12 +32,16 @@ public class Output implements MutableElement {
 	}
 
 	public Connection getSource() {
+		return source.get();
+	}
+	
+	public SimpleObjectProperty<Connection> sourceProperty() {
 		return source;
 	}
 
 	public void getActiveNodes(ArrayList<Node> activeNodes) {
-		if (source instanceof Node) {
-			((Node) source).getActive(activeNodes);
+		if (source.get() instanceof Node) {
+			((Node) source.get()).getActive(activeNodes);
 		}
 	}
 	
@@ -44,14 +51,14 @@ public class Output implements MutableElement {
 			if (m instanceof Output) {
 				Output o = (Output) m;
 				if (index == o.getIndex()) {
-					if (source != o.getSource()) {
-						if (source instanceof Input && o.getSource() instanceof Input) {
-							if (((Input) source).getIndex() == ((Input) o.getSource()).getIndex()) {
+					if (source.get() != o.getSource()) {
+						if (source.get() instanceof Input && o.getSource() instanceof Input) {
+							if (((Input) source.get()).getIndex() == ((Input) o.getSource()).getIndex()) {
 								return true;
 							}
-						} else if (source instanceof Node && o.getSource() instanceof Node) {
-							if (((Node) source).getRow() == ((Node) o.getSource()).getRow() &&
-									((Node) source).getColumn() == ((Node) o.getSource()).getColumn()) {
+						} else if (source.get() instanceof Node && o.getSource() instanceof Node) {
+							if (((Node) source.get()).getRow() == ((Node) o.getSource()).getRow() &&
+									((Node) source.get()).getColumn() == ((Node) o.getSource()).getColumn()) {
 								return true;
 							}
 						}