Free cookie consent management tool by TermsFeed Policy Generator

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

#1614: updated to new persistence and .NET 4.6.1

Location:
branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/ExhaustiveOneMoveGenerator.cs

    r15562 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("Exhaustive 1-Move MoveGenerator", "Exhaustively generates all possible 1-moves.")]
    34   [StorableClass]
     35  [StorableType("A200C3BE-D761-4F82-9CA9-44A7BB2AB0DD")]
    3536  public class ExhaustiveOneMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, IExhaustiveMoveGenerator {
    3637   
    … …  
    4041
    4142    [StorableConstructor]
    42     protected ExhaustiveOneMoveGenerator(bool deserializing) : base(deserializing) { }
     43    protected ExhaustiveOneMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4344    protected ExhaustiveOneMoveGenerator(ExhaustiveOneMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4445    public ExhaustiveOneMoveGenerator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPMoveGenerator.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("GQAPMoveGenerator", "Base class for move generators for the Generalized Quadratic Assignment Problem.")]
    32   [StorableClass]
     33  [StorableType("4CB9C31B-4ACA-4ED6-8C7E-756319EFB8FF")]
    3334  public abstract class GQAPMoveGenerator : SingleSuccessorOperator, IMoveGenerator, IGQAPMoveOperator,
    3435    IProblemInstanceAwareGQAPOperator {
    … …  
    4445
    4546    [StorableConstructor]
    46     protected GQAPMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected GQAPMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4748    protected GQAPMoveGenerator(GQAPMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4849    public GQAPMoveGenerator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPNMoveGenerator.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.
    … …  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3233  [Item("N-Move Generator", "Base class for move operators that generate N-Move moves.")]
    33   [StorableClass]
     34  [StorableType("AC6F4053-7EEF-4125-A6F7-C93A3DC7001A")]
    3435  public abstract class GQAPNMoveGenerator : GQAPMoveGenerator, IGQAPNMoveOperator {
    3536
    … …  
    4647
    4748    [StorableConstructor]
    48     protected GQAPNMoveGenerator(bool deserializing) : base(deserializing) { }
     49    protected GQAPNMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4950    protected GQAPNMoveGenerator(GQAPNMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5051    public GQAPNMoveGenerator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMove.cs

    r15511 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.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2930  [Item("N-Move", "An N-Move describes the relocation of n equipments to n different locations.")]
    30   [StorableClass]
     31  [StorableType("A3E69FD9-B578-486C-81CE-D1CB65A250CE")]
    3132  public class NMove : Item {
    3233    [Storable]
    … …  
    5657
    5758    [StorableConstructor]
    58     protected NMove(bool deserializing) : base(deserializing) { }
     59    protected NMove(StorableConstructorFlag _) : base(_) { }
    5960    protected NMove(NMove original, Cloner cloner)
    6061      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveAbsoluteAttribute.cs

    r15511 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  [Item("N-Move Absolute TabuAttribute", "Attribute to determine whether a certain move is tabu.")]
    31   [StorableClass]
     32  [StorableType("39C4AE8F-9FEB-447A-878B-38796B7E8AAF")]
    3233  public class NMoveAbsoluteTabuAttribute : Item {
    3334
    … …  
    3839
    3940    [StorableConstructor]
    40     protected NMoveAbsoluteTabuAttribute(bool deserializing) : base(deserializing) { }
     41    protected NMoveAbsoluteTabuAttribute(StorableConstructorFlag _) : base(_) { }
    4142    protected NMoveAbsoluteTabuAttribute(NMoveAbsoluteTabuAttribute original, Cloner cloner) : base(original, cloner) { }
    4243    public NMoveAbsoluteTabuAttribute(NMove move, IntegerVector assignment, double moveQuality)

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveMaker.cs

    r15511 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 {
    3233  [Item("N-Move Maker", "Performs an N-Move.")]
    33   [StorableClass]
     34  [StorableType("9DAB4C4D-533A-4990-B591-A4C877F0CCE9")]
    3435  public class NMoveMaker : SingleSuccessorOperator, IQualityAwareGQAPOperator, IMoveQualityAwareGQAPOperator, IGQAPNMoveOperator, IMoveMaker {
    3536
    … …  
    5455
    5556    [StorableConstructor]
    56     protected NMoveMaker(bool deserializing) : base(deserializing) { }
     57    protected NMoveMaker(StorableConstructorFlag _) : base(_) { }
    5758    protected NMoveMaker(NMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5859    public NMoveMaker()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuChecker.cs

    r15511 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.Moves {
    3233  [Item("N-Move TabuChecker", "Checks if a certain N-Move is tabu.")]
    33   [StorableClass]
     34  [StorableType("8E122154-5BCE-404A-8AD4-6C30912B3E89")]
    3435  public class NMoveTabuChecker : SingleSuccessorOperator, ITabuChecker,
    3536    IGQAPNMoveOperator, IMoveQualityAwareGQAPOperator {
    … …  
    6869
    6970    [StorableConstructor]
    70     protected NMoveTabuChecker(bool deserializing) : base(deserializing) { }
     71    protected NMoveTabuChecker(StorableConstructorFlag _) : base(_) { }
    7172    protected NMoveTabuChecker(NMoveTabuChecker original, Cloner cloner) : base(original, cloner) { }
    7273    public NMoveTabuChecker()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuMaker.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.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Moves {
    3031  [Item("N-Move TabuMaker", "Declares an N-Move tabu.")]
    31   [StorableClass]
     32  [StorableType("BE81C264-2DD8-4A2C-8796-D0D1E121FF53")]
    3233  public class NMoveTabuMaker : TabuMaker, IGQAPNMoveOperator, IMoveQualityAwareGQAPOperator {
    3334
    … …  
    4344
    4445    [StorableConstructor]
    45     protected NMoveTabuMaker(bool deserializing) : base(deserializing) { }
     46    protected NMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4647    protected NMoveTabuMaker(NMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4748    public NMoveTabuMaker()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveMultiMoveGenerator.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.
    … …  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3233  [Item("Stochastic N-Move MultiMoveGenerator", "Randomly samples a number of N-Moves.")]
    33   [StorableClass]
     34  [StorableType("EEE53E16-0FB6-4041-A9AC-ECDA5E73A505")]
    3435  public class StochasticNMoveMultiMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, IMultiMoveGenerator {
    3536   
    … …  
    4243
    4344    [StorableConstructor]
    44     protected StochasticNMoveMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected StochasticNMoveMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4546    protected StochasticNMoveMultiMoveGenerator(StochasticNMoveMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4647    public StochasticNMoveMultiMoveGenerator()

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.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.
    … …  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.Random;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("Stochastic N-Move SingleMoveGenerator", "Randomly samples a single N-Move.")]
    36   [StorableClass]
     37  [StorableType("7CC8D0D6-C865-485F-A16A-C2ED764C6AC4")]
    3738  public class StochasticNMoveSingleMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3839   
    … …  
    4243
    4344    [StorableConstructor]
    44     protected StochasticNMoveSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected StochasticNMoveSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4546    protected StochasticNMoveSingleMoveGenerator(StochasticNMoveSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4647    public StochasticNMoveSingleMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.