Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR.cs

    r15583 r16565  
    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.Encodings.RealVectorEncoding;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    27   [StorableClass]
     27  [StorableType("3DBC1750-FDEA-454C-AF65-EA4337CEE823")]
    2828  public abstract class IHR : MultiObjectiveTestFunction {
    2929    protected override double[,] GetBounds(int objectives) {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected IHR(bool deserializing) : base(deserializing) { }
     46    protected IHR(StorableConstructorFlag _) : base(_) { }
    4747    protected IHR(IHR original, Cloner cloner) : base(original, cloner) { }
    4848    public IHR() : base(minimumObjectives: 2, maximumObjectives: 2, minimumSolutionLength: 2, maximumSolutionLength: int.MaxValue) { }

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR1.cs

    r15583 r16565  
    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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("IHR1", "Testfunction as defined as IHR1 in \"Igel, C., Hansen, N., & Roth, S. (2007). Covariance matrix adaptation for multi-objective optimization. Evolutionary computation, 15(1), 1-28.\" [24.06.16]")]
    30   [StorableClass]
     30  [StorableType("16DF9415-9D12-4FB9-A985-7EEAE05A24CA")]
    3131  public class IHR1 : IHR {
    3232    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected IHR1(bool deserializing) : base(deserializing) { }
     47    protected IHR1(StorableConstructorFlag _) : base(_) { }
    4848    protected IHR1(IHR1 original, Cloner cloner) : base(original, cloner) { }
    4949    public IHR1() : base() {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR2.cs

    r15583 r16565  
    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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("IHR2", "Testfunction as defined as IHR2 in \"Igel, C., Hansen, N., & Roth, S. (2007). Covariance matrix adaptation for multi-objective optimization. Evolutionary computation, 15(1), 1-28.\" [24.06.16]")]
    30   [StorableClass]
     30  [StorableType("3E06E73F-61CD-4B99-99A8-84E6E9C0EFC9")]
    3131  public class IHR2 : IHR {
    3232    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected IHR2(bool deserializing) : base(deserializing) { }
     48    protected IHR2(StorableConstructorFlag _) : base(_) { }
    4949    protected IHR2(IHR2 original, Cloner cloner) : base(original, cloner) { }
    5050    public IHR2() : base() {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR3.cs

    r15583 r16565  
    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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("IHR3", "Testfunction as defined as IHR3 in \"Igel, C., Hansen, N., & Roth, S. (2007). Covariance matrix adaptation for multi-objective optimization. Evolutionary computation, 15(1), 1-28.\" [24.06.16]")]
    30   [StorableClass]
     30  [StorableType("316D5351-762D-4883-ACEF-06F4EAFA73AE")]
    3131  public class IHR3 : IHR {
    3232    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected IHR3(bool deserializing) : base(deserializing) { }
     48    protected IHR3(StorableConstructorFlag _) : base(_) { }
    4949    protected IHR3(IHR3 original, Cloner cloner) : base(original, cloner) { }
    5050    public IHR3() : base() {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR4.cs

    r15583 r16565  
    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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("IHR4", "Testfunction as defined as IHR4 in \"Igel, C., Hansen, N., & Roth, S. (2007). Covariance matrix adaptation for multi-objective optimization. Evolutionary computation, 15(1), 1-28.\" [24.06.16]")]
    30   [StorableClass]
     30  [StorableType("E83A9E6E-F7B3-4B27-B5CA-A323D89844F5")]
    3131  public class IHR4 : IHR {
    3232    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected IHR4(bool deserializing) : base(deserializing) { }
     51    protected IHR4(StorableConstructorFlag _) : base(_) { }
    5252    protected IHR4(IHR4 original, Cloner cloner) : base(original, cloner) { }
    5353    public IHR4() : base() {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR6.cs

    r15583 r16565  
    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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("IHR6", "Testfunction as defined as IHR6 in \"Igel, C., Hansen, N., & Roth, S. (2007). Covariance matrix adaptation for multi-objective optimization. Evolutionary computation, 15(1), 1-28.\" [24.06.16]")]
    30   [StorableClass]
     30  [StorableType("5C0A4163-831B-4507-997F-A70B59E3A445")]
    3131  public class IHR6 : IHR {
    3232    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected IHR6(bool deserializing) : base(deserializing) { }
     47    protected IHR6(StorableConstructorFlag _) : base(_) { }
    4848    protected IHR6(IHR6 original, Cloner cloner) : base(original, cloner) { }
    4949    public IHR6() : base() {
Note: See TracChangeset for help on using the changeset viewer.