Changeset 6233 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Timestamp:

05/19/11 13:52:12 (14 years ago)

Author:

mkommend

Message:

#1532:

• Enabled renaming of symbols
• Fixed cloning of grammers
• Added readonly attribute in grammars to lock grammars during the algorithm run
• Removed useless clone method in cloner
• Changed CheckedItemCollectionViews to enable scrolling during the locked state

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• SymbolicRegressionModel.cs (modified) (4 diffs)
• SymbolicRegressionSolution.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -94 +95 @@
       } else {
         var mainBranch = startNode.GetSubtree(0);
+        var product = MakeProduct(mainBranch, beta);
         startNode.RemoveSubtree(0);
-        var scaledMainBranch = MakeSum(MakeProduct(beta, mainBranch), alpha);
+        startNode.AddSubtree(product);
+
+        var scaledMainBranch = MakeSum(product, alpha);
+        startNode.RemoveSubtree(0);
         startNode.AddSubtree(scaledMainBranch);
       }
@@ -104 +109 @@
         return treeNode;
       } else {
-        var node = (new Addition()).CreateTreeNode();
+        var addition = treeNode.Grammar.Symbols.OfType<Addition>().FirstOrDefault();
+        if (addition == null) addition = new Addition();
+        var node = addition.CreateTreeNode();
         var alphaConst = MakeConstant(alpha);
         node.AddSubtree(treeNode);
@@ -112 +119 @@
     }
 
-    private static ISymbolicExpressionTreeNode MakeProduct(double beta, ISymbolicExpressionTreeNode treeNode) {
+    private static ISymbolicExpressionTreeNode MakeProduct(ISymbolicExpressionTreeNode treeNode, double beta) {
       if (beta.IsAlmost(1.0)) {
         return treeNode;
       } else {
-        var node = (new Multiplication()).CreateTreeNode();
+        var multipliciation = treeNode.Grammar.Symbols.OfType<Multiplication>().FirstOrDefault();
+        if (multipliciation == null) multipliciation = new Multiplication();
+        var node = multipliciation.CreateTreeNode();
         var betaConst = MakeConstant(beta);
         node.AddSubtree(treeNode);

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

@@ -75 +75 @@
     }
 
-    private new void RecalculateResults() {
+    private void RecalculateResults() {
       ModelLength = Model.SymbolicExpressionTree.Length;
       ModelDepth = Model.SymbolicExpressionTree.Depth;