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

Timestamp:

02/07/17 10:43:13 (8 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/LrpUtils.cs (modified) (3 diffs)

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

@@ -19 +19 @@
       DistanceFuncs = new Dictionary<DistanceType, Func<double[,], int, double[,], int, double>>();
       DistanceFuncs.Add(DistanceType.EUC_2D, (d, i, c, j) => Math.Sqrt(Math.Pow(d[i, 0] - c[j, 0], 2.0) + Math.Pow(d[i, 1] - c[j, 1], 2.0)));
-      DistanceFuncs.Add(DistanceType.CEIL_2D, (d, i, c, j) => Math.Ceiling(DistanceFuncs[DistanceType.EUC_2D](d, i, c, j)) * 100);
+      DistanceFuncs.Add(DistanceType.CEIL_2D, (d, i, c, j) => Math.Ceiling(DistanceFuncs[DistanceType.EUC_2D](d, i, c, j) * 100));
     }
 
@@ -135 +135 @@
     }
 
-    public static double[,] GetVrpCoordinates(double[,] depotCoordinates, double[,] customerCoordinates, int depotIdx, int[] customers) {
-      var coordinates = new double[customers.Length + 1, 2];
+    public static double[,] GetVrpCoordinates(double[,] depotCoordinates, double[,] customerCoordinates, int[] depots, int[] customers) {
+      var coordinates = new double[depots.Length + customers.Length, 2];
 
-      coordinates[0, 0] = depotCoordinates[depotIdx, 0];
-      coordinates[0, 1] = depotCoordinates[depotIdx, 1];
+      for (int i = 0; i < depots.Length; i++) {
+        coordinates[i, 0] = depotCoordinates[depots[i], 0];
+        coordinates[i, 1] = depotCoordinates[depots[i], 1];
+      }
       for (int i = 0; i < customers.Length; i++) {
-        coordinates[i + 1, 0] = customerCoordinates[customers[i], 0];
-        coordinates[i + 1, 1] = customerCoordinates[customers[i], 1];
+        coordinates[i + depots.Length, 0] = customerCoordinates[customers[i], 0];
+        coordinates[i + depots.Length, 1] = customerCoordinates[customers[i], 1];
       }
 
@@ -148 +150 @@
     }
 
-    public static double[,] GetVrpDistances(double[,] depotCoordinates, double[,] customerCoordinates, int depotIdx, int[] customers, DistanceType distanceType) {
-      var coordinates = GetVrpCoordinates(depotCoordinates, customerCoordinates, depotIdx, customers);
+    public static double[,] GetVrpDistances(double[,] depotCoordinates, double[,] customerCoordinates, int[] depots, int[] customers, DistanceType distanceType) {
+      var coordinates = GetVrpCoordinates(depotCoordinates, customerCoordinates, depots, customers);
       return GetVrpDistances(coordinates, distanceType);
     }