Changeset 14455 for branches/MemPRAlgorithm

Timestamp:

12/05/16 16:09:10 (8 years ago)

Author:

abeham

Message:

#2701: fixed bugs in tsp

Location:

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

• Analyzers/BestTSPSolutionAnalyzer.cs (modified) (4 diffs)
• TravelingSalesmanProblem.cs (modified) (1 diff)

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs

@@ -53 +53 @@
       get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public LookupParameter<PathTSPTour> BestSolutionParameter {
-      get { return (LookupParameter<PathTSPTour>)Parameters["BestSolution"]; }
+    public LookupParameter<PathTSPTour> BestTSPSolutionParameter {
+      get { return (LookupParameter<PathTSPTour>)Parameters["BestTSPSolution"]; }
     }
     public ValueLookupParameter<ResultCollection> ResultsParameter {
@@ -78 +78 @@
       Parameters.Add(new ScopeTreeLookupParameter<Permutation>("Permutation", "The TSP solutions given in path representation from which the best solution should be analyzed."));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the TSP solutions which should be analyzed."));
-      Parameters.Add(new LookupParameter<PathTSPTour>("BestSolution", "The best TSP solution."));
+      Parameters.Add(new LookupParameter<PathTSPTour>("BestTSPSolution", "The best TSP solution."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best TSP solution should be stored."));
       Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this TSP instance."));
@@ -87 +87 @@
       PermutationParameter.Hidden = true;
       QualityParameter.Hidden = true;
-      BestSolutionParameter.Hidden = true;
+      BestTSPSolutionParameter.Hidden = true;
       ResultsParameter.Hidden = true;
       BestKnownQualityParameter.Hidden = true;
@@ -113 +113 @@
       }
 
-      PathTSPTour tour = BestSolutionParameter.ActualValue;
+      PathTSPTour tour = BestTSPSolutionParameter.ActualValue;
       if (tour == null) {
         tour = new PathTSPTour(coordinates, (Permutation)permutations[i].Clone(), new DoubleValue(qualities[i].Value));
-        BestSolutionParameter.ActualValue = tour;
+        BestTSPSolutionParameter.ActualValue = tour;
         results.Add(new Result("Best TSP Solution", tour));
       } else {

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

@@ -372 +372 @@
         BestKnownQuality = data.BestKnownQuality.Value;
       }
+      Encoding.Length = data.Dimension;
+
       OnReset();
     }