Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/13/15 15:00:15 (9 years ago)
Author:
abeham
Message:

#2174, #2282: merged revisions r11961,r11963,r11967,r11970,r11971,r11982,r11984,r11998,r12001,r12002,r12003,r12004,r11939,r11945,r11956,r11958,r11959,r11960,r11983,r11987,r11988,r11990,r11993,r11994,r11996,r11999,r12000 to stable

Location:
stable
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/BestVRPSolutionAnalyzer.cs

    r11170 r12005  
    3838  [Item("BestVRPSolutionAnalyzer", "An operator for analyzing the best solution of Vehicle Routing Problems.")]
    3939  [StorableClass]
    40   public sealed class BestVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, IGeneralVRPOperator {
     40  public sealed class BestVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, IGeneralVRPOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    4242      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/Capacitated/BestCapacitatedVRPSolutionAnalyzer.cs

    r11170 r12005  
    3838  [Item("BestCapacitatedVRPSolutionAnalyzer", "An operator for analyzing the best solution of capacitated Vehicle Routing Problems.")]
    3939  [StorableClass]
    40   public sealed class BestCapacitatedVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ICapacitatedOperator {
     40  public sealed class BestCapacitatedVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ICapacitatedOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    4242      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/PickupAndDelivery/BestPickupAndDeliveryVRPSolutionAnalyzer.cs

    r11170 r12005  
    3838  [Item("BestPickupAndDeliveryVRPSolutionAnalyzer", "An operator for analyzing the best solution of Pickup and Delivery Routing Problems.")]
    3939  [StorableClass]
    40   public sealed class BestPickupAndDeliveryVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, IPickupAndDeliveryOperator {
     40  public sealed class BestPickupAndDeliveryVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, IPickupAndDeliveryOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    4242      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/TimeWindowed/BestTimeWindowedVRPSolutionAnalyzer.cs

    r11170 r12005  
    3838  [Item("BestTimeWindowedVRPSolutionAnalyzer", "An operator for analyzing the best solution of time windowed Vehicle Routing Problems.")]
    3939  [StorableClass]
    40   public sealed class BestTimeWindowedVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ITimeWindowedOperator {
     40  public sealed class BestTimeWindowedVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ITimeWindowedOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    4242      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs

    r11170 r12005  
    3636  [Item("CapacityRelaxationVRPAnalyzer", "An operator for adaptively relaxing the capacity constraints.")]
    3737  [StorableClass]
    38   public class CapacityRelaxationVRPAnalyzer : SingleSuccessorOperator, IAnalyzer, ICapacitatedOperator {
     38  public class CapacityRelaxationVRPAnalyzer : SingleSuccessorOperator, IAnalyzer, ICapacitatedOperator, ISingleObjectiveOperator {
    3939    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    4040      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/PickupAndDelivery/PickupViolationsRelaxationVRPAnalyzer.cs

    r11170 r12005  
    3636  [Item("PickupViolationsRelaxationVRPAnalyzer", "An operator for adaptively relaxing the pickup constraints.")]
    3737  [StorableClass]
    38   public class PickupViolationsRelaxationVRPAnalyzer : SingleSuccessorOperator, IAnalyzer, IPickupAndDeliveryOperator {
     38  public class PickupViolationsRelaxationVRPAnalyzer : SingleSuccessorOperator, IAnalyzer, IPickupAndDeliveryOperator, ISingleObjectiveOperator {
    3939    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    4040      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/TimeWindowed/TimeWindowRelaxationVRPAnalyzer.cs

    r11170 r12005  
    3636  [Item("TimeWindowRelaxationVRPAnalyzer", "An operator for adaptively relaxing the time window constraints.")]
    3737  [StorableClass]
    38   public class TimeWindowRelaxationVRPAnalyzer : SingleSuccessorOperator, IAnalyzer, ITimeWindowedOperator {
     38  public class TimeWindowRelaxationVRPAnalyzer : SingleSuccessorOperator, IAnalyzer, ITimeWindowedOperator, ISingleObjectiveOperator {
    3939    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    4040      get { return (ILookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

    r11170 r12005  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2928using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3029
    … …  
    3231  [Item("AlbaEncoding", "Represents an Alba encoding of VRP solutions. It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    3332  [StorableClass]
    34   public class AlbaEncoding : PermutationEncoding {
     33  public class AlbaEncoding : General.PermutationEncoding {
    3534    #region IVRPEncoding Members
    3635    public override List<Tour> GetTours() {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs

    r11905 r12005  
    3636  [Item("AlbaLambdaInterchangeLocalImprovementOperator", "Takes a solution and finds the local optimum with respect to the lambda interchange neighborhood by decending along the steepest gradient.")]
    3737  [StorableClass]
    38   public class AlbaLambdaInterchangeLocalImprovementOperator : VRPOperator, IStochasticOperator, ILocalImprovementOperator {
     38  public class AlbaLambdaInterchangeLocalImprovementOperator : VRPOperator, IStochasticOperator, ILocalImprovementOperator, ISingleObjectiveOperator {
    3939
    4040    public IValueLookupParameter<IntValue> MaximumIterationsParameter {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs

    r11170 r12005  
    3333  [Item("MultiVRPMoveTabuMaker", "A multi VRP move tabu maker.")]
    3434  [StorableClass]
    35   public class MultiVRPMoveTabuMaker : SingleSuccessorOperator, IMultiVRPMoveOperator, ITabuMaker, IGeneralVRPOperator {
     35  public class MultiVRPMoveTabuMaker : SingleSuccessorOperator, IMultiVRPMoveOperator, ITabuMaker, IGeneralVRPOperator, ISingleObjectiveOperator {
    3636    public ILookupParameter VRPMoveParameter {
    3737      get { return (ILookupParameter)Parameters["VRPMove"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.cs

    r11170 r12005  
    3232  [Item("VRPMoveMaker", "Performs a VRP move.")]
    3333  [StorableClass]
    34   public abstract class VRPMoveMaker : VRPMoveOperator, IMoveMaker {
     34  public abstract class VRPMoveMaker : VRPMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3535    public ILookupParameter<DoubleValue> QualityParameter {
    3636      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
    … …  
    9191          }
    9292        }
    93       }
    94       finally {
     93      } finally {
    9594        foreach (IParameter parameter in addedParameters) {
    9695          this.Parameters.Remove(parameter);

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveTabuMaker.cs

    r11170 r12005  
    3232  [Item("PotvinPDExchangeMoveTabuMaker", "Declares a given exchange move as tabu.")]
    3333  [StorableClass]
    34   public class PotvinPDExchangeMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinPDExchangeMoveOperator, IPotvinOperator, IVRPMoveOperator {
     34  public class PotvinPDExchangeMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinPDExchangeMoveOperator, IPotvinOperator, ISingleObjectiveOperator {
    3535    public LookupParameter<ItemList<IItem>> TabuListParameter {
    3636      get { return (LookupParameter<ItemList<IItem>>)Parameters["TabuList"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveTabuMaker.cs

    r11170 r12005  
    3333  [Item("PotvinTwoOptStarMoveTabuMaker", "Declares a given two opt star move as tabu.")]
    3434  [StorableClass]
    35   public class PotvinTwoOptStarMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinTwoOptStarMoveOperator, IPotvinOperator, IVRPMoveOperator {
     35  public class PotvinTwoOptStarMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinTwoOptStarMoveOperator, IPotvinOperator, ISingleObjectiveOperator {
    3636    public LookupParameter<ItemList<IItem>> TabuListParameter {
    3737      get { return (LookupParameter<ItemList<IItem>>)Parameters["TabuList"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveTabuMaker.cs

    r11170 r12005  
    3232  [Item("PotvinVehicleAssignmentMoveTabuMaker", "Declares a given vehicle assignment move as tabu.")]
    3333  [StorableClass]
    34   public class PotvinVehicleAssignmentMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinVehicleAssignmentMoveOperator, IPotvinOperator, IVRPMoveOperator {
     34  public class PotvinVehicleAssignmentMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinVehicleAssignmentMoveOperator, IPotvinOperator, ISingleObjectiveOperator {
    3535    public LookupParameter<ItemList<IItem>> TabuListParameter {
    3636      get { return (LookupParameter<ItemList<IItem>>)Parameters["TabuList"]; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs

    r11170 r12005  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2928using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3029using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    … …  
    3332  [Item("PrinsEncoding", "Represents an Prins encoding of VRP solutions. 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.")]
    3433  [StorableClass]
    35   public class PrinsEncoding : PermutationEncoding {
     34  public class PrinsEncoding : General.PermutationEncoding {
    3635    #region IVRPEncoding Members
    3736    public override int GetTourIndex(Tour tour) {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs

    r11170 r12005  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2928using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3029
    … …  
    3231  [Item("ZhuEncoding", "Represents a Zhu encoding of VRP solutions. It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    3332  [StorableClass]
    34   public class ZhuEncoding : PermutationEncoding {
     33  public class ZhuEncoding : General.PermutationEncoding {
    3534    #region IVRPEncoding Members
    3635    public override int GetTourIndex(Tour tour) {
Note: See TracChangeset for help on using the changeset viewer.