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

Timestamp:

01/25/17 16:20:27 (8 years ago)

Author:

abeham

Message:

#2205: added GetSolution() method to FLP

File:

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

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

@@ -278 +278 @@
 
       var bestFlpSolution = (IntegerVector)flpResults["Best Solution"].Value;
-      var bestFlpQuality = FlpParameter.Value.Evaluate(bestFlpSolution);
-      var flpCustomerDemands = (DoubleArray)FlpParameter.Value.CustomerDemandsParameter.Value.Clone();
-      var flpDeliveryCosts = (DoubleMatrix)FlpParameter.Value.DeliveryCostsParameter.Value.Clone();
-      var flpDepotCapacities = (DoubleArray)FlpParameter.Value.DepotCapacitiesParameter.Value.Clone();
-      var flpOpeningCosts = (DoubleArray)FlpParameter.Value.OpeningCostsParameter.Value.Clone();
-      double totalOpeningCosts, totalDeliveryCosts; double[] depotUsage;
-      FacilityLocationProblem.Evaluate(bestFlpSolution.ToArray(), flpOpeningCosts, flpDepotCapacities, flpCustomerDemands, flpDeliveryCosts, out totalOpeningCosts, out totalDeliveryCosts, out depotUsage);
-      var flpSolution = new FacilityLocationSolution {
-        OpeningCosts = flpOpeningCosts,
-        DepotCapacities = flpDepotCapacities,
-        CustomerDemands = flpCustomerDemands,
-        DeliveryCosts = flpDeliveryCosts
-      };
-      flpSolution.CustomerToDepotAssignmentParameter.Value = bestFlpSolution;
-      flpSolution.FitnessValueParameter.Value = new DoubleValue(bestFlpQuality);
-      flpSolution.TotalOpeningCostsParameter.Value = new DoubleValue(totalOpeningCosts);
-      flpSolution.TotalDeliveryCostsParameter.Value = new DoubleValue(totalDeliveryCosts);
-      flpSolution.TotalOverbookedCapacityParameter.Value = new DoubleValue(bestFlpQuality - totalOpeningCosts - totalDeliveryCosts);
-
+      var flpSolution = FlpParameter.Value.GetSolution(bestFlpSolution);
+      
       var depots = bestFlpSolution.Select((x, i) => Tuple.Create(x, i)).GroupBy(x => x.Item1, x => x.Item2);
       var vrpSolutions = new ResultCollection(depots.Count());
@@ -305 +288 @@
         var vrp = (VehicleRoutingProblem)VrpParameter.Value.Clone();
         var vrpInstance = (CVRPProblemInstance)vrp.ProblemInstance;
-        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, depot.Key, customers);
+        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, depotIdx, customers);
         var distances = LrpUtils.GetVrpDistances(coordinates, distanceType);
         vrpInstance.Coordinates = new DoubleMatrix(coordinates);