Changeset 6600


Ignore:
Timestamp:
07/27/11 14:35:13 (9 years ago)
Author:
svonolfe
Message:

Re-Integrated the IBX, implemented review comments (#1561)

Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/PotvinEncoding.cs

    r6459 r6600  
    7575      place = -1;
    7676      bool bestFeasible = false;
    77       double minDetour = 0;
     77      double minDetour = double.MaxValue;
    7878
    7979      for (int tour = 0; tour < Tours.Count; tour++) {
     
    8787              capacity, distMatrix);
    8888
    89             if ((!allowInfeasible && feasible) || (allowInfeasible && (!bestFeasible || feasible))) {
     89            if (feasible || allowInfeasible && !bestFeasible) {
    9090              double newLength = Tours[tour].GetLength(distMatrix);
    9191              double detour = newLength - length;
    9292
    93               if (route <= 0 || detour < minDetour ||
    94                 (allowInfeasible && ((!(bestFeasible && !feasible)) && detour < minDetour || (feasible && !bestFeasible)))) {
     93              if (route < 0 || detour < minDetour || feasible && !bestFeasible) {
    9594                route = tour;
    9695                place = i;
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

    r6523 r6600  
    114114    <Compile Include="Encodings\Alba\LocalImprovement\AlbaLambdaInterchangeLocalImprovementOperator.cs" />
    115115    <Compile Include="Encodings\General\Creators\IterativeInsertionCreator.cs" />
     116    <Compile Include="Encodings\Potvin\Crossovers\PotvinInsertionBasedCrossover.cs" />
    116117    <Compile Include="Encodings\Potvin\Manipulators\PotvinLocalSearchManipulator.cs" />
    117118    <Compile Include="Interfaces\IVRPMultiNeighborhoodShakingOperator.cs" />
Note: See TracChangeset for help on using the changeset viewer.