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

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

Location:

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

Files:

• HeuristicLab.Networks.IntegratedOptimization.LocationRouting-3.3.csproj (modified) (2 diffs)
• LrpNetwork1.cs (modified) (1 diff)
• LrpNetwork2.cs (modified) (1 diff)
• LrpNetwork3.cs (added)
• LrpOrchestratorNode.cs (modified) (2 diffs)
• LrpOrchestratorNode1.cs (modified) (2 diffs)
• LrpOrchestratorNode2.cs (modified) (2 diffs)
• LrpOrchestratorNode3.cs (added)
• LrpUtils.cs (modified) (3 diffs)

branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/HeuristicLab.Networks.IntegratedOptimization.LocationRouting-3.3.csproj

@@ -83 +83 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -177 +182 @@
     <Compile Include="LrpNetwork.cs" />
     <Compile Include="LrpNetwork2.cs" />
+    <Compile Include="LrpNetwork3.cs" />
     <Compile Include="LrpOrchestratorNode.cs" />
     <Compile Include="LrpOrchestratorNode2.cs" />
+    <Compile Include="LrpOrchestratorNode3.cs" />
     <Compile Include="LrpUtils.cs" />
     <Compile Include="LrpNetwork1.cs" />

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

@@ -53 +53 @@
       var vp = new MinimizationVariegationProblem<RealVectorEncoding>();
       cmaes.Problem = vp;
+      var cmaAnalyzer = cmaes.Analyzer.Operators.OfType<CMAAnalyzer>().Single();
+      cmaes.Analyzer.Operators.SetItemCheckedState(cmaAnalyzer, true);
       cmaes.MaximumGenerations = 80;
       MetaSolver.Algorithm = cmaes;

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

@@ -53 +53 @@
       var vp = new MinimizationVariegationProblem<RealVectorEncoding>();
       cmaes.Problem = vp;
+      var cmaAnalyzer = cmaes.Analyzer.Operators.OfType<CMAAnalyzer>().Single();
+      cmaes.Analyzer.Operators.SetItemCheckedState(cmaAnalyzer, true);
       cmaes.MaximumGenerations = 80;
       MetaSolver.Algorithm = cmaes;

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

@@ -31 +31 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -183 +182 @@
     }
 
-    private void InstanceParameter_Value_ToStringChanged(object sender, EventArgs e) {
+    protected virtual void InstanceParameter_Value_ToStringChanged(object sender, EventArgs e) {
       string filePath = InstanceParameter.Value.Value;
       LrpUtils.Import(filePath, out nrOfDepots, out nrOfCustomers,

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

@@ -97 +97 @@
         var vrp = (VehicleRoutingProblem)VrpParameter.Value.Clone();
         var vrpInstance = (CVRPProblemInstance)vrp.ProblemInstance;
-        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, depotIdx, customers);
+        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, new[] { depotIdx }, customers);
         var distances = LrpUtils.GetVrpDistances(coordinates, distanceType);
         vrpInstance.Coordinates = new DoubleMatrix(coordinates);
@@ -111 +111 @@
 
         var vrpResults = (ResultCollection)vrpMsg["Results"];
-        var bestVrpSolution = (VRPSolution)vrpResults["Best valid VRP Solution"].Value.Clone();
+        IResult bestVrpSolutionResult;
+        if (!vrpResults.TryGetValue("Best valid VRP Solution", out bestVrpSolutionResult)
+         && !vrpResults.TryGetValue("Best VRP Solution", out bestVrpSolutionResult)) {
+          // no best solution found ... throw?
+        }
+        var bestVrpSolution = (VRPSolution)bestVrpSolutionResult.Value.Clone();
         vrpSolutions.Add(new Result("Depot " + depot.Key, bestVrpSolution));
       }

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

@@ -97 +97 @@
         var vrp = (VehicleRoutingProblem)VrpParameter.Value.Clone();
         var vrpInstance = (CVRPProblemInstance)vrp.ProblemInstance;
-        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, depotIdx, customers);
+        var coordinates = LrpUtils.GetVrpCoordinates(depotCoordinates, customerCoordinates, new[] { depotIdx }, customers);
         var distances = LrpUtils.GetVrpDistances(coordinates, distanceType);
         vrpInstance.Coordinates = new DoubleMatrix(coordinates);
@@ -111 +111 @@
 
         var vrpResults = (ResultCollection)vrpMsg["Results"];
-        var bestVrpSolution = (VRPSolution)vrpResults["Best valid VRP Solution"].Value.Clone();
+        IResult bestVrpSolutionResult;
+        if (!vrpResults.TryGetValue("Best valid VRP Solution", out bestVrpSolutionResult)
+         && !vrpResults.TryGetValue("Best VRP Solution", out bestVrpSolutionResult)) {
+          // no best solution found ... throw?
+        }
+        var bestVrpSolution = (VRPSolution)bestVrpSolutionResult.Value.Clone();
         vrpSolutions.Add(new Result("Depot " + depot.Key, bestVrpSolution));
       }

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);
     }