Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/04/20 07:35:27 (4 years ago)
Author:
abeham
Message:

#2521: fixed some issues in tests, renamed classes

Location:
branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4
Files:
2 added
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncodedSolution.cs

    r17698 r17714  
    3131  [Item("AlbaEncodedSolution", "Represents an Alba encoded solution for the VRP. It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    3232  [StorableType("8BB9735D-8371-46C1-B843-A6864B2ACDA5")]
    33   public class AlbaEncodedSolution : General.PermutationEncoding {
     33  public class AlbaEncodedSolution : General.PermutationEncodedSolution {
    3434    #region IVRPEncoding Members
    3535    public override List<Tour> GetTours() {

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

    r17711 r17714  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3232  [Item("AlbaEncoding", "Represents the encoding for Alba encoded solutions.")]
    33   [StorableType("9ff9f959-31d2-44e5-8a5e-b122220535c2")]
     33  [StorableType("42763c6b-358f-48a2-b134-075ed987d88c")]
    3434  public sealed class AlbaEncoding : VRPEncoding {
    3535

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

    r17698 r17714  
    3232  [Item("GVREncodedSolution", "Represents a genetic vehicle routing encoded solution of the VRP. It is implemented as described in Pereira, F.B. et al (2002). GVR: a New Genetic Representation for the Vehicle Routing Problem. AICS 2002, LNAI 2464, pp. 95-102.")]
    3333  [StorableType("27A8F267-9865-4AEA-9ECF-88D950D81D74")]
    34   public class GVREncodedSolution : TourEncoding {
     34  public class GVREncodedSolution : TourEncodedSolutions {
    3535    public override List<Tour> GetTours() {
    3636      List<Tour> tours = new List<Tour>();
    … …  
    9595      GVREncodedSolution solution = new GVREncodedSolution(problemInstance);
    9696
    97       TourEncoding.ConvertFrom(encoding, solution, problemInstance);
     97      TourEncodedSolutions.ConvertFrom(encoding, solution, problemInstance);
    9898
    9999      return solution;
    … …  
    103103      GVREncodedSolution solution = new GVREncodedSolution(problemInstance);
    104104
    105       TourEncoding.ConvertFrom(route, solution);
     105      TourEncodedSolutions.ConvertFrom(route, solution);
    106106
    107107      return solution;

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

    r17711 r17714  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
    3232  [Item("GVR Encoding", "Represents the genetic vehicle representation encoding for GVR encoded solutions.")]
    33   [StorableType("9ff9f959-31d2-44e5-8a5e-b122220535c2")]
    34   public class GVREncoding : VRPEncoding {
     33  [StorableType("e868041e-0c91-4734-940a-e339ec9dca89")]
     34  public sealed class GVREncoding : VRPEncoding {
    3535
    3636    [StorableConstructor]

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/MultiVRPEncoding.cs

    r17711 r17714  
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030
    31 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
     31namespace HeuristicLab.Problems.VehicleRouting.Encodings {
    3232  [Item("MultiVRPEncoding", "Represents the combination of all encodings from the VRP.")]
    33   [StorableType("9ff9f959-31d2-44e5-8a5e-b122220535c2")]
    34   public class MultiVRPEncoding : VRPEncoding {
     33  [StorableType("1ca6f16c-ea69-4a69-b03c-168d7285f1b7")]
     34  public sealed class MultiVRPEncoding : VRPEncoding {
    3535
    3636    [StorableConstructor]
    … …  
    5858    }
    5959    protected override void DiscoverOperators() {
    60       var assembly = typeof(IAlbaOperator).Assembly;
     60      var assembly = typeof(IVRPOperator).Assembly;
    6161      var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, assembly, true, false, false);
    6262      var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncodedSolution.cs

    r17712 r17714  
    3232  [Item("PotvinEncodedSolution", "Represents a potvin encoded solution of the VRP. 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.")]
    3333  [StorableType("A998C6C9-BCB3-46B7-B035-D7E76BE70184")]
    34   public class PotvinEncodedSolution : TourEncoding {
     34  public class PotvinEncodedSolution : TourEncodedSolutions {
    3535    [Storable]
    3636    public List<int> Unrouted { get; set; }
    … …  
    9696      PotvinEncodedSolution solution = new PotvinEncodedSolution(instance);
    9797
    98       TourEncoding.ConvertFrom(encoding, solution, instance);
     98      TourEncodedSolutions.ConvertFrom(encoding, solution, instance);
    9999
    100100      List<int> vehicles = new List<int>();

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

    r17711 r17714  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("Potvin Encoding", "Represents the Potvin encoding for Potvin encoded solutions.")]
    33   [StorableType("9ff9f959-31d2-44e5-8a5e-b122220535c2")]
    34   public class PotvinEncoding : VRPEncoding {
     33  [StorableType("4a586a73-7ca9-4abd-b017-d5c22af8cff5")]
     34  public sealed class PotvinEncoding : VRPEncoding {
    3535
    3636    [StorableConstructor]

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncodedSolution.cs

    r17712 r17714  
    3232  [Item("PrinsEncodedSolution", "Represents a Prins encoded solution of the VRP. 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.")]
    3333  [StorableType("A0E1EBC1-C0F5-4CD5-9279-1A669C6633CD")]
    34   public class PrinsEncodedSolution : General.PermutationEncoding {
     34  public class PrinsEncodedSolution : General.PermutationEncodedSolution {
    3535    #region IVRPEncoding Members
    3636    public override int GetTourIndex(Tour tour) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs

    r17711 r17714  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
    3232  [Item("Prins Encoding", "Represents the Prins encoding for Prins encoded solutions.")]
    33   [StorableType("9ff9f959-31d2-44e5-8a5e-b122220535c2")]
    34   public class PrinsEncoding : VRPEncoding {
     33  [StorableType("f2482ee3-e6b3-434e-a921-ed130200470f")]
     34  public sealed class PrinsEncoding : VRPEncoding {
    3535
    3636    [StorableConstructor]

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncodedSolution.cs

    r17712 r17714  
    3131  [Item("ZhuEncodedSolution", "Represents a Zhu encoded solution of the VRP. It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    3232  [StorableType("1A5F5A1D-E4F5-4477-887E-45FC488BC459")]
    33   public class ZhuEncodedSolution : General.PermutationEncoding {
     33  public class ZhuEncodedSolution : General.PermutationEncodedSolution {
    3434    #region IVRPEncoding Members
    3535    public override int GetTourIndex(Tour tour) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs

    r17711 r17714  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    3232  [Item("Zhu Encoding", "Represents the Zhu encoding for Zhu encoded solutions.")]
    33   [StorableType("9ff9f959-31d2-44e5-8a5e-b122220535c2")]
    34   public class ZhuEncoding : VRPEncoding {
     33  [StorableType("d02d7532-4a99-41e9-9a97-455792404507")]
     34  public sealed class ZhuEncoding : VRPEncoding {
    3535
    3636    [StorableConstructor]

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r17711 r17714  
    228228    <Compile Include="Encodings\General\Moves\VRPMoveMaker.cs" />
    229229    <Compile Include="Encodings\General\Moves\VRPMoveEvaluator.cs" />
    230     <Compile Include="Encodings\General\PermutationEncoding.cs" />
     230    <Compile Include="Encodings\General\PermutationEncodedSolution.cs" />
    231231    <Compile Include="Encodings\General\ShakingOperators\VehicleRoutingShakingOperator.cs" />
    232     <Compile Include="Encodings\General\TourEncoding.cs" />
     232    <Compile Include="Encodings\General\TourEncodedSolutions.cs" />
    233233    <Compile Include="Encodings\GVR\Crossovers\GVRCrossover.cs" />
    234234    <Compile Include="Encodings\GVR\GVREncodedSolution.cs" />
Note: See TracChangeset for help on using the changeset viewer.