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

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

File:

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

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
   using System.Collections.Generic;
+  using System.Linq;
+
   using Attributes;
 
@@ -23 +25 @@
       stack.Remove(2);
 
-      booleanStack.Push(first.Equals(second));
+      var equal = first.Equals(second);
+      booleanStack.Push(equal);
+    }
+
+    protected void Eval(IPushStack<IReadOnlyList<T>> vectorStack, IPushStack<bool> booleanStack) {
+      var first = vectorStack[1];
+      var second = vectorStack[0];
+      vectorStack.Remove(2);
+
+      var equal = first.SequenceEqual(second);
+      booleanStack.Push(equal);
     }
   }
@@ -92 +104 @@
 
   [StorableClass]
-  [PushExpression(StackTypes.Exec, "EXEC.=", StackTypes.Boolean)]
+  [PushExpression(StackTypes.Exec, "EXEC.=", StackTypes.Boolean, execIn: 0)]
   public class ExecEqualsExpression : EqualsExpression<Expression> {
     public ExecEqualsExpression() { }
@@ -157 +169 @@
   [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].=", StackTypes.Boolean)]
-  public class IntegerVectorEqualsExpression : EqualsExpression<List<long>> {
+  public class IntegerVectorEqualsExpression : EqualsExpression<long> {
     public IntegerVectorEqualsExpression() { }
     [StorableConstructor]
@@ -173 +185 @@
   [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].=", StackTypes.Boolean)]
-  public class FloatVectorEqualsExpression : EqualsExpression<List<double>> {
+  public class FloatVectorEqualsExpression : EqualsExpression<double> {
     public FloatVectorEqualsExpression() { }
     [StorableConstructor]
@@ -189 +201 @@
   [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].=", StackTypes.Boolean)]
-  public class BooleanVectorEqualsExpression : EqualsExpression<List<bool>> {
+  public class BooleanVectorEqualsExpression : EqualsExpression<bool> {
     public BooleanVectorEqualsExpression() { }
     [StorableConstructor]
@@ -205 +217 @@
   [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].=", StackTypes.Boolean)]
-  public class StringVectorEqualsExpression : EqualsExpression<List<string>> {
+  public class StringVectorEqualsExpression : EqualsExpression<string> {
     public StringVectorEqualsExpression() { }
     [StorableConstructor]