Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.QuadraticAssignment

  • stable/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    31   [StorableClass]
     31  [StorableType("8B15F5F0-4C42-4143-B7F5-2462C78BC49C")]
    3232  public class QAPEvaluator : InstrumentedOperator, IQAPEvaluator {
    3333
    … …  
    4646
    4747    [StorableConstructor]
    48     protected QAPEvaluator(bool deserializing) : base(deserializing) { }
     48    protected QAPEvaluator(StorableConstructorFlag _) : base(_) { }
    4949    protected QAPEvaluator(QAPEvaluator original, Cloner cloner) : base(original, cloner) { }
    5050    public QAPEvaluator() {

  • stable/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPInversionMoveEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPInversionMoveEvaluator", "Evaluated an inversion move on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("56ED50D5-FF78-4F9D-82B5-89F594353ADD")]
    3333  public class QAPInversionMoveEvaluator : QAPMoveEvaluator, IPermutationInversionMoveOperator {
    3434    public ILookupParameter<InversionMove> InversionMoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected QAPInversionMoveEvaluator(bool deserializing) : base(deserializing) { }
     39    protected QAPInversionMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    protected QAPInversionMoveEvaluator(QAPInversionMoveEvaluator original, Cloner cloner)
    4141      : base(original, cloner) {

  • stable/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPMoveEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    … …  
    3333  /// </summary>
    3434  [Item("QAPMoveEvaluator", "A base class for operators which evaluate moves.")]
    35   [StorableClass]
     35  [StorableType("71C3A4D8-F5BB-4539-AD28-B969D7F0D879")]
    3636  public abstract class QAPMoveEvaluator : SingleSuccessorOperator, IQAPMoveEvaluator {
    3737
    … …  
    5757
    5858    [StorableConstructor]
    59     protected QAPMoveEvaluator(bool deserializing) : base(deserializing) { }
     59    protected QAPMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    6060    protected QAPMoveEvaluator(QAPMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    6161    protected QAPMoveEvaluator()

  • stable/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPScrambleMoveEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPScrambleMoveEvaluator", "Evaluated a scramble move on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("E5D1B682-6ADA-4DEE-8546-6C5BCE1C91D0")]
    3333  public class QAPScrambleMoveEvaluator : QAPMoveEvaluator, IPermutationScrambleMoveOperator {
    3434    public ILookupParameter<ScrambleMove> ScrambleMoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected QAPScrambleMoveEvaluator(bool deserializing) : base(deserializing) { }
     39    protected QAPScrambleMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    protected QAPScrambleMoveEvaluator(QAPScrambleMoveEvaluator original, Cloner cloner)
    4141      : base(original, cloner) {

  • stable/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPSwap2MoveEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPSwap2MoveEvaluator", "Evaluated a swap-2 move on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("7BB50BA8-2690-4752-B129-91A520DB5829")]
    3333  public class QAPSwap2MoveEvaluator : QAPMoveEvaluator, IPermutationSwap2MoveOperator {
    3434    public ILookupParameter<Swap2Move> Swap2MoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected QAPSwap2MoveEvaluator(bool deserializing) : base(deserializing) { }
     39    protected QAPSwap2MoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    protected QAPSwap2MoveEvaluator(QAPSwap2MoveEvaluator original, Cloner cloner)
    4141      : base(original, cloner) {

  • stable/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPTranslocationMoveEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPTranslocationMoveEvaluator", "Evaluates translocation moves on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("0B1B33E0-7F88-485C-8E00-79FBB266CE4E")]
    3333  public class QAPTranslocationMoveEvaluator : QAPMoveEvaluator, IPermutationTranslocationMoveOperator {
    3434
    … …  
    3838
    3939    [StorableConstructor]
    40     protected QAPTranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected QAPTranslocationMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected QAPTranslocationMoveEvaluator(QAPTranslocationMoveEvaluator original, Cloner cloner)
    4242      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.