Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/31/19 14:40:15 (6 years ago)
Author:
abeham
Message:

#1614: updated to new persistence and .NET 4.6.1

Location:
branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs

    r15506 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Random;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334  [Item("CordeauCrossover", "The merge procedure that is described in Cordeau, J.-F., Gaudioso, M., Laporte, G., Moccia, L. 2006. A memetic heuristic for the generalized quadratic assignment problem. INFORMS Journal on Computing, 18, pp. 433–443.")]
    34   [StorableClass]
     35  [StorableType("05D7FC4C-EF71-4118-9FF1-B8B71B501A99")]
    3536  public class CordeauCrossover : GQAPCrossover,
    3637    IQualitiesAwareGQAPOperator, IProblemInstanceAwareGQAPOperator {
    … …  
    4748
    4849    [StorableConstructor]
    49     protected CordeauCrossover(bool deserializing) : base(deserializing) { }
     50    protected CordeauCrossover(StorableConstructorFlag _) : base(_) { }
    5051    protected CordeauCrossover(CordeauCrossover original, Cloner cloner)
    5152      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/DiscreteLocationCrossover.cs

    r15572 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Random;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334  [Item("DiscreteLocationCrossover", "Combines the assignment to locations from various parents.")]
    34   [StorableClass]
     35  [StorableType("E001CEB3-DAA4-4AF4-843B-2DD951F0EAA6")]
    3536  public class DiscreteLocationCrossover : GQAPCrossover {
    3637
    3738    [StorableConstructor]
    38     protected DiscreteLocationCrossover(bool deserializing) : base(deserializing) { }
     39    protected DiscreteLocationCrossover(StorableConstructorFlag _) : base(_) { }
    3940    protected DiscreteLocationCrossover(DiscreteLocationCrossover original, Cloner cloner)
    4041      : base(original, cloner) { }

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPCrossover.cs

    r15504 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132
    3233  [Item("GQAPCrossover", "A base class for operators that cross assignment vectors of the GeneralizedQuadraticAssignment problems.")]
    33   [StorableClass]
     34  [StorableType("DC860DB7-FC00-4374-ADC8-71BB4EDFC6E2")]
    3435  public abstract class GQAPCrossover : SingleSuccessorOperator, IGQAPCrossover, IStochasticOperator {
    3536    public override bool CanChangeName {
    … …  
    5152
    5253    [StorableConstructor]
    53     protected GQAPCrossover(bool deserializing) : base(deserializing) { }
     54    protected GQAPCrossover(StorableConstructorFlag _) : base(_) { }
    5455    protected GQAPCrossover(GQAPCrossover original, Cloner cloner) : base(original, cloner) { }
    5556    protected GQAPCrossover()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPPathRelinking.cs

    r15572 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Random;
     32using HEAL.Attic;
    3233
    3334namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    … …  
    3637  /// </summary>
    3738  [Item("GQAPPathRelinking", "Operator that performs path relinking between two solutions. It is described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
    38   [StorableClass]
     39  [StorableType("FAE65A24-AE6D-49DD-8A8C-6574D5304E08")]
    3940  public class GQAPPathRelinking : GQAPCrossover, IQualitiesAwareGQAPOperator {
    4041
    … …  
    5354
    5455    [StorableConstructor]
    55     protected GQAPPathRelinking(bool deserializing) : base(deserializing) { }
     56    protected GQAPPathRelinking(StorableConstructorFlag _) : base(_) { }
    5657    protected GQAPPathRelinking(GQAPPathRelinking original, Cloner cloner) : base(original, cloner) { }
    5758    public GQAPPathRelinking()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/MultiGQAPCrossover.cs

    r15504 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.PluginInfrastructure;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("MultiGQAPCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    36   [StorableClass]
     37  [StorableType("C8AA967E-11CF-48A0-BEC2-71A9ABEB1801")]
    3738  public class MultiGQAPCrossover : StochasticMultiBranch<IGQAPCrossover>, IGQAPCrossover, IProblemInstanceAwareGQAPOperator, IStochasticOperator {
    3839    public override bool CanChangeName {
    … …  
    5455
    5556    [StorableConstructor]
    56     protected MultiGQAPCrossover(bool deserializing) : base(deserializing) { }
     57    protected MultiGQAPCrossover(StorableConstructorFlag _) : base(_) { }
    5758    protected MultiGQAPCrossover(MultiGQAPCrossover original, Cloner cloner) : base(original, cloner) { }
    5859    public MultiGQAPCrossover()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/ApproximateLocalSearch.cs

    r15558 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Random;
     34using HEAL.Attic;
    3435
    3536namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    … …  
    3839  /// </summary>
    3940  [Item("ApproximateLocalSearch", "The approximate local search is described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
    40   [StorableClass]
     41  [StorableType("58C75FBC-C586-4048-A60B-DCF967CB2E33")]
    4142  public class ApproximateLocalSearch : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
    4243    IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IAssignmentAwareGQAPOperator, IStochasticOperator {
    … …  
    8182
    8283    [StorableConstructor]
    83     protected ApproximateLocalSearch(bool deserializing) : base(deserializing) { }
     84    protected ApproximateLocalSearch(StorableConstructorFlag _) : base(_) { }
    8485    protected ApproximateLocalSearch(ApproximateLocalSearch original, Cloner cloner) : base(original, cloner) { }
    8586    public ApproximateLocalSearch()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/OneOptLocalSearch.cs

    r15562 r16728  
    22#region License Information
    33/* HeuristicLab
    4  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Random;
     34using HEAL.Attic;
    3435
    3536namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3637  [Item("1-opt LocalSearch", "A simple exhaustive 1-change local search.")]
    37   [StorableClass]
     38  [StorableType("C574770B-AB1E-46BE-8B3F-C8C5B2AD3ACF")]
    3839  public class OneOptLocalSearch : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
    3940    IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IAssignmentAwareGQAPOperator, IStochasticOperator {
    … …  
    6970
    7071    [StorableConstructor]
    71     protected OneOptLocalSearch(bool deserializing) : base(deserializing) { }
     72    protected OneOptLocalSearch(StorableConstructorFlag _) : base(_) { }
    7273    protected OneOptLocalSearch(OneOptLocalSearch original, Cloner cloner) : base(original, cloner) { }
    7374    public OneOptLocalSearch()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/DemandEquivalentSwapEquipmentManipluator.cs

    r15504 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Random;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334
    3435  [Item("DemandEquivalentSwapEquipmentManipluator", "Swaps equipment X from location A with as much equipments from location B that the demand of X is less than or equal to the demand of the swapped equipments in B.")]
    35   [StorableClass]
     36  [StorableType("1FC9A377-D187-414D-9901-D9B26C0BF98E")]
    3637  public class DemandEquivalentSwapEquipmentManipluator : GQAPManipulator {
    3738
    3839    [StorableConstructor]
    39     protected DemandEquivalentSwapEquipmentManipluator(bool deserializing) : base(deserializing) { }
     40    protected DemandEquivalentSwapEquipmentManipluator(StorableConstructorFlag _) : base(_) { }
    4041    protected DemandEquivalentSwapEquipmentManipluator(DemandEquivalentSwapEquipmentManipluator original, Cloner cloner) : base(original, cloner) { }
    4142    public DemandEquivalentSwapEquipmentManipluator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/GQAPManipulator.cs

    r15504 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132  [Item("GQAPManipulator", "A base class for operators that manipulate assignment vectors of the GeneralizedQuadraticAssignment problems.")]
    32   [StorableClass]
     33  [StorableType("4AC3D0BB-2BAA-4910-A806-7673BE3E7FEC")]
    3334  public abstract class GQAPManipulator : SingleSuccessorOperator, IGQAPManipulator, IProblemInstanceAwareGQAPOperator, IStochasticOperator {
    3435    public override bool CanChangeName {
    … …  
    4849
    4950    [StorableConstructor]
    50     protected GQAPManipulator(bool deserializing) : base(deserializing) { }
     51    protected GQAPManipulator(StorableConstructorFlag _) : base(_) { }
    5152    protected GQAPManipulator(GQAPManipulator original, Cloner cloner) : base(original, cloner) { }
    5253    protected GQAPManipulator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.cs

    r15504 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.PluginInfrastructure;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("MultiGQAPManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    36   [StorableClass]
     37  [StorableType("CA2893AC-EECE-4F3A-A12E-81DC838ADC3C")]
    3738  public class MultiGQAPManipulator : StochasticMultiBranch<IGQAPManipulator>, IGQAPManipulator,
    3839    IProblemInstanceAwareGQAPOperator {
    … …  
    5253
    5354    [StorableConstructor]
    54     protected MultiGQAPManipulator(bool deserializing) : base(deserializing) { }
     55    protected MultiGQAPManipulator(StorableConstructorFlag _) : base(_) { }
    5556    protected MultiGQAPManipulator(MultiGQAPManipulator original, Cloner cloner) : base(original, cloner) { }
    5657    public MultiGQAPManipulator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/RelocateEquipmentManipluator.cs

    r15572 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828using HeuristicLab.Random;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132
    3233  [Item("RelocateEquipmentManipluator", "Relocates a random equipment from an overstuffed location to a random one with space or a random equipment if constraints are satisfied.")]
    33   [StorableClass]
     34  [StorableType("B696CF26-6654-4CFC-8527-752C9F16F7DD")]
    3435  public class RelocateEquipmentManipluator : GQAPManipulator {
    3536   
    3637    [StorableConstructor]
    37     protected RelocateEquipmentManipluator(bool deserializing) : base(deserializing) { }
     38    protected RelocateEquipmentManipluator(StorableConstructorFlag _) : base(_) { }
    3839    protected RelocateEquipmentManipluator(RelocateEquipmentManipluator original, Cloner cloner) : base(original, cloner) { }
    3940    public RelocateEquipmentManipluator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapEquipmentManipluator.cs

    r15504 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Encodings.IntegerVectorEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2930
    3031  [Item("SwapEquipmentManipluator", "Swaps two equipments by placing each in the location of the other.")]
    31   [StorableClass]
     32  [StorableType("FC7FD665-84A3-4BEA-A139-8248120375E0")]
    3233  public class SwapEquipmentManipluator : GQAPManipulator {
    3334
    3435    [StorableConstructor]
    35     protected SwapEquipmentManipluator(bool deserializing) : base(deserializing) { }
     36    protected SwapEquipmentManipluator(StorableConstructorFlag _) : base(_) { }
    3637    protected SwapEquipmentManipluator(SwapEquipmentManipluator original, Cloner cloner) : base(original, cloner) { }
    3738    public SwapEquipmentManipluator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapLocationManipulator.cs

    r15504 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Encodings.IntegerVectorEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3031
    3132  [Item("SwapLocationManipluator", "Swaps two locations by exchanging all equipments between the locations.")]
    32   [StorableClass]
     33  [StorableType("F0828F68-42FD-4B3E-9E55-5A7145A442AB")]
    3334  public class SwapLocationManipluator : GQAPManipulator {
    3435   
    3536    [StorableConstructor]
    36     protected SwapLocationManipluator(bool deserializing) : base(deserializing) { }
     37    protected SwapLocationManipluator(StorableConstructorFlag _) : base(_) { }
    3738    protected SwapLocationManipluator(SwapLocationManipluator original, Cloner cloner) : base(original, cloner) { }
    3839    public SwapLocationManipluator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Shakers/NMoveShakingOperator.cs

    r15506 r16728  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Operators {
    3233  [Item("NMoveShakingOperator", "Performs a number of shaking operations that increase in strength.")]
    33   [StorableClass]
     34  [StorableType("22D9F959-9BAB-497D-B593-FF19BD8CE9AB")]
    3435  public class NMoveShakingOperator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
    3536    IAssignmentAwareGQAPOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {
    … …  
    5354
    5455    [StorableConstructor]
    55     protected NMoveShakingOperator(bool deserializing) : base(deserializing) { }
     56    protected NMoveShakingOperator(StorableConstructorFlag _) : base(_) { }
    5657    protected NMoveShakingOperator(NMoveShakingOperator original, Cloner cloner) : base(original, cloner) { }
    5758    public NMoveShakingOperator() {
Note: See TracChangeset for help on using the changeset viewer.