Changeset 14952 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Simplifier/Simplifier.cs

Timestamp:

05/10/17 11:23:05 (7 years ago)

Author:

pkimmesw

Message:

#2665 Added IsNoop to Expression, Made Expressions storable, Fixed Debugger, Fixed and improved problem data and result visualisation, Added custom ErcOption view, Added problem difficulty to problem data name

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Simplifier/Simplifier.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Simplifier/Simplifier.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Simplifier {
   using System;
+  using System.Collections.Generic;
 
   using Expressions;
 
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Tree;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
 
   public static class Simplifier {
@@ -10 +13 @@
       new TreeNode<Expression>(ExpressionTable.GetStatelessExpression<CodeNoopExpression>());
 
-    public static PushProgram Simplify(PushProgram program, Func<PushProgram, double> evaluator) {
+    public static PushProgram Simplify(PushProgram program, IReadOnlyPushConfiguration config, Func<PushProgram, double> evaluator) {
       var bestResult = evaluator(program);
+      //var noopFreeProgram = RemoveNoops(program, config);
       var tree = program.ToTree();
       var optimizedTree = RemoveUnnecessaryExpressions(tree, tree, ref bestResult, evaluator);
 
-      return optimizedTree.ToPushProgram(e => !ReferenceEquals(e, NoopNode.Value));
+      var optimizedPrgram = optimizedTree.ToPushProgram(e => !ReferenceEquals(e, NoopNode.Value));
+      return optimizedPrgram; // RemoveNoops(optimizedPrgram, config);
+    }
+
+    // not working so far, an expression can only be a noop if it is a noop for all examples of a problem
+    private static PushProgram RemoveNoops(PushProgram pushProgram, IReadOnlyPushConfiguration config) {
+      var expressions = new List<Expression>();
+      var interpreter = new PushInterpreter(config);
+
+      interpreter.Run(pushProgram, true);
+
+      while (interpreter.CanStep) {
+        var isNoop = interpreter.ExecStack.Top.IsNoop(interpreter);
+        if (!isNoop)
+          expressions.Add(interpreter.ExecStack.Top);
+
+        interpreter.Step();
+      }
+
+      return new PushProgram(expressions);
     }