Changeset 2136 for trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3

Timestamp:

07/06/09 17:12:37 (15 years ago)

Author:

gkronber

Message:

Improved handling of exceptional cases in data-based modeling evaluators. #688 (SimpleEvaluators should handle exceptional cases more gracefully)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3

Files:

• ConditionalCoefficientOfDeterminationEvaluator.cs (modified) (2 diffs)
• ConditionalMeanAbsolutePercentageErrorEvaluator.cs (modified) (1 diff)
• ConditionalMeanAbsolutePercentageOfRangeErrorEvaluator.cs (modified) (1 diff)
• ConditionalMeanSquaredErrorEvaluator.cs (modified) (1 diff)
• ConditionalVarianceAccountedForEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalCoefficientOfDeterminationEvaluator.cs

@@ -36 +36 @@
       }
     }
-    
+
     public override string Description {
       get {
@@ -45 +45 @@
 
     public override double Evaluate(double[,] values) {
-      double quality = SimpleR2Evaluator.Calculate(values);
-      if (double.IsNaN(quality) || double.IsInfinity(quality))
-        quality = double.MaxValue;
-
-      return quality;
+      try { return SimpleR2Evaluator.Calculate(values); }
+      catch (ArgumentException) {
+        return double.NegativeInfinity;
+      }
     }
   }

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalMeanAbsolutePercentageErrorEvaluator.cs

@@ -45 +45 @@
 
     public override double Evaluate(double[,] values) {
-      double quality = SimpleMeanAbsolutePercentageErrorEvaluator.Calculate(values);
-      if (double.IsNaN(quality) || double.IsInfinity(quality))
-        quality = double.MaxValue;
-
-      return quality;
+      try { return SimpleMeanAbsolutePercentageErrorEvaluator.Calculate(values); }
+      catch (ArgumentException) {
+        return double.PositiveInfinity;
+      }
     }
   }

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalMeanAbsolutePercentageOfRangeErrorEvaluator.cs

@@ -44 +44 @@
 
     public override double Evaluate(double[,] values) {
-      double quality = SimpleMeanAbsolutePercentageOfRangeErrorEvaluator.Calculate(values);
-      if (double.IsNaN(quality) || double.IsInfinity(quality))
-        quality = double.MaxValue;
-
-      return quality;
+      try {
+        return SimpleMeanAbsolutePercentageOfRangeErrorEvaluator.Calculate(values);
+      }
+      catch (ArgumentException) {
+        return double.PositiveInfinity;
+      }
     }
   }

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalMeanSquaredErrorEvaluator.cs

@@ -44 +44 @@
 
     public override double Evaluate(double[,] values) {
-      double quality = SimpleMSEEvaluator.Calculate(values);
-
-      if (double.IsNaN(quality) || double.IsInfinity(quality)) {
-        quality = double.MaxValue;
+      try {
+        return SimpleMSEEvaluator.Calculate(values);
       }
-
-      return quality;
+      catch (ArgumentException) {
+        return double.PositiveInfinity;
+      }
     }
   }

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalVarianceAccountedForEvaluator.cs

@@ -53 +53 @@
 
     public override double Evaluate(double[,] values) {
-      double quality = SimpleVarianceAccountedForEvaluator.Calculate(values);
-
-      if (double.IsNaN(quality) || double.IsInfinity(quality)) {
-        quality = double.MaxValue;
+      try { return SimpleVarianceAccountedForEvaluator.Calculate(values); }
+      catch (ArgumentException) {
+        return double.NegativeInfinity;
       }
-      return quality;
     }
   }