Changeset 5736 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

Timestamp:

03/17/11 15:14:45 (13 years ago)

Author:

gkronber

Message:

#1418 implemented linear scaling for classification solutions, fixed bugs interactive simplifier view for classification solutions.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (4 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -92 +92 @@
 
         // automatically fold all branches with impact = 1
-        List<ISymbolicExpressionTreeNode> nodeList = Content.Model.SymbolicExpressionTree.Root.GetSubTree(0).IterateNodesPrefix().ToList();
+        List<ISymbolicExpressionTreeNode> nodeList = Content.Model.SymbolicExpressionTree.Root.GetSubtree(0).IterateNodesPrefix().ToList();
         foreach (var parent in nodeList) {
-          for (int subTreeIndex = 0; subTreeIndex < parent.SubTrees.Count(); subTreeIndex++) {
-            var child = parent.GetSubTree(subTreeIndex);
+          for (int subTreeIndex = 0; subTreeIndex < parent.SubtreesCount; subTreeIndex++) {
+            var child = parent.GetSubtree(subTreeIndex);
             if (!(child.Symbol is Constant) && nodeImpacts[child].IsAlmost(1.0)) {
               SwitchNodeWithReplacementNode(parent, subTreeIndex);
@@ -102 +102 @@
         }
         // show only interesting part of solution
-        this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubTree(0).GetSubTree(0));
+        this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
         this.PaintNodeImpacts();
       }
@@ -124 +124 @@
       var tree = Content.Model.SymbolicExpressionTree;
       foreach (SymbolicExpressionTreeNode treeNode in tree.IterateNodesPostfix()) {
-        for (int i = 0; i < treeNode.SubTrees.Count(); i++) {
-          ISymbolicExpressionTreeNode subTree = treeNode.GetSubTree(i);
+        for (int i = 0; i < treeNode.SubtreesCount; i++) {
+          ISymbolicExpressionTreeNode subTree = treeNode.GetSubtree(i);
           if (subTree == visualTreeNode.SymbolicExpressionTreeNode) {
             SwitchNodeWithReplacementNode(treeNode, i);
@@ -133 +133 @@
 
       // show only interesting part of solution
-      this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubTree(0).GetSubTree(0));
+      this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
 
       UpdateModel(tree);
-      this.PaintNodeImpacts();
     }
 
     private void SwitchNodeWithReplacementNode(ISymbolicExpressionTreeNode parent, int subTreeIndex) {
-      ISymbolicExpressionTreeNode subTree = parent.GetSubTree(subTreeIndex);
-      parent.RemoveSubTree(subTreeIndex);
+      ISymbolicExpressionTreeNode subTree = parent.GetSubtree(subTreeIndex);
+      parent.RemoveSubtree(subTreeIndex);
       if (replacementNodes.ContainsKey(subTree)) {
         var replacementNode = replacementNodes[subTree];
-        parent.InsertSubTree(subTreeIndex, replacementNode);
+        parent.InsertSubtree(subTreeIndex, replacementNode);
         // exchange key and value 
         replacementNodes.Remove(subTree);
         replacementNodes.Add(replacementNode, subTree);
-      } else {
-        throw new InvalidOperationException("Could not find replacement value.");
       }
     }