Context Navigation

HeuristicLab.GP.StructureIdentification

Timestamp:

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

Author:

gkronber

Message:

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

Location:

Files:

r1894	r2136
37	37	}
38	38	}
39
	39
40	40	public override string Description {
41	41	get {
…	…
46	46
47	47	public override double Evaluate(double[,] values) {
48
49		~~double quality =~~ SimpleR2Evaluator.Calculate(values);
50		~~if (double.IsNaN(quality) \|\| double.IsInfinity(quality))~~
51		~~quality = double.MaxValue;~~
52
53		~~return quality;~~
	48	try {
	49	return SimpleR2Evaluator.Calculate(values);
	50	}
	51	catch (ArgumentException) {
	52	return double.NegativeInfinity;
	53	}
54	54	}
55	55	}

-                      r1894
+                      r2136
     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;
+      }
+    }
+  }

-                      r1894
+                      r2136
     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;
+      }
+    }
+  }

r1894	r2136
45	45
46	46	public override double Evaluate(double[,] values) {
47		double quality = SimpleMSEEvaluator.Calculate(values);
48
49		if (double.IsNaN(quality) \|\| double.IsInfinity(quality)) {
50		quality = double.MaxValue;
	47	try { return SimpleMSEEvaluator.Calculate(values); }
	48	catch (ArgumentException) {
	49	return double.PositiveInfinity;
51	50	}
52
53		~~return quality;~~
54	51	}
55	52	}

-                      r2043
+                      r2136
       evaluator.PrepareForEvaluation(dataset, targetVariable, start, end, punishmentFactor, tree);
       double[,] result = new double[end - start,2];
+      double[,] result = new double[end - start, 2];
       for (int i = start; i < end; i++) {
         result[i - start, 0] = dataset.GetValue(i, targetVariable);
         result[i - start,1] = evaluator.Evaluate(i);
+        result[i - start, 1] = evaluator.Evaluate(i);
+      }
+      return HeuristicLab.Modeling.SimpleMSEEvaluator.Calculate(result);
+      try {
+        return HeuristicLab.Modeling.SimpleMSEEvaluator.Calculate(result);
+      }
+      catch (ArgumentException) {
+        return double.PositiveInfinity;
+      }
+    }
+  }

r1894	r2136
54	54
55	55	public override double Evaluate(double[,] values) {
56		double quality = SimpleVarianceAccountedForEvaluator.Calculate(values);
57
58		if (double.IsNaN(quality) \|\| double.IsInfinity(quality)) {
59		quality = double.MaxValue;
	56	try { return SimpleVarianceAccountedForEvaluator.Calculate(values); }
	57	catch (ArgumentException) {
	58	return double.NegativeInfinity;
60	59	}
61		~~return quality;~~
62	60	}
63	61	}

Note: See TracChangeset for help on using the changeset viewer.