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

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Problems {
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Char;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Integer;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.String;
+
   public class PigLatin : BenchmarkSuiteDataDescriptor {
     private const string name = "Pig Latin";
@@ -22 +26 @@
         TrainingCount = 200,
         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 = 1000,
         EvalLimit = 2000,
         ErcOptions = {
           ErcProbability = 0.05,
-          CharErcOptions = {
-            IsEnabled = true,
-            Constants = new [] { ' ', 'a', 'e', 'i', 'o', 'u' },
-            Start = 0x20,
-            End = 0x7e
-          },
-          StringErcOptions = {
-            IsEnabled = true,
-            Constants = new [] { "ay", "aeiou" },
-            AllowLowercaseLetters = true,
-            AllowUppercaseLetters = false,
-            AllowSpace = true,
-            SpaceProbability = 0.2,
-          }
+          CharErcOptions = new CharErcOptions(
+            new IntegerConstantErcValue(' ', 'a', 'e', 'i', 'o', 'u'),
+            new IntegerRangeErcValue(0x20, 0x7e)),
+          StringErcOptions = new StringErcOptions(
+            new StringConstantErcValue("ay", "aeiou"),
+            new StringRandomErcValue {
+              IsEnabled = true,
+              AllowLowercaseLetters = true,
+              AllowUppercaseLetters = false,
+              AllowSpace = true,
+              SpaceProbability = 0.2,
+          })
         }
       };
@@ -50 +52 @@
         OutputArgs = output,
         InputString = input,
-        OutputString = output,
+        OutputPrint = output[0],
       };
     }