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/Misc/CIGTAB.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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("CIGTAB", "to be aded")]
    30   [StorableClass]
     30  [StorableType("1D78E29D-4697-44A1-8A53-3909E3B7D57D")]
    3131  public class CIGTAB : MultiObjectiveTestFunction {
    3232    protected override double[,] GetBounds(int objectives) {
    … …  
    5858
    5959    [StorableConstructor]
    60     protected CIGTAB(bool deserializing) : base(deserializing) { }
     60    protected CIGTAB(StorableConstructorFlag _) : base(_) { }
    6161    protected CIGTAB(CIGTAB original, Cloner cloner) : base(original, cloner) { }
    6262    public override IDeepCloneable Clone(Cloner cloner) {

  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/ELLI1.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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("ELLI", "to be aded")]
    30   [StorableClass]
     30  [StorableType("C4F3378F-169B-412C-8882-D733EF5388D9")]
    3131  public class ELLI : MultiObjectiveTestFunction {
    3232    protected override double[,] GetBounds(int objectives) {
    … …  
    5858
    5959    [StorableConstructor]
    60     protected ELLI(bool deserializing) : base(deserializing) { }
     60    protected ELLI(StorableConstructorFlag _) : base(_) { }
    6161    protected ELLI(ELLI original, Cloner cloner) : base(original, cloner) { }
    6262    public override IDeepCloneable Clone(Cloner cloner) {

  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Fonseca.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.Core;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    3030  [Item("Fonseca", "Fonseca and Flemming function from // https://en.wikipedia.org/wiki/Test_functions_for_optimization [30.11.2015]")]
    31   [StorableClass]
     31  [StorableType("CBB43DEB-9DD2-4365-A3CF-18F89F2A47B0")]
    3232  public class Fonseca : MultiObjectiveTestFunction {
    3333    protected override double[,] GetBounds(int objectives) {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected Fonseca(bool deserializing) : base(deserializing) { }
     54    protected Fonseca(StorableConstructorFlag _) : base(_) { }
    5555    protected Fonseca(Fonseca original, Cloner cloner) : base(original, cloner) { }
    5656    public override IDeepCloneable Clone(Cloner cloner) {

  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Kursawe.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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("Kursawe", "Kursawe function from // http://darwin.di.uminho.pt/jecoli/index.php/Multiobjective_example [30.11.2015]")]
    30   [StorableClass]
     30  [StorableType("9D38092B-2C55-450E-A27A-2C28714745ED")]
    3131  public class Kursawe : MultiObjectiveTestFunction {
    3232    protected override double[,] GetBounds(int objectives) {
    … …  
    5151
    5252    [StorableConstructor]
    53     protected Kursawe(bool deserializing) : base(deserializing) { }
     53    protected Kursawe(StorableConstructorFlag _) : base(_) { }
    5454    protected Kursawe(Kursawe original, Cloner cloner) : base(original, cloner) { }
    5555    public override IDeepCloneable Clone(Cloner cloner) {

  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/SchafferN1.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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("SchafferN1", "Schaffer function N.1 for mulitobjective optimization from // https://en.wikipedia.org/wiki/Test_functions_for_optimization [30.11.2015]")]
    30   [StorableClass]
     30  [StorableType("A676EB9C-ECA8-40D7-BA16-ADDDDD482092")]
    3131  public class SchafferN1 : MultiObjectiveTestFunction {
    3232    protected override double[,] GetBounds(int objectives) {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected SchafferN1(bool deserializing) : base(deserializing) { }
     54    protected SchafferN1(StorableConstructorFlag _) : base(_) { }
    5555    protected SchafferN1(SchafferN1 original, Cloner cloner) : base(original, cloner) { }
    5656    public override IDeepCloneable Clone(Cloner cloner) {

  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/SchafferN2.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.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    2929  [Item("SchafferN2", "Schaffer function N.2 for mulitobjective optimization from // https://en.wikipedia.org/wiki/Test_functions_for_optimization [30.11.2015]")]
    30   [StorableClass]
     30  [StorableType("CCF2BA5F-BBE5-4280-ABC7-10C02EF947CB")]
    3131  public class SchafferN2 : MultiObjectiveTestFunction {
    3232    protected override double[,] GetBounds(int objectives) {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected SchafferN2(bool deserializing) : base(deserializing) { }
     50    protected SchafferN2(StorableConstructorFlag _) : base(_) { }
    5151    protected SchafferN2(SchafferN2 original, Cloner cloner) : base(original, cloner) { }
    5252    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.