Changeset 17264 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3

Timestamp:

09/19/19 20:35:46 (5 years ago)

Author:

abeham

Message:

#2521: Finished refactoring pTSP

Location:

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

Files:

• AnalyticalPTSP.cs (modified) (2 diffs)
• EstimatedPTSP.cs (modified) (2 diffs)
• Improvers/PTSPAnalyticalInsertionLocalImprovement.cs (modified) (1 diff)
• Improvers/PTSPAnalyticalInversionLocalImprovement.cs (modified) (1 diff)
• Improvers/PTSPAnalyticalTwoPointFiveLocalImprovement.cs (modified) (1 diff)
• Improvers/PTSPEstimatedInsertionLocalImprovement.cs (modified) (4 diffs)
• Improvers/PTSPEstimatedInversionLocalImprovement.cs (modified) (4 diffs)
• Improvers/PTSPEstimatedTwoPointFiveLocalImprovement.cs (modified) (4 diffs)
• Interfaces/IEstimatedPTSPOperator.cs (modified) (1 diff)
• Interfaces/ITwoPointFiveMoveOperator.cs (modified) (1 diff)
• Moves/EstimatedPTSPMoveEvaluator.cs (modified) (3 diffs)
• ProbabilisticTSP.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -48 +47 @@
       Operators.Add(new PTSPAnalyticalTwoPointFiveMoveEvaluator());
 
-      Encoding.ConfigureOperators(Operators.OfType<IOperator>());
-      foreach (var twopointfiveMoveOperator in Operators.OfType<ITwoPointFiveMoveOperator>()) {
-        twopointfiveMoveOperator.TwoPointFiveMoveParameter.ActualName = "Permutation.TwoPointFiveMove";
-      }
+      Encoding.ConfigureOperators(Operators);
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new AnalyticalPTSP(this, cloner);
+    }
+
+    protected override void OnEncodingChanged() {
+      base.OnEncodingChanged();
+      Encoding.ConfigureOperators(Operators);
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

@@ -29 +29 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Parameters;
+using HeuristicLab.Problems.Instances;
 using HeuristicLab.Random;
 
@@ -189 +190 @@
     }
 
+    public override void Load(PTSPData data) {
+      base.Load(data);
+      UpdateRealizations();
+    }
+
     private void UpdateRealizations() {
       var data = new List<BoolArray>(Realizations);
-      var rng = new FastRandom(RealizationsSeed);
-      for (var i = 0; i < Realizations; i++) {
+      var rng = new MersenneTwister((uint)RealizationsSeed);
+      if (Enumerable.Range(0, ProbabilisticTSPData.Cities).All(c => ProbabilisticTSPData.GetProbability(c) <= 0))
+        throw new InvalidOperationException("All probabilities are zero.");
+      while (data.Count < Realizations) {
         var cities = 0;
         var r = new bool[ProbabilisticTSPData.Cities];

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInsertionLocalImprovement.cs

@@ -40 +40 @@
   [Item("pTSP Analytical Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
   [StorableType("5adca9d8-02b2-4937-9f79-a24d8ea8ea19")]
-  public sealed class PTSPAnalyticalInsertionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator {
+  public sealed class PTSPAnalyticalInsertionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, IPermutationLocalImprovementOperator {
 
     public ILookupParameter<IntValue> LocalIterationsParameter {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInversionLocalImprovement.cs

@@ -40 +40 @@
   [Item("pTSP Analytical Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
   [StorableType("88147d6a-e843-4f65-8058-421453b5206a")]
-  public sealed class PTSPAnalyticalInversionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator {
+  public sealed class PTSPAnalyticalInversionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, IPermutationLocalImprovementOperator {
 
     public ILookupParameter<IntValue> LocalIterationsParameter {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalTwoPointFiveLocalImprovement.cs

@@ -40 +40 @@
   [Item("pTSP Analytical 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
   [StorableType("6e07195e-0da7-45ea-9385-0c66594127db")]
-  public sealed class PTSPAnalyticalTwoPointFiveLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator {
+  public sealed class PTSPAnalyticalTwoPointFiveLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, IPermutationLocalImprovementOperator {
 
     public ILookupParameter<IntValue> LocalIterationsParameter {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInsertionLocalImprovement.cs

@@ -42 +42 @@
   [Item("pTSP Estimated Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
   [StorableType("B2D60579-A97D-4E44-B11C-61CDA6EBEBA7")]
-  public sealed class PTSPEstimatedInsertionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator {
+  public sealed class PTSPEstimatedInsertionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, IPermutationLocalImprovementOperator {
 
     public ILookupParameter<IntValue> LocalIterationsParameter {
@@ -76 +76 @@
     }
 
-    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationsParameter {
-      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["Realizations"]; }
+    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationDataParameter {
+      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["RealizationData"]; }
     }
 
@@ -93 +93 @@
       Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized."));
       Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP."));
-      Parameters.Add(new LookupParameter<ItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances."));
+      Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("RealizationData", "The list of samples drawn from all possible stochastic instances."));
     }
 
@@ -131 +131 @@
       var evaluations = EvaluatedSolutionsParameter.ActualValue;
       var data = ProbabilisticTSPDataParameter.ActualValue;
-      var realizations = RealizationsParameter.ActualValue;
+      var realizations = RealizationDataParameter.ActualValue;
       if (localIterations == null) {
         localIterations = new IntValue(0);

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInversionLocalImprovement.cs

@@ -42 +42 @@
   [Item("PTSP Estimated Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
   [StorableType("AA67F3B1-2667-4F0B-A79F-4A02B89EE977")]
-  public sealed class PTSPEstimatedInversionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator {
+  public sealed class PTSPEstimatedInversionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, IPermutationLocalImprovementOperator {
 
     public ILookupParameter<IntValue> LocalIterationsParameter {
@@ -76 +76 @@
     }
 
-    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationsParameter {
-      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["Realizations"]; }
+    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationDataParameter {
+      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["RealizationData"]; }
     }
 
@@ -93 +93 @@
       Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized."));
       Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP."));
-      Parameters.Add(new LookupParameter<ItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances."));
+      Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("RealizationData", "The list of samples drawn from all possible stochastic instances."));
     }
 
@@ -131 +131 @@
       var evaluations = EvaluatedSolutionsParameter.ActualValue;
       var data = ProbabilisticTSPDataParameter.ActualValue;
-      var realizations = RealizationsParameter.ActualValue;
+      var realizations = RealizationDataParameter.ActualValue;
       if (localIterations == null) {
         localIterations = new IntValue(0);

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedTwoPointFiveLocalImprovement.cs

@@ -42 +42 @@
   [Item("PTSP Estimated 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
   [StorableType("8B04265A-50AD-4FAD-99F8-2357D6F10CC3")]
-  public sealed class PTSPEstimatedTwoPointFiveLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator {
+  public sealed class PTSPEstimatedTwoPointFiveLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, IPermutationLocalImprovementOperator {
 
     public ILookupParameter<IntValue> LocalIterationsParameter {
@@ -75 +75 @@
       get { return (ILookupParameter<IProbabilisticTSPData>)Parameters["PTSP Data"]; }
     }
-    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationsParameter {
-      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["Realizations"]; }
+    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationDataParameter {
+      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["RealizationData"]; }
     }
 
@@ -92 +92 @@
       Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem should be maximized or minimized."));
       Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP."));
-      Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances."));
+      Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("RealizationData", "The list of samples drawn from all possible stochastic instances."));
     }
 
@@ -131 +131 @@
       var evaluations = EvaluatedSolutionsParameter.ActualValue;
       var data = ProbabilisticTSPDataParameter.ActualValue;
-      var realizations = RealizationsParameter.ActualValue;
+      var realizations = RealizationDataParameter.ActualValue;
       if (localIterations == null) {
         localIterations = new IntValue(0);

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Interfaces/IEstimatedPTSPOperator.cs

@@ -28 +28 @@
   public interface IEstimatedPTSPOperator : IItem {
     ILookupParameter<IProbabilisticTSPData> ProbabilisticTSPDataParameter { get; }
-    ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationsParameter { get; }
+    ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationDataParameter { get; }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Interfaces/ITwoPointFiveMoveOperator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
-using HEAL.Attic;
+using HeuristicLab.Encodings.PermutationEncoding;
 
 namespace HeuristicLab.Problems.PTSP {
   [StorableType("C21E0AC3-85BD-4F40-8DD6-E79A019278E1")]
-  public interface ITwoPointFiveMoveOperator : IMoveOperator {
+  public interface ITwoPointFiveMoveOperator : IPermutationMoveOperator {
     ILookupParameter<TwoPointFiveMove> TwoPointFiveMoveParameter { get; }
   }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/EstimatedPTSPMoveEvaluator.cs

@@ -43 +43 @@
       get { return (ILookupParameter<IProbabilisticTSPData>)Parameters["PTSP Data"]; }
     }
-    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationsParameter {
-      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["Realizations"]; }
+    public ILookupParameter<ReadOnlyItemList<BoolArray>> RealizationDataParameter {
+      get { return (ILookupParameter<ReadOnlyItemList<BoolArray>>)Parameters["RealizationData"]; }
     }
     public ILookupParameter<DoubleValue> QualityParameter {
@@ -60 +60 @@
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
       Parameters.Add(new LookupParameter<IProbabilisticTSPData>("PTSP Data", "The main parameters of the pTSP."));
-      Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("Realizations", "The list of samples drawn from all possible stochastic instances."));
+      Parameters.Add(new LookupParameter<ReadOnlyItemList<BoolArray>>("RealizationData", "The list of samples drawn from all possible stochastic instances."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of a TSP solution."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The evaluated quality of a move on a TSP solution."));
@@ -67 +67 @@
     public override IOperation Apply() {
       var permutation = PermutationParameter.ActualValue;
-      var realizations = RealizationsParameter.ActualValue;
+      var realizations = RealizationDataParameter.ActualValue;
       var data = ProbabilisticTSPDataParameter.ActualValue;
       var relativeQualityDifference = EvaluateMove(permutation, data, realizations);

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/ProbabilisticTSP.cs

@@ -157 +157 @@
         try {
           var tour = new Permutation(PermutationTypes.RelativeUndirected, data.BestKnownTour);
-          var tourLength = Evaluate(tour, new FastRandom(1));
+          var tourLength = Evaluate(tour, new MersenneTwister(1));
           BestKnownSolution = new ProbabilisticTSPSolution(data.Coordinates != null ? new DoubleMatrix(data.Coordinates) : null, new PercentArray(data.Probabilities), tour, new DoubleValue(tourLength));
           BestKnownQuality = tourLength;