Changeset 12448 for branches/SensitivityEvaluator/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineWeightedResidualsMeanSquaredErrorCalculator.cs

Timestamp:

06/15/15 17:00:37 (9 years ago)

Author:

ehopf

Message:

#2361: Minor naming changes.

File:

• branches/SensitivityEvaluator/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineWeightedResidualsMeanSquaredErrorCalculator.cs (modified) (3 diffs)

branches/SensitivityEvaluator/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineWeightedResidualsMeanSquaredErrorCalculator.cs

@@ -36 +36 @@
 
     public double PositiveClassValue { get; private set; }
-    public double ClassValueMax { get; private set; }
-    public double ClassValueMin { get; private set; }
-    public double ObviousResidualsWeight { get; private set; }
+    public double ClassValuesMax { get; private set; }
+    public double ClassValuesMin { get; private set; }
+    public double DefiniteResidualsWeight { get; private set; }
     public double PositiveClassResidualsWeight { get; private set; }
-    public double NegativeClassResidualsWeight { get; private set; }
+    public double NegativeClassesResidualsWeight { get; private set; }
 
-    public OnlineWeightedResidualsMeanSquaredErrorCalculator(double positiveClassValue, double classValueMax, double classValueMin,
-                                                                double obviousResidualsWeight, double positiveClassResidualsWeight, double negativeClassResidualsWeight) {
+    public OnlineWeightedResidualsMeanSquaredErrorCalculator(double positiveClassValue, double classValuesMax, double classValuesMin,
+                                                                double definiteResidualsWeight, double positiveClassResidualsWeight, double negativeClassesResidualsWeight) {
       PositiveClassValue = positiveClassValue;
-      ClassValueMax = classValueMax;
-      ClassValueMin = classValueMin;
-      ObviousResidualsWeight = obviousResidualsWeight;
+      ClassValuesMax = classValuesMax;
+      ClassValuesMin = classValuesMin;
+      DefiniteResidualsWeight = definiteResidualsWeight;
       PositiveClassResidualsWeight = positiveClassResidualsWeight;
-      NegativeClassResidualsWeight = negativeClassResidualsWeight;
+      NegativeClassesResidualsWeight = negativeClassesResidualsWeight;
       Reset();
     }
@@ -75 +75 @@
         double weight;
         //apply weight
-        if (estimated > ClassValueMax || estimated < ClassValueMin) {
-          weight = ObviousResidualsWeight;
-        } else if (original.IsAlmost(PositiveClassValue))
-        {
+        if (estimated > ClassValuesMax || estimated < ClassValuesMin) {
+          weight = DefiniteResidualsWeight;
+        } else if (original.IsAlmost(PositiveClassValue)) {
           weight = PositiveClassResidualsWeight;
-        } else
-        {
-          weight = NegativeClassResidualsWeight;
+        } else {
+          weight = NegativeClassesResidualsWeight;
         }
         error *= weight;
@@ -92 +90 @@
     #endregion
 
-    public static double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, double positiveClassValue, double classValueMax, double classValueMin,
-                                                                double obviousValuesWeight, double positiveClassValuesWeight, double negativeClassValuesWeight, out OnlineCalculatorError errorState) {
+    public static double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, double positiveClassValue, double classValuesMax, double classValuesMin,
+                                                                double definiteResidualsWeight, double positiveClassResidualsWeight, double negativeClassesResidualsWeight, out OnlineCalculatorError errorState) {
       IEnumerator<double> originalEnumerator = originalValues.GetEnumerator();
       IEnumerator<double> estimatedEnumerator = estimatedValues.GetEnumerator();
-      OnlineWeightedResidualsMeanSquaredErrorCalculator calculator = new OnlineWeightedResidualsMeanSquaredErrorCalculator(positiveClassValue, classValueMax, classValueMin, obviousValuesWeight, positiveClassValuesWeight, negativeClassValuesWeight);
+      OnlineWeightedResidualsMeanSquaredErrorCalculator calculator = new OnlineWeightedResidualsMeanSquaredErrorCalculator(positiveClassValue, classValuesMax, classValuesMin, definiteResidualsWeight, positiveClassResidualsWeight, negativeClassesResidualsWeight);
 
       // always move forward both enumerators (do not use short-circuit evaluation!)