Changeset 4415


Ignore:
Timestamp:
09/16/10 14:51:59 (9 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs

    r4246 r4415  
    3030using HeuristicLab.Parameters;
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    32 using HeuristicLab.Problems.DataAnalysis.Evaluators;
    3332using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3433
     
    6160    private const string RelativeNumberOfEvaluatedSamplesParameterName = "RelativeNumberOfEvaluatedSamples";
    6261
    63     private const string TrainingMeanSquaredErrorQualityParameterName = "Mean squared error (training)";
    64     private const string MinTrainingMeanSquaredErrorQualityParameterName = "Min mean squared error (training)";
    65     private const string MaxTrainingMeanSquaredErrorQualityParameterName = "Max mean squared error (training)";
    66     private const string AverageTrainingMeanSquaredErrorQualityParameterName = "Average mean squared error (training)";
    67     private const string BestTrainingMeanSquaredErrorQualityParameterName = "Best mean squared error (training)";
    68 
    69     private const string TrainingAverageRelativeErrorQualityParameterName = "Average relative error (training)";
    70     private const string MinTrainingAverageRelativeErrorQualityParameterName = "Min average relative error (training)";
    71     private const string MaxTrainingAverageRelativeErrorQualityParameterName = "Max average relative error (training)";
    72     private const string AverageTrainingAverageRelativeErrorQualityParameterName = "Average average relative error (training)";
    73     private const string BestTrainingAverageRelativeErrorQualityParameterName = "Best average relative error (training)";
    74 
    75     private const string TrainingRSquaredQualityParameterName = "R² (training)";
    76     private const string MinTrainingRSquaredQualityParameterName = "Min R² (training)";
    77     private const string MaxTrainingRSquaredQualityParameterName = "Max R² (training)";
    78     private const string AverageTrainingRSquaredQualityParameterName = "Average R² (training)";
    79     private const string BestTrainingRSquaredQualityParameterName = "Best R² (training)";
    80 
    81     private const string TestMeanSquaredErrorQualityParameterName = "Mean squared error (test)";
    82     private const string MinTestMeanSquaredErrorQualityParameterName = "Min mean squared error (test)";
    83     private const string MaxTestMeanSquaredErrorQualityParameterName = "Max mean squared error (test)";
    84     private const string AverageTestMeanSquaredErrorQualityParameterName = "Average mean squared error (test)";
    85     private const string BestTestMeanSquaredErrorQualityParameterName = "Best mean squared error (test)";
    86 
    87     private const string TestAverageRelativeErrorQualityParameterName = "Average relative error (test)";
    88     private const string MinTestAverageRelativeErrorQualityParameterName = "Min average relative error (test)";
    89     private const string MaxTestAverageRelativeErrorQualityParameterName = "Max average relative error (test)";
    90     private const string AverageTestAverageRelativeErrorQualityParameterName = "Average average relative error (test)";
    91     private const string BestTestAverageRelativeErrorQualityParameterName = "Best average relative error (test)";
    92 
    93     private const string TestRSquaredQualityParameterName = "R² (test)";
    94     private const string MinTestRSquaredQualityParameterName = "Min R² (test)";
    95     private const string MaxTestRSquaredQualityParameterName = "Max R² (test)";
    96     private const string AverageTestRSquaredQualityParameterName = "Average R² (test)";
    97     private const string BestTestRSquaredQualityParameterName = "Best R² (test)";
    98 
    99     private const string RSquaredValuesParameterName = "R²";
    100     private const string MeanSquaredErrorValuesParameterName = "Mean squared error";
    101     private const string RelativeErrorValuesParameterName = "Average relative error";
    102 
    10362    #region parameter properties
    10463    public ILookupParameter<IRandom> RandomParameter {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionModel.cs

    r4068 r4415  
    4545    }
    4646
     47    [StorableHook(HookType.AfterDeserialization)]
     48    private void AfterDeserializationHook() {
     49      if (inputVariables == null)
     50        this.inputVariables = tree.IterateNodesPrefix().OfType<VariableTreeNode>().Select(var => var.VariableName).Distinct().ToList();
     51    }
     52
    4753    [Storable]
    4854    private SymbolicExpressionTree tree;
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs

    r4250 r4415  
    3434  [Item("SymbolicRegressionSolution", "Represents a solution for a symbolic regression problem which can be visualized in the GUI.")]
    3535  [StorableClass]
    36   public sealed class SymbolicRegressionSolution : DataAnalysisSolution {
     36  public class SymbolicRegressionSolution : DataAnalysisSolution {
    3737    public SymbolicRegressionSolution() : base() { }
    3838    public SymbolicRegressionSolution(DataAnalysisProblemData problemData, SymbolicRegressionModel model, double lowerEstimationLimit, double upperEstimationLimit)
     
    6363    }
    6464
    65     private List<double> estimatedValues;
     65    protected List<double> estimatedValues;
    6666    public override IEnumerable<double> EstimatedValues {
    6767      get {
Note: See TracChangeset for help on using the changeset viewer.