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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ.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.
    … …  
    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("3ED6C22E-EA6E-4336-BC49-884CE151E514")]
    2929  public abstract class DTLZ : MultiObjectiveTestFunction {
    3030    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    … …  
    5050
    5151    [StorableConstructor]
    52     protected DTLZ(bool deserializing) : base(deserializing) { }
     52    protected DTLZ(StorableConstructorFlag _) : base(_) { }
    5353    protected DTLZ(DTLZ original, Cloner cloner) : base(original, cloner) { }
    5454    public DTLZ() : base(minimumObjectives: 2, maximumObjectives: int.MaxValue, minimumSolutionLength: 2, maximumSolutionLength: int.MaxValue) { }

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ1.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.
    … …  
    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("DTLZ1", "Testfunction as defined as DTLZ1 in http://repository.ias.ac.in/81671/ [30.11.15]")]
    29   [StorableClass]
     29  [StorableType("1DBE5FE4-049B-4BAD-AE2B-4951D0D3D616")]
    3030  public class DTLZ1 : DTLZ {
    3131    protected override double GetBestKnownHypervolume(int objectives) {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected DTLZ1(bool deserializing) : base(deserializing) { }
     37    protected DTLZ1(StorableConstructorFlag _) : base(_) { }
    3838    protected DTLZ1(DTLZ1 original, Cloner cloner) : base(original, cloner) { }
    3939    public DTLZ1() : base() {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ2.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.
    … …  
    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("DTLZ2", "Testfunction as defined as DTLZ2 in http://repository.ias.ac.in/81671/ [30.11.15]")]
    29   [StorableClass]
     29  [StorableType("C5BB2CA1-DB97-4D2E-BDB2-C9F2572D45DF")]
    3030  public class DTLZ2 : DTLZ {
    3131    protected override double GetBestKnownHypervolume(int objectives) {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected DTLZ2(bool deserializing) : base(deserializing) { }
     37    protected DTLZ2(StorableConstructorFlag _) : base(_) { }
    3838    protected DTLZ2(DTLZ2 original, Cloner cloner) : base(original, cloner) { }
    3939    public DTLZ2() : base() { }

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ3.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.
    … …  
    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("DTLZ3", "Testfunction as defined as DTLZ3 in http://repository.ias.ac.in/81671/ [30.11.15]")]
    29   [StorableClass]
     29  [StorableType("0B225A81-61B0-4716-8373-33CE07A58920")]
    3030  public class DTLZ3 : DTLZ {
    3131    protected override double GetBestKnownHypervolume(int objectives) {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected DTLZ3(bool deserializing) : base(deserializing) { }
     37    protected DTLZ3(StorableConstructorFlag _) : base(_) { }
    3838    protected DTLZ3(DTLZ3 original, Cloner cloner) : base(original, cloner) { }
    3939    public DTLZ3() : base() { }

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ4.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.
    … …  
    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("DTLZ4", "Testfunction as defined as DTLZ4 in http://repository.ias.ac.in/81671/ [30.11.15]")]
    29   [StorableClass]
     29  [StorableType("2222AE43-E24A-4D30-93F3-496A1FE79B29")]
    3030  public class DTLZ4 : DTLZ {
    3131    protected override double GetBestKnownHypervolume(int objectives) {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected DTLZ4(bool deserializing) : base(deserializing) { }
     37    protected DTLZ4(StorableConstructorFlag _) : base(_) { }
    3838    protected DTLZ4(DTLZ4 original, Cloner cloner) : base(original, cloner) { }
    3939    public DTLZ4() : base() { }

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ5.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.
    … …  
    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("DTLZ5", "Testfunction as defined as DTLZ5 in http://repository.ias.ac.in/81671/ [30.11.15]")]
    29   [StorableClass]
     29  [StorableType("CEFD068E-521B-459F-80F1-B2AE4D114D41")]
    3030  public class DTLZ5 : DTLZ {
    3131
    3232    [StorableConstructor]
    33     protected DTLZ5(bool deserializing) : base(deserializing) { }
     33    protected DTLZ5(StorableConstructorFlag _) : base(_) { }
    3434    protected DTLZ5(DTLZ5 original, Cloner cloner) : base(original, cloner) { }
    3535    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ6.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.
    … …  
    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("DTLZ6", "Testfunction as defined as DTLZ5 in http://repository.ias.ac.in/81671/ [30.11.15]")]
    29   [StorableClass]
     29  [StorableType("5C92E344-A85F-4FAE-B7C3-2D188D60B049")]
    3030  public class DTLZ6 : DTLZ {
    3131
    3232    [StorableConstructor]
    33     protected DTLZ6(bool deserializing) : base(deserializing) { }
     33    protected DTLZ6(StorableConstructorFlag _) : base(_) { }
    3434    protected DTLZ6(DTLZ6 original, Cloner cloner) : base(original, cloner) { }
    3535    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ7.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("DTLZ7", "Testfunction as defined as DTLZ6 in http://repository.ias.ac.in/81671/ [30.11.15] NOTE: The website http://people.ee.ethz.ch/~sop/download/supplementary/testproblems/dtlz7/index.php [16.12.2015] lables this function as DTLZ7")]
    30   [StorableClass]
     30  [StorableType("D98AAC02-652E-4ED4-9365-5589E970CFBD")]
    3131  public class DTLZ7 : DTLZ {
    3232    protected override double GetBestKnownHypervolume(int objectives) {
    … …  
    3636
    3737    [StorableConstructor]
    38     protected DTLZ7(bool deserializing) : base(deserializing) { }
     38    protected DTLZ7(StorableConstructorFlag _) : base(_) { }
    3939    protected DTLZ7(DTLZ7 original, Cloner cloner) : base(original, cloner) { }
    4040    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ8.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.
    … …  
    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("DTLZ8", "Testfunction as defined as DTLZ7 in http://repository.ias.ac.in/81671/ [30.11.15]. There has been a renumbering therefore the numbers do not match")]
    29   [StorableClass]
     29  [StorableType("067D6CD2-0416-4FB3-AA21-B561776762A4")]
    3030  public class DTLZ8 : DTLZ, IConstrainedTestFunction {
    3131    public static double[] IllegalValue(int size, bool[] maximization) {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected DTLZ8(bool deserializing) : base(deserializing) { }
     40    protected DTLZ8(StorableConstructorFlag _) : base(_) { }
    4141    protected DTLZ8(DTLZ8 original, Cloner cloner) : base(original, cloner) { }
    4242    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.