Changeset 4415 for trunk/sources

Timestamp:

09/16/10 14:51:59 (14 years ago)

Author:

mkommend

Message:

Adapted regression classes to work with classification plugin (ticket #939).

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic

Files:

• Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs (modified) (2 diffs)
• SymbolicRegressionModel.cs (modified) (1 diff)
• SymbolicRegressionSolution.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.DataAnalysis.Evaluators;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
@@ -61 +60 @@
     private const string RelativeNumberOfEvaluatedSamplesParameterName = "RelativeNumberOfEvaluatedSamples";
 
-    private const string TrainingMeanSquaredErrorQualityParameterName = "Mean squared error (training)";
-    private const string MinTrainingMeanSquaredErrorQualityParameterName = "Min mean squared error (training)";
-    private const string MaxTrainingMeanSquaredErrorQualityParameterName = "Max mean squared error (training)";
-    private const string AverageTrainingMeanSquaredErrorQualityParameterName = "Average mean squared error (training)";
-    private const string BestTrainingMeanSquaredErrorQualityParameterName = "Best mean squared error (training)";
-
-    private const string TrainingAverageRelativeErrorQualityParameterName = "Average relative error (training)";
-    private const string MinTrainingAverageRelativeErrorQualityParameterName = "Min average relative error (training)";
-    private const string MaxTrainingAverageRelativeErrorQualityParameterName = "Max average relative error (training)";
-    private const string AverageTrainingAverageRelativeErrorQualityParameterName = "Average average relative error (training)";
-    private const string BestTrainingAverageRelativeErrorQualityParameterName = "Best average relative error (training)";
-
-    private const string TrainingRSquaredQualityParameterName = "R² (training)";
-    private const string MinTrainingRSquaredQualityParameterName = "Min R² (training)";
-    private const string MaxTrainingRSquaredQualityParameterName = "Max R² (training)";
-    private const string AverageTrainingRSquaredQualityParameterName = "Average R² (training)";
-    private const string BestTrainingRSquaredQualityParameterName = "Best R² (training)";
-
-    private const string TestMeanSquaredErrorQualityParameterName = "Mean squared error (test)";
-    private const string MinTestMeanSquaredErrorQualityParameterName = "Min mean squared error (test)";
-    private const string MaxTestMeanSquaredErrorQualityParameterName = "Max mean squared error (test)";
-    private const string AverageTestMeanSquaredErrorQualityParameterName = "Average mean squared error (test)";
-    private const string BestTestMeanSquaredErrorQualityParameterName = "Best mean squared error (test)";
-
-    private const string TestAverageRelativeErrorQualityParameterName = "Average relative error (test)";
-    private const string MinTestAverageRelativeErrorQualityParameterName = "Min average relative error (test)";
-    private const string MaxTestAverageRelativeErrorQualityParameterName = "Max average relative error (test)";
-    private const string AverageTestAverageRelativeErrorQualityParameterName = "Average average relative error (test)";
-    private const string BestTestAverageRelativeErrorQualityParameterName = "Best average relative error (test)";
-
-    private const string TestRSquaredQualityParameterName = "R² (test)";
-    private const string MinTestRSquaredQualityParameterName = "Min R² (test)";
-    private const string MaxTestRSquaredQualityParameterName = "Max R² (test)";
-    private const string AverageTestRSquaredQualityParameterName = "Average R² (test)";
-    private const string BestTestRSquaredQualityParameterName = "Best R² (test)";
-
-    private const string RSquaredValuesParameterName = "R²";
-    private const string MeanSquaredErrorValuesParameterName = "Mean squared error";
-    private const string RelativeErrorValuesParameterName = "Average relative error";
-
     #region parameter properties
     public ILookupParameter<IRandom> RandomParameter {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionModel.cs

@@ -45 +45 @@
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      if (inputVariables == null)
+        this.inputVariables = tree.IterateNodesPrefix().OfType<VariableTreeNode>().Select(var => var.VariableName).Distinct().ToList();
+    }
+
     [Storable]
     private SymbolicExpressionTree tree;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs

@@ -34 +34 @@
   [Item("SymbolicRegressionSolution", "Represents a solution for a symbolic regression problem which can be visualized in the GUI.")]
   [StorableClass]
-  public sealed class SymbolicRegressionSolution : DataAnalysisSolution {
+  public class SymbolicRegressionSolution : DataAnalysisSolution {
     public SymbolicRegressionSolution() : base() { }
     public SymbolicRegressionSolution(DataAnalysisProblemData problemData, SymbolicRegressionModel model, double lowerEstimationLimit, double upperEstimationLimit)
@@ -63 +63 @@
     }
 
-    private List<double> estimatedValues;
+    protected List<double> estimatedValues;
     public override IEnumerable<double> EstimatedValues {
       get {