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

Timestamp:

05/10/17 11:23:05 (7 years ago)

Author:

pkimmesw

Message:

#2665 Added IsNoop to Expression, Made Expressions storable, Fixed Debugger, Fixed and improved problem data and result visualisation, Added custom ErcOption view, Added problem difficulty to problem data name

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteEvaluator.cs (modified) (3 diffs)

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

@@ -37 +37 @@
 
     [StorableConstructor]
-    public PushBenchmarkSuiteEvaluator(bool deserializing) { }
+    public PushBenchmarkSuiteEvaluator(bool deserializing) : base(deserializing) { }
 
     public PushBenchmarkSuiteEvaluator(PushBenchmarkSuiteEvaluator origin, Cloner cloner) : base(origin, cloner) {
@@ -172 +172 @@
 
     private static double BooleanDiffer(bool a, bool b) {
-      return a && b ? 0 : a || b ? 1 : 2;
+      return a == b ? 0 : 1;
     }
 
@@ -200 +200 @@
     }
 
+    private static readonly string[] separator = { "\n" };
     private static double GetPrintDiffer(string estimated, IPushStack<string> printStack) {
-      var printResult = string.Join(Environment.NewLine, printStack);
+      var estimatedCount = estimated.Split(separator, StringSplitOptions.None).Length;
+      var printResult = string.Join(separator[0], printStack.Take(estimatedCount));
 
       return LevenshteinDistance(estimated, printResult);