diff options
author | Eduardo Pedroni <ep625@york.ac.uk> | 2014-04-18 09:08:41 +0100 |
---|---|---|
committer | Eduardo Pedroni <ep625@york.ac.uk> | 2014-04-18 09:08:41 +0100 |
commit | 88314e71f908efcfc38da3b800319c171a6ccceb (patch) | |
tree | df42e3af2652dff815d1269bb81906a7af51e089 /src/jcgp/backend/modules | |
parent | e7d7e8506a511d78f9e323ac09587f79ad503f42 (diff) |
Added parsers, did a bit of testing, switched to java8
Diffstat (limited to 'src/jcgp/backend/modules')
-rw-r--r-- | src/jcgp/backend/modules/problem/SymbolicRegression.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jcgp/backend/modules/problem/SymbolicRegression.java b/src/jcgp/backend/modules/problem/SymbolicRegression.java index c92d183..46b8e09 100644 --- a/src/jcgp/backend/modules/problem/SymbolicRegression.java +++ b/src/jcgp/backend/modules/problem/SymbolicRegression.java @@ -2,18 +2,18 @@ package jcgp.backend.modules.problem; import java.util.ArrayList; -import jcgp.backend.function.IntegerArithmetic; +import jcgp.backend.function.DoubleArithmetic; import jcgp.backend.resources.Resources; -public class SymbolicRegression extends TestCaseProblem<Integer> { +public class SymbolicRegression extends TestCaseProblem<Double> { public SymbolicRegression(Resources resources) { super(resources); - functionSet = new IntegerArithmetic(); + functionSet = new DoubleArithmetic(); - ArrayList<TestCase<Integer>> tc = new ArrayList<TestCase<Integer>>(); - tc.add(new TestCase<Integer>(new Integer[]{1, 2, 3}, new Integer[]{-4, 5, 6})); - tc.add(new TestCase<Integer>(new Integer[]{3, 2, 5}, new Integer[]{2, 5, 9})); + ArrayList<TestCase<Double>> tc = new ArrayList<TestCase<Double>>(); + tc.add(new TestCase<Double>(new Double[]{1.0, 2.0, 3.0}, new Double[]{-4.0, 5.0, 6.0})); + tc.add(new TestCase<Double>(new Double[]{3.0, 2.0, 5.0}, new Double[]{2.0, 5.0, 9.0})); setTestCases(tc); } |