Changeset 13941 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModel.cs

Timestamp:

06/28/16 13:33:17 (8 years ago)

Author:

mkommend

Message:

#2604:

• Base classes for data analysis, classification, and regression models
• Added target variable to classification and regression models
• Switched parameter order in data analysis solutions (model, problemdata)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModel.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModel.cs

@@ -61 +61 @@
     public IEnumerable<string> VariablesUsedForPrediction {
       get {
-        return
+        var variables =
           SymbolicExpressionTree.IterateNodesPrefix()
             .OfType<VariableTreeNode>()
             .Select(x => x.VariableName)
-            .Distinct()
-            .OrderBy(x => x);
+            .Distinct();
+        var variableConditions = SymbolicExpressionTree.IterateNodesPrefix()
+          .OfType<VariableConditionTreeNode>().Select(x => x.VariableName).Distinct();
+
+        return variables.Union(variableConditions).OrderBy(x => x);
       }
     }