Changeset 14744 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/BenchmarkSuiteDataDescriptor.cs

Timestamp:

03/10/17 21:42:09 (7 years ago)

Author:

pkimmesw

Message:

#2665 Renamings due to typos, ManagedPool tests, Skip Noops in Debugger

File:

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

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

@@ -9 +9 @@
 
   using HeuristicLab.BenchmarkSuite.Problems;
+  using HeuristicLab.Common;
+  using HeuristicLab.Core;
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
   using Microsoft.VisualBasic.FileIO;
 
-  public abstract class BenchmarkSuiteDataDescriptor : IBenchmarkSuiteDataDescriptor, IExampleParser {
-    protected const string InstanceArchiveName = "HeuristicLab.BenchmarkSuite.Data.BenchmarkExamples.zip";
-    protected const string ResourcePath = @".*\.Data\.";
-    protected const string ExampleSeparator = ",";
 
-    protected const char ArrayValueSeparator = ' ';
-    protected static readonly char[] ArraySymbolTrim = { '[', ']' };
+  [StorableClass]
+  public abstract class BenchmarkSuiteDataDescriptor : NamedItem, IBenchmarkSuiteDataDescriptor {
+    private const string InstanceArchiveName = "HeuristicLab.BenchmarkSuite.Data.BenchmarkExamples.zip";
+    private const string ResourcePath = @".*\.Data\.";
+    private const string ExampleSeparator = ",";
 
-    private readonly Lazy<Data> data;
-    private readonly Lazy<Example[]> examples;
+    private const char ArrayValueSeparator = ' ';
+    private static readonly char[] ArraySymbolTrim = { '[', ']' };
 
-    protected BenchmarkSuiteDataDescriptor() {
-      examples = new Lazy<Example[]>(ParseData().ToArray, false);
+    protected BenchmarkSuiteDataDescriptor() { }
+
+    [StorableConstructor]
+    protected BenchmarkSuiteDataDescriptor(bool deserializing) : base(deserializing) { }
+
+
+    [Storable]
+    private Example[] examples;
+    public Example[] Examples
+    {
+      get
+      {
+        return this.examples ?? (this.examples = this.ParseData().ToArray());
+      }
     }
 
-    protected Example[] Examples { get { return examples.Value; } }
-
-    public abstract string Name { get; }
-    public abstract string FileName { get; }
-    public abstract string Description { get; }
-    protected abstract int OriginalTrainingCount { get; }
-    protected abstract int OriginalTestCount { get; }
-    protected abstract int BestResult { get; }
-    protected abstract int WorstResult { get; }
-    protected abstract int InputArgumentCount { get; }
-    protected abstract int OutputArgumentCount { get; }
-    protected int TotalArgumentCount { get { return InputArgumentCount + OutputArgumentCount; } }
+    public new abstract string Name { get; }
+    protected abstract string FileName { get; }
+    public new abstract string Description { get; }
+    public abstract int OriginalTrainingCount { get; }
+    public abstract int OriginalTestCount { get; }
+    public abstract int BestResult { get; }
+    public abstract int WorstResult { get; }
+    public abstract int InputArgumentCount { get; }
+    public abstract int OutputArgumentCount { get; }
+    public int TotalArgumentCount { get { return InputArgumentCount + OutputArgumentCount; } }
 
     public abstract Example ParseExample(string[] input, string[] output);
-
-    public Data CreateData() {
-      return new Data(
-        BestResult,
-        WorstResult,
-        OriginalTestCount,
-        OriginalTrainingCount,
-        InputArgumentCount,
-        OutputArgumentCount,
-        Examples,
-        this);
-    }
 
     private IEnumerable<Example> ParseData() {
@@ -127 +127 @@
       throw new InvalidDataException(string.Format("Unable to parse {0} as boolean", str));
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return this;
+    }
   }
 }