Changeset 17517 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs

Timestamp:

04/20/20 17:31:31 (4 years ago)

Author:

abeham

Message:

#2521: Worked on ResultParameter for Problem and Algorithms

• Add ResultParameter to TSP, BinaryVectorProblem, and HillClimber
• Refactor ResultParameter to allow presetting the ResultCollection instead of having to discover it (e.g. for use in BasicAlgorithms)
• Unify Results property among EngineAlgorithm and BasicAlgorithm
  • There is now only a single instance which is storable

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs

@@ -47 +47 @@
     [Storable] public IValueParameter<ITSPData> TSPDataParameter { get; private set; }
     [Storable] public IValueParameter<ITSPSolution> BestKnownSolutionParameter { get; private set; }
+    [Storable] public IResultParameter<ITSPSolution> BestTSPSolutionParameter { get; private set; }
 
     public ITSPData TSPData {
@@ -64 +65 @@
       TSPDataParameter = cloner.Clone(original.TSPDataParameter);
       BestKnownSolutionParameter = cloner.Clone(original.BestKnownSolutionParameter);
+      BestTSPSolutionParameter = cloner.Clone(original.BestTSPSolutionParameter);
     }
 
@@ -70 +72 @@
       Parameters.Add(TSPDataParameter = new ValueParameter<ITSPData>("TSPData", "The main parameters of the TSP."));
       Parameters.Add(BestKnownSolutionParameter = new OptionalValueParameter<ITSPSolution>("BestKnownSolution", "The best known solution."));
-
+      Parameters.Add(BestTSPSolutionParameter = new ResultParameter<ITSPSolution>("Best TSP Solution", "The best so far solution found."));
+      
       TSPData = new EuclideanTSPData();
       Encoding.Length = TSPData.Cities;
@@ -112 +115 @@
       }
 
-      IResult bestSolutionResult;
-      if (results.TryGetValue("Best TSP Solution", out bestSolutionResult)) {
-        var bestSolution = bestSolutionResult.Value as ITSPSolution;
-        if (bestSolution == null || Maximization && bestSolution.TourLength.Value < qualities[i]
-          || !Maximization && bestSolution.TourLength.Value > qualities[i]) {
-          bestSolutionResult.Value = TSPData.GetSolution(solutions[i], qualities[i]);
-        }
-      } else results.Add(new Result("Best TSP Solution", TSPData.GetSolution(solutions[i], qualities[i])));
+      var bestSolution = BestTSPSolutionParameter.ActualValue;
+      if (bestSolution == null || IsBetter(qualities[i], bestSolution.TourLength.Value)) {
+        BestTSPSolutionParameter.ActualValue = TSPData.GetSolution(solutions[i], qualities[i]);
+      }
     }