Changeset 5649 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DataAnalysisProblemData.cs

Timestamp:

03/10/11 10:00:09 (13 years ago)

Author:

gkronber

Message:

#1418 Implemented classes for classification based on a discriminant function and thresholds and implemented interfaces and base classes for clustering.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DataAnalysisProblemData.cs (modified) (6 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DataAnalysisProblemData.cs

@@ -44 +44 @@
       get { return (IFixedValueParameter<Dataset>)Parameters[DatasetParameterName]; }
     }
-    public IFixedValueParameter<ICheckedItemCollection<StringValue>> InputVariablesParameter {
-      get { return (IFixedValueParameter<ICheckedItemCollection<StringValue>>)Parameters[InputVariablesParameterName]; }
+    public IFixedValueParameter<ICheckedItemList<StringValue>> InputVariablesParameter {
+      get { return (IFixedValueParameter<ICheckedItemList<StringValue>>)Parameters[InputVariablesParameterName]; }
     }
     public IFixedValueParameter<IntValue> TrainingPartitionStartParameter {
@@ -65 +65 @@
       get { return DatasetParameter.Value; }
     }
-    public ICheckedItemCollection<StringValue> InputVariables {
+    public ICheckedItemList<StringValue> InputVariables {
       get { return InputVariablesParameter.Value; }
     }
     public IEnumerable<string> AllowedInputVariables {
-      get { return InputVariables.CheckedItems.Select(x => x.Value); }
+      get { return InputVariables.CheckedItems.Select(x => x.Value.Value); }
     }
 
@@ -110 +110 @@
         throw new ArgumentException("All allowed input variables must be present in the dataset.");
 
-      var inputVariables = new CheckedItemCollection<StringValue>(dataset.VariableNames.Select(x => new StringValue(x)));
+      var inputVariables = new CheckedItemList<StringValue>(dataset.VariableNames.Select(x => new StringValue(x)));
       foreach (StringValue x in inputVariables)
         inputVariables.SetItemCheckedState(x, allowedInputVariables.Contains(x.Value));
@@ -120 +120 @@
 
       Parameters.Add(new FixedValueParameter<Dataset>(DatasetParameterName, "", dataset));
-      Parameters.Add(new FixedValueParameter<ICheckedItemCollection<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly()));
+      Parameters.Add(new FixedValueParameter<ICheckedItemList<StringValue>>(InputVariablesParameterName, "", inputVariables.AsReadOnly()));
       Parameters.Add(new FixedValueParameter<IntValue>(TrainingPartitionStartParameterName, "", new IntValue(trainingPartitionStart)));
       Parameters.Add(new FixedValueParameter<IntValue>(TrainingPartitionEndParameterName, "", new IntValue(trainingPartitionEnd)));
@@ -132 +132 @@
     private void RegisterEventHandlers() {
       DatasetParameter.ValueChanged += new EventHandler(Parameter_ValueChanged);
-      InputVariables.CheckedItemsChanged += new CollectionItemsChangedEventHandler<StringValue>(InputVariables_CheckedItemsChanged);
+      InputVariables.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<StringValue>>(InputVariables_CheckedItemsChanged);
       TrainingPartitionStart.ValueChanged += new EventHandler(Parameter_ValueChanged);
       TrainingPartitionEnd.ValueChanged += new EventHandler(Parameter_ValueChanged);
@@ -139 +139 @@
     }
 
-    private void InputVariables_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<StringValue> e) {
+    private void InputVariables_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<StringValue>> e) {
       OnChanged();
     }
+
     private void Parameter_ValueChanged(object sender, EventArgs e) {
       OnChanged();