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

Timestamp:

08/28/17 09:03:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Improved Performance

File:

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

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

@@ -156 +156 @@
 
         // float error
-        case ProblemType.VectorAverage: return GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision));
+        case ProblemType.VectorAverage: return GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision, Data.WorstResult));
 
         // integer error
@@ -184 +184 @@
     private double Default(IPushInterpreter interpreter, Example example) {
       var integerDiff = GetDiff(example.OutputInteger, interpreter.IntegerStack, Data.WorstResult, IntegerDiffer);
-      var floatDiff = GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision));
+      var floatDiff = GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision, Data.WorstResult));
       var booleanDiff = GetDiff(example.OutputBoolean, interpreter.BooleanStack, Data.WorstResult, BooleanDiffer);
       var stringDiff = GetDiff(example.OutputString, interpreter.StringStack, Data.WorstResult, StringDiffer);
@@ -190 +190 @@
       var printDiff = GetPrintDiffer(example.OutputPrint, interpreter.PrintStack, Data.WorstResult);
       var integerVectorDiff = GetVectorDiff(example.OutputIntegerVector, interpreter.IntegerVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, IntegerDiffer));
-      var floatVectorDiff = GetVectorDiff(example.OutputFloatVector, interpreter.FloatVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, (x, y) => FloatDiffer(x, y, example.OutputFloatVectorPrecision)));
+      var floatVectorDiff = GetVectorDiff(example.OutputFloatVector, interpreter.FloatVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, (x, y) => FloatDiffer(x, y, example.OutputFloatVectorPrecision, Data.WorstResult)));
       var stringVectorDiff = GetVectorDiff(example.OutputStringVector, interpreter.StringVectorStack, Data.WorstResult, (a, b) => VectorDiffer(a, b, StringDiffer));
 
@@ -315 +315 @@
         return Data.WorstResult;
 
-      var floatDiff = GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision));
+      var floatDiff = GetDiff(example.OutputFloat, interpreter.FloatStack, Data.WorstResult, (a, b) => FloatDiffer(a, b, example.OutputFloatPrecision, Data.WorstResult));
       var expectedStr = example.OutputFloat[0].ToString(Data.FloatStringFormat, CultureInfo.CurrentCulture);
       var resultStr = interpreter.FloatStack.TopOrDefault.ToString(Data.FloatStringFormat, CultureInfo.CurrentCulture);
@@ -480 +480 @@
     }
 
-    private static double FloatDiffer(double a, double b, int digits) {
+    private static double FloatDiffer(double a, double b, int digits, double worst) {
       var result = Math.Round(a, digits) - Math.Round(b, digits);
 
       // ReSharper disable once CompareOfFloatsByEqualityOperator
-      if (result == double.MinValue || double.IsPositiveInfinity(result) || double.IsNaN(result))
-        return double.MaxValue;
-
-      // ReSharper disable once CompareOfFloatsByEqualityOperator
-      if (result == double.MaxValue || double.IsNegativeInfinity(result))
-        return double.MinValue;
+      if (result == double.MinValue || double.IsPositiveInfinity(result) ||
+          double.IsNaN(result) ||
+          result == double.MaxValue || double.IsNegativeInfinity(result))
+        return worst;
 
       return Math.Abs(result);
@@ -545 +543 @@
       where T : IComparable {
       if (estimated.Count == 0) return 0d;
+      if (resultStack.IsEmpty && estimated.Count > 0) return worstResult;
 
       var diff = 0d;
@@ -551 +550 @@
       if (!resultStack.IsEmpty) {
 
-        for (var i = 0; i < comparableLength; i++) {
-          diff += Math.Min(differ(estimated[i], resultStack[i]), worstResult);
+        for (var i = 0; i < comparableLength && diff < worstResult; i++) {
+          diff += differ(estimated[i], resultStack[i]);
         }
       }
 
       var emptyTArray = new T[0];
-      for (var i = comparableLength; i < estimated.Count - comparableLength; i++) {
+      for (var i = comparableLength; i < estimated.Count - comparableLength && diff < worstResult; i++) {
         diff += differ(estimated[i], emptyTArray);
       }
@@ -567 +566 @@
       where T : IComparable {
       if (estimated.Count == 0) return 0d;
+      if (resultStack.IsEmpty && estimated.Count > 0) return worstResult;
 
       var diff = 0d;
@@ -572 +572 @@
 
       if (!resultStack.IsEmpty) {
-        for (var i = 0; i < comparableLength; i++) {
-          diff += Math.Min(differ(estimated[i], resultStack[i]), worstResult);
+        for (var i = 0; i < comparableLength && diff < worstResult; i++) {
+          diff += differ(estimated[i], resultStack[i]);
         }
       }
 
-      for (var i = comparableLength; i < estimated.Count - comparableLength; i++) {
+      for (var i = comparableLength; i < estimated.Count - comparableLength && diff < worstResult; i++) {
         diff += differ(estimated[i], default(T));
       }