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

Timestamp:

08/20/10 17:42:27 (14 years ago)

Author:

gkronber

Message:

Worked on overfitting analyzer and CPP. #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

@@ -89 +89 @@
     public ILookupParameter<DataTable> QualitiesParameter {
       get { return (ILookupParameter<DataTable>)Parameters["Qualities"]; }
+    }
+    public IValueLookupParameter<DoubleValue> MinAverageSizeParameter {
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["MinAverageSize"]; }
     }
 
@@ -111 +114 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Correlation(Length, AdjustedFitness)"));
       Parameters.Add(new LookupParameter<DoubleValue>("Correlation(Fitness, AdjustedFitness)"));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("MinAverageSize", new DoubleValue(15)));
     }
 
@@ -151 +155 @@
       if (!Parameters.ContainsKey("ComplexityAdaption")) {
         Parameters.Add(new ValueLookupParameter<PercentValue>("ComplexityAdaption", new PercentValue(-5)));
+      }
+      if (!Parameters.ContainsKey("MinAverageSize")) {
+        Parameters.Add(new ValueLookupParameter<DoubleValue>("MinAverageSize", new DoubleValue(15)));
       }
     }
@@ -190 +197 @@
         else sizeAdaption = Math.Ceiling(sizeAdaption);
         double g = lengthMeanCalculator.Mean + sizeAdaption;
+        if (g < MinAverageSizeParameter.ActualValue.Value)
+          g = MinAverageSizeParameter.ActualValue.Value;
 
         //            cov(l, f) - (g(t+1) - mu(t)) avgF