Ignore:
Timestamp:
12/28/18 16:10:48 (2 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3
Files:
38 edited

Legend:

Unmodified
Added
Removed
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/CrowdingAnalyzer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    31   [StorableClass]
     31  [StorableType("F06FB45C-051E-4AD8-BD82-16DA9DCBCACB")]
    3232  [Item("CrowdingAnalyzer", "The mean crowding distance for each point of the Front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
    3333  public class CrowdingAnalyzer : MOTFAnalyzer {
     
    4242
    4343    [StorableConstructor]
    44     protected CrowdingAnalyzer(bool deserializing) : base(deserializing) { }
     44    protected CrowdingAnalyzer(StorableConstructorFlag _) : base(_) { }
    4545    public CrowdingAnalyzer(CrowdingAnalyzer original, Cloner cloner)
    4646      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/GenerationalDistanceAnalyzer.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.Linq;
    2423using HeuristicLab.Common;
     
    2726using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    3029
    3130namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    32   [StorableClass]
     31  [StorableType("EBC72F16-E329-4D18-800C-8642EFD0F05C")]
    3332  [Item("GenerationalDistanceAnalyzer", "The generational distance between the current and the best known front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
    3433  public class GenerationalDistanceAnalyzer : MOTFAnalyzer {
     
    4948
    5049    [StorableConstructor]
    51     protected GenerationalDistanceAnalyzer(bool deserializing) : base(deserializing) { }
     50    protected GenerationalDistanceAnalyzer(StorableConstructorFlag _) : base(_) { }
    5251    protected GenerationalDistanceAnalyzer(GenerationalDistanceAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5352    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/HypervolumeAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    33   [StorableClass]
     33  [StorableType("13D363E4-76FF-4A5A-9B2C-767D9E880E4B")]
    3434  [Item("HypervolumeAnalyzer", "Computes the enclosed Hypervolume between the current front and a given reference Point")]
    3535  public class HypervolumeAnalyzer : MOTFAnalyzer {
     
    5050
    5151    [StorableConstructor]
    52     protected HypervolumeAnalyzer(bool deserializing)
    53       : base(deserializing) {
     52    protected HypervolumeAnalyzer(StorableConstructorFlag _) : base(_) {
    5453    }
    5554
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/InvertedGenerationalDistanceAnalyzer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    31   [StorableClass]
     31  [StorableType("EC99F3C1-D8D2-4738-9523-0D07438647A5")]
    3232  [Item("InvertedGenerationalDistanceAnalyzer", "The inverted generational distance between the current and the best known front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
    3333  public class InvertedGenerationalDistanceAnalyzer : MOTFAnalyzer {
     
    5656
    5757    [StorableConstructor]
    58     protected InvertedGenerationalDistanceAnalyzer(bool deserializing) : base(deserializing) { }
     58    protected InvertedGenerationalDistanceAnalyzer(StorableConstructorFlag _) : base(_) { }
    5959    protected InvertedGenerationalDistanceAnalyzer(InvertedGenerationalDistanceAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6060    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/MOTFAnalyzer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030
    3131namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    3232
    33   [StorableClass]
     33  [StorableType("CFBB2CAB-C1B7-4F14-9A01-6D5624B7B681")]
    3434  public abstract class MOTFAnalyzer : SingleSuccessorOperator, IMultiObjectiveTestFunctionAnalyzer {
    3535    public virtual bool EnabledByDefault { get { return true; } }
     
    5454
    5555    [StorableConstructor]
    56     protected MOTFAnalyzer(bool deserializing) : base(deserializing) { }
     56    protected MOTFAnalyzer(StorableConstructorFlag _) : base(_) { }
    5757    protected MOTFAnalyzer() {
    5858      Parameters.Add(new ScopeTreeLookupParameter<DoubleArray>("Qualities", "The qualities of the parameter vector."));
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/ScatterPlotAnalyzer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    31   [StorableClass]
     31  [StorableType("720E2726-7F31-4425-B478-327D24BA2FF3")]
    3232  [Item("ScatterPlotAnalyzer", "Creates a Scatterplot for the current and the best known front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
    3333  public class ScatterPlotAnalyzer : MOTFAnalyzer {
     
    4343
    4444    [StorableConstructor]
    45     protected ScatterPlotAnalyzer(bool deserializing) : base(deserializing) { }
     45    protected ScatterPlotAnalyzer(StorableConstructorFlag _) : base(_) { }
    4646    protected ScatterPlotAnalyzer(ScatterPlotAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4747    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/SpacingAnalyzer.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    30   [StorableClass]
     30  [StorableType("F32027A7-3116-4864-A404-820F866BFD65")]
    3131  [Item("SpacingAnalyzer", "The spacing of the current front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
    3232  public class SpacingAnalyzer : MOTFAnalyzer {
     
    3636    }
    3737    [StorableConstructor]
    38     protected SpacingAnalyzer(bool deserializing) : base(deserializing) { }
     38    protected SpacingAnalyzer(StorableConstructorFlag _) : base(_) { }
    3939
    4040
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj

    r16454 r16462  
    8787      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    8888    </Reference>
    89     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     89    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    9090      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    9191    </Reference>
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Problems.Instances;
    3232
    3333namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    34   [StorableClass]
     34  [StorableType("AB0C6A73-C432-46FD-AE3B-9841EAB2478C")]
    3535  [Creatable(CreatableAttribute.Categories.Problems, Priority = 95)]
    3636  [Item("Test Function (multi-objective)", "Test functions with real valued inputs and multiple objectives.")]
     
    9797
    9898    [StorableConstructor]
    99     protected MultiObjectiveTestFunctionProblem(bool deserializing) : base(deserializing) { }
     99    protected MultiObjectiveTestFunctionProblem(StorableConstructorFlag _) : base(_) { }
    100100    [StorableHook(HookType.AfterDeserialization)]
    101101    private void AfterDeserialization() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/ParetoFrontScatterPlot.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    29   [StorableClass]
     29  [StorableType("3BF7AD0E-8D55-4033-974A-01DB16F9E41A")]
    3030  [Item("Pareto Front Scatter Plot", "The optimal front, current front and its associated Points in the searchspace")]
    3131  public class ParetoFrontScatterPlot : Item {
     
    8787
    8888    [StorableConstructor]
    89     protected ParetoFrontScatterPlot(bool deserializing)
    90       : base(deserializing) { }
     89    protected ParetoFrontScatterPlot(StorableConstructorFlag _) : base(_) { }
    9190    #endregion
    9291  }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ1.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ2.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ3.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ4.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ5.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ6.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ7.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/DTLZ/DTLZ8.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Encodings.RealVectorEncoding;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR1.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR2.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR3.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR4.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/IHR/IHR6.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/CIGTAB.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/ELLI1.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Fonseca.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/Kursawe.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/SchafferN1.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/Misc/SchafferN2.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/MultiObjectiveTestFunction.cs

    r16453 r16462  
    2727using HeuristicLab.Encodings.RealVectorEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
     
    3434  /// </summary>
    3535  [Item("Multi-Objective Function", "Base class for multi objective functions.")]
    36   [StorableClass]
     36  [StorableType("6E9E9993-5B26-4D97-A58C-B4FD28308544")]
    3737  public abstract class MultiObjectiveTestFunction : ParameterizedNamedItem, IMultiObjectiveTestFunction {
    3838    /// <summary>
     
    120120
    121121    [StorableConstructor]
    122     protected MultiObjectiveTestFunction(bool deserializing) : base(deserializing) { }
     122    protected MultiObjectiveTestFunction(StorableConstructorFlag _) : base(_) { }
    123123
    124124    protected MultiObjectiveTestFunction(MultiObjectiveTestFunction original, Cloner cloner)
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT1.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT2.cs

    r16453 r16462  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Encodings.RealVectorEncoding;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT3.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT4.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/TestFunctions/ZDT/ZDT6.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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.