Changeset 17248 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators

Timestamp:

09/11/19 21:35:59 (5 years ago)

Author:

abeham

Message:

#2521: working on TSP refactoring

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators

Files:

• TSPInversionMoveEvaluator.cs (added)
• TSPMoveEvaluator.cs (modified) (2 diffs)
• TSPTranslocationMoveEvaluator.cs (added)
• ThreeOpt (deleted)
• TwoOpt (deleted)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPMoveEvaluator.cs

@@ -5 +5 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
   [StorableType("17477ad2-2c84-4b02-b5ac-f35ef6cc667f")]
-  public interface ITSPMoveEvaluator : IOperator {
+  public interface ITSPMoveEvaluator : IOperator, ISingleObjectiveMoveEvaluator, IMoveOperator {
     ILookupParameter<Permutation> TSPTourParameter { get; }
     ILookupParameter<ITSPData> TSPDataParameter { get; }
@@ -23 +24 @@
     [Storable] public ILookupParameter<DoubleValue> TourLengthParameter { get; private set; }
     [Storable] public ILookupParameter<DoubleValue> TourLengthWithMoveParameter { get; private set; }
+
+    ILookupParameter<DoubleValue> ISingleObjectiveMoveEvaluator.QualityParameter => TourLengthParameter;
+    ILookupParameter<DoubleValue> ISingleObjectiveMoveEvaluator.MoveQualityParameter => TourLengthWithMoveParameter;
 
     [StorableConstructor]