Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/29/11 15:40:01 (14 years ago)
Author:
svonolfe
Message:

Merged changes from trunk into branch (#1177)

Location:
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaStochasticTranslocationSingleMoveGenerator.cs

    r5130 r5867  
    3434  [Item("AlbaStochasticTranslocationSingleMoveGenerator", "An operator which generates a single translocation move for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    3535  [StorableClass]
    36   public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator, IMultiVRPMoveGenerator {
     36  public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator {
    3737    [Storable]
    3838    private TranslocationMoveGenerator generator = new StochasticTranslocationSingleMoveGenerator();
    … …  
    8080      generator.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8181      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(generator);
    82       op.Operator.Execute((IExecutionContext)op);
     82      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    8383
    8484      foreach (IScope scope in this.ExecutionContext.Scope.SubScopes) {

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs

    r4752 r5867  
    101101      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    102102      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    103       op.Operator.Execute((IExecutionContext)op);
     103      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    104104
    105105      return next;

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs

    r5130 r5867  
    7878    private AlbaTranslocationMoveHardTabuCriterion(AlbaTranslocationMoveHardTabuCriterion original, Cloner cloner)
    7979      : base(original, cloner) {
     80      tabuChecker = cloner.Clone(original.tabuChecker);
    8081    }
    8182
    … …  
    8788      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8889      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    89       op.Operator.Execute((IExecutionContext)op);
     90      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    9091
    9192      return next;

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs

    r5130 r5867  
    6161    private AlbaTranslocationMoveMaker(AlbaTranslocationMoveMaker original, Cloner cloner)
    6262      : base(original, cloner) {
     63        moveMaker = cloner.Clone(original.moveMaker);
    6364    }
    6465
    … …  
    7172      moveMaker.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    7273      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(moveMaker);
    73       op.Operator.Execute((IExecutionContext)op);
     74      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    7475    }
    7576  }

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs

    r5130 r5867  
    7878    private AlbaTranslocationMoveSoftTabuCriterion(AlbaTranslocationMoveSoftTabuCriterion original, Cloner cloner)
    7979      : base(original, cloner) {
     80        tabuChecker = cloner.Clone(original.tabuChecker);
    8081    }
    8182
    … …  
    8788      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8889      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    89       op.Operator.Execute((IExecutionContext)op);
     90      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    9091
    9192      return next;

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs

    r5130 r5867  
    7878    private AlbaTranslocationMoveTabuMaker(AlbaTranslocationMoveTabuMaker original, Cloner cloner)
    7979      : base(original, cloner) {
     80        moveTabuMaker = cloner.Clone(original.moveTabuMaker);
    8081    }
    8182
    … …  
    8788      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8889      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    89       op.Operator.Execute((IExecutionContext)op);
     90      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    9091
    9192      return next;
Note: See TracChangeset for help on using the changeset viewer.