Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Timestamp:

03/17/11 14:07:47 (14 years ago)

Author:

mkommend

Message:

#1418: Corrected problem interfaces & unified naming of subtrees.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• Interfaces/ISymbolicRegressionProblem.cs (deleted)
• Interfaces/ISymbolicRegressionSingleObjectiveProblem.cs (deleted)
• MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs (modified) (1 diff)
• SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (1 diff)
• SymbolicRegressionSolution.cs (modified) (4 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -111 +111 @@
     <Compile Include="SymbolicRegressionModel.cs" />
     <Compile Include="Interfaces\ISymbolicRegressionModel.cs" />
-    <Compile Include="Interfaces\ISymbolicRegressionProblem.cs" />
-    <Compile Include="Interfaces\ISymbolicRegressionSingleObjectiveProblem.cs" />
     <Compile Include="Interfaces\ISymbolicRegressionSolution.cs" />
     <Compile Include="Interfaces\ISymbolicRegressionEvaluator.cs" />

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

@@ -31 +31 @@
   [StorableClass]
   [Creatable("Problems")]
-  public class SymbolicRegressionMultiObjectiveProblem : SymbolicDataAnalysisMultiObjectiveProblem<IRegressionProblemData, ISymbolicRegressionMultiObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator> {
+  public class SymbolicRegressionMultiObjectiveProblem : SymbolicDataAnalysisMultiObjectiveProblem<IRegressionProblemData, ISymbolicRegressionMultiObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IRegressionProblem {
     private const double PunishmentFactor = 10;
     private const int InitialMaximumTreeDepth = 8;

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -31 +31 @@
   [StorableClass]
   [Creatable("Problems")]
-  public class SymbolicRegressionSingleObjectiveProblem : SymbolicDataAnalysisSingleObjectiveProblem<IRegressionProblemData, ISymbolicRegressionSingleObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator> {
+  public class SymbolicRegressionSingleObjectiveProblem : SymbolicDataAnalysisSingleObjectiveProblem<IRegressionProblemData, ISymbolicRegressionSingleObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>,IRegressionProblem {
     private const double PunishmentFactor = 10;
     private const int InitialMaximumTreeDepth = 8;

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

@@ -73 +73 @@
       ConstantTreeNode betaTreeNode = null;
       // check if model has been scaled previously by analyzing the structure of the tree
-      var startNode = Model.SymbolicExpressionTree.Root.GetSubTree(0);
-      if (startNode.GetSubTree(0).Symbol is Addition) {
-        var addNode = startNode.GetSubTree(0);
-        if (addNode.SubtreesCount == 2 && addNode.GetSubTree(0).Symbol is Multiplication && addNode.GetSubTree(1).Symbol is Constant) {
-          alphaTreeNode = addNode.GetSubTree(1) as ConstantTreeNode;
-          var mulNode = addNode.GetSubTree(0);
-          if (mulNode.SubtreesCount == 2 && mulNode.GetSubTree(1).Symbol is Constant) {
-            betaTreeNode = mulNode.GetSubTree(1) as ConstantTreeNode;
+      var startNode = Model.SymbolicExpressionTree.Root.GetSubtree(0);
+      if (startNode.GetSubtree(0).Symbol is Addition) {
+        var addNode = startNode.GetSubtree(0);
+        if (addNode.SubtreesCount == 2 && addNode.GetSubtree(0).Symbol is Multiplication && addNode.GetSubtree(1).Symbol is Constant) {
+          alphaTreeNode = addNode.GetSubtree(1) as ConstantTreeNode;
+          var mulNode = addNode.GetSubtree(0);
+          if (mulNode.SubtreesCount == 2 && mulNode.GetSubtree(1).Symbol is Constant) {
+            betaTreeNode = mulNode.GetSubtree(1) as ConstantTreeNode;
           }
         }
@@ -90 +90 @@
         alphaTreeNode.Value += alpha;
       } else {
-        var mainBranch = startNode.GetSubTree(0);
-        startNode.RemoveSubTree(0);
+        var mainBranch = startNode.GetSubtree(0);
+        startNode.RemoveSubtree(0);
         var scaledMainBranch = MakeSum(MakeProduct(beta, mainBranch), alpha);
-        startNode.AddSubTree(scaledMainBranch);
+        startNode.AddSubtree(scaledMainBranch);
       }
 
@@ -105 +105 @@
         var node = (new Addition()).CreateTreeNode();
         var alphaConst = MakeConstant(alpha);
-        node.AddSubTree(treeNode);
-        node.AddSubTree(alphaConst);
+        node.AddSubtree(treeNode);
+        node.AddSubtree(alphaConst);
         return node;
       }
@@ -117 +117 @@
         var node = (new Multiplication()).CreateTreeNode();
         var betaConst = MakeConstant(beta);
-        node.AddSubTree(treeNode);
-        node.AddSubTree(betaConst);
+        node.AddSubtree(treeNode);
+        node.AddSubtree(betaConst);
         return node;
       }