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

Timestamp:

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

Author:

pkimmesw

Message:

#2665 Dynamic ErcValues, Separate Push from BenchmarkSuite Push

File:

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

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Char;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Integer;
+
   public class Checksum : BenchmarkSuiteDataDescriptor {
     private const string name = "Checksum";
@@ -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 = 800,
         EvalLimit = 1500,
         ErcOptions = {
           ErcProbability = 0.05,
-          IntegerErcOptions = {
-            IsEnabled = true,
-            Constants = new [] { 64 },
-            Start = -128,
-            End = 128
-          },
-          CharErcOptions = {
-            IsEnabled = true,
-            Constants = new [] { ' ' },
-            Start = 0x20,
-            End = 0x7e
-          }
+          IntegerErcOptions = new IntegerErcOptions(
+            new IntegerConstantErcValue(64),
+            new IntegerRangeErcValue(-128, 128)),
+          CharErcOptions = new CharErcOptions(
+            new IntegerConstantErcValue(' '),
+            new IntegerRangeErcValue(0x20, 0x7e))
         }
       };
@@ -48 +45 @@
         OutputArgs = output,
         InputString = input,
-        OutputChar = output[0].ToCharArray(),
+        OutputPrint = output[0],
       };
     }