Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4208


Ignore:
Timestamp:
08/13/10 11:16:52 (14 years ago)
Author:
svonolfe
Message:

Updated naming and descriptions of the VRP operators (#1039)

Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3
Files:
2 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/AlbaMoveMaker.cs

    r4179 r4208  
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    28   [Item("AlbaTranslocationMoveMaker", "An operator which makes translocation moves for the Alba representation.")]
     28  [Item("PermutationTranslocationMoveMaker", "An operator which makes translocation moves for the Alba representation.")]
    2929  [StorableClass]
    3030  public abstract class AlbaMoveMaker : AlbaMoveOperator {

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/PermutationTranslocationMoveEvaluator.cs

    r4207 r4208  
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting {
    29   [Item("AlbaTranslocationMoveEvaluator", "Evaluates a translocation or insertion move (3-opt) for a VRP representation.")]
     29  [Item("PermutationTranslocationMoveEvaluator", "Evaluates a translocation or insertion move (3-opt) for a VRP representation.")]
    3030  [StorableClass]
    31   public sealed class AlbaTranslocationMoveEvaluator : VRPMoveEvaluator, IAlbaTranslocationMoveOperator {
     31  public sealed class PermutationTranslocationMoveEvaluator : VRPMoveEvaluator, IAlbaTranslocationMoveOperator {
    3232    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
    3333      get { return (ILookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
    … …  
    3636
    3737    [StorableConstructor]
    38     private AlbaTranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
     38    private PermutationTranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
    3939
    40     public AlbaTranslocationMoveEvaluator()
     40    public PermutationTranslocationMoveEvaluator()
    4141      : base() {
    4242      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move to evaluate."));

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/PermutationTranslocationMoveGenerator.cs

    r4207 r4208  
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    31   [Item("AlbaTranslocationMoveGenerator", "An operator which generates translocation moves for a VRP representation.")]
     31  [Item("PermutationTranslocationMoveGenerator", "An operator which generates translocation moves for a VRP representation.")]
    3232  [StorableClass]
    33   public sealed class AlbaTranslocationMoveGenerator : PermutationMoveOperator, IAlbaTranslocationMoveOperator, IMultiMoveGenerator {
     33  public sealed class PermutationTranslocationMoveGenerator : PermutationMoveOperator, IAlbaTranslocationMoveOperator, IMultiMoveGenerator {
    3434    public IValueLookupParameter<TranslocationMoveGenerator> TranslocationMoveGeneratorParameter {
    3535      get { return (IValueLookupParameter<TranslocationMoveGenerator>)Parameters["TranslocationMoveGenerator"]; }
    … …  
    6969
    7070    [StorableConstructor]
    71     private AlbaTranslocationMoveGenerator(bool deserializing) : base(deserializing) { }
     71    private PermutationTranslocationMoveGenerator(bool deserializing) : base(deserializing) { }
    7272
    73     public AlbaTranslocationMoveGenerator()
     73    public PermutationTranslocationMoveGenerator()
    7474      : base() {
    7575      Parameters.Add(new ValueLookupParameter<TranslocationMoveGenerator>("TranslocationMoveGenerator", "The move generator.",

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/PermutationTranslocationMoveHardTabuCriterion.cs

    r4207 r4208  
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    29   [Item("AlbaTranslocationMoveHardTabuCriterion", "An operator which checks if translocation moves are tabu using a hard criterion for a VRP representation.")]
     29  [Item("PermutationTranslocationMoveHardTabuCriterion", "An operator which checks if translocation moves are tabu using a hard criterion for a VRP representation.")]
    3030  [StorableClass]
    31   public sealed class AlbaTranslocationMoveHardTabuCriterion : PermutationMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
     31  public sealed class PermutationTranslocationMoveHardTabuCriterion : PermutationMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
    3232    private TranslocationMoveHardTabuCriterion tabuChecker;
    3333    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {
    … …  
    5757
    5858    [StorableConstructor]
    59     private AlbaTranslocationMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
     59    private PermutationTranslocationMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
    6060
    61     public AlbaTranslocationMoveHardTabuCriterion()
     61    public PermutationTranslocationMoveHardTabuCriterion()
    6262      : base() {
    6363      tabuChecker = new TranslocationMoveHardTabuCriterion();

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/PermutationTranslocationMoveMaker.cs

    r4207 r4208  
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    29   [Item("AlbaTranslocationMoveMaker", "An operator which makes translocation moves for a VRP representation.")]
     29  [Item("PermutationTranslocationMoveMaker", "An operator which makes translocation moves for a VRP representation.")]
    3030  [StorableClass]
    31   public sealed class AlbaTranslocationMoveMaker : AlbaMoveMaker, IAlbaTranslocationMoveOperator, IVRPMoveMaker {
     31  public sealed class PermutationTranslocationMoveMaker : AlbaMoveMaker, IAlbaTranslocationMoveOperator, IVRPMoveMaker {
    3232    private TranslocationMoveMaker moveMaker;
    3333
    … …  
    4949
    5050    [StorableConstructor]
    51     private AlbaTranslocationMoveMaker(bool deserializing) : base(deserializing) { }
     51    private PermutationTranslocationMoveMaker(bool deserializing) : base(deserializing) { }
    5252
    53     public AlbaTranslocationMoveMaker()
     53    public PermutationTranslocationMoveMaker()
    5454      : base() {
    5555      moveMaker = new TranslocationMoveMaker();

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/PermutationTranslocationMoveSoftTabuCriterion.cs

    r4207 r4208  
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    29   [Item("AlbaTranslocationMoveSoftTabuCriterion", "An operator which checks if translocation moves are tabu using a soft criterion for a VRP representation.")]
     29  [Item("PermutationTranslocationMoveSoftTabuCriterion", "An operator which checks if translocation moves are tabu using a soft criterion for a VRP representation.")]
    3030  [StorableClass]
    31   public sealed class AlbaTranslocationMoveSoftTabuCriterion : PermutationMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
     31  public sealed class PermutationTranslocationMoveSoftTabuCriterion : PermutationMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
    3232    private TranslocationMoveSoftTabuCriterion tabuChecker;
    3333    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {
    … …  
    5757
    5858    [StorableConstructor]
    59     private AlbaTranslocationMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
     59    private PermutationTranslocationMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
    6060
    61     public AlbaTranslocationMoveSoftTabuCriterion()
     61    public PermutationTranslocationMoveSoftTabuCriterion()
    6262      : base() {
    6363      tabuChecker = new TranslocationMoveSoftTabuCriterion();

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/PermutationTranslocationMoveTabuMaker.cs

    r4207 r4208  
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    29   [Item("AlbaTranslocationMoveTabuMaker", "An operator which makes translocation moves tabu for a VRP representation.")]
     29  [Item("PermutationTranslocationMoveTabuMaker", "An operator which makes translocation moves tabu for a VRP representation.")]
    3030  [StorableClass]
    31   public sealed class AlbaTranslocationMoveTabuMaker : PermutationMoveOperator, IAlbaTranslocationMoveOperator, ITabuMaker {
     31  public sealed class PermutationTranslocationMoveTabuMaker : PermutationMoveOperator, IAlbaTranslocationMoveOperator, ITabuMaker {
    3232    private TranslocationMoveTabuMaker moveTabuMaker;
    3333    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {
    … …  
    5757
    5858    [StorableConstructor]
    59     private AlbaTranslocationMoveTabuMaker(bool deserializing) : base(deserializing) { }
     59    private PermutationTranslocationMoveTabuMaker(bool deserializing) : base(deserializing) { }
    6060
    61     public AlbaTranslocationMoveTabuMaker()
     61    public PermutationTranslocationMoveTabuMaker()
    6262      : base() {
    6363      moveTabuMaker = new TranslocationMoveTabuMaker();

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj

    r4206 r4208  
    158158    <Compile Include="Encodings\Alba\Moves\AlbaMoveOperator.cs" />
    159159    <Compile Include="Encodings\Alba\Moves\AlbaMoveMaker.cs" />
    160     <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveGenerator.cs" />
    161     <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveMaker.cs" />
    162     <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveTabuMaker.cs" />
    163     <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveSoftTabuCriterion.cs" />
    164     <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveHardTabuCriterion.cs" />
     160    <Compile Include="Encodings\Alba\Moves\ThreeOpt\PermutationTranslocationMoveGenerator.cs" />
     161    <Compile Include="Encodings\Alba\Moves\ThreeOpt\PermutationTranslocationMoveMaker.cs" />
     162    <Compile Include="Encodings\Alba\Moves\ThreeOpt\PermutationTranslocationMoveTabuMaker.cs" />
     163    <Compile Include="Encodings\Alba\Moves\ThreeOpt\PermutationTranslocationMoveSoftTabuCriterion.cs" />
     164    <Compile Include="Encodings\Alba\Moves\ThreeOpt\PermutationTranslocationMoveHardTabuCriterion.cs" />
    165165    <Compile Include="Encodings\Potvin\PotvinEncoding.cs" />
    166166    <Compile Include="Encodings\VRPMoveOperator.cs" />
    … …  
    180180    <Compile Include="Interfaces\IVRPCreator.cs" />
    181181    <Compile Include="Interfaces\IVRPOperator.cs" />
    182     <Compile Include="Encodings\Alba\Moves\ThreeOpt\AlbaTranslocationMoveEvaluator.cs" />
     182    <Compile Include="Encodings\Alba\Moves\ThreeOpt\PermutationTranslocationMoveEvaluator.cs" />
    183183    <Compile Include="MoveEvaluators\VRPMoveEvaluator.cs" />
    184184    <Compile Include="VRPSolution.cs" />
Note: See TracChangeset for help on using the changeset viewer.