Changeset 4223 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis

Timestamp:

08/16/10 10:00:31 (14 years ago)

Author:

gkronber

Message:

Corrected calculation of relative quality in dynamic depth limit comparator to work correctly for maximization problems and changed operator to update best of run quality immediately. #1142

File:

• branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynamicDepthLimitComparator.cs (modified) (2 diffs)

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

@@ -81 +81 @@
 
     public override IOperation Apply() {
-      if (ResultParameter.ActualValue.Value) {
+      if (ResultParameter.ActualValue == null || ResultParameter.ActualValue.Value) {
+        ResultParameter.ActualValue = new BoolValue(true);
         double leftQuality = LeftSideParameter.ActualValue.Value;
-        ItemArray<DoubleValue> rightQualities = RightSideParameter.ActualValue;
-
-        if (rightQualities.Length < 1) throw new InvalidOperationException(Name + ": No subscopes found.");
         bool maximization = MaximizationParameter.ActualValue.Value;
-
-        int bestParentIndex;
-        double bestParentQuality;
-
-        if (maximization)
-          bestParentQuality = rightQualities.Max(x => x.Value);
-        else
-          bestParentQuality = rightQualities.Min(x => x.Value);
-        bestParentIndex = rightQualities.FindIndex(x => x.Value == bestParentQuality);
 
         SymbolicExpressionTree tree = SymbolicExpressionTreeParameter.ActualValue;
@@ -102 +91 @@
         double cLower = CLowerParameter.Value.Value;
         double bestQuality = BestQualityParameter.ActualValue.Value;
-        double qualityPercentageChange = maximization ? -(bestQuality / leftQuality - 1) : (bestQuality / leftQuality - 1);
+        double relativeQuality = maximization ? (leftQuality - bestQuality) / leftQuality : (bestQuality - leftQuality) / leftQuality;
         if (tree.Height <= ddl) {
           // height is smaller than ddl => check improvement and reduce ddl 
-          if (qualityPercentageChange >= (ddl - tree.Height) * cLower) {
-            ddl = Math.Max(tree.Height, InitialDepthLimitParameter.Value.Value);
+          if (relativeQuality >= (ddl - tree.Height) * cLower) {
+            ddl = Math.Max(tree.Height, InitialDepthLimitParameter.ActualValue.Value);
           }
         } else {
           // height is larger than dll => check improvement and increase ddl
-          if (qualityPercentageChange >= (tree.Height - ddl) * cRaise) {
+          if (relativeQuality >= (tree.Height - ddl) * cRaise) {
             ddl = tree.Height;
           } else {
-            // height is larger but no improvment => reject
+            // height is larger but no improvement => reject
             ResultParameter.ActualValue.Value = false;
           }
         }
+
+        // update best quality
+        if (relativeQuality > 0 && ResultParameter.ActualValue.Value)
+          BestQualityParameter.ActualValue.Value = leftQuality;
 
         DynamicDepthLimitParameter.ActualValue.Value = ddl;