Changeset 2226 for trunk/sources/HeuristicLab.Modeling

Timestamp:

08/03/09 15:18:36 (15 years ago)

Author:

gkronber

Message:

• Added extension method IsAlmost to type double
• changed evaluation semantics of boolean operations in HL3TreeEvaluator

(#713)

Location:

trunk/sources/HeuristicLab.Modeling/3.2

Files:

• DoubleExtensions.cs (added)
• HeuristicLab.Modeling-3.2.csproj (modified) (1 diff)
• SimpleEvaluatorBase.cs (modified) (1 diff)
• SimpleMeanAbsolutePercentageOfRangeErrorEvaluator.cs (modified) (1 diff)
• SimpleVarianceAccountedForEvaluator.cs (modified) (1 diff)
• VariableEvaluationImpactCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Modeling/3.2/HeuristicLab.Modeling-3.2.csproj

@@ -83 +83 @@
   <ItemGroup>
     <Compile Include="ClassificationProblemInjector.cs" />
+    <Compile Include="DoubleExtensions.cs" />
     <Compile Include="VariableImpactCalculatorBase.cs" />
     <Compile Include="VariableEvaluationImpactCalculator.cs" />

trunk/sources/HeuristicLab.Modeling/3.2/SimpleEvaluatorBase.cs

@@ -31 +31 @@
 
     public abstract double Evaluate(double[,] values);
-
-    protected static bool IsAlmost(double x, double y) {
-      return Math.Abs(x - y) < 1.0E-12;
-    }
   }
 }

trunk/sources/HeuristicLab.Modeling/3.2/SimpleMeanAbsolutePercentageOfRangeErrorEvaluator.cs

@@ -53 +53 @@
       double range = Statistics.Range(originalValues);
       if (double.IsInfinity(range)) throw new ArgumentException("Range of elements in values is infinity");
-      if (IsAlmost(range, 0.0)) throw new ArgumentException("Range of elements in values is zero");
+      if (range.IsAlmost(0.0)) throw new ArgumentException("Range of elements in values is zero");
 
       for (int i = 0; i < values.GetLength(0); i++) {

trunk/sources/HeuristicLab.Modeling/3.2/SimpleVarianceAccountedForEvaluator.cs

@@ -69 +69 @@
       double errorsVariance = Statistics.Variance(errors);
       double originalsVariance = Statistics.Variance(originalTargetVariableValues);
-      if (IsAlmost(originalsVariance, 0.0))
-        if (IsAlmost(errorsVariance, 0.0)) {
+      if (originalsVariance.IsAlmost(0.0))
+        if (errorsVariance.IsAlmost(0.0)) {
           return 1.0;
         } else {

trunk/sources/HeuristicLab.Modeling/3.2/VariableEvaluationImpactCalculator.cs

@@ -64 +64 @@
     protected override double[] PostProcessImpacts(double[] impacts) {
       double mseSum = impacts.Sum();
-      if (IsAlmost(mseSum, 0.0)) mseSum = 1.0;
+      if (mseSum.IsAlmost(0.0)) mseSum = 1.0;
       for (int i = 0; i < impacts.Length; i++) {
         impacts[i] = impacts[i] / mseSum;