Changeset 3480

Timestamp:

04/21/10 22:46:12 (15 years ago)

Author:

gkronber

Message:

minor bug fixes #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.3/ScatterPlotView.cs (modified) (1 diff)

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

@@ -190 +190 @@
 
     void DataAnalysisProblemData_Changed(object sender, EventArgs e) {
+      UpdateGrammar();
+      UpdatePartitioningParameters();
+    }
+
+    private void UpdateGrammar() {
       foreach (var varSymbol in FunctionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable>()) {
         varSymbol.VariableNames = DataAnalysisProblemData.InputVariables.Select(x => x.Value);
       }
-      UpdatePartitioningParameters();
     }
 
@@ -282 +286 @@
       operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>());
       ParameterizeOperators();
+      UpdateGrammar();
+      UpdatePartitioningParameters();
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/ScatterPlotView.cs

@@ -36 +36 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Scatter Plot View")]
-  [Content(typeof(DataAnalysisSolution))]
+  [Content(typeof(DataAnalysisSolution), true)]
   public partial class ScatterPlotView : AsynchronousContentView {
     private const string DEFAULT_CAPTION = "Scatter Plot";