Changeset 14606 for branches

Timestamp:

01/25/17 15:57:45 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

File:

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

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

@@ -298 +298 @@
 
       var depots = bestFlpSolution.Select((x, i) => Tuple.Create(x, i)).GroupBy(x => x.Item1, x => x.Item2);
-      var vrpSolutions = new ItemDictionary<IntValue, VRPSolution>();
-      foreach (var depot in depots) {
+      var vrpSolutions = new ResultCollection(depots.Count());
+      foreach (var depot in depots.OrderBy(x => x.Key)) {
         var depotIdx = depot.Key;
         var customers = depot.ToArray();
@@ -319 +319 @@
 
         var bestVrpSolution = (VRPSolution)vrpResults["Best valid VRP Solution"].Value.Clone();
-        vrpSolutions.Add(new IntValue(depot.Key), bestVrpSolution);
+        vrpSolutions.Add(new Result("Depot " + depot.Key, bestVrpSolution));
       }
 
       #region Analyze
-      double objectiveValue = LrpUtils.Evaluate(flpSolution, vrpSolutions.Values.ToArray());
+      double objectiveValue = LrpUtils.Evaluate(flpSolution, vrpSolutions.Select(x => (VRPSolution)x.Value).ToArray());
       ((DoubleValue)message["Quality"]).Value = objectiveValue;
 
@@ -329 +329 @@
       if (!Results.TryGetValue("Best LRP Quality", out bestQuality)) {
         Results.Add(new Result("Best LRP Quality", new DoubleValue(objectiveValue)));
-        Results.Add(new Result("Best FLP", flpSolution));
-        Results.Add(new Result("Best VRPs", vrpSolutions));
+        Results.Add(new Result("Best FLP Solution", flpSolution));
+        Results.Add(new Result("Best VRP Solutions", vrpSolutions));
       } else if (objectiveValue < ((DoubleValue)bestQuality.Value).Value) {
         ((DoubleValue)bestQuality.Value).Value = objectiveValue;
-        Results["Best FLP"].Value = flpSolution;
-        Results["Best VRPs"].Value = vrpSolutions;
+        Results["Best FLP Solution"].Value = flpSolution;
+        Results["Best VRP Solutions"].Value = vrpSolutions;
       }
       #endregion