Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/24/20 00:58:42 (5 years ago)
Author:
abeham
Message:

#2521: working on VRP (WIP)

Location:
branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR
Files:
1 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers/GVRCrossover.cs

    r17226 r17698  
    5252    }
    5353
    54     private GVREncoding Crossover(IRandom random, GVREncoding parent1, GVREncoding parent2) {
    55       GVREncoding child = parent1.Clone() as GVREncoding;
     54    private GVREncodedSolution Crossover(IRandom random, GVREncodedSolution parent1, GVREncodedSolution parent2) {
     55      GVREncodedSolution child = parent1.Clone() as GVREncodedSolution;
    5656
    5757      Tour tour = parent2.Tours[random.Next(parent2.Tours.Count)];
    … …  
    9797      } else {
    9898        //special case -> only one tour, whole tour has been chosen as subroute
    99         child = parent1.Clone() as GVREncoding;
     99        child = parent1.Clone() as GVREncodedSolution;
    100100      }
    101101
    … …  
    104104
    105105    public override IOperation InstrumentedApply() {
    106       ItemArray<IVRPEncoding> parents = new ItemArray<IVRPEncoding>(ParentsParameter.ActualValue.Length);
     106      ItemArray<IVRPEncodedSolution> parents = new ItemArray<IVRPEncodedSolution>(ParentsParameter.ActualValue.Length);
    107107      for (int i = 0; i < ParentsParameter.ActualValue.Length; i++) {
    108         IVRPEncoding solution = ParentsParameter.ActualValue[i];
    109         if (!(solution is GVREncoding)) {
    110           parents[i] = GVREncoding.ConvertFrom(solution, ProblemInstance);
     108        IVRPEncodedSolution solution = ParentsParameter.ActualValue[i];
     109        if (!(solution is GVREncodedSolution)) {
     110          parents[i] = GVREncodedSolution.ConvertFrom(solution, ProblemInstance);
    111111        } else {
    112112          parents[i] = solution;
    … …  
    115115      ParentsParameter.ActualValue = parents;
    116116
    117       ChildParameter.ActualValue = Crossover(RandomParameter.ActualValue, parents[0] as GVREncoding, parents[1] as GVREncoding);
     117      ChildParameter.ActualValue = Crossover(RandomParameter.ActualValue, parents[0] as GVREncodedSolution, parents[1] as GVREncodedSolution);
    118118
    119119      return base.InstrumentedApply();

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRDisplacementManipulator.cs

    r17226 r17698  
    4444    }
    4545
    46     protected override void Manipulate(IRandom random, GVREncoding individual) {
     46    protected override void Manipulate(IRandom random, GVREncodedSolution individual) {
    4747      Tour tour = individual.Tours[random.Next(individual.Tours.Count)];
    4848      int breakPoint1 = random.Next(tour.Stops.Count);

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInsertionManipulator.cs

    r17226 r17698  
    4343    }
    4444
    45     protected override void Manipulate(IRandom random, GVREncoding individual) {
     45    protected override void Manipulate(IRandom random, GVREncodedSolution individual) {
    4646      int customer = random.Next(1, individual.Cities + 1);
    4747      Tour tour;

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInversionManipulator.cs

    r17226 r17698  
    4343    }
    4444
    45     protected override void Manipulate(IRandom random, GVREncoding individual) {
     45    protected override void Manipulate(IRandom random, GVREncodedSolution individual) {
    4646      Tour tour = individual.Tours[random.Next(individual.Tours.Count)];
    4747      int breakPoint1 = random.Next(tour.Stops.Count);

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRManipulator.cs

    r17226 r17698  
    4747    }
    4848
    49     protected abstract void Manipulate(IRandom random, GVREncoding individual);
     49    protected abstract void Manipulate(IRandom random, GVREncodedSolution individual);
    5050
    5151    public override IOperation InstrumentedApply() {
    52       IVRPEncoding solution = VRPToursParameter.ActualValue;
    53       if (!(solution is GVREncoding)) {
    54         VRPToursParameter.ActualValue = GVREncoding.ConvertFrom(solution, ProblemInstance);
     52      IVRPEncodedSolution solution = VRPToursParameter.ActualValue;
     53      if (!(solution is GVREncodedSolution)) {
     54        VRPToursParameter.ActualValue = GVREncodedSolution.ConvertFrom(solution, ProblemInstance);
    5555      }
    5656
    57       Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as GVREncoding);
     57      Manipulate(RandomParameter.ActualValue, VRPToursParameter.ActualValue as GVREncodedSolution);
    5858
    5959      return base.InstrumentedApply();

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRSwapManipulator.cs

    r17226 r17698  
    4343    }
    4444
    45     protected override void Manipulate(IRandom random, GVREncoding individual) {
     45    protected override void Manipulate(IRandom random, GVREncodedSolution individual) {
    4646      int customer1 = random.Next(1, individual.Cities + 1);
    4747      int customer2 = random.Next(1, individual.Cities + 1);
Note: See TracChangeset for help on using the changeset viewer.