Changeset 17614 for branches/2521_ProblemRefactoring/HeuristicLab.Parameters

Timestamp:

06/19/20 17:53:36 (4 years ago)

Author:

abeham

Message:

#2521: work in progress (removed solution creator parameter from encoding), OrienteeringProblem and test functions are broken

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3

Files:

• ConstrainedValueParameter.cs (modified) (2 diffs)
• OptionalConstrainedValueParameter.cs (modified) (1 diff)
• ParameterChangeHandler.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -57 +58 @@
     }
 
+    public override void Repopulate(IEnumerable<IItem> items) {
+      var itemsOfT = items.OfType<T>().ToList();
+      T oldItem = Value;
+      ValidValues.Clear();
+      T defaultItem = itemsOfT.FirstOrDefault();
+
+      foreach (T i in itemsOfT.OrderBy(x => x is INamedItem ? ((INamedItem)x).Name : x.ItemName))
+        ValidValues.Add(i);
+
+      if (oldItem != null) {
+        T item = ValidValues.FirstOrDefault(x => x.GetType() == oldItem.GetType());
+        if (item != null) Value = item;
+        else oldItem = null;
+      }
+      if (oldItem == null && defaultItem != null)
+        Value = defaultItem;
+    }
+
     protected override void ValidValues_ItemsAdded(object sender, CollectionItemsChangedEventArgs<T> e) {
       if (Value == null) Value = ValidValues.First();

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs

@@ -175 +175 @@
     }
 
+    public virtual void Repopulate(IEnumerable<IItem> items) {
+      var itemsOfT = items.OfType<T>().ToList();
+      T oldItem = Value;
+      ValidValues.Clear();
+
+      foreach (T i in itemsOfT.OrderBy(x => x is INamedItem ? ((INamedItem)x).Name : x.ItemName))
+        ValidValues.Add(i);
+
+      if (oldItem != null) {
+        T item = ValidValues.FirstOrDefault(x => x.GetType() == oldItem.GetType());
+        if (item != null) Value = item;
+      }
+    }
+
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ParameterChangeHandler.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Parameters {
-  public abstract class ParameterChangeHandler<TItem> where TItem : class, IItem {
+  public class ParameterChangeHandler<TItem> where TItem : class, IItem {
     protected Action handler;
 
@@ -37 +37 @@
       handler();
     }
+
+    public static ParameterChangeHandler<TItem> Create(IValueParameter<TItem> parameter, Action handler) {
+      return new ParameterChangeHandler<TItem>(parameter, handler);
+    }
   }