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

Timestamp:

04/27/17 17:42:27 (8 years ago)

Author:

jkarder

Message:

#2205: worked on optimization networks

• added lrp networks (4, 5)
• fixed lrp evaluation
• updated flp models
• updated to cplex 12.7

Location:

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

Files:

• HeuristicLab.Networks.IntegratedOptimization.LocationRouting-3.3.csproj (modified) (1 diff)
• LrpNetwork4.cs (added)
• LrpNetwork5.cs (added)
• LrpOrchestratorNode4.cs (added)
• LrpOrchestratorNode5.cs (added)
• LrpUtils.cs (modified) (1 diff)

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

@@ -183 +183 @@
     <Compile Include="LrpNetwork2.cs" />
     <Compile Include="LrpNetwork3.cs" />
+    <Compile Include="LrpNetwork4.cs" />
+    <Compile Include="LrpNetwork5.cs" />
     <Compile Include="LrpOrchestratorNode.cs" />
     <Compile Include="LrpOrchestratorNode2.cs" />
     <Compile Include="LrpOrchestratorNode3.cs" />
+    <Compile Include="LrpOrchestratorNode4.cs" />
+    <Compile Include="LrpOrchestratorNode5.cs" />
     <Compile Include="LrpUtils.cs" />
     <Compile Include="LrpNetwork1.cs" />

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

@@ -167 +167 @@
 
     public static double Evaluate(FacilityLocationSolution flpSolution, VRPSolution[] vrpSolutions) {
-      return flpSolution.TotalOpeningCostsParameter.Value.Value + vrpSolutions.Sum(x => x.Quality.Value);
+      if (flpSolution.TotalOverbookedCapacityParameter.Value.Value > 0.0)
+        return flpSolution.FitnessValueParameter.Value.Value + vrpSolutions.Sum(x => x.Quality.Value);
+      else
+        return flpSolution.TotalOpeningCostsParameter.Value.Value + vrpSolutions.Sum(x => x.Quality.Value);
     }
   }