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

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

@@ -2 +2 @@
   using System.Linq;
 
-  using HeuristicLab.BenchmarkSuite.ERC;
   using HeuristicLab.Common;
   using HeuristicLab.Core;
@@ -16 +15 @@
 
     public Data(Data origin, Cloner cloner) : base(origin, cloner) {
-      Name = origin.Name;
-      Description = origin.Description;
       OriginalTrainingCount = origin.OriginalTrainingCount;
       OriginalTestCount = origin.OriginalTestCount;
@@ -24 +21 @@
       InputArgumentTypes = origin.InputArgumentTypes;
       OutputArgumentTypes = origin.OutputArgumentTypes;
-      Examples = origin.Examples.ToArray();
+
+      if (origin.Examples != null)
+        Examples = origin.Examples.Select(e => (Example)e.Clone(cloner)).ToArray();
+
       EnabledDataTypes = origin.EnabledDataTypes;
-      this.ProblemErcOptions = cloner.Clone(origin.ProblemErcOptions);
     }
 
-    [Storable]
-    public string Name { get; set; }
-    [Storable]
-    public string Description { get; set; }
     [Storable]
     public int OriginalTrainingCount { get; set; }
@@ -38 +33 @@
     public int OriginalTestCount { get; set; }
     [Storable]
-    public int BestResult { get; set; }
+    public double BestResult { get; set; }
     [Storable]
-    public int WorstResult { get; set; }
+    public double WorstResult { get; set; }
     [Storable]
     public ExampleArgumentType[] InputArgumentTypes { get; set; }
@@ -48 +43 @@
     [Storable]
     public Example[] Examples { get; set; }
-    [Storable]
-    public ProblemErcOptions ProblemErcOptions { get; set; }
     [Storable]
     public DataTypes EnabledDataTypes { get; set; }
@@ -67 +60 @@
     public int EvalLimit { get; set; }
 
-    /// <summary>
-    /// “Max Gens” gives the maximum number of generations in a single PushGP run.
-    /// </summary>
-    [Storable]
-    public int MaxGenerations { get; set; }
-
-    /// <summary>
-    /// “Prog Eval Budget” is the maximum number of programs that will be evaluated before a run is terminated.
-    /// </summary>
-    [Storable]
-    public int ProgEvalBudget { get; set; }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new Data(this, cloner);