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

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

File:

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

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

@@ -2 +2 @@
   using System;
   using System.Collections.Generic;
+  using System.Globalization;
   using System.Linq;
 
@@ -130 +131 @@
       var example = Data.Examples[exampleIndex];
 
-      interpreter.BooleanStack.Push(example.InputBoolean);
-      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);
-      interpreter.IntegerVectorStack.Push(example.InputIntegerVector);
-      interpreter.FloatVectorStack.Push(example.InputFloatVector);
+      //interpreter.BooleanStack.Push(example.InputBoolean);
+      //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);
+      //interpreter.IntegerVectorStack.Push(example.InputIntegerVector);
+      //interpreter.FloatVectorStack.Push(example.InputFloatVector);
+
+      interpreter.SetInput(
+        integers: example.InputInteger,
+        floats: example.InputFloat,
+        booleans: example.InputBoolean,
+        chars: example.InputChar,
+        strings: example.InputString,
+        integerVectors: example.InputIntegerVector,
+        floatVectors: example.InputFloatVector,
+        stringVectors: example.InputStringVector);
 
       interpreter.Run(program);
 
       switch (Data.ProblemType) {
-        //case ProblemType.NumberIO:
-        //  if (interpreter.PrintStack.IsEmpty)
-        //    return Data.WorstResult;
-
-        //  double value;
-        //  var levenshteinDistance = GetPrintDiffer(example.OutputPrint, interpreter.PrintStack, example.OutputPrintLineCount, Data.WorstResult);
-        //  return levenshteinDistance + (double.TryParse(interpreter.PrintStack.Top, out value)
-        //    ? FloatDiffer(value, example.OutputFloat[0], example.OutputFloatPrecision)
-        //    : Data.WorstResult / 2);
-
-        case ProblemType.Median: return interpreter.PrintStack.IsEmpty ? 1 : interpreter.PrintStack.Top.Equals(example.OutputPrint) ? 0 : 1;
-      }
-
+        case ProblemType.NumberIO: return NumberIo(interpreter, example);
+        case ProblemType.Median: return Median(interpreter, example);
+      }
+
+      return Default(interpreter, example);
+    }
+
+    private double Default(IPushInterpreter interpreter, Example example) {
       var result = GetDiff(example.OutputInteger, interpreter.IntegerStack, Data.WorstResult, IntegerDiffer)
-                 + GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision))
-                 + GetDiff(example.OutputBoolean, interpreter.BooleanStack, Data.WorstResult, BooleanDiffer)
-                 + GetDiff(example.OutputString, interpreter.StringStack, Data.WorstResult, StringDiffer)
-                 + GetDiff(example.OutputChar, interpreter.CharStack, Data.WorstResult, CharDiffer)
-                 + GetPrintDiffer(example.OutputPrint, interpreter.PrintStack, example.OutputPrintLineCount, Data.WorstResult)
-                 + GetVectorDiff(example.OutputIntegerVector, interpreter.IntegerVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, IntegerDiffer))
-                 + GetVectorDiff(example.OutputFloatVector, interpreter.FloatVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, (x, y) => FloatDiffer(x, y, example.OutputFloatVectorPrecision)))
-                 + GetVectorDiff(example.OutputStringVector, interpreter.StringVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, StringDiffer));
+             + GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision))
+             + GetDiff(example.OutputBoolean, interpreter.BooleanStack, Data.WorstResult, BooleanDiffer)
+             + GetDiff(example.OutputString, interpreter.StringStack, Data.WorstResult, StringDiffer)
+             + GetDiff(example.OutputChar, interpreter.CharStack, Data.WorstResult, CharDiffer)
+             + GetPrintDiffer(example.OutputPrint, interpreter.PrintStack, example.OutputPrintLineCount, Data.WorstResult)
+             + GetVectorDiff(example.OutputIntegerVector, interpreter.IntegerVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, IntegerDiffer))
+             + GetVectorDiff(example.OutputFloatVector, interpreter.FloatVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, (x, y) => FloatDiffer(x, y, example.OutputFloatVectorPrecision)))
+             + GetVectorDiff(example.OutputStringVector, interpreter.StringVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, StringDiffer));
 
       return result;
+    }
+
+    private double Median(IPushInterpreter interpreter, Example example) {
+      return interpreter.PrintStack.IsEmpty || !interpreter.PrintStack.Top.Equals(example.OutputPrint) ? 1 : 0;
+    }
+
+    private double NumberIo(IPushInterpreter interpreter, Example example) {
+      if (interpreter.PrintStack.IsEmpty)
+        return Data.WorstResult;
+
+      double value;
+      if (double.TryParse(interpreter.PrintStack.Top, NumberStyles.Number | NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out value)) {
+        var diff = Math.Abs(example.OutputFloat[0] - value);
+        var result = Math.Min(diff, Data.WorstResult);
+
+        return result;
+      }
+
+      var penaltyError = Data.WorstResult / 4.0d;
+      var levenshteinDistance = GetPrintDiffer(
+        example.OutputPrint,
+        interpreter.PrintStack.Top,
+        Data.WorstResult);
+
+      return levenshteinDistance + penaltyError;
     }
 
@@ -217 +248 @@
     }
 
+    private static double GetPrintDiffer(string estimated, string printResult, double worstResult) {
+      var distance = LevenshteinDistance(estimated, printResult);
+
+      return Math.Min(distance, worstResult);
+    }
+
     private static double GetPrintDiffer(string estimated, IPushStack<string> printStack, int estimatedCount, double worstResult) {
-      var printResult = string.Join(PushEnvironment.NewLine, printStack.Take(estimatedCount));
+      var printResult = string.Join(PushEnvironment.NewLine, printStack.AsStrings().Take(estimatedCount));
       var distance = LevenshteinDistance(estimated, printResult);
 
@@ -234 +271 @@
         var count = Math.Min(estimated.Count, resultStack.Count);
         var result = resultStack.Peek(count);
-        comparableLength = Math.Min(estimated.Count, result.Length);
+        comparableLength = Math.Min(estimated.Count, result.Count);
 
         for (var i = 0; i < comparableLength; i++) {
@@ -259 +296 @@
         var count = Math.Min(estimated.Count, resultStack.Count);
         var result = resultStack.Peek(count);
-        comparableLength = Math.Min(estimated.Count, result.Length);
+        comparableLength = Math.Min(estimated.Count, result.Count);
 
         for (var i = 0; i < comparableLength; i++) {