Changeset 13366

Timestamp:

11/24/15 16:48:04 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted PermutationEncoding and TSP.

Location:

branches/ProblemRefactoring

Files:

• HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationCreator.cs (modified) (1 diff)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Permutation.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs (modified) (2 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationCreator.cs

@@ -28 +28 @@
   /// An interface which represents an operator for creating permutations.
   /// </summary>
-  public interface IPermutationCreator : IPermutationOperator, ISolutionCreator {
+  public interface IPermutationCreator : IPermutationOperator, ISolutionCreator<Permutation> {
     IValueLookupParameter<IntValue> LengthParameter { get; }
     ILookupParameter<Permutation> PermutationParameter { get; }

branches/ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Permutation.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -29 +30 @@
   [Item("Permutation", "Represents a permutation of integer values.")]
   [StorableClass]
-  public class Permutation : IntArray {
+  public class Permutation : IntArray, ISolution {
     [Storable]
     private PermutationTypes permutationType;

branches/ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs

@@ -34 +34 @@
   [Item("PermutationEncoding", "Describes a permutation encoding.")]
   [StorableClass]
-  public sealed class PermutationEncoding : Encoding<IPermutationCreator> {
+  public sealed class PermutationEncoding : Encoding<Permutation> {
     #region encoding parameters
     [Storable]
@@ -224 +224 @@
     #endregion
   }
-
-  public static class IndividualExtensionMethods {
-    public static Permutation Permutation(this Individual individual) {
-      var encoding = individual.GetEncoding<PermutationEncoding>();
-      return individual.Permutation(encoding.Name);
-    }
-    public static Permutation Permutation(this Individual individual, string name) {
-      return (Permutation)individual[name];
-    }
-  }
 }

branches/ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -40 +40 @@
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 100)]
   [StorableClass]
-  public sealed class TravelingSalesmanProblem : SingleObjectiveHeuristicOptimizationProblem<ITSPEvaluator, IPermutationCreator>, IStorableContent,
-    IProblemInstanceConsumer<TSPData> {
+  public sealed class TravelingSalesmanProblem : SingleObjectiveHeuristicOptimizationProblem<ITSPEvaluator, IPermutationCreator>,
+    ISingleObjectiveProblem<PermutationEncoding, Permutation>, IStorableContent, IProblemInstanceConsumer<TSPData> {
+
     private static readonly int DistanceMatrixSizeLimit = 1000;
     public string Filename { get; set; }
@@ -432 +433 @@
         try {
           EvaluateAndLoadTour(data.BestKnownTour);
-        } catch (InvalidOperationException) {
+        }
+        catch (InvalidOperationException) {
           if (data.BestKnownQuality.HasValue)
             BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);