Changeset 14744 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems

Timestamp:

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

Author:

pkimmesw

Message:

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

Location:

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

Files:

• Checksum.cs (modified) (1 diff)
• CountOdds.cs (modified) (2 diffs)
• Example.cs (modified) (2 diffs)

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

@@ -3 +3 @@
   using System.Text;
 
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
+  [StorableClass]
   public class Checksum : BenchmarkSuiteDataDescriptor {
     private const string name = "Checksum";
     private const string fileName = "Checksum.csv";
     private const string description = "";
+    public Checksum() { }
+
+    [StorableConstructor]
+    public Checksum(bool deserializing) : base(deserializing) { }
 
     public override string Name { get { return name; } }
-    public override string FileName { get { return fileName; } }
+    protected override string FileName { get { return fileName; } }
     public override string Description { get { return description; } }
-    protected override int InputArgumentCount { get { return 1; } }
-    protected override int OutputArgumentCount { get { return 1; } }
-    protected override int OriginalTrainingCount { get { return 228; } }
-    protected override int OriginalTestCount { get { return 1254; } }
-    protected override int BestResult { get { return 0; } }
-    protected override int WorstResult { get { return byte.MaxValue; } }
+    public override int InputArgumentCount { get { return 1; } }
+    public override int OutputArgumentCount { get { return 1; } }
+    public override int OriginalTrainingCount { get { return 228; } }
+    public override int OriginalTestCount { get { return 1254; } }
+    public override int BestResult { get { return 0; } }
+    public override int WorstResult { get { return byte.MaxValue; } }
 
     public override Example ParseExample(string[] input, string[] output) {

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
+  [StorableClass]
   public class CountOdds : BenchmarkSuiteDataDescriptor {
     private const string name = "Count Odds";
@@ -6 +8 @@
     private const string description = "";
 
+    public CountOdds() { }
+
+    [StorableConstructor]
+    public CountOdds(bool deserializing) : base(deserializing) { }
+
     public override string Name { get { return name; } }
-    public override string FileName { get { return fileName; } }
     public override string Description { get { return description; } }
-    protected override int InputArgumentCount { get { return 1; } }
-    protected override int OutputArgumentCount { get { return 1; } }
-    protected override int OriginalTrainingCount { get { return 200; } }
-    protected override int OriginalTestCount { get { return 2000; } }
-    protected override int BestResult { get { return 0; } }
-    protected override int WorstResult { get { return 50; } }
+    protected override string FileName { get { return fileName; } }
+    public override int InputArgumentCount { get { return 1; } }
+    public override int OutputArgumentCount { get { return 1; } }
+    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 Example ParseExample(string[] input, string[] output) {

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
+  using System;
 
   using HeuristicLab.Common;
@@ -23 +24 @@
 
     public void CopyTo(Example example) {
-      example.InputArgs = this.InputArgs;
-      example.OutputArgs = this.OutputArgs;
+      Array.Copy(InputArgs, example.InputArgs, InputArgs.Length);
+      Array.Copy(OutputArgs, example.OutputArgs, OutputArgs.Length);
 
-      example.InputBoolean = this.InputBoolean;
-      example.InputInt = this.InputInt;
-      example.InputFloat = this.InputFloat;
+      Array.Copy(InputBoolean, example.InputBoolean, InputBoolean.Length);
+      Array.Copy(InputInt, example.InputInt, InputInt.Length);
+      Array.Copy(InputFloat, example.InputFloat, InputFloat.Length);
 
-      example.OutputBoolean = this.OutputBoolean;
-      example.OutputInt = this.OutputInt;
-      example.OutputFloat = this.OutputFloat;
+      Array.Copy(OutputBoolean, example.OutputBoolean, OutputBoolean.Length);
+      Array.Copy(OutputInt, example.OutputInt, OutputInt.Length);
+      Array.Copy(OutputFloat, example.OutputFloat, OutputFloat.Length);
     }