Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/15/19 13:36:51 (6 years ago)
Author:
abeham
Message:

#2457: merged trunk into branch

Location:
branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/ExhaustiveInversionMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.PermutationEncoding {
    3131  [Item("ExhaustiveInversionMoveGenerator", "Generates all possible inversion moves (2-opt) from a given permutation.")]
    32   [StorableClass]
     32  [StorableType("7356F98C-404C-47B5-B290-EF4EE995D51C")]
    3333  public class ExhaustiveInversionMoveGenerator : InversionMoveGenerator, IExhaustiveMoveGenerator {
    3434    [StorableConstructor]
    35     protected ExhaustiveInversionMoveGenerator(bool deserializing) : base(deserializing) { }
     35    protected ExhaustiveInversionMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3636    protected ExhaustiveInversionMoveGenerator(ExhaustiveInversionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3737    public ExhaustiveInversionMoveGenerator() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMove.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    2727  [Item("InversionMove", "Item that describes an inversion move (2-opt).")]
    28   [StorableClass]
     28  [StorableType("864C1259-8419-410F-8DD1-2C2751B1AF6B")]
    2929  public class InversionMove : TwoIndexMove {
    3030    [StorableConstructor]
    31     protected InversionMove(bool deserializing) : base(deserializing) { }
     31    protected InversionMove(StorableConstructorFlag _) : base(_) { }
    3232    protected InversionMove(InversionMove original, Cloner cloner) : base(original, cloner) { }
    3333    public InversionMove() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveAbsoluteAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    2727  [Item("InversionMoveAbsoluteAttribute", "Specifies the tabu attributes for an inversion move (2-opt) on an absolute position permutation.")]
    28   [StorableClass]
     28  [StorableType("3C1B448F-5D8F-462F-9F2A-42CCDF4D596D")]
    2929  public class InversionMoveAbsoluteAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    3838
    3939    [StorableConstructor]
    40     protected InversionMoveAbsoluteAttribute(bool deserializing) : base(deserializing) { }
     40    protected InversionMoveAbsoluteAttribute(StorableConstructorFlag _) : base(_) { }
    4141    protected InversionMoveAbsoluteAttribute(InversionMoveAbsoluteAttribute original, Cloner cloner)
    4242      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.PermutationEncoding {
    3030  [Item("InversionMoveGenerator", "Base class for all inversion (2-opt) move generators.")]
    31   [StorableClass]
     31  [StorableType("FB20D0B5-4A65-4718-9A92-90C421034BCF")]
    3232  public abstract class InversionMoveGenerator : SingleSuccessorOperator, IPermutationInversionMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected InversionMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected InversionMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected InversionMoveGenerator(InversionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public InversionMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveHardTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3434
    3535If the aspiration condition is activated, a move will not be considered tabu against a move in the tabu list if it leads to a better solution than the quality recorded with the move in the tabu list.")]
    36   [StorableClass]
     36  [StorableType("E5212C75-4A9E-4F9F-920E-D76D11E72874")]
    3737  public class InversionMoveHardTabuCriterion : SingleSuccessorOperator, IPermutationInversionMoveOperator, ITabuChecker {
    3838    public override bool CanChangeName {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected InversionMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
     69    protected InversionMoveHardTabuCriterion(StorableConstructorFlag _) : base(_) { }
    7070    protected InversionMoveHardTabuCriterion(InversionMoveHardTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7171    public InversionMoveHardTabuCriterion()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.PermutationEncoding {
    3131  [Item("InversionMoveMaker", "Peforms an inversion move (2-opt) on a given permutation and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("9A0BCC19-9153-457B-A7E4-A16A51615739")]
    3333  public class InversionMoveMaker : SingleSuccessorOperator, IPermutationInversionMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected InversionMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected InversionMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected InversionMoveMaker(InversionMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public InversionMoveMaker()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveRelativeAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    2727  [Item("InversionMoveRelativeAttribute", "Specifies the tabu attributes for an inversion move (2-opt) on a relative position permutation.")]
    28   [StorableClass]
     28  [StorableType("92CFBF00-0D01-4EBA-9CED-EA1483C842F7")]
    2929  public class InversionMoveRelativeAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    3838
    3939    [StorableConstructor]
    40     protected InversionMoveRelativeAttribute(bool deserializing) : base(deserializing) { }
     40    protected InversionMoveRelativeAttribute(StorableConstructorFlag _) : base(_) { }
    4141    protected InversionMoveRelativeAttribute(InversionMoveRelativeAttribute original, Cloner cloner)
    4242      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveSoftTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3434
    3535If the aspiration condition is activated, a move will not be considered tabu against a move in the tabu list if it leads to a better solution than the quality recorded with the move in the tabu list.")]
    36   [StorableClass]
     36  [StorableType("5A5C8DDD-C22A-44CA-9261-BAFA79BB50BB")]
    3737  public class InversionMoveSoftTabuCriterion : SingleSuccessorOperator, IPermutationInversionMoveOperator, ITabuChecker {
    3838    public override bool CanChangeName {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected InversionMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
     69    protected InversionMoveSoftTabuCriterion(StorableConstructorFlag _) : base(_) { }
    7070    protected InversionMoveSoftTabuCriterion(InversionMoveSoftTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7171    public InversionMoveSoftTabuCriterion()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveTabuMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Optimization.Operators;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.PermutationEncoding {
    2929  [Item("InversionMoveTabuMaker", "Declares a given inversion move (2-opt) as tabu, by adding its attributes to the tabu list and also store the solution quality or the move quality (whichever is better).")]
    30   [StorableClass]
     30  [StorableType("81928009-A474-418B-8FD6-834FE79B43C9")]
    3131  public class InversionMoveTabuMaker : TabuMaker, IPermutationInversionMoveOperator {
    3232    public ILookupParameter<Permutation> PermutationParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected InversionMoveTabuMaker(bool deserializing) : base(deserializing) { }
     40    protected InversionMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4141    protected InversionMoveTabuMaker(InversionMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4242    public InversionMoveTabuMaker()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionMultiMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.PermutationEncoding {
    3030  [Item("StochasticInversionMultiMoveGenerator", "Randomly samples n from all possible inversion moves (2-opt) from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("7CFC07A2-6610-4716-96BE-ABC84A6DA4C6")]
    3232  public class StochasticInversionMultiMoveGenerator : InversionMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected StochasticInversionMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     46    protected StochasticInversionMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4747    protected StochasticInversionMultiMoveGenerator(StochasticInversionMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4848    public StochasticInversionMultiMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionSingleMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.PermutationEncoding {
    3030  [Item("StochasticInversionSingleMoveGenerator", "Randomly samples a single from all possible inversion moves (2-opt) from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("F7190264-4BE1-45A2-A908-E2C7869B4F1F")]
    3232  public class StochasticInversionSingleMoveGenerator : InversionMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3636
    3737    [StorableConstructor]
    38     protected StochasticInversionSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     38    protected StochasticInversionSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3939    protected StochasticInversionSingleMoveGenerator(StochasticInversionSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4040    public StochasticInversionSingleMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.