Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/CountOdds.cs

Timestamp:

04/10/17 00:27:31 (7 years ago)

Author:

pkimmesw

Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/CountOdds.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/CountOdds.cs

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
-  using HeuristicLab.BenchmarkSuite.ERC;
-  using HeuristicLab.Data;
 
   public class CountOdds : BenchmarkSuiteDataDescriptor {
@@ -7 +5 @@
     private const string fileName = "CountOdds.csv";
     private const string description = "";
-    private readonly ExampleArgumentType[] inputArgumentTypes = { ExampleArgumentType.IntegerCollection };
-    private readonly ExampleArgumentType[] outputArgumentTypes = { ExampleArgumentType.Integer };
 
-    private readonly DataTypes enabledDataTypeses = DataTypes.Exec | DataTypes.Integer | DataTypes.Boolean | DataTypes.IntegerVector;
-    private readonly ProblemErcOptions problemErcOptions = new ProblemErcOptions {
-      IntegerErcRange = new ErcOptionRange<IntValue>(
-        new IntValue(-1000),
-        new IntValue(1000),
-        new IntValue(0),
-        new IntValue(1),
-        new IntValue(2))
-    };
-
+    protected override string FileName { get { return fileName; } }
     public override string Name { get { return name; } }
     public override string Description { get { return description; } }
-    protected override string FileName { get { return fileName; } }
-    public override ExampleArgumentType[] InputArgumentTypes { get { return inputArgumentTypes; } }
-    public override ExampleArgumentType[] OutputArgumentTypes { get { return outputArgumentTypes; } }
-    public override int OriginalTrainingCount { get { return 200; } }
-    public override int OriginalTestCount { get { return 2000; } }
-    public override int BestResult { get { return 0; } }
-    public override int WorstResult { get { return 50; } }
-    public override ProblemErcOptions ProblemErcOptions { get { return this.problemErcOptions; } }
-    public override DataTypes EnabledDataTypes { get { return this.enabledDataTypeses; } }
-    public override int MaxSize { get { return 500; } }
-    public override int EvalLimit { get { return 1500; } }
-    public override int MaxGenerations { get { return 300; } }
-    public override int ProgEvalBudget { get { return 60000000; } }
+    protected override int InputArgumentCount { get { return 1; } }
+    protected override int OutputArgumentCount { get { return 1; } }
 
-    public override Example ParseExample(string[] input, string[] output) {
+    public override Data CreateProblemData() {
+      return new Data {
+        Name = Name,
+        Description = Description,
+        Examples = CloneExamples(),
+        BestResult = 0,
+        WorstResult = 50,
+        InputArgumentTypes = new[] { ExampleArgumentType.IntegerCollection },
+        OutputArgumentTypes = new[] { ExampleArgumentType.Integer },
+        OriginalTestCount = 2000,
+        OriginalTrainingCount = 200,
+        EnabledDataTypes = DataTypes.Exec | DataTypes.Integer | DataTypes.Boolean | DataTypes.IntegerVector,
+        EvalLimit = 1500,
+        MaxSize = 500,
+      };
+    }
+
+    protected override Example ParseExample(string[] input, string[] output) {
       return new Example {
         InputArgs = input,