Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/CodeExpressions.cs

Timestamp:

04/18/17 01:15:25 (8 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/CodeExpressions.cs (modified) (11 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/CodeExpressions.cs

@@ -83 +83 @@
     public override bool Eval(IInternalPushInterpreter interpreter) {
       // not enough arguments on stack
-      if ((interpreter.BooleanStack.Count == 0) || (interpreter.CodeStack.Count < 2)) return false;
+      if (interpreter.BooleanStack.Count == 0 ||
+          interpreter.CodeStack.Count < 2)
+        return false;
 
       var condition = interpreter.BooleanStack.Pop();
-      var items = interpreter.CodeStack.Pop(2);
-
-      interpreter.ExecStack.Push(condition ? items[0] : items[1]);
+      var first = interpreter.CodeStack[1];
+      var second = interpreter.CodeStack.Top;
+
+      interpreter.CodeStack.Remove(2);
+      interpreter.ExecStack.Push(condition ? first : second);
 
       return true;
@@ -104 +108 @@
 
       var first = interpreter.CodeStack.Top;
-      var second = interpreter.CodeStack.ReverseElementAt(1);
+      var second = interpreter.CodeStack[1];
+
       PushProgram firstProgram = null;
       PushProgram secondProgram = null;
@@ -130 +135 @@
 
       interpreter.CodeStack.Pop();
-
-      //var first = interpreter.CodeStack.Pop();
-      //var second = interpreter.CodeStack.Top;
 
       PushProgram result;
@@ -269 +271 @@
     public override bool Eval(IInternalPushInterpreter interpreter) {
       if ((interpreter.CodeStack.Count < 2) ||
-          (interpreter.CodeStack[interpreter.CodeStack.Count - 2].GetType() !=
+          (interpreter.CodeStack[1].GetType() !=
            typeof(PushProgram))) return false;
 
@@ -308 +310 @@
     public override bool Eval(IInternalPushInterpreter interpreter) {
       if (interpreter.CodeStack.Count < 2 ||
-         !interpreter.CodeStack[interpreter.CodeStack.Count - 2].IsProgram)
+         !interpreter.CodeStack[1].IsProgram)
         return false;
 
-      var values = interpreter.CodeStack.Pop(2);
-      var second = (PushProgram)values[0];
-      var contains = second.Expressions.Contains(values[1]);
-
+      var second = (PushProgram)interpreter.CodeStack[1];
+      var first = interpreter.CodeStack.Top;
+      interpreter.CodeStack.Remove(2);
+
+      var contains = second.Expressions.Contains(first);
       interpreter.BooleanStack.Push(contains);
-
       return true;
     }
@@ -371 +373 @@
       if (interpreter.CodeStack.Count < 2) return false;
 
-      var expressions = interpreter.CodeStack.Pop(2);
+      var second = interpreter.CodeStack[1];
+      var first = interpreter.CodeStack.Top;
+      interpreter.CodeStack.Remove(2);
+
       var firstItems = new Dictionary<int, int>();
       var secondItems = new Dictionary<int, int>();
 
-      DetermineUniqueItems(expressions[0], secondItems);
-      DetermineUniqueItems(expressions[1], firstItems);
+      DetermineUniqueItems(second, secondItems);
+      DetermineUniqueItems(first, firstItems);
 
       var discrepancy = GetDiscrepancy(firstItems, secondItems);
-
       interpreter.IntegerStack.Push(discrepancy);
 
@@ -522 +526 @@
         return false;
 
-      var source = interpreter.CodeStack[interpreter.CodeStack.Count - 2];
+      var source = interpreter.CodeStack[1];
       var target = (PushProgram)interpreter.CodeStack.Pop();
       var index = (int)interpreter.IntegerStack.Pop();
@@ -577 +581 @@
       if (interpreter.CodeStack.Count < 2 ||
          (interpreter.CodeStack.Top.IsProgram && ((PushProgram)interpreter.CodeStack.Top).Depth == interpreter.Configuration.MaxDepth) ||
-         (interpreter.CodeStack.ReverseElementAt(1).IsProgram && ((PushProgram)interpreter.CodeStack.ReverseElementAt(1)).Depth == interpreter.Configuration.MaxDepth))
+         (interpreter.CodeStack[1].IsProgram && ((PushProgram)interpreter.CodeStack[1]).Depth == interpreter.Configuration.MaxDepth))
         return false;
 
@@ -604 +608 @@
       if (interpreter.CodeStack.Count < 2) return false;
 
-      var expressions = interpreter.CodeStack.Pop(2);
-
-      var contains = expressions[1].IsProgram
-          ? ((PushProgram)expressions[1]).Expressions.Contains(expressions[0])
-          : expressions[1].Equals(expressions[0]);
+      var first = interpreter.CodeStack[1];
+      var second = interpreter.CodeStack.Top;
+      interpreter.CodeStack.Remove(2);
+
+      var contains = second.IsProgram
+          ? ((PushProgram)second).Expressions.Contains(first)
+          : second.Equals(first);
 
       interpreter.BooleanStack.Push(contains);
@@ -714 +720 @@
       if (interpreter.CodeStack.Count < 2) return false;
 
-      var expressions = interpreter.CodeStack.Pop(2);
-      var first = expressions[1];
-      var second = expressions[0];
+      var second = interpreter.CodeStack[1];
+      var first = interpreter.CodeStack.Top;
+      interpreter.CodeStack.Remove(2);
 
       var position = -1;
@@ -765 +771 @@
         return false;
 
-      var expressions = interpreter.CodeStack.Pop(2);
-      var third = interpreter.CodeStack.Top;
-      var second = expressions[0];
-      var first = expressions[1] as PushProgram;
+      var third = interpreter.CodeStack[2];
+      var second = interpreter.CodeStack[1];
+      var first = interpreter.CodeStack.Top as PushProgram;
+      interpreter.CodeStack.Remove(2);
+
       var firstExpressions = first.Expressions;
       var newExpressions = interpreter.PoolContainer.ExpressionListPool.Get();