Changeset 15345 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Evaluator/PushBenchmarkSuiteEvaluator.cs

Timestamp:

08/31/17 18:59:39 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Lexicase

File:

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

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Evaluator/PushBenchmarkSuiteEvaluator.cs

@@ -149 +149 @@
         case ProblemType.Smallest:
         case ProblemType.Median: return PrintedStringRight(interpreter, example);
+        case ProblemType.MedianIntegerError: return MedianIntegerError(interpreter, example);
 
         // boolean error
@@ -214 +215 @@
     }
 
+    private double MedianIntegerError(IPushInterpreter interpreter, Example example) {
+      var printResult = interpreter.PrintStack.ToString();
+
+      long result;
+      if (long.TryParse(printResult, out result)) {
+        var diff = Math.Abs(result - example.OutputInteger[0]);
+
+        return Math.Min(Data.WorstResult, diff);
+      }
+
+      return Data.WorstResult;
+    }
+
     private double NumberIo(IPushInterpreter interpreter, Example example) {
       if (!string.IsNullOrEmpty(example.OutputPrint) && interpreter.PrintStack.IsEmpty)
@@ -289 +303 @@
       var printLines = interpreter.PrintStack.AsStrings().ToArray();
       var lineCountWithCorrectFormat = printLines.Count(line => line.IsNumeric());
-      var lineCountWithInvalidFormat = example.OutputPrintLineCount - lineCountWithCorrectFormat;
+      var lineCountWithInvalidFormat = Math.Max(0, example.OutputPrintLineCount - lineCountWithCorrectFormat);
 
       lineCountWithInvalidFormat = Math.Abs(Math.Min(lineCountWithInvalidFormat, example.OutputPrintLineCount));