Changeset 14605 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting

Timestamp:

01/25/17 15:25:29 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• fixed vrp variegation in LrpOrchestratorNode1

File:

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

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

@@ -305 +305 @@
         var vrp = (VehicleRoutingProblem)VrpParameter.Value.Clone();
         var vrpInstance = (CVRPProblemInstance)vrp.ProblemInstance;
-        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, depot.Key, depot.ToArray());
+        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, depot.Key, customers);
         var distances = LrpUtils.GetVrpDistances(coordinates, distanceType);
         vrpInstance.Coordinates = new DoubleMatrix(coordinates);
         vrpInstance.DistanceMatrix = new DoubleMatrix(distances);
-        vrpInstance.Demand = new DoubleArray(depot.Select(x => customerDemands[x]).ToArray());
+        vrpInstance.Demand = new DoubleArray(new[] { 0.0 }.Concat(customers.Select(x => customerDemands[x])).ToArray());
         vrpInstance.Vehicles.Value = customers.Length;
 
@@ -315 +315 @@
         vrpMsg["OrchestrationMessage"] = new EnumValue<OrchestrationMessage>(OrchestrationMessage.Prepare | OrchestrationMessage.Start);
         vrpMsg["Problem"] = vrp;
-        try {
-          VrpSolverOrchestrationPort.SendMessage(vrpMsg);
-        } catch { }
+        VrpSolverOrchestrationPort.SendMessage(vrpMsg);
         cts.Token.ThrowIfCancellationRequested();