Changeset 14909 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions

Timestamp:

05/03/17 01:31:10 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed VectorExpression errors, Fixed BenchmarkSuite Problem Data View issues

Location:

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

Files:

• ExpressionTable.cs (modified) (1 diff)
• VectorNthExpressions.cs (modified) (1 diff)
• VectorSetExpressions.cs (modified) (2 diffs)
• VectorSubExpressions.cs (modified) (1 diff)
• VectorTakeExpressions.cs (modified) (1 diff)

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

@@ -141 +141 @@
     public static IReadOnlyList<string> GetExpressionsByStackTypes(StackTypes allowedTypes) {
       return stackDependencyToNamesTable
-          .Where(entry => (entry.Key & ~allowedTypes) == StackTypes.None)
+          .Where(entry => (entry.Key & ~allowedTypes) == 0x0)
           .SelectMany(entry => entry.Value)
           .ToArray();

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

@@ -16 +16 @@
       IPushStack<List<T>> vectorStack,
       IPushStack<T> literalStack) {
-      if (vectorStack.IsEmpty || interpreter.IntegerStack.IsEmpty) return false;
+      if (vectorStack.IsEmpty || vectorStack.Top.Count == 0 || interpreter.IntegerStack.IsEmpty) return false;
 
       var vector = vectorStack.Pop();

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

@@ -17 +17 @@
       bool isLiteralTypeInteger = false) {
       if (vectorStack.IsEmpty ||
+          vectorStack.Top.Count == 0 ||
           literalStack.IsEmpty ||
           (isLiteralTypeInteger && interpreter.IntegerStack.Count < 2) ||
@@ -38 +39 @@
 
       if (index < 0)
-        index = vector.Count - index;
+        index *= -1;
 
       vector[index] = literal;

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

@@ -16 +16 @@
       if (vectorStack.IsEmpty || interpreter.IntegerStack.Count < 2) return false;
 
-      var first = (int)Math.Min(vectorStack.Count, Math.Max(0, interpreter.IntegerStack[1]));
-      var second = (int)Math.Min(vectorStack.Count, Math.Max(first, interpreter.IntegerStack.Top));
+      var first = (int)Math.Min(vectorStack.Top.Count, Math.Max(0, interpreter.IntegerStack[1]));
+      var second = (int)Math.Min(vectorStack.Top.Count, Math.Max(first, interpreter.IntegerStack.Top));
       interpreter.IntegerStack.Remove(2);
 
+      if (vectorStack.Top.Count == 0)
+        return true;
+
       var result = vectorStack.Top.GetRange(first, second - first);
-      vectorStack.Push(result);
+      vectorStack.SetTop(result);
       return true;
     }

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

@@ -16 +16 @@
 
       var count = (int)interpreter.IntegerStack.Pop();
+
+      if (vectorStack.Top.Count == 0)
+        return true;
+
+      count %= vectorStack.Top.Count;
+
+      if (count < 0)
+        count *= -1;
+
       var result = vectorStack.Top.GetRange(0, count);
+      vectorStack.SetTop(result);
 
-      vectorStack.Push(result);
       return true;
     }