Changeset 14379 for branches

Timestamp:

11/09/16 14:55:10 (8 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.

Location:

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4

Files:

• GoalSeekingUtil.cs (modified) (2 diffs)
• MultiObjectiveGoalSeekingProblem.cs (modified) (5 diffs)
• SingleObjectiveGoalSeekingProblem.cs (modified) (4 diffs)

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/GoalSeekingUtil.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -61 +82 @@
       }
       return encoding;
+    }
+
+    internal static void UpdateEncoding(RealVectorEncoding encoding, IEnumerable<InputParameter> inputParameters) {
+      encoding.Length = inputParameters.Count();
+      encoding.Bounds = new DoubleMatrix(encoding.Length, 2);
+      encoding.Bounds.RowNames = inputParameters.Select(x => x.Name);
+      encoding.Bounds.ColumnNames = new[] { "Min.", "Max." };
+
+      int i = 0;
+      foreach (var parameter in inputParameters) {
+        encoding.Bounds[i, 0] = parameter.Min;
+        encoding.Bounds[i, 1] = parameter.Max;
+        ++i;
+      }
     }
 

branches/HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/MultiObjectiveGoalSeekingProblem.cs

@@ -53 +53 @@
       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]; }
     }
     public IFixedValueParameter<DoubleValue> QualitySumCutoffParameter {
@@ -154 +154 @@
       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>()));
       Parameters.Add(new FixedValueParameter<DoubleValue>(QualitySumCutoffParameterName, new DoubleValue(0.2)));
       QualitySumCutoffParameter.Hidden = true;
@@ -228 +228 @@
         for (int j = 0; j < activeParameters.Count * 3; j += 3) {
           int k = j + offset;
-          rowValues[k] = 0; // TODO: figure this out and fix
+          rowValues[k] = activeParameters[j / 3].Value;
           rowValues[k + 1] = vector[j / 3];
           rowValues[k + 2] = rowValues[k + 1] - rowValues[k];
@@ -261 +261 @@
     }
 
-    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);
@@ -275 +275 @@
       if (inputs.ItemChecked(inputParameter) != inputParameter.Active)
         inputs.SetItemCheckedState(inputParameter, inputParameter.Active);
-      Encoding = GoalSeekingUtil.CreateEncoding(ActiveInputs);
+      GoalSeekingUtil.UpdateEncoding(Encoding, ActiveInputs);
     }
 

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);
     }