diff options
Diffstat (limited to 'src/jcgp/CGP.java')
| -rw-r--r-- | src/jcgp/CGP.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/jcgp/CGP.java b/src/jcgp/CGP.java index 6cf5429..d2be161 100644 --- a/src/jcgp/CGP.java +++ b/src/jcgp/CGP.java @@ -24,9 +24,13 @@ public final class CGP { public CGP() { initialise(); - fitnessFunction.evaluate(population); - - ea.evolve(population, mutator); + for (int i = 0; i < Parameters.getTotalGenerations(); i++) { + Parameters.setCurrentGeneration(i); + fitnessFunction.evaluate(population); + ea.evolve(population, mutator); + } + + } /** @@ -51,7 +55,7 @@ public final class CGP { Parameters.setMaxArity(functionSet.getMaxArity()); // initialise fitness function and truth table - TruthTable.setTestCases(new TestCase(new int[] {2, 5, 4}, new int[] {1, 10, 15})); + TruthTable.setTestCases(new TestCase(new Object[] {2, 5, 4}, new Object[] {1, 10, 15})); fitnessFunction = new TruthTableEvaluator(); // initialise EA |