Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/CountOdds.cs

Timestamp:

04/18/17 01:15:25 (7 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/CountOdds.cs (modified) (4 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
 
   public class CountOdds : BenchmarkSuiteDataDescriptor {
     private const string name = "Count Odds";
     private const string fileName = "CountOdds.csv";
-    private const string description = "";
+    private const string description = "Given a vector of integers, return the number of integers that are odd, without use of a specific even or odd instruction(but allowing instructions such as mod and quotient)";
 
     protected override string FileName { get { return fileName; } }
@@ -12 +13 @@
     protected override int OutputArgumentCount { get { return 1; } }
 
-    public override Data CreateProblemData() {
-      return new Data {
+    public override ProblemData CreateProblemData() {
+      return new ProblemData {
         Name = Name,
         Description = Description,
@@ -19 +20 @@
         BestResult = 0,
         WorstResult = 50,
-        InputArgumentTypes = new[] { ExampleArgumentType.IntegerCollection },
+        InputArgumentTypes = new[] { ExampleArgumentType.IntegerVector },
         OutputArgumentTypes = new[] { ExampleArgumentType.Integer },
-        OriginalTestCount = 2000,
-        OriginalTrainingCount = 200,
+        TestCount = 2000,
+        TrainingCount = 200,
         EnabledDataTypes = DataTypes.Exec | DataTypes.Integer | DataTypes.Boolean | DataTypes.IntegerVector,
+        MaxSize = 500,
         EvalLimit = 1500,
-        MaxSize = 500,
+        ErcOptions = {
+          ErcProbability = 0.05,
+          IntegerErcOptions = {
+            IsEnabled = true,
+            Constants = new [] { 0, 1, 2},
+            Start = -1000,
+            End = 1000
+          }
+        }
       };
     }
@@ -33 +43 @@
         InputArgs = input,
         OutputArgs = output,
-        InputInt = ExampleArgumentConverter.ConvertIntegers(input[0]),
-        OutputInt = ExampleArgumentConverter.ConvertIntegers(output[0])
+        InputIntegerVector = new[] { ExampleArgumentConverter.ConvertIntegers(input[0]) },
+        OutputInteger = ExampleArgumentConverter.ConvertIntegers(output[0])
       };
     }