Changeset 4347


Ignore:
Timestamp:
08/31/10 14:24:12 (12 years ago)
Author:
svonolfe
Message:

Sorted Operators alphabetically, disabled LS operators by default (#1039)

Location:
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/MultiVRPSolutionCreator.cs

    r4346 r4347  
    9494        Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer."));
    9595
    96         foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCreator))) {
     96        foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCreator)).OrderBy(op => op.Name)) {
    9797          if (!typeof(MultiOperator<IVRPCreator>).IsAssignableFrom(type))
    9898            Operators.Add((IVRPCreator)Activator.CreateInstance(type), true);
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Crossovers/MultiVRPSolutionCrossover.cs

    r4346 r4347  
    101101      Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer."));
    102102
    103       foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCrossover))) {
     103      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCrossover)).OrderBy(op => op.Name)) {
    104104        if (!typeof(MultiOperator<IVRPCrossover>).IsAssignableFrom(type))
    105105          Operators.Add((IVRPCrossover)Activator.CreateInstance(type), true);
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Manipulators/MultiVRPSolutionManipulator.cs

    r4346 r4347  
    9494      Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer."));
    9595
    96       foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPManipulator))) {
    97         if (!typeof(MultiOperator<IVRPManipulator>).IsAssignableFrom(type))
    98           Operators.Add((IVRPManipulator)Activator.CreateInstance(type), true);
     96      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPManipulator)).OrderBy(op => op.Name)) {
     97        if (!typeof(MultiOperator<IVRPManipulator>).IsAssignableFrom(type)) {
     98          IVRPManipulator op = (IVRPManipulator)Activator.CreateInstance(type);
     99          bool operatorChecked = true;
     100          if(op is HeuristicLab.Problems.VehicleRouting.Encodings.Potvin.PotvinLocalSearchManipulator ||
     101            op is HeuristicLab.Problems.VehicleRouting.Encodings.Prins.PrinsLSManipulator)
     102            operatorChecked = false;
     103          Operators.Add(op, operatorChecked);
     104        }
    99105      }
    100106    }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs

    r4205 r4347  
    118118      Parameters.Add(new LookupParameter<IVRPMove>("VRPMove", "The generated moves."));
    119119
    120       foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IMultiVRPMoveGenerator))) {
     120      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IMultiVRPMoveGenerator)).OrderBy(op => op.Name)) {
    121121        if (!typeof(MultiOperator<IMultiVRPMoveGenerator>).IsAssignableFrom(type))
    122122          Operators.Add((IMultiVRPMoveGenerator)Activator.CreateInstance(type), true);
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

    r4317 r4347  
    320320      operators.Add(new BestAverageWorstVRPToursAnalyzer());
    321321      ParameterizeAnalyzer();
    322       operators.AddRange(ApplicationManager.Manager.GetInstances<IVRPOperator>().Cast<IOperator>());
     322      operators.AddRange(ApplicationManager.Manager.GetInstances<IVRPOperator>().Cast<IOperator>().OrderBy(op => op.Name));
    323323      ParameterizeOperators();
    324324      UpdateMoveEvaluators();
Note: See TracChangeset for help on using the changeset viewer.