Changeset 17625 for branches/2521_ProblemRefactoring/HeuristicLab.Parameters

Timestamp:

06/23/20 04:23:45 (4 years ago)

Author:

abeham

Message:

#2521:

• Changed IParticleCreator to not derive from ISolutionCreator (it calls the solution creator itself, thus leading to an infinite loop)
• Remove ForceValue method and added method to set value in constrained value parameters from valid values
• Fix ScopeTreeLookupParameter not caching the actual value
• Fixed single-objective test functions and removed lots of parameterize code

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3

Files:

• OptionalConstrainedValueParameter.cs (modified) (3 diffs)
• ScopeTreeLookupParameter.cs (modified) (1 diff)

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

@@ -55 +55 @@
       set {
         if (ReadOnly) throw new InvalidOperationException("Cannot set the value of a readonly parameter.");
-        DoSetValue(value);
-      }
-    }
-    public virtual void ForceValue(T value) {
-      DoSetValue(value);
-    }
-    private void DoSetValue(T value) {
-      if (value != this.value) {
-        if ((value != null) && !validValues.Contains(value)) throw new ArgumentException("Invalid value.");
-        DeregisterValueEvents();
-        this.value = value;
-        RegisterValueEvents();
-        OnValueChanged();
-      }
-    }
+        if (value != this.value) {
+          if ((value != null) && !validValues.Contains(value)) throw new ArgumentException("Invalid value.");
+          DeregisterValueEvents();
+          this.value = value;
+          RegisterValueEvents();
+          OnValueChanged();
+        }
+      }
+    }
+
     IItem IValueParameter.Value {
       get { return Value; }
@@ -170 +165 @@
     #endregion
 
-    public void Populate(IEnumerable<IItem> items) {
+    public virtual void Populate(IEnumerable<IItem> items) {
       ValidValues.Clear();
       ValidValues.UnionWith(items.OfType<T>());
@@ -187 +182 @@
         if (item != null) Value = item;
       }
+    }
+
+    public virtual IItem SetValueToFirstOf(Type itemType) {
+      var item = ValidValues.Where(i => itemType.IsAssignableFrom(i.GetType())).FirstOrDefault();
+      if (item != null) Value = item;
+      return item;
     }
 

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

@@ -133 +133 @@
         j++;
       }
+      CachedActualValue = values;
     }