Changeset 3905 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Analyzers

Timestamp:

06/08/10 17:47:15 (14 years ago)

Author:

gkronber

Message:

Implemented calculation of variable impacts as integral over relative variable frequencies. #1036

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Analyzers/RegressionSolutionAnalyzer.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Analyzers/RegressionSolutionAnalyzer.cs

@@ -44 +44 @@
     private const string LowerEstimationLimitParameterName = "LowerEstimationLimit";
     private const string BestSolutionQualityParameterName = "BestSolutionQuality";
+    private const string GenerationsParameterName = "Generations";
     private const string ResultsParameterName = "Results";
     private const string BestSolutionResultName = "Best solution (on validiation set)";
@@ -52 +53 @@
     private const string BestSolutionTrainingRelativeError = "Best solution average relative error (training)";
     private const string BestSolutionTestRelativeError = "Best solution average relative error (test)";
+    private const string BestSolutionGeneration = "Best solution generation";
 
     #region parameter properties
@@ -71 +73 @@
     public ILookupParameter<ResultCollection> ResultsParameter {
       get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
+    }
+    public ILookupParameter<IntValue> GenerationsParameter {
+      get {
+        return (ILookupParameter<IntValue>)Parameters[GenerationsParameterName];
+      }
     }
     #endregion
@@ -98 +105 @@
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>(QualityParameterName, "The qualities of the symbolic regression trees which should be analyzed."));
       Parameters.Add(new LookupParameter<DoubleValue>(BestSolutionQualityParameterName, "The quality of the best regression solution."));
+      Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "The number of generations calculated so far."));
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The result collection where the best symbolic regression solution should be stored."));
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    public void Initialize() {
+      // backwards compatibility
+      if (!Parameters.ContainsKey(GenerationsParameterName)) {
+        Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "The number of generations calculated so far."));
+      }
     }
 
@@ -135 +151 @@
         Results[BestSolutionTrainingRelativeError].Value = new DoubleValue(trainingRelError);
         Results[BestSolutionTestRelativeError].Value = new DoubleValue(testRelError);
+        Results[BestSolutionGeneration].Value = new IntValue(GenerationsParameter.ActualValue.Value);
       } else {
         Results.Add(new Result(BestSolutionResultName, solution));
@@ -143 +160 @@
         Results.Add(new Result(BestSolutionTrainingRelativeError, new DoubleValue(trainingRelError)));
         Results.Add(new Result(BestSolutionTestRelativeError, new DoubleValue(testRelError)));
+        Results.Add(new Result(BestSolutionGeneration, new IntValue(GenerationsParameter.ActualValue.Value)));
       }
       #endregion