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

1 files changed, 6 insertions, 21 deletions

diff --git a/src/jcgp/tests/OutputTests.java b/src/jcgp/tests/OutputTests.java
index b8f7d96..00cfea3 100644
--- a/src/jcgp/tests/OutputTests.java
+++ b/src/jcgp/tests/OutputTests.java
@@ -2,10 +2,7 @@ package jcgp.tests;
 
 import static org.junit.Assert.assertTrue;
 
-import java.util.Random;
-
-import jcgp.Utilities;
-import jcgp.parameters.Parameters;
+import jcgp.CGP.Resources;
 import jcgp.population.Chromosome;
 import jcgp.population.Connection;
 import jcgp.population.Output;
@@ -30,27 +27,15 @@ public class OutputTests {
 
 	private Output output;
 	private static Chromosome chromosome;
+	private static Resources resources;
 	// these are the test values
 	private final int outputValue = 10;
 	private final int outputIndex = 2;
 
 	@BeforeClass
 	public static void setUpBeforeClass() {
-		// initialise utilities
-		Utilities.setResources(new Random(1234), null);
-
-		// initialise parameters
-		Parameters.setColumns(0);
-		Parameters.setRows(0);
-		Parameters.setInputs(0);
-		Parameters.setOutputs(0);
-		Parameters.setLevelsBack(0);
-		Parameters.setMutationRate(10);
-		Parameters.setTotalGenerations(100);
-		Parameters.setTotalRuns(5);
-		Parameters.setMaxArity(2);
-
-		chromosome = new Chromosome();
+		resources = new Resources();
+		chromosome = new Chromosome(resources);
 	}
 
 	@Before
@@ -61,7 +46,7 @@ public class OutputTests {
 	@Test
 	public void evaluationsTest() {
 		// set source connection, check that the appropriate value is returned
-		output.setConnection(new Connection() {
+		output.setConnection(0, new Connection() {
 
 			@Override
 			public Object getValue() {
@@ -96,7 +81,7 @@ public class OutputTests {
 				return null;
 			}
 		};
-		output.setConnection(newConn);
+		output.setConnection(0, newConn);
 
 		assertTrue("Incorrect connection returned.", output.getSource() == newConn);
 	}