Changeset 4329 for branches

Timestamp:

08/26/10 12:48:22 (14 years ago)

Author:

gkronber

Message:

Extended covariant parsimony pressure operator to make it possible to apply pressure over the whole run, increasing the avg. tree size gradually and decreasing it when overfitting. #1142

File:

• branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressure.cs (modified) (4 diffs)

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

@@ -73 +73 @@
     public IValueLookupParameter<PercentValue> ComplexityAdaptionParameter {
       get { return (IValueLookupParameter<PercentValue>)Parameters["ComplexityAdaption"]; }
+    }
+    public IValueLookupParameter<BoolValue> InvertComplexityAdaptionParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["InvertComplexityAdaption"]; }
     }
     public IValueLookupParameter<DoubleValue> MinAverageSizeParameter {
@@ -94 +97 @@
       Parameters.Add(new ValueLookupParameter<DoubleValue>("MinAverageSize", new DoubleValue(15)));
       Parameters.Add(new LookupParameter<DoubleValue>("C"));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("InvertComplexityAdaption"));
     }
 
@@ -122 +126 @@
       if (!Parameters.ContainsKey("C")) {
         Parameters.Add(new LookupParameter<DoubleValue>("C"));
+      }
+      if (!Parameters.ContainsKey("InvertComplexityAdaption")) {
+        Parameters.Add(new ValueLookupParameter<BoolValue>("InvertComplexityAdaption"));
       }
     }
@@ -157 +164 @@
         }
 
-        double sizeAdaption = lengthMeanCalculator.Mean * ComplexityAdaptionParameter.ActualValue.Value;
+        //double sizeAdaption = lengthMeanCalculator.Mean * ComplexityAdaptionParameter.ActualValue.Value;
+        double sizeAdaption = 100.0 * ComplexityAdaptionParameter.ActualValue.Value;
+        if (InvertComplexityAdaptionParameter.ActualValue != null && InvertComplexityAdaptionParameter.ActualValue.Value) {
+          sizeAdaption = -sizeAdaption;
+        }
         if (lengthMeanCalculator.Mean + sizeAdaption < MinAverageSizeParameter.ActualValue.Value)
           sizeAdaption = 0.0;