Changeset 4350 for branches/DataAnalysis

Timestamp:

08/31/10 18:25:03 (14 years ago)

Author:

gkronber

Message:

added minimal size parameter for pruning operator. #1142

Location:

branches/DataAnalysis

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/SymbolicRegressionTournamentPruning.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressure.cs (modified) (1 diff)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/SymbolicRegressionTournamentPruning.cs

@@ -126 +126 @@
     public IValueLookupParameter<BoolValue> ApplyPruningParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["ApplyPruning"]; }
+    }
+    public IValueLookupParameter<IntValue> MinimalTreeSizeParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["MinimalTreeSize"]; }
     }
     #endregion
@@ -214 +217 @@
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection."));
       Parameters.Add(new ValueLookupParameter<PercentValue>("RelativeNumberOfEvaluatedRows", new PercentValue(1.0)));
+      Parameters.Add(new ValueLookupParameter<IntValue>("MinimalTreeSize", new IntValue(15)));
     }
 
@@ -233 +237 @@
       if (!Parameters.ContainsKey("RelativeNumberOfEvaluatedRows")) {
         Parameters.Add(new ValueLookupParameter<PercentValue>("RelativeNumberOfEvaluatedRows", new PercentValue(1.0)));
+      }
+      if (!Parameters.ContainsKey("MinimalTreeSize")) {
+        Parameters.Add(new ValueLookupParameter<IntValue>("MinimalTreeSize", new IntValue(15)));
       }
 
@@ -261 +268 @@
             SymbolicExpressionTreeInterpreter, Evaluator, Maximization.Value,
             LowerEstimationLimit.Value, UpperEstimationLimit.Value,
-            MaxPruningRatio.Value, QualityGainWeight.Value);
+            MinimalTreeSizeParameter.ActualValue.Value, MaxPruningRatio.Value, QualityGainWeight.Value);
         }
       }
@@ -271 +278 @@
       ISymbolicExpressionTreeInterpreter interpreter, ISymbolicRegressionEvaluator evaluator, bool maximization,
       double lowerEstimationLimit, double upperEstimationLimit,
-      double maxPruningRatio, double qualityGainWeight) {
-
+      int minTreeSize, double maxPruningRatio, double qualityGainWeight) {
+
+      
       int originalSize = tree.Size;
-
       // min size of the resulting pruned tree
       int minPrunedSize = (int)(originalSize * (1 - maxPruningRatio));
+      minPrunedSize = Math.Max(minPrunedSize, minTreeSize);
 
       // use the same subset of rows for all iterations and for all pruning tournaments

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

@@ -170 +170 @@
         }
         if (lengthMeanCalculator.Mean + sizeAdaption < MinAverageSizeParameter.ActualValue.Value)
-          sizeAdaption = 0.0;
+          sizeAdaption = MinAverageSizeParameter.ActualValue.Value - lengthMeanCalculator.Mean;
 
         //            cov(l, f) - (g(t+1) - mu(t)) avgF