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

Timestamp:

09/17/17 23:27:05 (7 years ago)

Author:

pkimmesw

Message:

#2665 Solution Cleanup

File:

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

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

@@ -220 +220 @@
       long result;
       if (long.TryParse(printResult, out result)) {
-        var diff = Math.Abs(result - example.OutputInteger[0]);
+        var diff = result.AbsoluteDiff(example.OutputInteger[0]);
 
         return Math.Min(Data.WorstResult, diff);
@@ -236 +236 @@
       double value;
       if (double.TryParse(printResult, NumberStyles.Number | NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out value)) {
-        var diff = Math.Abs(example.OutputFloat[0] - value);
+        var diff = example.OutputFloat[0].AbsoluteDiff(value);
         diff = Math.Min(diff, Data.WorstResult);
 
@@ -263 +263 @@
       var printResult = interpreter.PrintStack.ToString();
       var distance = example.OutputPrint.LevenshteinDistance(printResult);
-      var lineCountWithCorrectFormat = interpreter.PrintStack.AsStrings().Count(line => {
-        var parts = line.Split(' ');
-
-        if (parts.Length != 3)
-          return false;
-
-        var part0 = parts[0].Trim();
-        if (part0.Length == 0 || !part0.IsNumeric())
-          return false;
-
-        var part1 = parts[1].Trim();
-        if (part1.Length != 1)
-          return false;
-
-        var part2 = parts[2].Trim();
-        if (part2.Length != 1)
-          return false;
-
-        return true;
-      });
+
+      var lineCountWithCorrectFormat = interpreter.PrintStack
+        .AsStrings()
+        .Count(line => {
+          var parts = line.Split(' ');
+
+          if (parts.Length != 3)
+            return false;
+
+          var part0 = parts[0].Trim();
+          if (part0.Length == 0 || !part0.IsNumeric())
+            return false;
+
+          var part1 = parts[1].Trim();
+          if (part1.Length != 1)
+            return false;
+
+          var part2 = parts[2].Trim();
+          if (part2.Length != 1)
+            return false;
+
+          return true;
+        });
 
       var lineCountWithInvalidFormat = example.OutputPrintLineCount - lineCountWithCorrectFormat;
@@ -300 +303 @@
       }
 
-      var distance = example.OutputPrint.LevenshteinDistance(interpreter.PrintStack.ToString());
+      var printResult = interpreter.PrintStack.ToString();
+      var distance = example.OutputPrint.LevenshteinDistance(printResult);
+
       var printLines = interpreter.PrintStack.AsStrings().ToArray();
-      var lineCountWithCorrectFormat = printLines.Count(line => line.IsNumeric());
-      var lineCountWithInvalidFormat = Math.Max(0, example.OutputPrintLineCount - lineCountWithCorrectFormat);
-
-      lineCountWithInvalidFormat = Math.Abs(Math.Min(lineCountWithInvalidFormat, example.OutputPrintLineCount));
+
+      var lineCountWithInvalidFormat = printLines
+        .Take(example.OutputPrintLineCount)
+        .Count(line => !line.IsNumeric());
 
       var compareLength = Math.Min(printLines.Length, example.OutputPrintLineCount);
-      long integerError = 0;
+      var integerError = 0L;
 
       for (var i = 0; i < compareLength; i++) {
         long value;
         if (long.TryParse(printLines[i], out value)) {
-          integerError += Math.Abs(value - example.OutputIntegerVector[0][i]);
-        } else {
-          integerError += example.OutputPrintLineCount > 0
-            ? (long)(Data.WorstResult / example.OutputPrintLineCount)
-            : 0;
+          integerError += value.AbsoluteDiff(example.OutputIntegerVector[0][i]);
         }
       }
 
-      var result = distance + lineCountWithInvalidFormat + integerError;
+      var result = distance + lineCountWithInvalidFormat + integerError / compareLength;
       return Math.Min(result, Data.WorstResult);
     }
@@ -347 +348 @@
 
       // add penalty if length does not match
-      var result = expectedVector.Length > 0
-        ? (expectedVector.Length - comparableLength) * (Data.WorstResult / expectedVector.Length)
-        : 0;
+      //var result = expectedVector.Length > 0
+      //  ? (expectedVector.Length - comparableLength) * (Data.WorstResult / expectedVector.Length)
+      //  : 0;
+
+      if (comparableLength == 0) {
+        return Data.WorstResult;
+      }
+
+      var result = 0d;
 
       for (var i = 0; i < comparableLength; i++) {
-        result += Math.Abs(resultVector[i] - expectedVector[i]);
+        result += resultVector[i].AbsoluteDiff(expectedVector[i]);
+      }
+
+      for (var i = comparableLength; i < expectedVector.Length; i++) {
+        result += expectedVector[i];
       }
 
@@ -372 +383 @@
       var distance = example.OutputPrint.LevenshteinDistance(printResult);
       var lineCount = interpreter.PrintStack.Count;
-      var lineCountError = Math.Abs(example.OutputPrintLineCount - lineCount);
+      var lineCountError = example.OutputPrintLineCount.AbsoluteDiff(lineCount);
       var totalWordsPerLineError = 0L;
 
       for (var i = 0; i < interpreter.PrintStack.Lines.Count - 1; i++) {
-        totalWordsPerLineError += Math.Abs(interpreter.PrintStack.Lines[i].Split(' ').Length - estimatedWordsPerLineCount);
+        totalWordsPerLineError += interpreter.PrintStack.Lines[i].Split(' ').Length.AbsoluteDiff(estimatedWordsPerLineCount);
       }
 
       // last line
       var lastLine = interpreter.PrintStack.Lines[interpreter.PrintStack.Lines.Count - 1];
-      totalWordsPerLineError += Math.Abs(lastLine.Split(' ').Length - estimatedLastWordCount);
+      totalWordsPerLineError += lastLine.Split(' ').Length.AbsoluteDiff(estimatedLastWordCount);
 
       var result = distance + lineCountError + totalWordsPerLineError;
@@ -396 +407 @@
 
       // add penalty if length does not match
-      var result = expectedVector.Length > 0
-        ? (expectedVector.Length - comparableLength) * (Data.WorstResult / expectedVector.Length)
-        : 0;
+      //var result = expectedVector.Length > 0
+      //  ? (expectedVector.Length - comparableLength) * (Data.WorstResult / expectedVector.Length)
+      //  : 0;
+
+      if (comparableLength == 0) {
+        return Data.WorstResult;
+      }
+
+      var result = 0d;
 
       for (var i = 0; i < comparableLength; i++) {
         var expectedStr = expectedVector[i].ToString();
         var resultStr = resultVector[i].ToString();
+
         result += expectedStr.LevenshteinDistance(resultStr);
+      }
+
+      for (var i = comparableLength; i < expectedVector.Length; i++) {
+        result += expectedVector[i].ToString().Length;
       }
 
@@ -424 +446 @@
       var expectedNumberOfSentences = example.OutputInteger[0];
       statsError += BenchmarkSuite.Problems.WordStats.GetNumberOfSentences(printStr, out numberOfSentences)
-        ? Math.Abs(expectedNumberOfSentences - numberOfSentences)
+        ? expectedNumberOfSentences.AbsoluteDiff(numberOfSentences)
         : Data.WorstResult / 3.0;
 
@@ -430 +452 @@
       var expectedAverageSentenceLength = example.OutputFloat[0];
       statsError += BenchmarkSuite.Problems.WordStats.GetAverageSentenceLength(printStr, out averageSentenceLength)
-        ? Math.Abs(expectedAverageSentenceLength - averageSentenceLength)
+        ? expectedAverageSentenceLength.AbsoluteDiff(averageSentenceLength)
         : Data.WorstResult / 3.0;
 
@@ -445 +467 @@
 
       var expectedLastCharIndex = example.OutputPrint.Length - 1;
+      var resultLastCharIndex = printStr.Length - 1;
       var result = distance;
 
-      if (expectedLastCharIndex >= 0) {
+      if (expectedLastCharIndex >= 0 && resultLastCharIndex >= 0) {
         var expectedLastChar = example.OutputPrint[expectedLastCharIndex];
-        var resultLastCharIndex = printStr.Length - 1;
-
-        if (resultLastCharIndex >= 0) {
-          var resultLastChar = printStr[resultLastCharIndex];
-          result += Math.Abs(expectedLastChar - resultLastChar);
-        }
+        var resultLastChar = printStr[resultLastCharIndex];
+
+        result += expectedLastChar.AbsoluteDiff(resultLastChar);
       }
 
@@ -470 +490 @@
       var expectedNumberOfSyllables = example.OutputInteger[0];
       var numberOfSyllablesError = BenchmarkSuite.Problems.Syllables.GetNumberOfSyllables(printStr, out numberOfSyllables)
-        ? Math.Abs(expectedNumberOfSyllables - numberOfSyllables)
+        ? expectedNumberOfSyllables.AbsoluteDiff(numberOfSyllables)
         : Data.WorstResult / 2.0;
 
@@ -487 +507 @@
       var expectedGrade = example.OutputChar[0];
       var gradeError = BenchmarkSuite.Problems.Grades.GetGrade(printStr, out grade)
-        ? Math.Abs(expectedGrade - grade)
-        : Data.WorstResult / 2;
+        ? expectedGrade.AbsoluteDiff(grade)
+        : char.MaxValue;
 
       var result = distance + gradeError;
@@ -500 +520 @@
       if (result == double.MinValue || double.IsPositiveInfinity(result) ||
           double.IsNaN(result) ||
+          // ReSharper disable once CompareOfFloatsByEqualityOperator
           result == double.MaxValue || double.IsNegativeInfinity(result))
         return worst;
@@ -576 +597 @@
       return double.IsNaN(diff) || double.IsInfinity(diff)
          ? worstResult
-         : diff;
+         : Math.Min(diff, worstResult);
     }
 
@@ -599 +620 @@
       return double.IsNaN(diff) || double.IsInfinity(diff)
         ? worstResult
-        : diff;
+        : Math.Min(diff, worstResult);
     }
   }