Light refactoring, a good amount of testing done, added some new functions.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/jcgp/tests/ChromosomeTests.java b/src/jcgp/tests/ChromosomeTests.java
index c943da8..46463c5 100644
--- a/src/jcgp/tests/ChromosomeTests.java
+++ b/src/jcgp/tests/ChromosomeTests.java
@@ -6,9 +6,8 @@ import java.util.Random;
 
 import jcgp.Parameters;
 import jcgp.Utilities;
-import jcgp.function.Addition;
+import jcgp.function.Arithmetic;
 import jcgp.function.FunctionSet;
-import jcgp.function.Subtraction;
 import jcgp.population.Chromosome;
 import jcgp.population.Connection;
 import jcgp.population.Input;
@@ -50,7 +49,7 @@ public class ChromosomeTests {
 	@BeforeClass
 	public static void setUpBeforeClass() {
 		// initialise function set
-		FunctionSet functionSet = new FunctionSet(new Addition(), new Subtraction());
+		FunctionSet functionSet = new FunctionSet(new Arithmetic.Addition(), new Arithmetic.Subtraction());
 
 		// initialise utilities
 		Utilities.setResources(new Random(1234), functionSet);