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

Timestamp:

03/17/11 15:14:45 (14 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.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs (modified) (4 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

@@ -48 +48 @@
       ISymbolicExpressionTreeNode root = new ProgramRootSymbol().CreateTreeNode();
       ISymbolicExpressionTreeNode start = new StartSymbol().CreateTreeNode();
-      root.AddSubTree(start);
+      root.AddSubtree(start);
       tempTree = new SymbolicExpressionTree(root);
     }
@@ -73 +73 @@
       string targetVariable = Content.ProblemData.TargetVariable;
       Dictionary<ISymbolicExpressionTreeNode, double> impactValues = new Dictionary<ISymbolicExpressionTreeNode, double>();
-      List<ISymbolicExpressionTreeNode> nodes = tree.Root.GetSubTree(0).GetSubTree(0).IterateNodesPostfix().ToList();
+      List<ISymbolicExpressionTreeNode> nodes = tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPostfix().ToList();
       var originalOutput = interpreter.GetSymbolicExpressionTreeValues(tree, dataset, rows)
         .ToArray();
@@ -98 +98 @@
 
     private double CalculateReplacementValue(ISymbolicExpressionTreeNode node) {
-      var start = tempTree.Root.GetSubTree(0);
-      while (start.SubTrees.Count() > 0) start.RemoveSubTree(0);
-      start.AddSubTree((ISymbolicExpressionTreeNode)node.Clone());
+      var start = tempTree.Root.GetSubtree(0);
+      while (start.SubtreesCount > 0) start.RemoveSubtree(0);
+      start.AddSubtree((ISymbolicExpressionTreeNode)node.Clone());
       var interpreter = Content.Model.Interpreter;
       var rows = Content.ProblemData.TrainingIndizes;
@@ -108 +108 @@
 
     private void SwitchNode(ISymbolicExpressionTreeNode root, ISymbolicExpressionTreeNode oldBranch, ISymbolicExpressionTreeNode newBranch) {
-      for (int i = 0; i < root.SubTrees.Count(); i++) {
-        if (root.GetSubTree(i) == oldBranch) {
-          root.RemoveSubTree(i);
-          root.InsertSubTree(i, newBranch);
+      for (int i = 0; i < root.SubtreesCount; i++) {
+        if (root.GetSubtree(i) == oldBranch) {
+          root.RemoveSubtree(i);
+          root.InsertSubtree(i, newBranch);
           return;
         }