Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (8 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinLocalSearchManipulator.cs

    r14185 r14927  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinLocalSearchManipulator", "The LSM operator which manipulates a VRP representation.  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.")]
    32   [StorableClass]
     32  [StorableType("353397c3-f3b0-452d-84a6-674aca59ed5d")]
    3333  public sealed class PotvinLocalSearchManipulator : PotvinManipulator, IVRPLocalSearchManipulator {
    3434    public IValueParameter<IntValue> Iterations {
    … …  
    139139      }
    140140    }
    141  
     141
    142142
    143143    protected override void Manipulate(IRandom random, PotvinEncoding individual) {
    144       ApplyManipulation(random, individual, ProblemInstance, Iterations.Value.Value);     
     144      ApplyManipulation(random, individual, ProblemInstance, Iterations.Value.Value);
    145145    }
    146146  }

  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinManipulator.cs

    r14185 r14927  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinManipulator", "A VRP manipulation operation.")]
    33   [StorableClass]
     33  [StorableType("0e157395-801e-4247-bc97-777c1fb181b1")]
    3434  public abstract class PotvinManipulator : VRPManipulator, IStochasticOperator, IPotvinOperator {
    3535    public ILookupParameter<IRandom> RandomParameter {

  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinOneLevelExchangeManipulator.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinOneLevelExchangeMainpulator", "The 1M operator which manipulates a VRP representation.  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.")]
    29   [StorableClass]
     29  [StorableType("7d5ebc64-735e-4e88-acb6-b3a35c7612e2")]
    3030  public sealed class PotvinOneLevelExchangeMainpulator : PotvinManipulator {
    3131    [StorableConstructor]
    … …  
    7070    protected override void Manipulate(IRandom random, PotvinEncoding individual) {
    7171      bool allowInfeasible = AllowInfeasibleSolutions.Value.Value;
    72       ApplyManipulation(random, individual, ProblemInstance, allowInfeasible);     
     72      ApplyManipulation(random, individual, ProblemInstance, allowInfeasible);
    7373    }
    7474  }

  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinPairwiseOneLevelExchangeManipulator.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    2626using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3030  [Item("PotvinPairwiseOneLevelExchangeMainpulator", "The 1M operator which manipulates a PDP representation. It has been adapted to pickup and delivery from 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. It was adapted to the PDP formulation.")]
    31   [StorableClass]
     31  [StorableType("57e7f96a-9119-4bf4-8d4e-c53e13983ab7")]
    3232  public sealed class PotvinPairwiseOneLevelExchangeMainpulator : PotvinManipulator {
    3333    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinPairwiseTwoLevelExchangeManipulator.cs

    r14185 r14927  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    2727using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPairwiseTwoLevelExchangeManipulator", "The 2M operator which manipulates a VRP representation.   It has been adapted to pickup and delivery from 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.  It was adapted to the PDP formulation.")]
    32   [StorableClass]
     32  [StorableType("362c5c70-0f8b-46b0-afce-e55e16e32f38")]
    3333  public sealed class PotvinPairwiseTwoLevelExchangeManipulator : PotvinManipulator {
    3434    [StorableConstructor]
    … …  
    130130    public static PotvinEncoding ApplyManipulation(IRandom random, PotvinEncoding individual, IPickupAndDeliveryProblemInstance pdp, bool allowInfeasible) {
    131131      PotvinEncoding result = null;
    132      
     132
    133133      int selectedIndex = SelectRandomTourBiasedByLength(random, individual, pdp);
    134134      if (selectedIndex >= 0) {
    … …  
    190190        if (result != null) {
    191191          VRPToursParameter.ActualValue = result;
    192         }       
     192        }
    193193      }
    194194    }

  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinTwoLevelExchangeManipulator", "The 2M operator which manipulates a VRP representation.  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.")]
    29   [StorableClass]
     29  [StorableType("e1bfaee1-5c92-4239-a4fc-a13fe3080010")]
    3030  public sealed class PotvinTwoLevelExchangeManipulator : PotvinManipulator {
    3131    [StorableConstructor]
    … …  
    9191      }
    9292    }
    93      
     93
    9494
    9595    protected override void Manipulate(IRandom random, PotvinEncoding individual) {

  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinVehicleAssignmentManipulator.cs

    r14185 r14927  
    2424using HeuristicLab.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinVehicleAssignmentMainpulator", "A manipulator that changes the vehicle assignment")]
    33   [StorableClass]
     33  [StorableType("75e852c4-61c5-4dd6-9049-af183d5e5ed9")]
    3434  public sealed class PotvinVehicleAssignmentMainpulator : VRPManipulator, ITimeWindowedOperator,
    3535    IMultiDepotOperator, IHeterogenousCapacitatedOperator {
Note: See TracChangeset for help on using the changeset viewer.