Changeset 6811 for trunk

Timestamp:

09/20/11 18:32:08 (13 years ago)

Author:

gkronber

Message:

#1081 added configuration of default grammar for time-series prognosis and improved multiple update of variable impacts result

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisVariableFrequencyAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectiveProblem.cs

@@ -62 +62 @@
       MaximumSymbolicExpressionTreeLength.Value = InitialMaximumTreeLength;
 
+      SymbolicExpressionTreeGrammarParameter.ValueChanged += (o, e) => ConfigureGrammarSymbols();
+
+      ConfigureGrammarSymbols();
+
       InitializeOperators();
       UpdateEstimationLimits();
+    }
+    
+    private void ConfigureGrammarSymbols() {
+      var grammar = SymbolicExpressionTreeGrammar as TypeCoherentExpressionGrammar;
+      if (grammar != null) grammar.ConfigureAsDefaultTimeSeriesPrognosisGrammar();
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisVariableFrequencyAnalyzer.cs

@@ -80 +80 @@
       ItemArray<ISymbolicExpressionTree> expressions = SymbolicExpressionTreeParameter.ActualValue;
       ResultCollection results = ResultCollection;
-      DoubleMatrix impacts;
       DataTable datatable;
       if (VariableFrequenciesParameter.ActualValue == null) {
@@ -86 +85 @@
         datatable.VisualProperties.XAxisTitle = "Generation";
         datatable.VisualProperties.YAxisTitle = "Relative Variable Frequency";
-        impacts = new DoubleMatrix();
         VariableFrequenciesParameter.ActualValue = datatable;
-        VariableImpactsParameter.ActualValue = impacts;
         results.Add(new Result("Variable frequencies", "Relative frequency of variable references aggregated over the whole population.", datatable));
-        results.Add(new Result("Variable impacts", "The relative variable relevance calculated as the average relative variable frequency over the whole run.", impacts));
-      }
-
-      impacts = VariableImpactsParameter.ActualValue;
+        results.Add(new Result("Variable impacts", "The relative variable relevance calculated as the average relative variable frequency over the whole run.", new DoubleMatrix()));
+      }
+
       datatable = VariableFrequenciesParameter.ActualValue;
       // all rows must have the same number of values so we can just take the first
@@ -117 +113 @@
                            .OrderByDescending(p => p.Impact)
                            .ToList();
-      var matrix = (IStringConvertibleMatrix)impacts;
+      var impacts = new DoubleMatrix();
+      var matrix = impacts as IStringConvertibleMatrix;
       matrix.Rows = orderedImpacts.Count;
       matrix.RowNames = orderedImpacts.Select(x => x.Name);
@@ -127 +124 @@
       }
 
+      VariableImpactsParameter.ActualValue = impacts;
+      results["Variable impacts"].Value = impacts;
       return base.Apply();
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

@@ -192 +192 @@
       Symbols.Where(s => s.Name == TimeSeriesSymbolsName).First().Enabled = false;
     }
+
+    public void ConfigureAsDefaultTimeSeriesPrognosisGrammar() {
+      Symbols.Where(s => s is Variable).First().Enabled = false;
+      Symbols.Where(s => s.Name == TrigonometricFunctionsName).First().Enabled = false;
+      Symbols.Where(s => s.Name == PowerFunctionsName).First().Enabled = false;
+      Symbols.Where(s => s.Name == ConditionalSymbolsName).First().Enabled = false;
+    }
   }
 }