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:
7 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Crossovers/GreedyPartitionCrossover.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.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Random;
    2929
    3030namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3131  [Item("Greedy Partition Crossover", "The Greedy Partition Crossover (GPX) is implemented as described in Ülker, Ö., Özcan, E., Korkmaz, E. E. 2007. Linear linkage encoding in grouping problems: applications on graph coloring and timetabling. In Practice and Theory of Automated Timetabling VI, pp. 347-363. Springer Berlin Heidelberg.")]
    32   [StorableClass]
     32  [StorableType("C0CDC693-4513-404A-9CE9-598C6DC2E319")]
    3333  public sealed class GreedyPartitionCrossover : LinearLinkageCrossover {
    3434
    3535    [StorableConstructor]
    36     private GreedyPartitionCrossover(bool deserializing) : base(deserializing) { }
     36    private GreedyPartitionCrossover(StorableConstructorFlag _) : base(_) { }
    3737    private GreedyPartitionCrossover(GreedyPartitionCrossover original, Cloner cloner) : base(original, cloner) { }
    3838    public GreedyPartitionCrossover() { }

  • stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Crossovers/GroupCrossover.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.
    … …  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2726
    2827namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2928  [Item("Group Crossover", "The Group Crossover is implemented as described in Korkmaz, E.E. 2010. Multi-objective Genetic Algorithms for grouping problems. Applied Intelligence 33(2), pp. 179-192.")]
    30   [StorableClass]
     29  [StorableType("E3B2FBDD-C923-4FE2-85C8-B2202EEF367F")]
    3130  public sealed class GroupCrossover : LinearLinkageCrossover {
    3231
    3332    [StorableConstructor]
    34     private GroupCrossover(bool deserializing) : base(deserializing) { }
     33    private GroupCrossover(StorableConstructorFlag _) : base(_) { }
    3534    private GroupCrossover(GroupCrossover original, Cloner cloner) : base(original, cloner) { }
    3635    public GroupCrossover() { }

  • stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Crossovers/LowestIndexFirstCrossover.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.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2929  [Item("Lowest Index First Crossover", "The Lowest Index First Crossover (LIFX) is implemented as described in Ülker, Ö., Özcan, E., Korkmaz, E. E. 2007. Linear linkage encoding in grouping problems: applications on graph coloring and timetabling. In Practice and Theory of Automated Timetabling VI, pp. 347-363. Springer Berlin Heidelberg.")]
    30   [StorableClass]
     30  [StorableType("1DFB1827-AFE6-4210-A542-F9EA112FF039")]
    3131  public sealed class LowestIndexFirstCrossover : LinearLinkageCrossover {
    3232
    3333    [StorableConstructor]
    34     private LowestIndexFirstCrossover(bool deserializing) : base(deserializing) { }
     34    private LowestIndexFirstCrossover(StorableConstructorFlag _) : base(_) { }
    3535    private LowestIndexFirstCrossover(LowestIndexFirstCrossover original, Cloner cloner) : base(original, cloner) { }
    3636    public LowestIndexFirstCrossover() { }

  • stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Crossovers/LowestIndexMaxCrossover.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.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Random;
    2929
    3030namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3131  [Item("Lowest Index Max Crossover", "The Lowest Index Max Crossover (LIMX) is implemented as described in Ülker, Ö., Özcan, E., Korkmaz, E. E. 2007. Linear linkage encoding in grouping problems: applications on graph coloring and timetabling. In Practice and Theory of Automated Timetabling VI, pp. 347-363. Springer Berlin Heidelberg.")]
    32   [StorableClass]
     32  [StorableType("CDD94469-9B80-4FBB-AC40-DADE1A9462F1")]
    3333  public sealed class LowestIndexMaxCrossover : LinearLinkageCrossover {
    3434
    3535    [StorableConstructor]
    36     private LowestIndexMaxCrossover(bool deserializing) : base(deserializing) { }
     36    private LowestIndexMaxCrossover(StorableConstructorFlag _) : base(_) { }
    3737    private LowestIndexMaxCrossover(LowestIndexMaxCrossover original, Cloner cloner) : base(original, cloner) { }
    3838    public LowestIndexMaxCrossover() { }

  • stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Crossovers/MultiLLECrossover.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.
    … …  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Reflection;
    2625using HeuristicLab.Collections;
    2726using HeuristicLab.Common;
    … …  
    3029using HeuristicLab.Optimization;
    3130using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3332using HeuristicLab.PluginInfrastructure;
    3433
    3534namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3635  [Item("Multi LLE Crossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    37   [StorableClass]
     36  [StorableType("276A73EA-3642-4B8F-9CD4-74C1B2772728")]
    3837  public class MultiLinearLinkageCrossover : StochasticMultiBranch<ILinearLinkageCrossover>, ILinearLinkageCrossover, IStochasticOperator {
    3938    public override bool CanChangeName {
    … …  
    5352
    5453    [StorableConstructor]
    55     protected MultiLinearLinkageCrossover(bool deserializing) : base(deserializing) { }
     54    protected MultiLinearLinkageCrossover(StorableConstructorFlag _) : base(_) { }
    5655    protected MultiLinearLinkageCrossover(MultiLinearLinkageCrossover original, Cloner cloner) : base(original, cloner) { }
    5756    public MultiLinearLinkageCrossover()

  • stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Crossovers/SinglePointCrossover.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.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2828  [Item("Single Point Crossover", "The single point crossover concatenates two linkage strings at a randomly chosen point.")]
    29   [StorableClass]
     29  [StorableType("1F1A83F4-659C-4A88-9A0C-4507257A3741")]
    3030  public sealed class SinglePointCrossover : LinearLinkageCrossover {
    3131
    3232    [StorableConstructor]
    33     private SinglePointCrossover(bool deserializing) : base(deserializing) { }
     33    private SinglePointCrossover(StorableConstructorFlag _) : base(_) { }
    3434    private SinglePointCrossover(SinglePointCrossover original, Cloner cloner) : base(original, cloner) { }
    3535    public SinglePointCrossover() { }
Note: See TracChangeset for help on using the changeset viewer.