Changeset 14379 for branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/SingleObjectiveGoalSeekingProblem.cs

Timestamp:

11/09/16 14:55:10 (7 years ago)

Author:

bburlacu

Message:

#2679: Use an item list for models in the goal seeking problems instead of an item collection. Update encoding instead of creating a new one when inputs are changed.

File:

• branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/SingleObjectiveGoalSeekingProblem.cs (modified) (4 diffs)

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/SingleObjectiveGoalSeekingProblem.cs

@@ -51 +51 @@
       get { return (IValueParameter<CheckedItemList<GoalParameter>>)Parameters[GoalsParameterName]; }
     }
-    public IFixedValueParameter<ItemCollection<IRegressionModel>> ModelsParameter {
-      get { return (IFixedValueParameter<ItemCollection<IRegressionModel>>)Parameters[ModelsParameterName]; }
+    public IFixedValueParameter<ItemList<IRegressionModel>> ModelsParameter {
+      get { return (IFixedValueParameter<ItemList<IRegressionModel>>)Parameters[ModelsParameterName]; }
     }
     #endregion
@@ -139 +139 @@
       Parameters.Add(new ValueParameter<CheckedItemList<InputParameter>>(InputsParameterName));
       Parameters.Add(new ValueParameter<CheckedItemList<GoalParameter>>(GoalsParameterName));
-      Parameters.Add(new FixedValueParameter<ItemCollection<IRegressionModel>>(ModelsParameterName, new ItemCollection<IRegressionModel>()));
+      Parameters.Add(new FixedValueParameter<ItemList<IRegressionModel>>(ModelsParameterName, new ItemList<IRegressionModel>()));
       EncodingParameter.Hidden = true;
       EvaluatorParameter.Hidden = true;
@@ -176 +176 @@
     }
 
-    private void ModelCollection_ItemsChanged(object sender, CollectionItemsChangedEventArgs<IRegressionModel> e) {
+    private void ModelCollection_ItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<IRegressionModel>> e) {
       if (e.Items == null || !e.Items.Any()) return;
       GoalSeekingUtil.UpdateInputs(InputsParameter.Value, Models, InputParameterChanged);
-      Encoding = GoalSeekingUtil.CreateEncoding(ActiveInputs);
+      GoalSeekingUtil.UpdateEncoding(Encoding, ActiveInputs);
       dataset = Inputs.Any() ? new ModifiableDataset(Inputs.Select(x => x.Name), Inputs.Select(x => new List<double> { x.Value })) : new ModifiableDataset();
       GoalSeekingUtil.UpdateTargets(GoalsParameter.Value, Models, GoalParameterChanged);
@@ -190 +190 @@
       if (inputs.ItemChecked(inputParameter) != inputParameter.Active)
         inputs.SetItemCheckedState(inputParameter, inputParameter.Active);
-      Encoding = GoalSeekingUtil.CreateEncoding(ActiveInputs);
+      GoalSeekingUtil.UpdateEncoding(Encoding, ActiveInputs);
     }