Changeset 17625

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

Files:

• HeuristicLab.Optimization/3.3/Interfaces/IParticleCreator.cs (modified) (2 diffs)
• HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs (modified) (3 diffs)
• HeuristicLab.Parameters/3.3/ScopeTreeLookupParameter.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (8 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Interfaces/IParticleCreator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -28 +28 @@
   /// Interface to represent an operator that generates a particle. 
   /// </summary>
-  public interface IParticleCreator : ISolutionCreator {
+  public interface IParticleCreator : IOperator {
     ILookupParameter<ISolutionCreator> SolutionCreatorParameter { get; }
   }

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

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -25 +25 @@
 using System.Threading;
 using HEAL.Attic;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -71 +70 @@
       BestKnownQuality = TestFunction.BestKnownQuality;
       Bounds = (DoubleMatrix)TestFunction.Bounds.Clone();
-      Dimension = TestFunction.MinimumProblemSize;
+      Dimension = Math.Min(Math.Max(2, TestFunction.MinimumProblemSize), TestFunction.MaximumProblemSize);
       BestKnownSolutionParameter.Value = TestFunction.GetBestKnownSolution(Dimension);
-      InitializeOperators();
+
+
+      Operators.AddRange(new IItem[] {
+        new SingleObjectiveTestFunctionImprovementOperator(),
+        new SingleObjectiveTestFunctionPathRelinker(),
+        new SingleObjectiveTestFunctionSimilarityCalculator(),
+        new EuclideanSimilarityCalculator(),
+        new AdditiveMoveEvaluator() });
+
+      SolutionCreatorParameter.SetValueToFirstOf(typeof(UniformRandomRealVectorCreator));
+
+      Parameterize();
       RegisterEventHandlers();
     }
@@ -87 +97 @@
 
     private void RegisterEventHandlers() {
-      Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
       TestFunctionParameter.ValueChanged += TestFunctionParameterOnValueChanged;
     }
@@ -109 +118 @@
 
       SingleObjectiveTestFunctionSolution solution = null;
-      if (results.TryGetValue("Best Solution", out var res)) {
+      if (results.TryGetValue("Best Solution", out var res) && res.Value != null) {
         solution = (SingleObjectiveTestFunctionSolution)res.Value;
         if (IsBetter(best.Item2, solution.BestQuality.Value)) {
@@ -122 +131 @@
           Bounds = BoundsRefParameter.Value
         };
-        results.Add(new Result("Best Solution", solution));
+        results.AddOrUpdateResult("Best Solution", solution);
       }
       if (best.Item1.Length == 2) solution.Population = new ItemArray<RealVector>(realVectors.Select(x => (RealVector)x.Clone()));
@@ -129 +138 @@
 
     #region Events
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
-      Parameterize();
-    }
-    protected override void OnEvaluatorChanged() {
-      base.OnEvaluatorChanged();
-      Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
       Parameterize();
     }
@@ -145 +149 @@
     protected override void BoundsOnChanged() {
       base.BoundsOnChanged();
-      Parameterize();
-    }
-    private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
       Parameterize();
     }
@@ -167 +168 @@
 
     #region Helpers
-    private void InitializeOperators() {
-      Operators.Add(new SingleObjectiveTestFunctionImprovementOperator());
-      Operators.Add(new SingleObjectiveTestFunctionPathRelinker());
-      Operators.Add(new SingleObjectiveTestFunctionSimilarityCalculator());
-      Operators.Add(new EuclideanSimilarityCalculator());
-      Operators.Add(new AdditiveMoveEvaluator());
-
-      Parameterize();
-    }
-
     private void Parameterize() {
       var operators = new List<IItem>();
 
-      //TODO correct wiring code, because most of the parameters are wired in the encoding
-      foreach (var op in Operators.OfType<PopulationSimilarityAnalyzer>()) {
-        var calcs = Operators.OfType<ISolutionSimilarityCalculator>().ToArray();
-        op.SimilarityCalculatorParameter.ValidValues.Clear();
-        foreach (var c in calcs) {
-          // TODO: unified encoding parameters
-          c.SolutionVariableName = Encoding.Name;
-          c.QualityVariableName = Evaluator.QualityParameter.ActualName;
-          op.SimilarityCalculatorParameter.ValidValues.Add(c);
-        }
-      }
-      foreach (var op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {
-        operators.Add(op);
-        op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-        op.QualityParameter.Hidden = true;
-        foreach (var movOp in Encoding.Operators.OfType<IRealVectorAdditiveMoveQualityOperator>())
-          movOp.MoveQualityParameter.ActualName = op.MoveQualityParameter.ActualName;
-      }
-      foreach (var op in Operators.OfType<IRealVectorParticleCreator>()) {
-        // TODO: unified encoding parameters
-        op.RealVectorParameter.ActualName = Encoding.Name;
-        op.RealVectorParameter.Hidden = true;
-        op.BoundsParameter.ActualName = BoundsRefParameter.Name;
-        op.BoundsParameter.Hidden = true;
-      }
-      foreach (var op in Operators.OfType<IRealVectorParticleUpdater>()) {
-        // TODO: unified encoding parameters
-        op.RealVectorParameter.ActualName = Encoding.Name;
-        op.RealVectorParameter.Hidden = true;
-        op.BoundsParameter.ActualName = BoundsRefParameter.Name;
-        op.BoundsParameter.Hidden = true;
-      }
-      foreach (var op in Operators.OfType<IRealVectorSwarmUpdater>()) {
-        op.MaximizationParameter.ActualName = MaximizationParameter.Name;
-        op.MaximizationParameter.Hidden = true;
-      }
-      foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
-        operators.Add(op);
-        op.SolutionParameter.ActualName = Encoding.Name;
-        op.SolutionParameter.Hidden = true;
-      }
       foreach (var op in Operators.OfType<ITestFunctionSolutionSimilarityCalculator>()) {
         operators.Add(op);
-        op.SolutionVariableName = Encoding.Name;
-        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
         op.Bounds = Bounds;
       }