Changeset 6011 for branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4
- Timestamp:
- 04/15/11 14:54:43 (13 years ago)
- Location:
- branches/histogram
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/histogram
- Property svn:mergeinfo changed
/trunk/sources (added) merged: 5962-5963,5971-5972,5975-5976,5983-5984,5987,5993,5997-5998,6002-6003,6009
- Property svn:mergeinfo changed
-
branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/InteractiveSymbolicDiscriminantFunctionClassificationSolutionSimplifierView.cs
r5942 r6011 59 59 protected override Dictionary<ISymbolicExpressionTreeNode, double> CalculateReplacementValues(ISymbolicExpressionTree tree) { 60 60 Dictionary<ISymbolicExpressionTreeNode, double> replacementValues = new Dictionary<ISymbolicExpressionTreeNode, double>(); 61 foreach (ISymbolicExpressionTreeNode node in tree.IterateNodesPrefix()) { 62 if (!(node.Symbol is ProgramRootSymbol || node.Symbol is StartSymbol)) { 63 replacementValues[node] = CalculateReplacementValue(node); 64 } 61 foreach (ISymbolicExpressionTreeNode node in tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix()) { 62 replacementValues[node] = CalculateReplacementValue(node, tree); 65 63 } 66 64 return replacementValues; … … 90 88 foreach (ISymbolicExpressionTreeNode node in nodes) { 91 89 var parent = node.Parent; 92 constantNode.Value = CalculateReplacementValue(node );90 constantNode.Value = CalculateReplacementValue(node, tree); 93 91 ISymbolicExpressionTreeNode replacementNode = constantNode; 94 92 SwitchNode(parent, node, replacementNode); … … 111 109 } 112 110 113 private double CalculateReplacementValue(ISymbolicExpressionTreeNode node) { 111 private double CalculateReplacementValue(ISymbolicExpressionTreeNode node, ISymbolicExpressionTree sourceTree) { 112 // remove old ADFs 113 while (tempTree.Root.SubtreesCount > 1) tempTree.Root.RemoveSubtree(1); 114 // clone ADFs of source tree 115 for (int i = 1; i < sourceTree.Root.SubtreesCount; i++) { 116 tempTree.Root.AddSubtree((ISymbolicExpressionTreeNode)sourceTree.Root.GetSubtree(i).Clone()); 117 } 114 118 var start = tempTree.Root.GetSubtree(0); 115 119 while (start.SubtreesCount > 0) start.RemoveSubtree(0); -
branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs
r5834 r6011 27 27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views { 28 28 [Content(typeof(SymbolicDiscriminantFunctionClassificationSolution), true)] 29 [View("SymbolicDiscriminan 29 [View("SymbolicDiscriminantFunctionClassificationSolution View")] 30 30 public partial class SymbolicDiscriminantFunctionClassificationSolutionView : DiscriminantFunctionClassificationSolutionView { 31 31 public SymbolicDiscriminantFunctionClassificationSolutionView() {
Note: See TracChangeset
for help on using the changeset viewer.