Free cookie consent management tool by TermsFeed Policy Generator

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

#2457: merged trunk into branch

Location:
branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/EMSSMove.cs

    r15079 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.LinearLinkageEncoding {
    2727  [Item("EMSSMove", "Base class for shift, split, merge, and extract moves.")]
    28   [StorableClass]
     28  [StorableType("CE20CA9A-A191-4DA5-9F42-DAE9B79640E1")]
    2929  public abstract class EMSSMove : Item {
    3030    [Storable]
    … …  
    3333
    3434    [StorableConstructor]
    35     protected EMSSMove(bool deserializing) : base(deserializing) { }
     35    protected EMSSMove(StorableConstructorFlag _) : base(_) { }
    3636    protected EMSSMove(EMSSMove original, Cloner cloner)
    3737      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/EMSSMoveGenerator.cs

    r15079 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.LinearLinkageEncoding {
    3030  [Item("EMSSMoveGenerator", "Base class for all EMSS move generators (extract, merge, shift, and split).")]
    31   [StorableClass]
     31  [StorableType("471A0A7B-30DD-4B29-97EE-9B3F7FAED582")]
    3232  public abstract class EMSSMoveGenerator : SingleSuccessorOperator, ILinearLinkageEMSSMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected EMSSMoveGenerator(bool deserializing) : base(deserializing) { }
     44    protected EMSSMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4545    protected EMSSMoveGenerator(EMSSMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4646    public EMSSMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/EMSSMoveMaker.cs

    r15079 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 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.LinearLinkageEncoding {
    3131  [Item("EMSSMoveMaker", "Applies an EMSS move to the lle grouping (extract, merge, shift, and split.")]
    32   [StorableClass]
     32  [StorableType("B252F8AE-AEEA-4A21-8882-04739D4D2202")]
    3333  public class EMSSMoveMaker : SingleSuccessorOperator, ILinearLinkageEMSSMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected EMSSMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected EMSSMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected EMSSMoveMaker(EMSSMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public EMSSMoveMaker()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/ExhaustiveEMSSMoveGenerator.cs

    r15079 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.LinearLinkageEncoding {
    3131  [Item("ExhaustiveEMSSMoveGenerator", "Generates all possible extract, merge, shift, and split (EMSS) moves from a given LLE solution.")]
    32   [StorableClass]
     32  [StorableType("E5E81516-ADD2-474D-A93F-00580D485F07")]
    3333  public class ExhaustiveEMSSMoveGenerator : EMSSMoveGenerator, IExhaustiveMoveGenerator {
    3434    [StorableConstructor]
    35     protected ExhaustiveEMSSMoveGenerator(bool deserializing) : base(deserializing) { }
     35    protected ExhaustiveEMSSMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3636    protected ExhaustiveEMSSMoveGenerator(ExhaustiveEMSSMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3737    public ExhaustiveEMSSMoveGenerator() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/ExtractMove.cs

    r15079 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.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2828  [Item("Extract Move", "Extracts an item into a group of its own.")]
    29   [StorableClass]
     29  [StorableType("D42CB819-F307-4081-9227-7F6786E6853B")]
    3030  public sealed class ExtractMove : EMSSMove {
    3131    [Storable]
    … …  
    4141
    4242    [StorableConstructor]
    43     private ExtractMove(bool deserializing) : base(deserializing) { }
     43    private ExtractMove(StorableConstructorFlag _) : base(_) { }
    4444    private ExtractMove(ExtractMove original, Cloner cloner)
    4545      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/MergeMove.cs

    r15079 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.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2828  [Item("Merge Move", "Merges two groups together.")]
    29   [StorableClass]
     29  [StorableType("4AC9ADD2-3825-4CFE-8074-6F3CA7251700")]
    3030  public sealed class MergeMove : EMSSMove {
    3131    [Storable]
    … …  
    3434   
    3535    [StorableConstructor]
    36     private MergeMove(bool deserializing) : base(deserializing) { }
     36    private MergeMove(StorableConstructorFlag _) : base(_) { }
    3737    private MergeMove(MergeMove original, Cloner cloner)
    3838      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/ShiftMove.cs

    r15079 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.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2828  [Item("Shift Move", "Shifts an item from one group to another.")]
    29   [StorableClass]
     29  [StorableType("577C4FAF-A02C-4896-8EEB-54360989A4B3")]
    3030  public sealed class ShiftMove : EMSSMove {
    3131    [Storable]
    … …  
    4747
    4848    [StorableConstructor]
    49     private ShiftMove(bool deserializing) : base(deserializing) { }
     49    private ShiftMove(StorableConstructorFlag _) : base(_) { }
    5050    private ShiftMove(ShiftMove original, Cloner cloner)
    5151      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/SplitMove.cs

    r15079 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.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2828  [Item("Split Move", "Splits a group into two groups.")]
    29   [StorableClass]
     29  [StorableType("98EB5FF6-A384-482B-B700-7EB012639E64")]
    3030  public sealed class SplitMove : EMSSMove {
    3131    [Storable]
    … …  
    3333
    3434    [StorableConstructor]
    35     private SplitMove(bool deserializing) : base(deserializing) { }
     35    private SplitMove(StorableConstructorFlag _) : base(_) { }
    3636    private SplitMove(SplitMove original, Cloner cloner)
    3737      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/StochasticEMSSMultiMoveGenerator.cs

    r15079 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;
    3030using HeuristicLab.Random;
    3131
    3232namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3333  [Item("StochasticEMSSMultiMoveGenerator", "Randomly samples n from all possible EMSS moves (extract, merge, shift, and split) from a given lle grouping.")]
    34   [StorableClass]
     34  [StorableType("AE38F823-B840-4AFB-A780-259CB6C95D23")]
    3535  public class StochasticEMSSMultiMoveGenerator : EMSSMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3636    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected StochasticEMSSMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     49    protected StochasticEMSSMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5050    protected StochasticEMSSMultiMoveGenerator(StochasticEMSSMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5151    public StochasticEMSSMultiMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/EMSS/StochasticEMSSSingleMoveGenerator.cs

    r15079 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;
    2929using HeuristicLab.Random;
    3030
    3131namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3232  [Item("StochasticEMSSSingleMoveGenerator", "Randomly samples a single from all possible EMSS moves (extract, merge, shift, and split) from a given lle grouping.")]
    33   [StorableClass]
     33  [StorableType("345211F0-E998-4C0E-B466-C2FC24D278E4")]
    3434  public class StochasticEMSSSingleMoveGenerator : EMSSMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected StochasticEMSSSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     40    protected StochasticEMSSSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4141    protected StochasticEMSSSingleMoveGenerator(StochasticEMSSSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4242    public StochasticEMSSSingleMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.