Changeset 15273 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator

Timestamp:

07/19/17 12:55:58 (8 years ago)

Author:

pkimmesw

Message:

#2665 Started Plush Encoding, Added Zero Error Individual Count Analyzer

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator

Files:

• CodeGeneratorUtils.cs (modified) (1 diff)
• LinearCodeGenerator.cs (modified) (2 diffs)
• RecursiveCodeGenerator.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator/CodeGeneratorUtils.cs

@@ -7 +7 @@
 
   using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Extensions;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.SolutionCreator;
 
   using Stack;
 
   internal static class CodeGeneratorUtils {
-    internal static Expression CreateExpressionOrErc(
+    private static readonly Expression Noop = ExpressionTable.GetStatelessExpression<ExecNoopExpression>();
+
+    internal static Expression MapToExpression(
       IRandom random,
-      IReadOnlyList<string> enabledExpressions,
       IReadOnlyErcOptions ercOptions,
+      IReadOnlyExpressionsConfiguration config,
       IDictionary<string, Expression> customExpressions = null) {
       var customCount = customExpressions == null ? 0 : customExpressions.Count;
-      var index = random.Next(enabledExpressions.Count + customCount);
+      var enabledExpressionCount = config.EnabledExpressions.Count;
+      var index = random.Next(enabledExpressionCount + customCount);
 
-      return index >= enabledExpressions.Count
-        ? customExpressions.Values.ElementAt(index - enabledExpressions.Count)
-        : CreateExpressionOrErc(index, random, enabledExpressions, ercOptions);
+      return index >= config.EnabledExpressions.Count
+        ? customExpressions.Values.ElementAt(index - enabledExpressionCount)
+        : MapToExpression(index, random, ercOptions, config);
     }
 
-    internal static Expression CreateExpressionOrErc(
+    internal static Expression MapToExpression(
       int index,
       IRandom random,
-      IReadOnlyList<string> enabledExpressions,
-      IReadOnlyErcOptions ercOptions) {
-      var name = enabledExpressions[index];
+      IReadOnlyErcOptions ercOptions,
+      IReadOnlyExpressionsConfiguration config) {
 
-      return CreateExpressionOrErc(name, random, ercOptions);
+      switch (index) {
+        case PushSolutionEncoding.Noop:
+          return Noop;
+
+        case PushSolutionEncoding.Erc:
+          var stackType = config.ExpressionsPerStackCount.RandomWeightedOrDefault(random, pair => pair.Value).Key;
+
+          if (stackType == default(StackTypes))
+            break;
+
+          return CreateRandomErcExpression(stackType, random, ercOptions);
+
+        case PushSolutionEncoding.In:
+          if (config.InExpressionCount == 0) break;
+
+          var nr = random.Next(0, config.InExpressionCount) + 1;
+          return ExpressionTable.InExpressionTable[nr];
+      }
+
+      var name = config.EnabledExpressions[index];
+      return ExpressionTable.GetExpression(name);
     }
 
-    private static Expression CreateExpressionOrErc(
-      string expressionName,
-      IRandom random,
-      IReadOnlyErcOptions ercOptions) {
-      //var x = random.NextDouble();
-      //Expression expression = null;
+    //private static Expression CreateExpressionOrErc(
+    //  string expressionName,
+    //  IRandom random,
+    //  IReadOnlyErcOptions ercOptions) {
+    //  var x = random.NextDouble();
+    //  Expression expression = null;
 
-      //if (x < ercOptions.ErcProbability) {
-      //  var expressionType = ExpressionTable.NameToTypeTable[expressionName];
-      //  expression = CreateRandomErcExpression(
-      //      ExpressionTable.TypeToAttributeTable[expressionType].StackType,
-      //      random,
-      //      ercOptions);
-      //}
+    //  if (x < ercOptions.ErcProbability) {
+    //    var expressionType = ExpressionTable.NameToTypeTable[expressionName];
+    //    expression = CreateRandomErcExpression(
+    //        ExpressionTable.TypeToAttributeTable[expressionType].StackType,
+    //        random,
+    //        ercOptions);
+    //  }
 
-      //if (expression == null || expression is ExecNoopExpression) {
-      //  expression = ExpressionTable.GetExpression(expressionName);
-      //}
+    //  if (expression == null || expression is ExecNoopExpression) {
+    //    expression = ExpressionTable.GetExpression(expressionName);
+    //  }
 
-      //return expression;
+    //  return expression;
+    //}
 
-      var expression = ExpressionTable.GetExpression(expressionName);
-
-      return expression;
-    }
-
-    private static readonly Expression Noop = ExpressionTable.GetStatelessExpression<ExecNoopExpression>();
     /// <summary>
     /// Create a ErcExpression whereby the type of the expression conforms to the passed stack type.

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator/LinearCodeGenerator.cs

@@ -31 +31 @@
       IManagedPool<PooledList<Expression>> expressionListPool = null,
       IRandom random = null,
-      IReadOnlyPushConfiguration pushConfiguration = null,
+      IReadOnlyPushConfiguration config = null,
       IDictionary<string, Expression> customExpressions = null) {
       if (maxPoints == 0)
         return new Expression[0];
 
-      random = random ?? new FastRandom();
-      pushConfiguration = pushConfiguration ?? new PushConfiguration();
+      random = random ?? new MersenneTwister();
+      config = config ?? new PushConfiguration();
 
       var size = maxPoints <= 1 ? 1 : random.Next(1, maxPoints);
@@ -43 +43 @@
 
       for (var i = 0; i < size; i++) {
-        var expression = CodeGeneratorUtils.CreateExpressionOrErc(
+        var expression = CodeGeneratorUtils.MapToExpression(
           random,
-          pushConfiguration.EnabledExpressions,
-          pushConfiguration.ErcOptions,
+          config.ErcOptions,
+          config,
           customExpressions);
 

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator/RecursiveCodeGenerator.cs

@@ -49 +49 @@
     private static IEnumerable<Expression> RandomCodeWithSize(int points, IRandom random, IReadOnlyPushConfiguration pushConfiguration, IDictionary<string, Expression> customExpressions = null) {
       if (points == 1) {
-        return new[] { CodeGeneratorUtils.CreateExpressionOrErc(
+        return new[] { CodeGeneratorUtils.MapToExpression(
           random,
-          pushConfiguration.EnabledExpressions,
           pushConfiguration.ErcOptions,
+          pushConfiguration,
           customExpressions)
         };