Changeset 14895 for branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting
- Timestamp:
- 04/27/17 17:42:27 (8 years ago)
- Location:
- branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3
- Files:
-
- 4 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/HeuristicLab.Networks.IntegratedOptimization.LocationRouting-3.3.csproj
r14649 r14895 183 183 <Compile Include="LrpNetwork2.cs" /> 184 184 <Compile Include="LrpNetwork3.cs" /> 185 <Compile Include="LrpNetwork4.cs" /> 186 <Compile Include="LrpNetwork5.cs" /> 185 187 <Compile Include="LrpOrchestratorNode.cs" /> 186 188 <Compile Include="LrpOrchestratorNode2.cs" /> 187 189 <Compile Include="LrpOrchestratorNode3.cs" /> 190 <Compile Include="LrpOrchestratorNode4.cs" /> 191 <Compile Include="LrpOrchestratorNode5.cs" /> 188 192 <Compile Include="LrpUtils.cs" /> 189 193 <Compile Include="LrpNetwork1.cs" /> -
branches/OptimizationNetworks/HeuristicLab.Networks.IntegratedOptimization.LocationRouting/3.3/LrpUtils.cs
r14649 r14895 167 167 168 168 public static double Evaluate(FacilityLocationSolution flpSolution, VRPSolution[] vrpSolutions) { 169 return flpSolution.TotalOpeningCostsParameter.Value.Value + vrpSolutions.Sum(x => x.Quality.Value); 169 if (flpSolution.TotalOverbookedCapacityParameter.Value.Value > 0.0) 170 return flpSolution.FitnessValueParameter.Value.Value + vrpSolutions.Sum(x => x.Quality.Value); 171 else 172 return flpSolution.TotalOpeningCostsParameter.Value.Value + vrpSolutions.Sum(x => x.Quality.Value); 170 173 } 171 174 }
Note: See TracChangeset
for help on using the changeset viewer.