Changeset 3549

Timestamp:

04/27/10 21:34:52 (14 years ago)

Author:

gkronber

Message:

Added NumberOfInputVariables result calculation for symbolic regression problems. #938 (Data types and operators for regression problems)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/BestValidationSymbolicRegressionSolutionVisualizer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/BestValidationSymbolicRegressionSolutionVisualizer.cs

@@ -215 +215 @@
         BestValidationSolutionParameter.ActualValue.Model = newBestSolution.Model;
 
+      AddResult("NumberOfInputVariables", new IntValue(CountInputVariables(tree)));
+
       var trainingValues = problemData.Dataset.GetVariableValues(problemData.TargetVariable.Value, problemData.TrainingSamplesStart.Value, problemData.TrainingSamplesEnd.Value);
       var testValues = problemData.Dataset.GetVariableValues(problemData.TargetVariable.Value, problemData.TestSamplesStart.Value, problemData.TestSamplesEnd.Value);
@@ -225 +227 @@
       AddResult("MeanRelativeError (Test)", new PercentValue(SimpleMeanAbsolutePercentageErrorEvaluator.Calculate(testValues, newBestSolution.EstimatedTestValues)));
       AddResult("RSquared (Test)", new DoubleValue(SimpleRSquaredEvaluator.Calculate(testValues, newBestSolution.EstimatedTestValues)));
+    }
+
+    private int CountInputVariables(SymbolicExpressionTree tree) {
+      return (from node in tree.IterateNodesPrefix().OfType<VariableTreeNode>()
+              select node.VariableName)
+             .Distinct()
+             .Count();
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs

@@ -35 +35 @@
   [Item("DataAnalysisSolution", "Represents a solution for a data analysis problem which can be visualized in the GUI.")]
   [StorableClass]
-  public abstract class DataAnalysisSolution : Item {
+  public abstract class DataAnalysisSolution : NamedItem {
     [Storable]
     private DataAnalysisProblemData problemData;