- Timestamp:
- 10/06/14 13:17:52 (10 years ago)
- Location:
- stable
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 11330,11332
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs
r11170 r11416 75 75 } 76 76 77 protected v oid RegisterItemEvents(IEnumerable<T> items) {77 protected virtual void RegisterItemEvents(IEnumerable<T> items) { 78 78 foreach (T item in items) { 79 79 if (item != null) { … … 83 83 } 84 84 } 85 pr ivatevoid DeregisterItemEvents(IEnumerable<T> items) {85 protected virtual void DeregisterItemEvents(IEnumerable<T> items) { 86 86 foreach (T item in items) { 87 87 if (item != null) { -
stable/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis merged: 11330
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification merged: 11332
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationSolution.cs
r11170 r11416 20 20 #endregion 21 21 22 using System.Linq; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; 24 25 using HeuristicLab.Data; 26 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 25 27 using HeuristicLab.Optimization; 26 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 61 63 public SymbolicClassificationSolution(ISymbolicClassificationModel model, IClassificationProblemData problemData) 62 64 : base(model, problemData) { 65 foreach (var node in model.SymbolicExpressionTree.Root.IterateNodesPrefix().OfType<SymbolicExpressionTreeTopLevelNode>()) 66 node.SetGrammar(null); 67 63 68 Add(new Result(ModelLengthResultName, "Length of the symbolic classification model.", new IntValue())); 64 69 Add(new Result(ModelDepthResultName, "Depth of the symbolic classification model.", new IntValue())); -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationSolution.cs
r11170 r11416 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 26 27 using HeuristicLab.Optimization; 27 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 107 108 public SymbolicDiscriminantFunctionClassificationSolution(ISymbolicDiscriminantFunctionClassificationModel model, IClassificationProblemData problemData) 108 109 : base(model, problemData) { 110 foreach (var node in model.SymbolicExpressionTree.Root.IterateNodesPrefix().OfType<SymbolicExpressionTreeTopLevelNode>()) 111 node.SetGrammar(null); 112 109 113 Add(new Result(ModelLengthResultName, "Length of the symbolic classification model.", new IntValue())); 110 114 Add(new Result(ModelDepthResultName, "Depth of the symbolic classification model.", new IntValue())); 111 112 115 113 116 ResultCollection estimationLimitResults = new ResultCollection(); -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression merged: 11332
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs
r11170 r11416 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 26 27 using HeuristicLab.Optimization; 27 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 102 103 public SymbolicRegressionSolution(ISymbolicRegressionModel model, IRegressionProblemData problemData) 103 104 : base(model, problemData) { 105 foreach (var node in model.SymbolicExpressionTree.Root.IterateNodesPrefix().OfType<SymbolicExpressionTreeTopLevelNode>()) 106 node.SetGrammar(null); 107 104 108 Add(new Result(ModelLengthResultName, "Length of the symbolic regression model.", new IntValue())); 105 109 Add(new Result(ModelDepthResultName, "Depth of the symbolic regression model.", new IntValue())); -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged: 11332
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs
r11170 r11416 91 91 } 92 92 93 94 private static readonly ISymbolicExpressionGrammar grammar = new TypeCoherentExpressionGrammar(); 93 95 private void insertNodeToolStripMenuItem_Click(object sender, EventArgs e) { 94 96 if (currSelected == null || currSelected.Content is SymbolicExpressionTreeTerminalNode) return; … … 96 98 97 99 using (var dialog = new InsertNodeDialog()) { 98 dialog.SetAllowedSymbols( parent.Grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun || s is GroupSymbol))); // allow everything100 dialog.SetAllowedSymbols(grammar.Symbols.Where(s => !(s is ProgramRootSymbol || s is StartSymbol || s is Defun || s is GroupSymbol))); // allow everything 99 101 dialog.ShowDialog(this); 100 102 if (dialog.DialogResult != DialogResult.OK) return; -
stable/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisSolution.cs
r11170 r11416 21 21 22 22 using System; 23 using System.Collections.Generic; 23 24 using System.Drawing; 24 25 using HeuristicLab.Common; … … 106 107 } 107 108 109 //mkommend avoid unnecessary event registration for result name changes 110 protected override void RegisterItemEvents(IEnumerable<IResult> items) { } 111 protected override void DeregisterItemEvents(IEnumerable<IResult> items) { } 112 108 113 #region INamedItem Members 109 114 [Storable]
Note: See TracChangeset
for help on using the changeset viewer.