Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/19/10 16:50:39 (14 years ago)
Author:
abeham
Message:

#1084

  • Removing all foreign move evaluators in the TSP
  • Put the AlbaTranslocationMove operators under an interface of their own
Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r3991 r4047  
    3434  [Item("AlbaTranslocationMoveGenerator", "An operator which generates translocation moves for the alba representation.")]
    3535  [StorableClass]
    36   public sealed class AlbaTranslocationMoveGenerator : AlbaMoveOperator, IPermutationTranslocationMoveOperator, IMultiMoveGenerator {
     36  public sealed class AlbaTranslocationMoveGenerator : AlbaMoveOperator, IAlbaTranslocationMoveOperator, IMultiMoveGenerator {
    3737    public IValueLookupParameter<TranslocationMoveGenerator> TranslocationMoveGeneratorParameter {
    3838      get { return (IValueLookupParameter<TranslocationMoveGenerator>)Parameters["TranslocationMoveGenerator"]; }

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

    r3938 r4047  
    3434  [Item("AlbaTranslocationMoveHardTabuCriterion", "An operator which checks if translocation moves are tabu using a hard criterion.")]
    3535  [StorableClass]
    36   public sealed class AlbaTranslocationMoveHardTabuCriterion : AlbaMoveOperator, IPermutationTranslocationMoveOperator, ITabuChecker {
     36  public sealed class AlbaTranslocationMoveHardTabuCriterion : AlbaMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
    3737    private TranslocationMoveHardTabuCriterion tabuChecker;
    3838    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

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

    r3938 r4047  
    3434  [Item("AlbaTranslocationMoveMaker", "An operator which makes translocation moves for the alba representation.")]
    3535  [StorableClass]
    36   public sealed class AlbaTranslocationMoveMaker : AlbaMoveMaker, IPermutationTranslocationMoveOperator, IMoveMaker {
     36  public sealed class AlbaTranslocationMoveMaker : AlbaMoveMaker, IAlbaTranslocationMoveOperator, IMoveMaker {
    3737    private TranslocationMoveMaker moveMaker;
    3838    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

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

    r3938 r4047  
    3434  [Item("AlbaTranslocationMoveSoftTabuCriterion", "An operator which checks if translocation moves are tabu using a soft criterion.")]
    3535  [StorableClass]
    36   public sealed class AlbaTranslocationMoveSoftTabuCriterion : AlbaMoveOperator, IPermutationTranslocationMoveOperator, ITabuChecker {
     36  public sealed class AlbaTranslocationMoveSoftTabuCriterion : AlbaMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker {
    3737    private TranslocationMoveSoftTabuCriterion tabuChecker;
    3838    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

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

    r3938 r4047  
    3434  [Item("AlbaTranslocationMoveTabuMaker", "An operator which makes translocation moves tabu for the alba representation.")]
    3535  [StorableClass]
    36   public sealed class AlbaTranslocationMoveTabuMaker : AlbaMoveOperator, IPermutationTranslocationMoveOperator, ITabuMaker {
     36  public sealed class AlbaTranslocationMoveTabuMaker : AlbaMoveOperator, IAlbaTranslocationMoveOperator, ITabuMaker {
    3737    private TranslocationMoveTabuMaker moveTabuMaker;
    3838    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {

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

    r3938 r4047  
    8686    <Compile Include="Analyzers\BestVRPSolutionAnalyzer.cs" />
    8787    <Compile Include="Encodings\Alba\Crossovers\AlbaPermutationCrossover.cs" />
     88    <Compile Include="Encodings\Alba\Interfaces\IAlbaTranslocationMoveOperator.cs" />
    8889    <Compile Include="Encodings\Alba\Manipulators\AlbaPermutationManipulator.cs" />
    8990    <Compile Include="Encodings\Alba\Creators\AlbaPushForwardInsertionCreator.cs" />

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

    r4015 r4047  
    385385    }
    386386    private void InitializeMoveGenerators() {
    387       foreach (AlbaTranslocationMoveGenerator op in Operators.OfType<AlbaTranslocationMoveGenerator>()) {
     387      foreach (IAlbaTranslocationMoveOperator op in Operators.OfType<IAlbaTranslocationMoveOperator>()) {
    388388        if (op is IMoveGenerator) {
    389389          op.TranslocationMoveParameter.ActualNameChanged += new EventHandler(TranslocationMoveParameter_ActualNameChanged);
    … …  
    456456        op.TardinessPenalty.ActualName = TardinessPenalty.Name;
    457457      }
    458       string translocationMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>().First().TranslocationMoveParameter.ActualName;
    459       foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>())
     458      string translocationMove = Operators.OfType<IMoveGenerator>().OfType<IAlbaTranslocationMoveOperator>().First().TranslocationMoveParameter.ActualName;
     459      foreach (IAlbaTranslocationMoveOperator op in Operators.OfType<IAlbaTranslocationMoveOperator>())
    460460        op.TranslocationMoveParameter.ActualName = translocationMove;
    461461
Note: See TracChangeset for help on using the changeset viewer.