Changeset 17620 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering

Timestamp:

06/22/20 03:45:41 (5 years ago)

Author:

abeham

Message:

#2521:

• Fixed orienteering problem
• Corrected ParameterizeOperators in all encoding-specific problem base classes
• Added new interfaces and wiring code to IntegerVectorEncoding

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3

Files:

• HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (1 diff)
• Improvers/OrienteeringLocalImprovementOperator.cs (modified) (1 diff)
• Interfaces/IOrienteeringOperator.cs (added)
• Interfaces/IOrienteeringSolutionCreator.cs (modified) (1 diff)
• OrienteeringProblem.cs (modified) (4 diffs)
• Shakers/OrienteeringShakingOperator.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

@@ -91 +91 @@
     <Compile Include="Creators\GreedyOrienteeringTourCreator.cs" />
     <Compile Include="Improvers\OrienteeringLocalImprovementOperator.cs" />
+    <Compile Include="Interfaces\IOrienteeringOperator.cs" />
     <Compile Include="Interfaces\IOrienteeringSolutionCreator.cs" />
     <Compile Include="OrienteeringProblemData.cs" />

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

@@ -39 +39 @@
   [Item("OrienteeringLocalImprovementOperator", @"Implements the iterative improvement procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
   [StorableType("92FA69B3-F243-4D12-A67A-AA1D7EBCD302")]
-  public sealed class OrienteeringLocalImprovementOperator : SingleSuccessorOperator, ILocalImprovementOperator {
+  public sealed class OrienteeringLocalImprovementOperator : SingleSuccessorOperator, IOrienteeringOperator, IIntegerVectorLocalImprovementOperator {
 
     #region Parameter Properties

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringSolutionCreator.cs

@@ -21 +21 @@
 
 using HEAL.Attic;
-using HeuristicLab.Core;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 
 namespace HeuristicLab.Problems.Orienteering {
   [StorableType("7E0D4527-4D8C-4FBA-BB3A-26F20B6463ED")]
-  public interface IOrienteeringSolutionCreator : IIntegerVectorCreator {
-    ILookupParameter<IOrienteeringProblemData> OrienteeringProblemDataParameter { get; }
+  public interface IOrienteeringSolutionCreator : IIntegerVectorCreator, IOrienteeringOperator {
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

@@ -26 +26 @@
 using System.Threading;
 using HEAL.Attic;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.Instances;
@@ -65 +63 @@
       BestKnownSolutionParameter = cloner.Clone(original.BestKnownSolutionParameter);
       BestOrienteeringSolutionParameter = cloner.Clone(original.BestOrienteeringSolutionParameter);
+      RegisterEventHandlers();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -76 +75 @@
       Maximization = true;
       Dimension = OrienteeringProblemData.Cities;
-
-      InitializeOperators();
+      Bounds = new Data.IntMatrix(new[,] { { 0, Dimension } }, @readonly: true);
+
+      var creator = new GreedyOrienteeringTourCreator();
+      Operators.AddRange(new IItem[] { creator, new OrienteeringLocalImprovementOperator(), new OrienteeringShakingOperator() });
+      SolutionCreatorParameter.Value = creator;
+
+      Parameterize();
+      RegisterEventHandlers();
+    }
+
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
     }
 
@@ -152 +163 @@
     private void OrienteeringProblemDataParameterOnValueChanged(object sender, EventArgs e) {
       Dimension = OrienteeringProblemData.Cities;
-    }
-
-    protected override void OnEvaluatorChanged() {
-      base.OnEvaluatorChanged();
-      ParameterizeOperators();
-    }
+      Bounds = new Data.IntMatrix(new[,] { { 0, Dimension } }, @readonly: true);
+    }
+
     protected override void DimensionOnChanged() {
       base.DimensionOnChanged();
-      if (Dimension != OrienteeringProblemData.Cities)
+      if (Dimension != OrienteeringProblemData.Cities) {
         Dimension = OrienteeringProblemData.Cities;
-    }
-
-    private void InitializeOperators() {
-      ISolutionCreator creator;
-      SolutionCreatorParameter.ValidValues.Add(creator = new GreedyOrienteeringTourCreator() {
-        OrienteeringProblemDataParameter = { ActualName = OrienteeringProblemDataParameter.Name }
-      });
-      SolutionCreatorParameter.Value = creator;
-
-      Operators.Add(new OrienteeringLocalImprovementOperator() {
-        OrienteeringProblemDataParameter = { ActualName = OrienteeringProblemDataParameter.Name }
-      });
-      Operators.Add(new OrienteeringShakingOperator() {
-        OrienteeringProblemDataParameter = { ActualName = OrienteeringProblemDataParameter.Name }
-      });
-      Operators.Add(new QualitySimilarityCalculator());
-      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
-
-      ParameterizeOperators();
-    }
-
-    private void ParameterizeOperators() {
-      foreach (var op in Operators.OfType<OrienteeringLocalImprovementOperator>()) {
-        op.IntegerVectorParameter.ActualName = Encoding.Name;
+        Bounds = new Data.IntMatrix(new [,] { { 0, Dimension } }, @readonly: true);
+      }
+    }
+
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
+      Parameterize();
+    }
+
+    private void Parameterize() {
+      foreach (var op in Operators.OfType<OrienteeringLocalImprovementOperator>())
         op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      }
-      foreach (var op in Operators.OfType<OrienteeringShakingOperator>()) {
-        op.IntegerVectorParameter.ActualName = Encoding.Name;
-      }
-      foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
-        similarityCalculator.SolutionVariableName = Encoding.Name;
-        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
-      }
+
+      foreach (var op in Operators.OfType<IOrienteeringOperator>())
+        op.OrienteeringProblemDataParameter.ActualName = OrienteeringProblemDataParameter.Name;
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

@@ -49 +49 @@
   [Item("OrienteeringShakingOperator", @"Implements the shaking procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
   [StorableType("D6654BD1-63CD-4057-89C8-36D1EE6EA7DF")]
-  public sealed class OrienteeringShakingOperator : SingleSuccessorOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {
+  public sealed class OrienteeringShakingOperator : SingleSuccessorOperator, IOrienteeringOperator, IIntegerVectorMultiNeighborhoodShakingOperator, IStochasticOperator {
 
     #region Shaking Parameter Properties