Changeset 14649 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode2.cs

Timestamp:

02/07/17 10:43:13 (7 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added lrp network 3
• fixed bug in distance calculation
• renamed FLP.mod to FLP_1.mod
• activated cma analyzer per default

File:

• branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode2.cs (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode2.cs

@@ -97 +97 @@
         var vrp = (VehicleRoutingProblem)VrpParameter.Value.Clone();
         var vrpInstance = (CVRPProblemInstance)vrp.ProblemInstance;
-        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, depotIdx, customers);
+        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, new[] { depotIdx }, customers);
         var distances = LrpUtils.GetVrpDistances(coordinates, distanceType);
         vrpInstance.Coordinates = new DoubleMatrix(coordinates);
@@ -111 +111 @@
 
         var vrpResults = (ResultCollection)vrpMsg["Results"];
-        var bestVrpSolution = (VRPSolution)vrpResults["Best valid VRP Solution"].Value.Clone();
+        IResult bestVrpSolutionResult;
+        if (!vrpResults.TryGetValue("Best valid VRP Solution", out bestVrpSolutionResult)
+         && !vrpResults.TryGetValue("Best VRP Solution", out bestVrpSolutionResult)) {
+          // no best solution found ... throw?
+        }
+        var bestVrpSolution = (VRPSolution)bestVrpSolutionResult.Value.Clone();
         vrpSolutions.Add(new Result("Depot " + depot.Key, bestVrpSolution));
       }