Changeset 4227 for branches/DataAnalysis

Timestamp:

08/16/10 11:24:14 (14 years ago)

Author:

gkronber

Message:

Added significant improvement check to dynamic operator equalization. #1142

File:

• branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqComparator.cs (modified) (5 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqComparator.cs

@@ -77 +77 @@
     public ILookupParameter<DoubleValue> BestValidationQualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Best solution quality (validation)"]; }
+    }
+    public IValueLookupParameter<DoubleValue> CRaiseParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["CRaise"]; }
     }
 
@@ -95 +98 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Current best validation quality"));
       Parameters.Add(new LookupParameter<DoubleValue>("Best solution quality (validation)"));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("CRaise", "Necessary quality improvement per bin to allow extensions.", new DoubleValue(0.005)));
     }
 
@@ -110 +114 @@
           #endregion
           if (!Exists(bin)) {
-
             if (AntiOverfitParameter.ActualValue.Value) {
               // reject more complex solutions if the current validation quality is worse than the best so far
@@ -138 +141 @@
         double bestValidationQuality = BestValidationQualityParameter.ActualValue.Value;
         return maximization ? currentValidationQuality < bestValidationQuality : currentValidationQuality > bestValidationQuality;
-      } else 
+      } else
         return false;
     }
@@ -150 +153 @@
       if (Exists(binIndex)) {
         //if (IsNotFull(binIndex) /*||
-          //NewBestOfBin(solutionQuality, binIndex)*/) {        
+        //NewBestOfBin(solutionQuality, binIndex)*/) {        
         AddToBin(solutionQuality, binIndex);
-          accept = true;
+        accept = true;
+        UpdateBestQuality(solutionQuality);
         //}
-      } else if (NewBestOfRun(solutionQuality)) {
+      } else if (NewBestOfRun(solutionQuality) && SignificantImprovement(solutionQuality, binIndex)) {
         CreateNewBin(binIndex);
         AddToBin(solutionQuality, binIndex);
         accept = true;
+        UpdateBestQuality(solutionQuality);
       }
       return accept;
+    }
+
+    private void UpdateBestQuality(double solutionQuality) {
+      bool maximization = MaximizationParameter.ActualValue.Value;
+      double bestQuality = BestQualityParameter.ActualValue.Value;
+      if ((maximization && bestQuality < solutionQuality) ||
+         (!maximization && solutionQuality < bestQuality))
+        BestQualityParameter.ActualValue.Value = solutionQuality;
+    }
+
+    private bool SignificantImprovement(double solutionQuality, int newIndex) {
+      var binCapacities = BinCapacityParameter.ActualValue;
+      int binDiff = newIndex - binCapacities.Count + 1;
+      double bestQuality = BestQualityParameter.ActualValue.Value;
+      bool maximization = MaximizationParameter.ActualValue.Value;
+
+      double relativeQuality = maximization ? solutionQuality / bestQuality - 1 : bestQuality / solutionQuality - 1;
+      return relativeQuality >= binDiff * CRaiseParameter.ActualValue.Value;
     }