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

Timestamp:

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

Author:

pkimmesw

Message:

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

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/EqualsExpressions.cs (modified) (3 diffs)

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

@@ -15 +15 @@
       if (stack.Count < 2) return false;
 
-      var items = stack.Pop(2);
+      var first = stack[1];
+      var second = stack.Top;
+      stack.Remove(2);
 
-      booleanStack.Push(items[0].Equals(items[1]));
+      booleanStack.Push(first.Equals(second));
 
       return true;
@@ -35 +37 @@
       if (interpreter.FloatStack.Count < 2) return false;
 
-      var items = interpreter.FloatStack.Pop(2);
-      interpreter.BooleanStack.Push(items[0].IsAlmost(items[1]));
+      var first = interpreter.FloatStack[1];
+      var second = interpreter.FloatStack.Top;
+      interpreter.FloatStack.Remove(2);
+
+      interpreter.BooleanStack.Push(first.IsAlmost(second));
       return true;
     }
@@ -89 +94 @@
     }
   }
+
+  [PushExpression(StackTypes.FloatVector, "FLOAT[].=", StackTypes.Boolean)]
+  public class FloatVectorEqualsExpression : EqualsExpression<List<double>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.FloatVectorStack, interpreter.BooleanStack);
+    }
+  }
+
+  [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].=", StackTypes.Boolean)]
+  public class BooleanVectorEqualsExpression : EqualsExpression<List<bool>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanVectorStack, interpreter.BooleanStack);
+    }
+  }
+
+  [PushExpression(StackTypes.StringVector, "STRING[].=", StackTypes.Boolean)]
+  public class StringVectorEqualsExpression : EqualsExpression<List<string>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.StringVectorStack, interpreter.BooleanStack);
+    }
+  }
 }