Changeset 14733 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite

Timestamp:

03/08/17 11:57:42 (8 years ago)

Author:

pkimmesw

Message:

#2665 Storable problem data, Renamings due to typos, Removed GP from class names

Location:

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

Files:

• HeuristicLab.BenchmarkSuite.csproj (modified) (1 diff)
• Problems/Data.cs (modified) (3 diffs)
• Problems/Example.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/HeuristicLab.BenchmarkSuite.csproj

@@ -59 +59 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">

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

@@ -2 +2 @@
   using System.Linq;
 
-  using HeuristicLab.Common;
-  using HeuristicLab.Core;
+  using Common;
+  using Core;
+  using Persistence.Default.CompositeSerializers.Storable;
 
+  [StorableClass]
   public class Data : NamedItem {
     public Data(double bestResult, double worstResult, int testCount, int trainingCount,
@@ -20 +22 @@
     }
 
+    [StorableConstructor]
+    public Data(bool deserializing) : base(deserializing) { }
+
     public Data(Data origin, Cloner cloner) : base(origin, cloner) {
       this.BestResult = origin.BestResult;
@@ -28 +33 @@
     }
 
+    [Storable]
     public readonly IExampleParser ExampleParser;
+    [Storable]
     public readonly Example[] Examples;
+    [Storable]
     public readonly int OriginalTestCount;
+    [Storable]
     public readonly int OriginalTrainingCount;
+    [Storable]
     public readonly double WorstResult;
+    [Storable]
     public readonly double BestResult;
+    [Storable]
     public readonly int InputArgumentCount;
+    [Storable]
     public readonly int OutputArgumentCount;
 

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

@@ -2 +2 @@
 
   using HeuristicLab.Common;
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
+  [StorableClass]
   public class Example : DeepCloneable {
     public Example() {
@@ -17 +19 @@
     }
 
+    [StorableConstructor]
+    public Example(bool deserializing) { }
+
     public void CopyTo(Example example) {
       example.InputArgs = this.InputArgs;
@@ -30 +35 @@
     }
 
+    [Storable]
     public string[] InputArgs { get; set; }
+    [Storable]
     public string[] OutputArgs { get; set; }
+    [Storable]
     public long[] InputInt { get; set; }
+    [Storable]
     public double[] InputFloat { get; set; }
+    [Storable]
     public bool[] InputBoolean { get; set; }
+    [Storable]
     public long[] OutputInt { get; set; }
+    [Storable]
     public double[] OutputFloat { get; set; }
+    [Storable]
     public bool[] OutputBoolean { get; set; }
-
 
     public override IDeepCloneable Clone(Cloner cloner) {