Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/06/14 13:17:52 (10 years ago)
Author:
mkommend
Message:

#2238: Merged r11330 and r11332 into stable.

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationSolution.cs

    r11170 r11416  
    2020#endregion
    2121
     22using System.Linq;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Data;
     26using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2527using HeuristicLab.Optimization;
    2628using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    6163    public SymbolicClassificationSolution(ISymbolicClassificationModel model, IClassificationProblemData problemData)
    6264      : base(model, problemData) {
     65      foreach (var node in model.SymbolicExpressionTree.Root.IterateNodesPrefix().OfType<SymbolicExpressionTreeTopLevelNode>())
     66        node.SetGrammar(null);
     67
    6368      Add(new Result(ModelLengthResultName, "Length of the symbolic classification model.", new IntValue()));
    6469      Add(new Result(ModelDepthResultName, "Depth of the symbolic classification model.", new IntValue()));

  • stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationSolution.cs

    r11170 r11416  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
     26using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2627using HeuristicLab.Optimization;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    107108    public SymbolicDiscriminantFunctionClassificationSolution(ISymbolicDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData)
    108109      : base(model, problemData) {
     110      foreach (var node in model.SymbolicExpressionTree.Root.IterateNodesPrefix().OfType<SymbolicExpressionTreeTopLevelNode>())
     111        node.SetGrammar(null);
     112
    109113      Add(new Result(ModelLengthResultName, "Length of the symbolic classification model.", new IntValue()));
    110114      Add(new Result(ModelDepthResultName, "Depth of the symbolic classification model.", new IntValue()));
    111 
    112115
    113116      ResultCollection estimationLimitResults = new ResultCollection();
Note: See TracChangeset for help on using the changeset viewer.