Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorContainsExpressions.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/VectorContainsExpressions.cs (modified) (2 diffs)

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

@@ -2 +2 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
+  using System.Linq;
+
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
@@ -17 +19 @@
     protected VectorContainsExpression(bool deserializing) : base(deserializing) { }
 
-    protected bool IsNoop(IPushStack<List<T>> vectorStack, IPushStack<T> literalStack) {
+    protected bool IsNoop(IPushStack<IReadOnlyList<T>> vectorStack, IPushStack<T> literalStack) {
       return vectorStack.IsEmpty || literalStack.IsEmpty;
     }
 
-    protected void Eval(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack, IPushStack<T> literalStack, bool canOverride = false) {
+    protected void Eval(IInternalPushInterpreter interpreter, IPushStack<IReadOnlyList<T>> vectorStack, IPushStack<T> literalStack, bool canOverride = false) {
       var vector = vectorStack.Pop();
       var literal = canOverride ? literalStack.Top : literalStack.Pop();
       var contains = vector.Contains(literal);
 
-      if (canOverride) interpreter.BooleanStack.SetTop(contains);
+      if (canOverride) interpreter.BooleanStack.Top = contains;
       else interpreter.BooleanStack.Push(contains);
     }