Changeset 17698 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.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/ProblemInstances/VRPProblemInstance.cs (modified) (8 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
@@ -178 +178 @@
         return evaluator;
       }
-
       set {
         lock (locker) {
@@ -188 +187 @@
     }
 
-    public virtual double GetDistance(int start, int end, IVRPEncoding solution) {
+    public virtual double GetDistance(int start, int end, IVRPEncodedSolution solution) {
       if (distanceMatrix == null && UseDistanceMatrix.Value) {
         distanceMatrix = DistanceMatrix ?? CreateDistanceMatrix();
@@ -197 +196 @@
     }
 
-    public virtual double GetInsertionDistance(int start, int customer, int end, IVRPEncoding solution,
+    public virtual double GetInsertionDistance(int start, int customer, int end, IVRPEncodedSolution solution,
       out double startDistance, out double endDistance) {
       double distance = GetDistance(start, end, solution);
@@ -209 +208 @@
     }
 
-    public bool Feasible(IVRPEncoding solution) {
+    public bool Feasible(IVRPEncodedSolution solution) {
       return evaluator.Feasible(
         evaluator.Evaluate(
@@ -215 +214 @@
     }
 
-    public bool TourFeasible(Tour tour, IVRPEncoding solution) {
+    public bool TourFeasible(Tour tour, IVRPEncodedSolution solution) {
       return evaluator.Feasible(
         evaluator.EvaluateTour(
@@ -221 +220 @@
     }
 
-    public VRPEvaluation Evaluate(IVRPEncoding solution) {
+    public VRPEvaluation Evaluate(IVRPEncodedSolution solution) {
       return evaluator.Evaluate(this, solution);
     }
 
-    public VRPEvaluation EvaluateTour(Tour tour, IVRPEncoding solution) {
+    public VRPEvaluation EvaluateTour(Tour tour, IVRPEncodedSolution solution) {
       return evaluator.EvaluateTour(this, tour, solution);
     }
@@ -233 +232 @@
     }
 
-    public double GetInsertionCosts(VRPEvaluation eval, IVRPEncoding solution, int customer, int tour, int index, out bool feasible) {
+    public double GetInsertionCosts(VRPEvaluation eval, IVRPEncodedSolution solution, int customer, int tour, int index, out bool feasible) {
       return evaluator.GetInsertionCosts(this, solution, eval, customer, tour, index, out feasible);
     }