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.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT.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.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    28   [StorableClass]
     28  [StorableType("A8192C08-A1DA-479A-9381-9B634761B521")]
    2929  public abstract class ZDT : MultiObjectiveTestFunction {
    3030    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
     
    4949
    5050    [StorableConstructor]
    51     protected ZDT(bool deserializing) : base(deserializing) { }
     51    protected ZDT(StorableConstructorFlag _) : base(_) { }
    5252    protected ZDT(MultiObjectiveTestFunction original, Cloner cloner)
    5353      : base(original, cloner) {
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT1.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.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2828  [Item("ZDT1", "ZDT1 function as defined in http://www.tik.ee.ethz.ch/sop/download/supplementary/testproblems/ [30.11.2015]")]
    29   [StorableClass]
     29  [StorableType("5F62D1CB-4EC5-4C89-B168-25DF1F549CCA")]
    3030  public class ZDT1 : ZDT {
    3131    protected override double GetBestKnownHypervolume(int objectives) {
     
    3434
    3535    [StorableConstructor]
    36     protected ZDT1(bool deserializing) : base(deserializing) { }
     36    protected ZDT1(StorableConstructorFlag _) : base(_) { }
    3737    protected ZDT1(ZDT1 original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT2.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.Core;
    2323using HeuristicLab.Encodings.RealVectorEncoding;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2727  [Item("ZDT2", "ZDT2 function as defined in http://www.tik.ee.ethz.ch/sop/download/supplementary/testproblems/ [30.11.2015]")]
    28   [StorableClass]
     28  [StorableType("82C93549-F1D6-4034-96B1-A3AC1E213127")]
    2929  public class ZDT2 : ZDT {
    3030    protected override double GetBestKnownHypervolume(int objectives) {
     
    3333
    3434    [StorableConstructor]
    35     protected ZDT2(bool deserializing) : base(deserializing) { }
     35    protected ZDT2(StorableConstructorFlag _) : base(_) { }
    3636    protected ZDT2(ZDT2 original, Cloner cloner) : base(original, cloner) { }
    3737    public override IDeepCloneable Clone(Cloner cloner) {
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT3.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.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2828  [Item("ZDT3", "ZDT3 function as defined in http://www.tik.ee.ethz.ch/sop/download/supplementary/testproblems/ [30.11.2015]")]
    29   [StorableClass]
     29  [StorableType("89C250F4-DC30-4852-AE6E-E3936569A2BA")]
    3030  public class ZDT3 : ZDT {
    3131    protected override double GetBestKnownHypervolume(int objectives) {
     
    3434
    3535    [StorableConstructor]
    36     protected ZDT3(bool deserializing) : base(deserializing) { }
     36    protected ZDT3(StorableConstructorFlag _) : base(_) { }
    3737    protected ZDT3(ZDT3 original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT4.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.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2828  [Item("ZDT4", "ZDT4 function as defined in http://www.tik.ee.ethz.ch/sop/download/supplementary/testproblems/ [30.11.2015]")]
    29   [StorableClass]
     29  [StorableType("489FC6F2-A461-4A0A-A5D2-145598A43283")]
    3030  public class ZDT4 : ZDT {
    3131    protected override double[,] GetBounds(int objectives) {
     
    4444
    4545    [StorableConstructor]
    46     protected ZDT4(bool deserializing) : base(deserializing) { }
     46    protected ZDT4(StorableConstructorFlag _) : base(_) { }
    4747    protected ZDT4(ZDT4 original, Cloner cloner) : base(original, cloner) { }
    4848    public override IDeepCloneable Clone(Cloner cloner) {
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT6.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.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2828  [Item("ZDT6", "ZDT6 function as defined in http://www.tik.ee.ethz.ch/sop/download/supplementary/testproblems/ [30.11.2015]")]
    29   [StorableClass]
     29  [StorableType("7F442B29-9A07-487E-BAAB-CBE2D683E421")]
    3030  public class ZDT6 : ZDT {
    3131    protected override double GetBestKnownHypervolume(int objectives) {
     
    3434
    3535    [StorableConstructor]
    36     protected ZDT6(bool deserializing) : base(deserializing) { }
     36    protected ZDT6(StorableConstructorFlag _) : base(_) { }
    3737    protected ZDT6(ZDT6 original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.