Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/14/11 14:00:19 (13 years ago)
Author:
mkommend
Message:

#1506: Restructured calculation of results in IDataAnalysisSolutions and fixed bug in SymbolicDiscriminantClassisificationEstimatedValuesView.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationSolution.cs

    r5809 r6411  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    23 using System.Linq;
    2422using HeuristicLab.Common;
    2523using HeuristicLab.Core;
    2624using HeuristicLab.Data;
    27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Operators;
    29 using HeuristicLab.Parameters;
     25using HeuristicLab.Optimization;
    3026using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    31 using HeuristicLab.Optimization;
    32 using System;
    3327
    3428namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    6963      Add(new Result(ModelLengthResultName, "Length of the symbolic classification model.", new IntValue()));
    7064      Add(new Result(ModelDepthResultName, "Depth of the symbolic classification model.", new IntValue()));
    71       RecalculateResults();
     65      CalculateResults();
    7266    }
    7367
    … …  
    7670    }
    7771
    78     protected override void OnModelChanged(EventArgs e) {
    79       base.OnModelChanged(e);
    80       RecalculateResults();
     72    protected override void RecalculateResults() {
     73      base.RecalculateResults();
     74      CalculateResults();
    8175    }
    8276
    83     private new void RecalculateResults() {
     77    private void CalculateResults() {
    8478      ModelLength = Model.SymbolicExpressionTree.Length;
    8579      ModelDepth = Model.SymbolicExpressionTree.Depth;

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationSolution.cs

    r5975 r6411  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
    … …  
    6766      Add(new Result(ModelLengthResultName, "Length of the symbolic classification model.", new IntValue()));
    6867      Add(new Result(ModelDepthResultName, "Depth of the symbolic classification model.", new IntValue()));
    69       RecalculateResults();
     68      CalculateResults();
    7069    }
    7170
    … …  
    7473    }
    7574
    76     protected override void OnModelChanged(EventArgs e) {
    77       base.OnModelChanged(e);
    78       RecalculateResults();
     75    protected override void RecalculateResults() {
     76      base.RecalculateResults();
     77      CalculateResults();
    7978    }
    8079
    81     private new void RecalculateResults() {
     80    private void CalculateResults() {
    8281      ModelLength = Model.SymbolicExpressionTree.Length;
    8382      ModelDepth = Model.SymbolicExpressionTree.Depth;
Note: See TracChangeset for help on using the changeset viewer.