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

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

@@ -17 +17 @@
     protected VectorIndexOfExpression(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;
     }
@@ -23 +23 @@
     protected void Eval(
       IInternalPushInterpreter interpreter,
-      IPushStack<List<T>> vectorStack,
+      IPushStack<IReadOnlyList<T>> vectorStack,
       IPushStack<T> literalStack,
       bool canOverride = false) {
       var vector = vectorStack.Pop();
       var literal = canOverride ? literalStack.Top : literalStack.Pop();
-      var result = vector.IndexOf(literal);
 
-      if (canOverride) interpreter.IntegerStack.SetTop(result);
-      else interpreter.IntegerStack.Push(result);
+      var index = -1;
+      for (var i = 0; i < vector.Count && index < 0; i++) {
+        if (vector[i].Equals(literal)) {
+          index = i;
+          break;
+        }
+      }
+
+      if (canOverride) interpreter.IntegerStack.Top = index;
+      else interpreter.IntegerStack.Push(index);
     }
   }