Changeset 17698 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs

Timestamp:

07/24/20 00:58:42 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP (WIP)

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs

@@ -45 +45 @@
     }
 
-    public ILookupParameter<IVRPEncoding> VRPToursParameter {
-      get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }
+    public ILookupParameter<IVRPEncodedSolution> VRPToursParameter {
+      get { return (ILookupParameter<IVRPEncodedSolution>)Parameters["VRPTours"]; }
     }
 
@@ -75 +75 @@
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The amount of evaluated solutions (here a move is counted only as 4/n evaluated solutions with n being the length of the permutation)."));
       Parameters.Add(new LookupParameter<ResultCollection>("Results", "The collection where to store results."));
-      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours to be manipulated."));
+      Parameters.Add(new LookupParameter<IVRPEncodedSolution>("VRPTours", "The VRP tours to be manipulated."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality value of the assignment."));
       Parameters.Add(new ValueParameter<IntValue>("Lambda", "The lambda value.", new IntValue(1)));
@@ -86 +86 @@
     }
 
-    public static void Apply(AlbaEncoding solution, int maxIterations,
+    public static void Apply(AlbaEncodedSolution solution, int maxIterations,
       int lambda, int samples, IRandom random, IVRPProblemInstance problemInstance, ref double quality, out int evaluatedSolutions) {
       evaluatedSolutions = 0;
@@ -93 +93 @@
         AlbaLambdaInterchangeMove bestMove = null;
         foreach (AlbaLambdaInterchangeMove move in AlbaStochasticLambdaInterchangeMultiMoveGenerator.GenerateAllMoves(solution, problemInstance, lambda, samples, random)) {
-          AlbaEncoding newSolution = solution.Clone() as AlbaEncoding;
+          AlbaEncodedSolution newSolution = solution.Clone() as AlbaEncodedSolution;
           AlbaLambdaInterchangeMoveMaker.Apply(newSolution, move);
           double moveQuality =
@@ -111 +111 @@
     public override IOperation InstrumentedApply() {
       int maxIterations = MaximumIterationsParameter.ActualValue.Value;
-      AlbaEncoding solution = null;
+      AlbaEncodedSolution solution = null;
 
-      if (VRPToursParameter.ActualValue is AlbaEncoding)
-        solution = VRPToursParameter.ActualValue as AlbaEncoding;
+      if (VRPToursParameter.ActualValue is AlbaEncodedSolution)
+        solution = VRPToursParameter.ActualValue as AlbaEncodedSolution;
       else
-        VRPToursParameter.ActualValue = solution = AlbaEncoding.ConvertFrom(VRPToursParameter.ActualValue, ProblemInstance);
+        VRPToursParameter.ActualValue = solution = AlbaEncodedSolution.ConvertFrom(VRPToursParameter.ActualValue, ProblemInstance);
 
       int lambda = LambdaParameter.Value.Value;