Changeset 14897 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/ReplaceSpaceWithNewline.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/ReplaceSpaceWithNewline.cs (modified) (3 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
-  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Char;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Integer;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.String;
 
   public class ReplaceSpaceWithNewline : BenchmarkSuiteDataDescriptor {
@@ -24 +26 @@
         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 = 1600,
         ErcOptions = {
           ErcProbability = 0.05,
-          CharErcOptions = {
-            IsEnabled = true,
-            Constants = new [] { ' ', '\r' },
-            Start = 0x20,
-            End = 0x7e
-          },
-          StringErcOptions = {
-            IsEnabled = true,
-            AllowLowercaseLetters = true,
-            AllowUppercaseLetters = false,
-            AllowSpace = true,
-            SpaceProbability = 0.2
-          }
+          CharErcOptions = new CharErcOptions(
+            new IntegerConstantErcValue(' ', '\r'),
+            new IntegerRangeErcValue(0x20, 0x7e)),
+          StringErcOptions = new StringErcOptions(
+            new StringRandomErcValue {
+              IsEnabled = true,
+              AllowLowercaseLetters = true,
+              AllowUppercaseLetters = false,
+              AllowSpace = true,
+              SpaceProbability = 0.2
+            })
         }
       };
@@ -51 +51 @@
         OutputArgs = output,
         InputString = input,
-        OutputString = new[] { output[0] },
+        OutputPrint = output[0],
         OutputInteger = ExampleArgumentConverter.ConvertIntegers(output[1]),
       };