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

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)
• SimpleArithmeticExpressionEvaluator.cs (modified) (2 diffs)

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();
           }