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

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

@@ -17 +17 @@
     protected VectorReplaceFirstExpression(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.Count < 2;
     }
 
-    protected void Eval(IPushStack<List<T>> vectorStack, IPushStack<T> literalStack) {
+    protected void Eval(IPushStack<IReadOnlyList<T>> vectorStack, IPushStack<T> literalStack) {
       var vector = vectorStack.Top;
       var first = literalStack.Top;
       var second = literalStack[1];
-      var index = vector.IndexOf(second);
       literalStack.Remove(2);
 
-      if (index >= 0)
-        vector[index] = first;
+      var index = -1;
+      for (var i = 0; i < vector.Count && index < 0; i++) {
+        if (vector[i].Equals(second)) {
+          index = i;
+          break;
+        }
+      }
+
+      if (index >= 0) {
+        var result = new List<T>(vector);
+        result[index] = first;
+        vectorStack.Top = result;
+      }
     }
   }