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

Timestamp:

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

Author:

pkimmesw

Message:

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

Location:

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

Files:

• Configuration/PushConfiguration.cs (modified) (1 diff)
• Expressions/ExpressionTable.cs (modified) (1 diff)
• Expressions/VectorNthExpressions.cs (modified) (1 diff)
• Expressions/VectorSetExpressions.cs (modified) (2 diffs)
• Expressions/VectorSubExpressions.cs (modified) (1 diff)
• Expressions/VectorTakeExpressions.cs (modified) (1 diff)
• Problem/BenchmarkSuite/PushBenchmarkSuiteEvaluator.cs (modified) (3 diffs)
• Stack/IPushStack.cs (modified) (1 diff)
• Stack/PushStack.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfiguration.cs

@@ -166 +166 @@
       EnabledExpressions.Clear();
 
-      // Enable those are required
       foreach (StackTypes type in Enum.GetValues(types.GetType())) {
         if (type == StackTypes.None) continue;
-
         enabledStacks[type] = false;
-
-        if (types.HasFlag(type))
-          EnableStack(type, false, true);
+      }
+
+      foreach (var pair in ExpressionTable.StackDependencyToNamesTable) {
+        if (types.HasFlag(pair.Key)) {
+          foreach (var name in pair.Value) {
+            EnableExpression(name, true);
+          }
+        }
       }
     }

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;
     }

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteEvaluator.cs

@@ -2 +2 @@
   using System;
   using System.Collections.Generic;
+  using System.Linq;
+
   using Common;
   using Core;
@@ -7 +9 @@
 
   using HeuristicLab.BenchmarkSuite;
-  using HeuristicLab.BenchmarkSuite.Problems;
   using HeuristicLab.Parameters;
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -131 +132 @@
       interpreter.IntegerStack.Push(example.InputInteger);
       interpreter.FloatStack.Push(example.InputFloat);
+      interpreter.CharStack.Push(example.InputChar);
+      interpreter.StringStack.Push(example.InputString);
+      interpreter.StringVectorStack.Push(example.InputStringVector.Select(v => new List<string>(v)));
+      interpreter.IntegerVectorStack.Push(example.InputIntegerVector.Select(v => new List<long>(v)));
+      interpreter.FloatVectorStack.Push(example.InputFloatVector.Select(v => new List<double>(v)));
 
       interpreter.Run(program);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/IPushStack.cs

@@ -15 +15 @@
     void Push(IReadOnlyList<T> items, int startIndex = 0);
     void Push(IReadOnlyList<T> items);
+    void Push(IEnumerable<T> items);
     T Peek();
     T[] Peek(int count);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/PushStack.cs

@@ -230 +230 @@
     }
 
+    public void Push(IEnumerable<T> items) {
+      if (!IsEnabled) return;
+
+      data.AddRange(items);
+    }
+
     public void Insert(int index, T item) {
       if (!IsEnabled) return;