Changeset 3373 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic

Timestamp:

04/16/10 15:22:57 (14 years ago)

Author:

gkronber

Message:

Refactored HeuristicLab.Problems.DataAnalysis namespace. #938 (Data types and operators for regression problems)

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic)
• ArithmeticExpressionGrammar.cs (modified) (4 diffs)
• SimpleArithmeticExpressionEvaluator.cs (modified) (2 diffs)
• SymbolicRegressionEvaluator.cs (deleted)
• SymbolicRegressionMeanSquaredErrorEvaluator.cs (deleted)
• SymbolicRegressionProblem.cs (deleted)
• SymbolicRegressionProblemView.Designer.cs (deleted)
• SymbolicRegressionProblemView.cs (deleted)
• Symbols/Constant.cs (modified) (1 diff)
• Symbols/ConstantTreeNode.cs (modified) (1 diff)
• Symbols/Variable.cs (modified) (1 diff)
• Symbols/VariableTreeNode.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/ArithmeticExpressionGrammar.cs

@@ -20 +20 @@
 #endregion
 
-
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using System.Collections.Generic;
@@ -28 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
-using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols;
 using HeuristicLab.Data;
-namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
   [Item("ArithmeticExpressionGrammar", "Represents a grammar for functional expressions using only arithmetic operations.")]
@@ -45 +44 @@
 
     [Storable]
-    private HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols.Variable variableSymbol;
+    private HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable variableSymbol;
 
     public ArithmeticExpressionGrammar()
@@ -58 +57 @@
       var div = new Division();
       var constant = new Constant();
-      variableSymbol = new HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols.Variable();
+      variableSymbol = new HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable();
 
       var allSymbols = new List<Symbol>() { add, sub, mul, div, constant, variableSymbol };
       var functionSymbols = new List<Symbol>() { add, sub, mul, div };
+
       foreach (var symb in allSymbols)
         AddSymbol(symb);

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs

@@ -27 +27 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
-using HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
 
-namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
   [Item("SimpleArithmeticExpressionEvaluator", "Default evaluator for arithmetic symbolic expression trees.")]
@@ -82 +82 @@
           }
         case CodeSymbol.Dynamic: {
-            if (currentInstr.dynamicNode is VariableTreeNode) {
-              var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
+            var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;
+            if (variableTreeNode != null) {
               return dataset[row, dataset.GetVariableIndex(variableTreeNode.VariableName)] * variableTreeNode.Weight;
-            } else if (currentInstr.dynamicNode is ConstantTreeNode) {
-              return ((ConstantTreeNode)currentInstr.dynamicNode).Value;
+            }
+            var constTreeNode = currentInstr.dynamicNode as ConstantTreeNode;
+            if (constTreeNode != null) {
+              return constTreeNode.Value;
             } else throw new NotSupportedException();
           }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Constant.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
-using HeuristicLab.Random;
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Parameters;
-namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
   [Item("Constant", "Represents a constant value.")]

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/ConstantTreeNode.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Random;
-namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
   public sealed class ConstantTreeNode : SymbolicExpressionTreeTerminalNode {

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Variable.cs

@@ -29 +29 @@
 using System.Collections.Generic;
 using System;
-namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
   [Item("Variable", "Represents a variable value.")]

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableTreeNode.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Random;
-namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
   [StorableClass]
   public sealed class VariableTreeNode : SymbolicExpressionTreeTerminalNode {