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

Timestamp:

03/23/17 01:11:18 (8 years ago)

Author:

pkimmesw

Message:

#2665 simplifier, push solution results view, performance improvements, small bug fixes, ui fixes

Location:

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

Files:

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

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

@@ -1 @@
-namespace HeuristicLab.BenchmarkSuite.Problems {
-  using System;
-  using System.Text;
+//namespace HeuristicLab.BenchmarkSuite.Problems {
+//  using System;
+//  using System.Text;
 
-  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+//  public class Checksum : BenchmarkSuiteDataDescriptor {
+//    private const string name = "Checksum";
+//    private const string fileName = "Checksum.csv";
+//    private const string description = "";
+//    private readonly ExampleArgumentType[] inputArgumentTypes = { ExampleArgumentType.IntegerCollection };
+//    private readonly ExampleArgumentType[] outputArgumentTypes = { ExampleArgumentType.IntegerCollection };
 
-  [StorableClass]
-  public class Checksum : BenchmarkSuiteDataDescriptor {
-    private const string name = "Checksum";
-    private const string fileName = "Checksum.csv";
-    private const string description = "";
-    public Checksum() { }
+//    public override string Name { get { return name; } }
+//    protected override string FileName { get { return fileName; } }
+//    public override string Description { get { return description; } }
+//    public override ExampleArgumentType[] InputArgumentTypes { get { return inputArgumentTypes; } }
+//    public override ExampleArgumentType[] OutputArgumentTypes { get { return outputArgumentTypes; } }
+//    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; } }
 
-    [StorableConstructor]
-    public Checksum(bool deserializing) : base(deserializing) { }
-
-    public override string Name { get { return name; } }
-    protected override string FileName { get { return fileName; } }
-    public override string Description { get { return description; } }
-    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) {
-      return new Example {
-        InputArgs = input,
-        OutputArgs = output,
-        InputInt = Array.ConvertAll(Encoding.ASCII.GetBytes(input[0]), c => (long)c),
-        OutputInt = Array.ConvertAll(Encoding.ASCII.GetBytes(output[0]), c => (long)c)
-      };
-    }
-  }
-}
+//    public override Example ParseExample(string[] input, string[] output) {
+//      return new Example {
+//        InputArgs = input,
+//        OutputArgs = output,
+//        InputInt = Array.ConvertAll(Encoding.ASCII.GetBytes(input[0]), c => (long)c),
+//        OutputInt = Array.ConvertAll(Encoding.ASCII.GetBytes(output[0]), c => (long)c)
+//      };
+//    }
+//  }
+//}

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
-  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+  using HeuristicLab.BenchmarkSuite.ERC;
+  using HeuristicLab.Data;
 
-  [StorableClass]
   public class CountOdds : BenchmarkSuiteDataDescriptor {
     private const string name = "Count Odds";
     private const string fileName = "CountOdds.csv";
     private const string description = "";
+    private readonly ExampleArgumentType[] inputArgumentTypes = { ExampleArgumentType.IntegerCollection };
+    private readonly ExampleArgumentType[] outputArgumentTypes = { ExampleArgumentType.Integer };
 
-    public CountOdds() { }
-
-    [StorableConstructor]
-    public CountOdds(bool deserializing) : base(deserializing) { }
+    private readonly DataTypes enabledDataTypeses = DataTypes.Exec | DataTypes.Integer | DataTypes.Boolean | DataTypes.IntegerVector;
+    private readonly ProblemErcOptions problemErcOptions = new ProblemErcOptions {
+      IntegerErcRange = new ErcOptionRange<IntValue>(
+        new IntValue(-1000),
+        new IntValue(1000),
+        new IntValue(0),
+        new IntValue(1),
+        new IntValue(2))
+    };
 
     public override string Name { get { return name; } }
     public override string Description { get { return description; } }
     protected override string FileName { get { return fileName; } }
-    public override int InputArgumentCount { get { return 1; } }
-    public override int OutputArgumentCount { get { return 1; } }
+    public override ExampleArgumentType[] InputArgumentTypes { get { return inputArgumentTypes; } }
+    public override ExampleArgumentType[] OutputArgumentTypes { get { return outputArgumentTypes; } }
     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 ProblemErcOptions ProblemErcOptions { get { return this.problemErcOptions; } }
+    public override DataTypes EnabledDataTypes { get { return this.enabledDataTypeses; } }
+    public override int MaxSize { get { return 500; } }
+    public override int EvalLimit { get { return 1500; } }
+    public override int MaxGenerations { get { return 300; } }
+    public override int ProgEvalBudget { get { return 60000000; } }
 
     public override Example ParseExample(string[] input, string[] output) {
@@ -27 +40 @@
         InputArgs = input,
         OutputArgs = output,
-        InputInt = ConvertIntegers(input[0]),
-        OutputInt = ConvertIntegers(output[0])
+        InputInt = ExampleArgumentConverter.ConvertIntegers(input[0]),
+        OutputInt = ExampleArgumentConverter.ConvertIntegers(output[0])
       };
     }