Changeset 13366 for branches/ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

Timestamp:

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

Author:

mkommend

Message:

#2521: Adapted PermutationEncoding and TSP.

File:

• branches/ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (2 diffs)

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