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

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMCrossover.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2727  [Item("JSMCrossover", "An operator which crosses two JSM representations.")]
    28   [StorableClass]
     28  [StorableType("09F360FC-2AA0-4C05-98E1-0BE700355C96")]
    2929  public abstract class JSMCrossover : ScheduleCrossover, IJSMOperator {
    3030
    3131    [StorableConstructor]
    32     protected JSMCrossover(bool deserializing) : base(deserializing) { }
     32    protected JSMCrossover(StorableConstructorFlag _) : base(_) { }
    3333    protected JSMCrossover(JSMCrossover original, Cloner cloner) : base(original, cloner) { }
    3434    public JSMCrossover()

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMJOXCrossover.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.Data;
    2525using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2929  [Item("JSMJobbasedOrderCrossover", "Represents a crossover operation swapping subsequences of the parents to generate offspring.")]
    30   [StorableClass]
     30  [StorableType("3D9540B9-6834-4C34-8D5D-001FBF442344")]
    3131  public class JSMJOXCrossover : JSMCrossover {
    3232
    3333    [StorableConstructor]
    34     protected JSMJOXCrossover(bool deserializing) : base(deserializing) { }
     34    protected JSMJOXCrossover(StorableConstructorFlag _) : base(_) { }
    3535    protected JSMJOXCrossover(JSMJOXCrossover original, Cloner cloner) : base(original, cloner) { }
    3636    public JSMJOXCrossover() : base() { }

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMOXCrossover.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2727  [Item("JSMOrderCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
    28   [StorableClass]
     28  [StorableType("8F353BE8-40E4-4C0E-A677-4B1F43A66A65")]
    2929  public class JSMOXCrossover : JSMCrossover {
    3030
    3131    [StorableConstructor]
    32     protected JSMOXCrossover(bool deserializing) : base(deserializing) { }
     32    protected JSMOXCrossover(StorableConstructorFlag _) : base(_) { }
    3333    protected JSMOXCrossover(JSMOXCrossover original, Cloner cloner) : base(original, cloner) { }
    3434    public JSMOXCrossover() : base() { }

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMSXXCrossover.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.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2828  [Item("JSMSubsequenceExchangeCrossover", "Represents a crossover operation identifiying and exchanging equal subsequences of the parents to generate offspring.")]
    29   [StorableClass]
     29  [StorableType("029A3890-FEB7-4D01-9092-E33CEBD8C0CC")]
    3030  public class JSMSXXCrossover : JSMCrossover {
    3131
    3232    [StorableConstructor]
    33     protected JSMSXXCrossover(bool deserializing) : base(deserializing) { }
     33    protected JSMSXXCrossover(StorableConstructorFlag _) : base(_) { }
    3434    protected JSMSXXCrossover(JSMSXXCrossover original, Cloner cloner) : base(original, cloner) { }
    3535    public JSMSXXCrossover() : base() { }

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMEncoding.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.
    … …  
    2020#endregion
    2121
    22 using System;
    2322using System.Text;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2827
    2928namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    3029  [Item("JobSequenceMatrixEncoding", "Represents an encoding for a scheduling Problem using a list of job sequences to deliver scheduleinformation.")]
    31   [StorableClass]
     30  [StorableType("8F19A51A-45F1-4C1D-BCD4-A9F57E40DDC5")]
    3231  public class JSMEncoding : Item, IScheduleEncoding {
    3332
    … …  
    3635
    3736    [StorableConstructor]
    38     protected JSMEncoding(bool deserializing) : base(deserializing) { }
     37    protected JSMEncoding(StorableConstructorFlag _) : base(_) { }
    3938    protected JSMEncoding(JSMEncoding original, Cloner cloner)
    4039      : base(original, cloner) {

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JSMRandomCreator.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    3131  [Item("JobSequenceMatrixCreator", "Creator class used to create Job Sequence Matrix solutions for standard JobShop scheduling problems.")]
    32   [StorableClass]
     32  [StorableType("F8053C69-31C2-4E05-8FA0-5AED15FAF804")]
    3333  public class JSMRandomCreator : ScheduleCreator, IStochasticOperator {
    3434
    … …  
    4444
    4545    [StorableConstructor]
    46     protected JSMRandomCreator(bool deserializing) : base(deserializing) { }
     46    protected JSMRandomCreator(StorableConstructorFlag _) : base(_) { }
    4747    protected JSMRandomCreator(JSMRandomCreator original, Cloner cloner) : base(original, cloner) { }
    4848    public JSMRandomCreator()

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMManipulator.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.ScheduleEncoding.JobSequenceMatrix {
    2828  [Item("JSMManipulator", "An operator which manipulates a JSM representation.")]
    29   [StorableClass]
     29  [StorableType("E190A576-B835-4343-9F0C-096E970B8DDD")]
    3030  public abstract class JSMManipulator : ScheduleManipulator, IJSMOperator {
    3131    [StorableConstructor]
    32     protected JSMManipulator(bool deserializing) : base(deserializing) { }
     32    protected JSMManipulator(StorableConstructorFlag _) : base(_) { }
    3333    protected JSMManipulator(JSMManipulator original, Cloner cloner) : base(original, cloner) { }
    3434    public JSMManipulator()

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMShiftChangeManipulator.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.Core;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    3131  [Item("JSMShiftChangeManipulator", "Represents a manipulation operation where the operations of a randomly determined job are shifted in one direction for all resources.")]
    32   [StorableClass]
     32  [StorableType("69212E02-2006-493D-92C0-0EF4EFDAAF8A")]
    3333  public class JSMShiftChangeManipulator : JSMManipulator {
    3434
    3535    [StorableConstructor]
    36     protected JSMShiftChangeManipulator(bool deserializing) : base(deserializing) { }
     36    protected JSMShiftChangeManipulator(StorableConstructorFlag _) : base(_) { }
    3737    protected JSMShiftChangeManipulator(JSMShiftChangeManipulator original, Cloner cloner) : base(original, cloner) { }
    3838    public JSMShiftChangeManipulator() : base() { }

  • stable/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMSwapManipulator.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.Core;
    2525using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2929  [Item("JSMSwapManipulator", "Represents a manipulation operation swapping parts of the individual.")]
    30   [StorableClass]
     30  [StorableType("7BB1535F-C886-40A3-9F7C-4A54CED90A6E")]
    3131  public class JSMSwapManipulator : JSMManipulator {
    3232
    3333    [StorableConstructor]
    34     protected JSMSwapManipulator(bool deserializing) : base(deserializing) { }
     34    protected JSMSwapManipulator(StorableConstructorFlag _) : base(_) { }
    3535    protected JSMSwapManipulator(JSMSwapManipulator original, Cloner cloner) : base(original, cloner) { }
    3636    public JSMSwapManipulator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.