Changeset 2328 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Predictor.cs

Timestamp:

09/03/09 15:00:23 (15 years ago)

Author:

gkronber

Message:

this is the remaining part of changeset r2327.
Applied changes in modeling plugins that are necessary for the new model analyzer (#722)

• predictor has properties for the lower and upper limit of the predicted value
• added views for predictors that show the limits (also added a new view for GeneticProgrammingModel that shows the size and height of the model)
• Reintroduced TreeEvaluatorInjectors that read a PunishmentFactor and calculate the lower and upper limits for estimated values (limits are set in the tree evaluators)
• Added operators to create Predictors. Changed modeling algorithms to use the predictors for the calculation of final model qualities and variable impacts (to be compatible with the new model analyzer the predictors use a very large PunishmentFactor)
• replaced all private implementations of double.IsAlmost and use HL.Commons instead (see #733 r2324)
• Implemented operator SolutionExtractor and moved BestSolutionStorer from HL.Logging to HL.Modeling (fixes #734)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Predictor.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Predictor.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class Predictor : ItemBase, IPredictor {
+  public class Predictor : PredictorBase {
     private ITreeEvaluator treeEvaluator;
-    
-
-    public Predictor() : base() { } // for persistence
-    public Predictor(ITreeEvaluator evaluator, IGeneticProgrammingModel tree)
-      : base() {
-      this.treeEvaluator = evaluator;
-      this.functionTree = tree;
-    }
 
     private IGeneticProgrammingModel functionTree;
@@ -46 +38 @@
       get { return functionTree; }
     }
+    public Predictor() : base() { } // for persistence
+    public Predictor(ITreeEvaluator evaluator, IGeneticProgrammingModel tree, double lowerPredictionLimit, double upperPredictionLimit)
+      : base(lowerPredictionLimit, upperPredictionLimit) {
+      this.treeEvaluator = evaluator;
+      this.functionTree = tree;
+    }
 
-    public double[] Predict(Dataset input, int start, int end) {
+    public override double[] Predict(Dataset input, int start, int end) {
+      treeEvaluator.UpperEvaluationLimit = UpperPredictionLimit;
+      treeEvaluator.LowerEvaluationLimit = LowerPredictionLimit;
+
       if (start < 0 || end <= start) throw new ArgumentException("start must be larger than zero and strictly smaller than end");
       if (end > input.Rows) throw new ArgumentOutOfRangeException("number of rows in input is smaller then end");
@@ -59 +60 @@
 
     public override IView CreateView() {
-      return functionTree.CreateView();
+      return new PredictorView(this);
     }