Changeset 3559

Timestamp:

04/29/10 18:26:23 (14 years ago)

Author:

gkronber

Message:

Implemented checkboxes to select input variables. #938 (Data types and operators for regression problems)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblemData.cs (modified) (5 diffs)

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

@@ -262 +262 @@
     }
     protected virtual void OnArchitectureParameterChanged(EventArgs e) {
-      var globalGrammar = FunctionTreeGrammar as GlobalSymbolicExpressionGrammar;
-      if (globalGrammar != null) {
-        globalGrammar.MaxFunctionArguments = MaxFunctionArguments.Value;
-        globalGrammar.MaxFunctionDefinitions = MaxFunctionDefiningBranches.Value;
-      }
+      UpdateGrammar();
     }
     protected virtual void OnGrammarChanged(EventArgs e) { }
@@ -356 +352 @@
     private void UpdateGrammar() {
       foreach (var varSymbol in FunctionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable>()) {
-        varSymbol.VariableNames = DataAnalysisProblemData.InputVariables.Select(x => x.Value);
+        varSymbol.VariableNames = DataAnalysisProblemData.InputVariables.CheckedItems.Select(x => x.Value);
+      }
+      var globalGrammar = FunctionTreeGrammar as GlobalSymbolicExpressionGrammar;
+      if (globalGrammar != null) {
+        globalGrammar.MaxFunctionArguments = MaxFunctionArguments.Value;
+        globalGrammar.MaxFunctionDefinitions = MaxFunctionDefiningBranches.Value;
       }
     }

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

@@ -46 +46 @@
     }
 
-    public IValueParameter<ItemSet<StringValue>> InputVariablesParameter {
-      get { return (IValueParameter<ItemSet<StringValue>>)Parameters["InputVariables"]; }
+    public IValueParameter<CheckedItemCollection<StringValue>> InputVariablesParameter {
+      get { return (IValueParameter<CheckedItemCollection<StringValue>>)Parameters["InputVariables"]; }
     }
 
@@ -85 +85 @@
       }
     }
-    public ItemSet<StringValue> InputVariables {
-      get { return (ItemSet<StringValue>)InputVariablesParameter.Value; }
+    public CheckedItemCollection<StringValue> InputVariables {
+      get { return (CheckedItemCollection<StringValue>)InputVariablesParameter.Value; }
       set {
         if (value != InputVariables) {
@@ -140 +140 @@
       : base() {
       Parameters.Add(new ValueParameter<Dataset>("Dataset", new Dataset()));
-      Parameters.Add(new ValueParameter<ItemSet<StringValue>>("InputVariables", new ItemSet<StringValue>()));
+      Parameters.Add(new ValueParameter<CheckedItemCollection<StringValue>>("InputVariables", new CheckedItemCollection<StringValue>()));
       Parameters.Add(new ConstrainedValueParameter<StringValue>("TargetVariable"));
       Parameters.Add(new ValueParameter<IntValue>("TrainingSamplesStart", new IntValue()));
@@ -252 +252 @@
       InputVariables.ItemsAdded += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<StringValue>(InputVariables_ItemsAdded);
       InputVariables.ItemsRemoved += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<StringValue>(InputVariables_ItemsRemoved);
+      InputVariables.ItemsChecked += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<StringValue>(InputVariables_ItemsChecked);
       foreach (var item in InputVariables)
         item.ValueChanged += new EventHandler(InputVariable_ValueChanged);
+    }
+
+    void InputVariables_ItemsChecked(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<StringValue> e) {
+      OnProblemDataChanged(e);
     }
 
@@ -323 +328 @@
         ((ConstrainedValueParameter<StringValue>)TargetVariableParameter).ValidValues.Add(variableName);
       TargetVariable = variableNames.First();
-      InputVariables = new ItemSet<StringValue>(variableNames.Skip(1));
+      InputVariables = new CheckedItemCollection<StringValue>(variableNames);
+      foreach (var variableName in variableNames.Skip(1))
+        InputVariables.SetItemCheckedState(variableName, true);
       int middle = (int)(csvFileParser.Rows * 0.5);
       TrainingSamplesStart = new IntValue(0);