Changeset 14897 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/Digits.cs

Timestamp:

04/28/17 22:52:08 (8 years ago)

Author:

pkimmesw

Message:

#2665 Dynamic ErcValues, Separate Push from BenchmarkSuite Push

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/Digits.cs (modified) (3 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Char;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Integer;
+
   public class Digits : BenchmarkSuiteDataDescriptor {
     private const string name = "Digits";
@@ -22 +25 @@
         TrainingCount = 100,
         TestCount = 1000,
-        EnabledDataTypes = DataTypes.Exec | DataTypes.Integer | DataTypes.Boolean | DataTypes.Char | DataTypes.String,
+        EnabledDataTypes = DataTypes.Exec | DataTypes.Integer | DataTypes.Boolean | DataTypes.Char | DataTypes.String | DataTypes.Print,
         MaxSize = 300,
         EvalLimit = 600,
         ErcOptions = {
           ErcProbability = 0.05,
-          IntegerErcOptions = {
-            IsEnabled = true,
-            Start = -10,
-            End = 10
-          },
-          CharErcOptions = {
-            IsEnabled = true,
-            Constants = new [] { '\r' },
-          }
+          IntegerErcOptions = new IntegerErcOptions(
+            new IntegerRangeErcValue(-10, 10)),
+          CharErcOptions = new CharErcOptions(
+            new IntegerConstantErcValue('\r'))
         }
       };
@@ -45 +43 @@
         OutputArgs = output,
         InputInteger = ExampleArgumentConverter.ConvertIntegers(input[0]),
-        OutputString = output,
+        OutputPrint = output[0],
       };
     }