Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/BenchmarkSuiteDataDescriptor.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/BenchmarkSuiteDataDescriptor.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/BenchmarkSuiteDataDescriptor.cs

@@ -6 +6 @@
   using System.Reflection;
   using System.Text.RegularExpressions;
-
-  using HeuristicLab.BenchmarkSuite.ERC;
   using HeuristicLab.BenchmarkSuite.Problems;
 
@@ -19 +17 @@
 
     private Example[] examples;
-    public Example[] Examples
-    {
-      get
-      {
-        return this.examples ?? (this.examples = this.ParseData().ToArray());
-      }
+
+    protected Example[] CloneExamples() {
+      if (examples == null) examples = ParseData().ToArray();
+      return examples.Select(e => (Example)e.Clone()).ToArray();
     }
 
-    public Data CreateProblemData() {
-      return new Data {
-        Name = Name,
-        Description = Description,
-        Examples = Examples.ToArray(),
-        BestResult = BestResult,
-        WorstResult = WorstResult,
-        InputArgumentTypes = InputArgumentTypes,
-        OutputArgumentTypes = OutputArgumentTypes,
-        OriginalTestCount = OriginalTestCount,
-        OriginalTrainingCount = OriginalTrainingCount,
-        EnabledDataTypes = EnabledDataTypes,
-        EvalLimit = EvalLimit,
-        MaxGenerations = MaxGenerations,
-        MaxSize = MaxSize,
-        ProgEvalBudget = ProgEvalBudget,
-        ProblemErcOptions = ProblemErcOptions,
-      };
-    }
+    public abstract Data CreateProblemData();
 
+    protected abstract string FileName { get; }
     public abstract string Name { get; }
     public abstract string Description { get; }
-    protected abstract string FileName { get; }
-    public abstract int OriginalTrainingCount { get; }
-    public abstract int OriginalTestCount { get; }
-    public abstract int BestResult { get; }
-    public abstract int WorstResult { get; }
-    public abstract ExampleArgumentType[] InputArgumentTypes { get; }
-    public abstract ExampleArgumentType[] OutputArgumentTypes { get; }
-    public abstract ProblemErcOptions ProblemErcOptions { get; }
-    public abstract DataTypes EnabledDataTypes { get; }
-    public abstract int MaxSize { get; }
-    public abstract int EvalLimit { get; }
-    public abstract int MaxGenerations { get; }
-    public abstract int ProgEvalBudget { get; }
+    protected abstract int InputArgumentCount { get; }
+    protected abstract int OutputArgumentCount { get; }
 
-    public abstract Example ParseExample(string[] input, string[] output);
+    protected abstract Example ParseExample(string[] input, string[] output);
 
     private IEnumerable<Example> ParseData() {
@@ -79 +47 @@
             var fields = parser.ReadFields();
 
-            if (fields.Length != InputArgumentTypes.Length + OutputArgumentTypes.Length)
+            if (fields.Length != InputArgumentCount + OutputArgumentCount)
               throw new InvalidDataException("Number of values do not fit");
 
-            var input = fields.Take(InputArgumentTypes.Length).ToArray();
-            var output = fields.Skip(OutputArgumentTypes.Length).ToArray();
+            var input = fields.Take(InputArgumentCount).ToArray();
+            var output = fields.Skip(InputArgumentCount).ToArray();
 
             yield return ParseExample(input, output);