Changeset 4945 for trunk

Timestamp:

11/26/10 13:40:42 (13 years ago)

Author:

mkommend

Message:

Changed VariableFrequencyAnalyzers to trace only used variables (ticket #1246).

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/SymbolicRegressionVariableFrequencyAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/VariableFrequencyAnalyser.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/SymbolicRegressionVariableFrequencyAnalyzer.cs

@@ -79 +79 @@
       ItemArray<SymbolicExpressionTree> expressions = SymbolicExpressionTreeParameter.ActualValue;
       DataAnalysisProblemData problemData = ProblemDataParameter.ActualValue;
-      var inputVariables = problemData.InputVariables.Select(x => x.Value);
+      var inputVariables = problemData.InputVariables.CheckedItems.Select(x => x.Value.Value);
       ResultCollection results = ResultsParameter.ActualValue;
 
       if (VariableFrequencies == null) {
         VariableFrequencies = new DataTable("Variable frequencies", "Relative frequency of variable references aggregated over the whole population.");
+        VariableFrequencies.VisualProperties.XAxisTitle = "Generations";
+        VariableFrequencies.VisualProperties.YAxisTitle = "Relative Variable Frequencies";
         // add a data row for each input variable
-        foreach (var inputVariable in inputVariables)
-          VariableFrequencies.Rows.Add(new DataRow(inputVariable));
+        foreach (var inputVariable in inputVariables) {
+          DataRow row = new DataRow(inputVariable);
+          row.VisualProperties.StartIndexZero = true;
+          VariableFrequencies.Rows.Add(row);
+        }
         results.Add(new Result("Variable frequencies", VariableFrequencies));
       }

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

@@ -75 +75 @@
 
     public override IOperation Apply() {
-      var inputVariables = DataAnalysisProblemData.InputVariables.Select(x => x.Value);
+      var inputVariables = DataAnalysisProblemData.InputVariables.CheckedItems.Select(x => x.Value.Value);
       if (VariableFrequencies == null) {
         VariableFrequencies = new DoubleMatrix(0, 1, inputVariables);