Changeset 14895 for branches

Timestamp:

04/27/17 17:42:27 (7 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

Files:

• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/HeuristicLab.Networks.IntegratedOptimization.LocationRouting-3.3.csproj (modified) (1 diff)
• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpNetwork4.cs (added)
• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpNetwork5.cs (added)
• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode4.cs (added)
• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpOrchestratorNode5.cs (added)
• HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpUtils.cs (modified) (1 diff)
• HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLP_1.mod (modified) (1 diff)
• HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLP_2.mod (modified) (1 diff)
• HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/HeuristicLab.Problems.FacilityLocation.CplexSolver-3.3.csproj (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);
     }
   }

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLP_1.mod

@@ -14 +14 @@
 dvar boolean y[0..(I-1)];       //Eröffnung Depot i
 dvar boolean z[0..(I-1)][0..(J-1)];   //Depot i beliefert Kunde j
+
+execute
+ {
+  cplex.threads=1;
+ }
 
 minimize

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/FLP_2.mod

@@ -15 +15 @@
 dvar boolean z[0..(I-1)][0..(J-1)];   //Depot i beliefert Kunde j
 
+execute
+ {
+  cplex.threads=1;
+ }
+ 
 minimize
 ( sum ( i in 0..(I-1) ) ( f[i] * y[i] ) );

branches/OptimizationNetworks/HeuristicLab.Problems.FacilityLocation.CplexSolver/3.3/HeuristicLab.Problems.FacilityLocation.CplexSolver-3.3.csproj

@@ -93 +93 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="oplall, Version=12.6.1.0, Culture=neutral, PublicKeyToken=7906592bc7cc7340, processorArchitecture=MSIL">
+    <Reference Include="oplall, Version=12.7.0.0, Culture=neutral, PublicKeyToken=7906592bc7cc7340, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files\IBM\ILOG\CPLEX_Studio1261\opl\lib\oplall.dll</HintPath>
+      <HintPath>C:\Program Files\IBM\ILOG\CPLEX_Studio127\opl\lib\oplall.dll</HintPath>
     </Reference>
     <Reference Include="System" />