Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/BenchmarkSuitePushSolutionView.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/Problem/BenchmarkSuite/BenchmarkSuitePushSolutionView.cs (modified) (3 diffs)

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

@@ -10 +10 @@
   using HeuristicLab.BenchmarkSuite.Views;
   using HeuristicLab.Common;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Constants;
 
   using Interpreter;
@@ -237 +238 @@
 
         case ExampleArgumentType.Print:
-          var requiredLines = example.OutputPrint.Split(new[] { Environment.NewLine }, StringSplitOptions.None).Length;
-          var count = Math.Min(requiredLines, interpreter.PrintStack.Count);
-          return string.Join(valueSeparator, string.Join(Environment.NewLine, interpreter.PrintStack.Peek(count)));
+          return string.Join(valueSeparator, string.Join(PushEnvironment.NewLine, interpreter.PrintStack.Take(example.OutputPrintLineCount)));
 
         case ExampleArgumentType.String:
@@ -257 +256 @@
     }
 
-    private static string GetVectorEntryAsString<T>(int offset, IPushStack<List<T>> vectorStack) {
+    private static string GetVectorEntryAsString<T>(int offset, IPushStack<IReadOnlyList<T>> vectorStack) {
       return vectorStack.Count > offset
        ? "[" + string.Join(",", vectorStack[offset]) + "]"
        : string.Empty;
-    }
-
-    private int GetCount<T>(IPushStack<T> stack, T[] data) {
-      return Math.Max(0, Math.Min(data.Length, stack.Count));
-    }
-
-    private int GetVectorCount<T>(IPushStack<List<T>> stack, T[][] data) {
-      return Math.Max(0, Math.Min(data.Length, stack.Count));
     }