diff options
Diffstat (limited to 'src/jcgp/backend/tests/NodeTests.java')
| -rw-r--r-- | src/jcgp/backend/tests/NodeTests.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jcgp/backend/tests/NodeTests.java b/src/jcgp/backend/tests/NodeTests.java index e8fe02f..0e08d92 100644 --- a/src/jcgp/backend/tests/NodeTests.java +++ b/src/jcgp/backend/tests/NodeTests.java @@ -7,7 +7,7 @@ import jcgp.backend.function.IntegerArithmetic; import jcgp.backend.population.Chromosome; import jcgp.backend.population.Connection; import jcgp.backend.population.Node; -import jcgp.backend.resources.Resources; +import jcgp.backend.resources.ModifiableResources; import org.junit.Before; import org.junit.BeforeClass; @@ -32,7 +32,7 @@ public class NodeTests { private Node node; private static Chromosome chromosome; - private static Resources resources; + private static ModifiableResources resources; // these numbers will be used by the node under test private final int arg1 = 2; private final int arg2 = 5; @@ -40,14 +40,14 @@ public class NodeTests { @BeforeClass public static void setUpBeforeClass() { - resources = new Resources(); - + resources = new ModifiableResources(); + resources.setFunctionSet(new IntegerArithmetic()); chromosome = new Chromosome(resources); } @Before public void setUp() throws Exception { - node = new Node(chromosome, 0, 0, resources.getInt("arity")); + node = new Node(chromosome, 0, 0, resources.arity()); // make node with anonymous addition function and hard-coded value connections node.initialise(new IntegerArithmetic.Addition(), new Connection[]{new Connection() { @@ -174,7 +174,7 @@ public class NodeTests { return 0; } }; - node.setConnection(resources.getRandomInt(resources.getInt("arity")), conn2); + node.setConnection(resources.getRandomInt(resources.arity()), conn2); assertTrue("Connection was not found in node.", node.getConnection(0) == conn2 || node.getConnection(1) == conn2); |