Changeset 7855


Ignore:
Timestamp:
05/21/12 14:32:32 (7 years ago)
Author:
svonolfe
Message:

Deactivated LS manipulators by default (#1177)

Location:
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/MultiVRPSolutionManipulator.cs

    r6716 r7855  
    8484      foreach (IOperator op in operators) {
    8585        if (op is IVRPManipulator && !(op is MultiVRPSolutionManipulator)) {
    86           Operators.Add(op.Clone() as IVRPManipulator, true);
     86          Operators.Add(op.Clone() as IVRPManipulator, !(op is IVRPLocalSearchManipulator));
    8787        }
    8888      }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/PermutationEncoding.cs

    r6851 r7855  
    3636    public abstract List<Tour> GetTours();
    3737
    38     public int GetTourIndex(Tour tour) {
     38    public virtual int GetTourIndex(Tour tour) {
    3939      int index = -1;
    4040
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/ShakingOperators/VehicleRoutingShakingOperator.cs

    r6093 r7855  
    7171     
    7272      foreach (IVRPManipulator shaker in ApplicationManager.Manager.GetInstances<IVRPManipulator>().OrderBy(x => x.Name))
    73         if (!(shaker is MultiVRPSolutionManipulator)) Operators.Add(shaker);
     73        if (!(shaker is MultiVRPSolutionManipulator)) Operators.Add(shaker, !(shaker is IVRPLocalSearchManipulator));
    7474    }
    7575
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinLocalSearchManipulator.cs

    r6838 r7855  
    2727using System.Collections.Generic;
    2828using HeuristicLab.Common;
     29using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2930
    3031namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3132  [Item("PotvinLocalSearchManipulator", "The LSM operator which manipulates a VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
    3233  [StorableClass]
    33   public sealed class PotvinLocalSearchManipulator : PotvinManipulator {
     34  public sealed class PotvinLocalSearchManipulator : PotvinManipulator, IVRPLocalSearchManipulator {
    3435    public IValueParameter<IntValue> Iterations {
    3536      get { return (IValueParameter<IntValue>)Parameters["Iterations"]; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsLSManipulator.cs

    r6607 r7855  
    2727using System.Collections.Generic;
    2828using HeuristicLab.Common;
     29using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2930
    3031namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
    3132  [Item("PrinsLSManipulator", "An operator which manipulates a VRP representation by using the Prins local search.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
    3233  [StorableClass]
    33   public abstract class PrinsLSManipulator : PrinsManipulator {
     34  public abstract class PrinsLSManipulator : PrinsManipulator, IVRPLocalSearchManipulator {
    3435    public IValueParameter<IntValue> Iterations {
    3536      get { return (IValueParameter<IntValue>)Parameters["Iterations"]; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r7689 r7855  
    190190    <Compile Include="Encodings\Potvin\Moves\OnePointCrossover\PotvinOnePointCrossoverMultiMoveGenerator.cs" />
    191191    <Compile Include="Encodings\Potvin\Moves\OnePointCrossover\PotvinOnePointCrossoverSingleMoveGenerator.cs" />
     192    <Compile Include="Interfaces\IVRPLocalSearchManipulator.cs" />
    192193    <Compile Include="Properties\AssemblyInfo.cs" />
    193194    <Compile Include="Encodings\Alba\AlbaEncoding.cs" />
Note: See TracChangeset for help on using the changeset viewer.