Changeset 14607 for branches

Timestamp:

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

Author:

abeham

Message:

#2205: added GetSolution() method to FLP

Location:

branches/OptimizationNetworks

Files:

• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode1.cs (modified) (2 diffs)
• HeuristicLab.Problems.FacilityLocation/3.3/FacilityLocationProblem.cs (modified) (5 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);

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation/3.3/FacilityLocationProblem.cs

@@ -37 +37 @@
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 230)]
   [StorableClass]
-  public class FacilityLocationProblem : SingleObjectiveBasicProblem<IntegerVectorEncoding> {
+  public sealed class FacilityLocationProblem : SingleObjectiveBasicProblem<IntegerVectorEncoding> {
     public override bool Maximization {
       get { return false; }
@@ -67 +67 @@
 
     [StorableConstructor]
-    protected FacilityLocationProblem(bool deserializing) : base(deserializing) { }
-    protected FacilityLocationProblem(FacilityLocationProblem original, Cloner cloner)
+    private FacilityLocationProblem(bool deserializing) : base(deserializing) { }
+    private FacilityLocationProblem(FacilityLocationProblem original, Cloner cloner)
       : base(original, cloner) {
       openingCostsParameter = cloner.Clone(original.openingCostsParameter);
@@ -153 +153 @@
     }
 
-    public virtual double Evaluate(IntegerVector depotAssignment) {
+    public double Evaluate(IntegerVector depotAssignment) {
       var openingCosts = OpeningCostsParameter.Value;
       var capacities = DepotCapacitiesParameter.Value;
@@ -163 +163 @@
 
       try {
-        Evaluate(depotAssignment, openingCosts, capacities, demands, deliveryCosts, out totalOpeningCosts, out totalDeliveryCosts, out depotUsage);
+        return Evaluate(depotAssignment, openingCosts, capacities, demands, deliveryCosts, out totalOpeningCosts, out totalDeliveryCosts, out depotUsage);
       } catch (IndexOutOfRangeException) {
         throw new ArgumentException("The solution contains more customers than there are problem data for.");
       }
+    }
+
+    public FacilityLocationSolution GetSolution(IntegerVector depotAssignment) {
+      var openingCosts = OpeningCostsParameter.Value;
+      var capacities = DepotCapacitiesParameter.Value;
+      var demands = CustomerDemandsParameter.Value;
+      var deliveryCosts = DeliveryCostsParameter.Value;
+
+      double totalOpeningCosts, totalDeliveryCosts, fitness;
+      double[] depotUsage;
+
+      try {
+        fitness = Evaluate(depotAssignment, openingCosts, capacities, demands, deliveryCosts, out totalOpeningCosts, out totalDeliveryCosts, out depotUsage);
+      } catch (IndexOutOfRangeException) {
+        throw new ArgumentException("The solution contains more customers than there are problem data for.");
+      }
 
       var overbooking = depotUsage.Zip(capacities, (a, b) => a > b ? a - b : 0).Sum();
-      if (overbooking > 0) // infeasible
-        return openingCosts.Sum() + deliveryCosts.Sum() + overbooking;
-
-      return totalOpeningCosts + totalDeliveryCosts;
-    }
-
-    public static void Evaluate(IEnumerable<int> customer2Depot, DoubleArray openingCosts, DoubleArray capacities, DoubleArray demands, DoubleMatrix deliveryCosts, out double totalOpeningCosts, out double totalDeliveryCosts, out double[] capacityDemandsPerDepot) {
+
+      return new FacilityLocationSolution() {
+        OpeningCosts = (DoubleArray)openingCosts.Clone(),
+        DepotCapacities = (DoubleArray)capacities.Clone(),
+        CustomerDemands = (DoubleArray)demands.Clone(),
+        DeliveryCosts = (DoubleMatrix)deliveryCosts.Clone(),
+        CustomerToDepotAssignmentParameter = { Value = (IntegerVector)depotAssignment.Clone() },
+        FitnessValueParameter = { Value = new DoubleValue(fitness) },
+        TotalOpeningCostsParameter = { Value = new DoubleValue(totalOpeningCosts) },
+        TotalDeliveryCostsParameter = { Value = new DoubleValue(totalDeliveryCosts) },
+        TotalOverbookedCapacityParameter = { Value = new DoubleValue(overbooking) }
+      };
+    } 
+
+    public static double Evaluate(IEnumerable<int> customer2Depot, DoubleArray openingCosts, DoubleArray capacities, DoubleArray demands, DoubleMatrix deliveryCosts, out double totalOpeningCosts, out double totalDeliveryCosts, out double[] capacityDemandsPerDepot) {
       var D = capacities.Length;
 
@@ -189 +213 @@
         customer++;
       }
+
+
+      var overbooking = capacityDemandsPerDepot.Zip(capacities, (a, b) => a > b ? a - b : 0).Sum();
+      if (overbooking > 0) // infeasible
+        return openingCosts.Sum() + deliveryCosts.Sum() + overbooking;
+
+      return totalOpeningCosts + totalDeliveryCosts;
     }