Free cookie consent management tool by TermsFeed Policy Generator

Changeset 17332


Ignore:
Timestamp:
10/15/19 16:45:00 (5 years ago)
Author:
bwerth
Message:

#2745 updated persistence to HEAL.Attic

Location:
branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/AdaptiveSamplingAlgorithm.cs

    r15343 r17332  
    33using System.Linq;
    44using System.Threading;
     5using HEAL.Attic;
    56using HeuristicLab.Algorithms.DataAnalysis;
    67using HeuristicLab.Analysis;
    … …  
    1314using HeuristicLab.Optimization.Operators;
    1415using HeuristicLab.Parameters;
    15 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    1616using HeuristicLab.Problems.DataAnalysis;
    1717using HeuristicLab.Random;
    … …  
    2020  [Item("Adaptive Sampling Algorithm (EGO)", "An adaptive sampling algorithm.")]
    2121  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
    22   [StorableClass]
    23   public class AdaptiveSamplingAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     22    [StorableType("7c77511b-4dcc-4dbb-bdbb-e9af304dd352")]
     23    public class AdaptiveSamplingAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    2424    public string Filename { get; set; }
    2525
    … …  
    110110    #region Constructors
    111111    [StorableConstructor]
    112     protected AdaptiveSamplingAlgorithm(bool deserializing) : base(deserializing) { }
     112    protected AdaptiveSamplingAlgorithm(StorableConstructorFlag deserializing) : base(deserializing) { }
    113113    [StorableHook(HookType.AfterDeserialization)]
    114114    private void AfterDeserialization() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteAdaptiveSamplingAlgorithm.cs

    r15976 r17332  
    33using System.Linq;
    44using System.Threading;
     5using HEAL.Attic;
    56using HeuristicLab.Algorithms.DataAnalysis;
    67using HeuristicLab.Analysis;
    … …  
    1314using HeuristicLab.Optimization.Operators;
    1415using HeuristicLab.Parameters;
    15 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    1616using HeuristicLab.Problems.DataAnalysis;
    1717using HeuristicLab.Random;
    … …  
    2020  [Item("Discrete Adaptive Sampling Algorithm (D-EGO)", "A discrete adaptive sampling algorithm.")]
    2121  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
    22   [StorableClass]
    23   public class DiscreteAdaptiveSamplingAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     22    [StorableType("39e06191-714c-44e0-8b57-a5a64f072371")]
     23    public class DiscreteAdaptiveSamplingAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    2424    public string Filename { get; set; }
    2525
    … …  
    115115    #region Constructors
    116116    [StorableConstructor]
    117     protected DiscreteAdaptiveSamplingAlgorithm(bool deserializing) : base(deserializing) { }
     117    protected DiscreteAdaptiveSamplingAlgorithm(StorableConstructorFlag deserializing) : base(deserializing) { }
    118118    [StorableHook(HookType.AfterDeserialization)]
    119119    private void AfterDeserialization() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteCorrelationAnalyzer.cs

    r15343 r17332  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Problems.DataAnalysis;
    3434
    3535namespace HeuristicLab.Algorithms.EGO {
    3636  [Item("DiscreteCorrelationAnalyzer", "Analyzes the correlation between perdictions and actual fitness values")]
    37   [StorableClass]
    38   public class DiscreteCorrelationAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
     37    [StorableType("1657262e-1ada-4672-a073-bc8b144ecf42")]
     38    public class DiscreteCorrelationAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
    3939    public override bool CanChangeName => true;
    4040    public bool EnabledByDefault => false;
    … …  
    4949
    5050    [StorableConstructor]
    51     protected DiscreteCorrelationAnalyzer(bool deserializing) : base(deserializing) { }
     51    protected DiscreteCorrelationAnalyzer(StorableConstructorFlag deserializing) : base(deserializing) { }
    5252    protected DiscreteCorrelationAnalyzer(DiscreteCorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5353    public DiscreteCorrelationAnalyzer() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteEfficientGlobalOptimizationAlgorithm.cs

    r15343 r17332  
    2424using System.Linq;
    2525using System.Threading;
     26using HEAL.Attic;
    2627using HeuristicLab.Algorithms.DataAnalysis;
    27 using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
    2828using HeuristicLab.Analysis;
    2929using HeuristicLab.Common;
    … …  
    3333using HeuristicLab.Optimization;
    3434using HeuristicLab.Parameters;
    35 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3635using HeuristicLab.Problems.DataAnalysis;
    3736using HeuristicLab.Problems.Instances;
    … …  
    3938
    4039namespace HeuristicLab.Algorithms.EGO {
    41   [StorableClass]
    42   [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 95)]
     40    [StorableType("26f99b28-75f1-4186-9c8b-b5c0548ea768")]
     41    [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 95)]
    4342  [Item("DiscreteEfficientGlobalOptimizationAlgorithm", "Solves a problem by sequentially learning a model, solving a subproblem on the model and evaluating the best found solution for this subproblem.")]
    4443  public class DiscreteEfficientGlobalOptimizationAlgorithm : BasicAlgorithm, ISurrogateAlgorithm<IntegerVector> {
    … …  
    158157    #region HLConstructors
    159158    [StorableConstructor]
    160     protected DiscreteEfficientGlobalOptimizationAlgorithm(bool deserializing) : base(deserializing) { }
     159    protected DiscreteEfficientGlobalOptimizationAlgorithm(StorableConstructorFlag deserializing) : base(deserializing) { }
    161160    [StorableHook(HookType.AfterDeserialization)]
    162161    protected void AfterDeseialization() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteEvaluatedSolutionsAnalyzer.cs

    r15343 r17332  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333
    3434namespace HeuristicLab.Algorithms.EGO {
    3535  [Item("DiscreteEvaluatedSolutionsAnalyzer", "Displays the evaluated Solutions for one or two dimensional problems")]
    36   [StorableClass]
    37   public class DiscreteEvaluatedSolutionsAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
     36    [StorableType("7a785e19-b120-4037-8acb-9223f19a2401")]
     37    public class DiscreteEvaluatedSolutionsAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
    3838    public override bool CanChangeName => true;
    3939    public bool EnabledByDefault => false;
    … …  
    5050
    5151    [StorableConstructor]
    52     protected DiscreteEvaluatedSolutionsAnalyzer(bool deserializing) : base(deserializing) { }
     52    protected DiscreteEvaluatedSolutionsAnalyzer(StorableConstructorFlag deserializing) : base(deserializing) { }
    5353    protected DiscreteEvaluatedSolutionsAnalyzer(DiscreteEvaluatedSolutionsAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5454    public DiscreteEvaluatedSolutionsAnalyzer() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteInfillProblem.cs

    r15343 r17332  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    … …  
    2930using HeuristicLab.Encodings.RealVectorEncoding;
    3031using HeuristicLab.Optimization;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333
    3434namespace HeuristicLab.Algorithms.EGO {
    35   [StorableClass]
    36   [Item("DiscreteInfillProblem", "A problem for finding the most interesing potential new sampling Points by optimizing some InfillCriterion")]
     35    [StorableType("7a98818c-8434-4a33-8230-2b2486772af6")]
     36    [Item("DiscreteInfillProblem", "A problem for finding the most interesing potential new sampling Points by optimizing some InfillCriterion")]
    3737  public sealed class DiscreteInfillProblem : SingleObjectiveBasicProblem<IntegerVectorEncoding> {
    3838
    … …  
    5959    #region Constructors
    6060    [StorableConstructor]
    61     private DiscreteInfillProblem(bool deserializing) : base(deserializing) { }
     61    private DiscreteInfillProblem(StorableConstructorFlag deserializing) : base(deserializing) { }
    6262    private DiscreteInfillProblem(DiscreteInfillProblem original, Cloner cloner) : base(original, cloner) {
    6363      infillCriterion = cloner.Clone(original.infillCriterion);

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteInfillSolver.cs

    r15343 r17332  
    2424using System.Linq;
    2525using System.Collections.Generic;
     26using HEAL.Attic;
    2627using HeuristicLab.Common;
    2728using HeuristicLab.Core;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Problems.DataAnalysis;
    3434
    3535namespace HeuristicLab.Algorithms.EGO {
    3636  [Item("DiscreteInfillSolver", "An IntegerVectorCreator that creates candidates by optimizing an infill-subproblem")]
    37   [StorableClass]
    38   public class DiscreteInfillSolver : IntegerVectorCreator, ICancellableOperator {
     37    [StorableType("50004a0b-b3aa-438c-bd80-bd5ff1763683")]
     38    public class DiscreteInfillSolver : IntegerVectorCreator, ICancellableOperator {
    3939
    4040    public ILookupParameter<IAlgorithm> InfillOptimizationAlgorithmParamter => (ILookupParameter<IAlgorithm>)Parameters["InfillAlgorithm"];
    … …  
    4848
    4949    [StorableConstructor]
    50     protected DiscreteInfillSolver(bool deserializing) : base(deserializing) { }
     50    protected DiscreteInfillSolver(StorableConstructorFlag deserializing) : base(deserializing) { }
    5151    protected DiscreteInfillSolver(DiscreteInfillSolver original, Cloner cloner) : base(original, cloner) { }
    5252    public DiscreteInfillSolver() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/DiscreteEGO/DiscreteSampleCollector.cs

    r15976 r17332  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2829using HeuristicLab.Operators;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232
    3333namespace HeuristicLab.Algorithms.EGO {
    3434  [Item("DiscreteSampleCollector", "Collects IntegerVectors into a modifiablbe dataset")]
    35   [StorableClass]
    36   public class DiscreteSampleCollector : InstrumentedOperator {
     35    [StorableType("b8638624-f79f-41e6-a837-d70824c00082")]
     36    public class DiscreteSampleCollector : InstrumentedOperator {
    3737    public override bool CanChangeName => true;
    3838
    … …  
    4242
    4343    [StorableConstructor]
    44     protected DiscreteSampleCollector(bool deserializing) : base(deserializing) { }
     44    protected DiscreteSampleCollector(StorableConstructorFlag deserializing) : base(deserializing) { }
    4545    protected DiscreteSampleCollector(DiscreteSampleCollector original, Cloner cloner) : base(original, cloner) { }
    4646    public DiscreteSampleCollector() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/EfficientGlobalOptimizationAlgorithm.cs

    r15343 r17332  
    2424using System.Linq;
    2525using System.Threading;
     26using HEAL.Attic;
    2627using HeuristicLab.Algorithms.DataAnalysis;
    2728using HeuristicLab.Analysis;
    … …  
    3233using HeuristicLab.Optimization;
    3334using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3535using HeuristicLab.Problems.DataAnalysis;
    3636using HeuristicLab.Problems.Instances;
    … …  
    3838
    3939namespace HeuristicLab.Algorithms.EGO {
    40   [StorableClass]
    41   [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 95)]
     40    [StorableType("bcca4742-9d91-4783-92dd-75dbc8c39f04")]
     41    [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 95)]
    4242  [Item("EfficientGlobalOptimizationAlgorithm", "Solves a problem by sequentially learning a model, solving a subproblem on the model and evaluating the best found solution for this subproblem.")]
    4343  public class EfficientGlobalOptimizationAlgorithm : BasicAlgorithm, ISurrogateAlgorithm<RealVector> {
    … …  
    157157    #region HLConstructors
    158158    [StorableConstructor]
    159     protected EfficientGlobalOptimizationAlgorithm(bool deserializing) : base(deserializing) { }
     159    protected EfficientGlobalOptimizationAlgorithm(StorableConstructorFlag deserializing) : base(deserializing) { }
    160160    [StorableHook(HookType.AfterDeserialization)]
    161161    protected void AfterDeseialization() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/HeuristicLab.Algorithms.EGO-3.4.csproj

    r15976 r17332  
    1010    <RootNamespace>HeuristicLab.Algorithms.EGO</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Algorithms.EGO-3.4</AssemblyName>
    12     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     14    <TargetFrameworkProfile />
    1415  </PropertyGroup>
    1516  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    3132  </PropertyGroup>
    3233  <ItemGroup>
     34    <Reference Include="HEAL.Attic, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     35      <SpecificVersion>False</SpecificVersion>
     36      <HintPath>..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     37    </Reference>
    3338    <Reference Include="HeuristicLab.Algorithms.CMAEvolutionStrategy-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    3439      <SpecificVersion>False</SpecificVersion>
    … …  
    5156      <Private>False</Private>
    5257    </Reference>
     58    <Reference Include="HeuristicLab.Attic, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     59      <SpecificVersion>False</SpecificVersion>
     60      <HintPath>..\..\..\trunk\bin\HeuristicLab.Attic.dll</HintPath>
     61    </Reference>
    5362    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    5463      <SpecificVersion>False</SpecificVersion>
    … …  
    121130    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec">
    122131      <Private>False</Private>
    123     </Reference>
    124     <Reference Include="HeuristicLab.Problems.SurrogateProblem-3.3, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
    125       <SpecificVersion>False</SpecificVersion>
    126       <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.SurrogateProblem-3.3.dll</HintPath>
    127132    </Reference>
    128133    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/AugmentedExpectedImprovement.cs

    r15064 r17332  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.RealVectorEncoding;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131
    … …  
    3333namespace HeuristicLab.Algorithms.EGO {
    3434
    35   [StorableClass]
    36   [Item("AugmentedExpectedImprovement", "Noisy InfillCriterion, Extension of the Expected Improvement as described in\n Global optimization of stochastic black-box systems via sequential kriging meta-models.\r\nHuang, D., Allen, T., Notz, W., Zeng, N.")]
     35    [StorableType("3ef5f8dc-d101-4f52-9daf-ca45c4b461ee")]
     36    [Item("AugmentedExpectedImprovement", "Noisy InfillCriterion, Extension of the Expected Improvement as described in\n Global optimization of stochastic black-box systems via sequential kriging meta-models.\r\nHuang, D., Allen, T., Notz, W., Zeng, N.")]
    3737  public class AugmentedExpectedImprovement : ExpectedImprovementBase {
    3838
    … …  
    5353    #region Constructors, Serialization and Cloning
    5454    [StorableConstructor]
    55     protected AugmentedExpectedImprovement(bool deserializing) : base(deserializing) { }
     55    protected AugmentedExpectedImprovement(StorableConstructorFlag deserializing) : base(deserializing) { }
    5656    protected AugmentedExpectedImprovement(AugmentedExpectedImprovement original, Cloner cloner) : base(original, cloner) {
    5757      Tau = original.Tau;

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/ExpectedImprovement.cs

    r15064 r17332  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    2627using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    … …  
    3131namespace HeuristicLab.Algorithms.EGO {
    3232
    33   [StorableClass]
    34   [Item("ExpectedImprovementMeassure", "Extension of the Expected Improvement to a weighted version by ANDRAS SÓBESTER , STEPHEN J. LEARY and ANDY J. KEANE   in \n On the Design of Optimization Strategies Based on Global Response Surface Approximation Models")]
     33    [StorableType("a9a7c704-6620-4129-9da3-74d590c8422a")]
     34    [Item("ExpectedImprovementMeassure", "Extension of the Expected Improvement to a weighted version by ANDRAS SÓBESTER , STEPHEN J. LEARY and ANDY J. KEANE   in \n On the Design of Optimization Strategies Based on Global Response Surface Approximation Models")]
    3535  public sealed class ExpectedImprovement : ExpectedImprovementBase {
    3636    #region Constructors, Serialization and Cloning
    3737    [StorableConstructor]
    38     private ExpectedImprovement(bool deserializing) : base(deserializing) { }
     38    private ExpectedImprovement(StorableConstructorFlag deserializing) : base(deserializing) { }
    3939    private ExpectedImprovement(ExpectedImprovement original, Cloner cloner) : base(original, cloner) { }
    4040    public ExpectedImprovement() { }

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/ExpectedImprovementBase.cs

    r15064 r17332  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    … …  
    2627using HeuristicLab.Encodings.RealVectorEncoding;
    2728using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    … …  
    3232namespace HeuristicLab.Algorithms.EGO {
    3333
    34   [StorableClass]
    35   public abstract class ExpectedImprovementBase : InfillCriterionBase {
     34    [StorableType("0c74770e-c3eb-4636-b570-c2d674c11fdb")]
     35    public abstract class ExpectedImprovementBase : InfillCriterionBase {
    3636
    3737    #region ParameterNames
    … …  
    5151    #region Constructors, Serialization and Cloning
    5252    [StorableConstructor]
    53     protected ExpectedImprovementBase(bool deserializing) : base(deserializing) { }
     53    protected ExpectedImprovementBase(StorableConstructorFlag deserializing) : base(deserializing) { }
    5454    [StorableHook(HookType.AfterDeserialization)]
    5555    private void AfterDeserialization() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/ExpectedQuality.cs

    r15064 r17332  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
     24using HEAL.Attic;
    2425using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    2727// ReSharper disable once CheckNamespace
    2828namespace HeuristicLab.Algorithms.EGO {
    2929
    30   [StorableClass]
    31   [Item("ExpectedQualityMeassure", "Use the quality predicted by the model")]
     30    [StorableType("21e5b05a-7603-46c4-8692-9e672b586244")]
     31    [Item("ExpectedQualityMeassure", "Use the quality predicted by the model")]
    3232  public class ExpectedQuality : InfillCriterionBase {
    3333    #region Constructors, Serialization and Cloning
    3434    [StorableConstructor]
    35     protected ExpectedQuality(bool deserializing) : base(deserializing) { }
     35    protected ExpectedQuality(StorableConstructorFlag deserializing) : base(deserializing) { }
    3636    protected ExpectedQuality(ExpectedQuality original, Cloner cloner) : base(original, cloner) { }
    3737    public ExpectedQuality() { }

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/ExpectedQuantileImprovement.cs

    r15064 r17332  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.RealVectorEncoding;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131
    … …  
    3333namespace HeuristicLab.Algorithms.EGO {
    3434
    35   [StorableClass]
    36   [Item("ExpectedQuantileImprovement", "Noisy InfillCriterion, Extension of the Expected Improvement as described in \n Noisy expectedimprovement and on - line computation time allocation for the optimization of simulators with tunable fidelitys\r\nPicheny, V., Ginsbourger, D., Richet, Y")]
     35    [StorableType("9c260dee-1f7c-4c07-bdef-a9e1bf2b26f8")]
     36    [Item("ExpectedQuantileImprovement", "Noisy InfillCriterion, Extension of the Expected Improvement as described in \n Noisy expectedimprovement and on - line computation time allocation for the optimization of simulators with tunable fidelitys\r\nPicheny, V., Ginsbourger, D., Richet, Y")]
    3737  public class ExpectedQuantileImprovement : ExpectedImprovementBase {
    3838
    … …  
    5656    #region HL-Constructors, Serialization and Cloning
    5757    [StorableConstructor]
    58     protected ExpectedQuantileImprovement(bool deserializing) : base(deserializing) { }
     58    protected ExpectedQuantileImprovement(StorableConstructorFlag deserializing) : base(deserializing) { }
    5959    protected ExpectedQuantileImprovement(ExpectedQuantileImprovement original, Cloner cloner) : base(original, cloner) {
    6060      Tau = original.Tau;

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/InfillCriterionBase.cs

    r15064 r17332  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Encodings.RealVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626using HeuristicLab.Problems.DataAnalysis;
    2727
    2828// ReSharper disable once CheckNamespace
    2929namespace HeuristicLab.Algorithms.EGO {
    30   [StorableClass]
    31   public abstract class InfillCriterionBase : ParameterizedNamedItem, IInfillCriterion {
     30    [StorableType("bf1f0622-7edc-4258-b79c-b0dc5aca5d70")]
     31    public abstract class InfillCriterionBase : ParameterizedNamedItem, IInfillCriterion {
    3232    [Storable]
    3333    public IRegressionSolution RegressionSolution { get; set; }
    … …  
    3737    public RealVectorEncoding Encoding { get; set; }
    3838
    39     protected InfillCriterionBase(bool deserializing) : base(deserializing) { }
     39    [StorableConstructor]
     40    protected InfillCriterionBase(StorableConstructorFlag deserializing) : base(deserializing) { }
    4041    protected InfillCriterionBase(InfillCriterionBase original, Cloner cloner) : base(original, cloner) {
    4142      RegressionSolution = cloner.Clone(original.RegressionSolution);

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/MinimalQuantileCriterium.cs

    r15064 r17332  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    … …  
    2627using HeuristicLab.Encodings.RealVectorEncoding;
    2728using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    … …  
    3232namespace HeuristicLab.Algorithms.EGO {
    3333
    34   [StorableClass]
    35   [Item("MinimalQuantileCriterium", "Adding or Subtracting the variance * factor to the model estimation")]
     34    [StorableType("94ac7c83-b4ae-4d81-ab55-0db37b5f8155")]
     35    [Item("MinimalQuantileCriterium", "Adding or Subtracting the variance * factor to the model estimation")]
    3636  public class MinimalQuantileCriterium : InfillCriterionBase {
    3737
    … …  
    5050    #region Constructors, Serialization and Cloning
    5151    [StorableConstructor]
    52     protected MinimalQuantileCriterium(bool deserializing) : base(deserializing) { }
     52    protected MinimalQuantileCriterium(StorableConstructorFlag deserializing) : base(deserializing) { }
    5353    protected MinimalQuantileCriterium(MinimalQuantileCriterium original, Cloner cloner) : base(original, cloner) { }
    5454    public MinimalQuantileCriterium() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/NeighbourDistance.cs

    r15338 r17332  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
     24using HEAL.Attic;
    2525using HeuristicLab.Algorithms.DataAnalysis;
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Encodings.RealVectorEncoding;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3029
    3130// ReSharper disable once CheckNamespace
    3231namespace HeuristicLab.Algorithms.EGO {
    3332
    34   [StorableClass]
    35   [Item("NeighbourDistance", "Exploration by maximizing the distance to the nearest neighbour")]
     33    [StorableType("96160d45-3abb-460b-aa31-c00204c1e914")]
     34    [Item("NeighbourDistance", "Exploration by maximizing the distance to the nearest neighbour")]
    3635  public class NeighbourDistance : InfillCriterionBase {
    3736
    … …  
    3938    #region Constructors, Serialization and Cloning
    4039    [StorableConstructor]
    41     protected NeighbourDistance(bool deserializing) : base(deserializing) { }
     40    protected NeighbourDistance(StorableConstructorFlag deserializing) : base(deserializing) { }
    4241    protected NeighbourDistance(NeighbourDistance original, Cloner cloner) : base(original, cloner) { }
    4342    public NeighbourDistance() { }

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/PluginExpectedImprovement.cs

    r15064 r17332  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727using HeuristicLab.Problems.DataAnalysis;
    2828
    2929// ReSharper disable once CheckNamespace
    30 namespace HeuristicLab.Algorithms.EGO {
     30namespace HeuristicLab.Algorithms.EGO
     31{
    3132
    32   [StorableClass]
    33   [Item("PluginExpectedImprovement", "Noisy InfillCriterion, Extension of the Expected Improvement by using the minimal prediction on the observed points\n rather than the minimal observed value as described in \n Global optimization based on noisy evaluations: An empirical study of two statistical approaches\r\nEmmanuel Vazqueza, Julien Villemonteixb, Maryan Sidorkiewiczb and Éric Walterc")]
     33    [StorableType("1983bcd7-f157-4498-9827-3be4a5af2b17")]
     34    [Item("PluginExpectedImprovement", "Noisy InfillCriterion, Extension of the Expected Improvement by using the minimal prediction on the observed points\n rather than the minimal observed value as described in \n Global optimization based on noisy evaluations: An empirical study of two statistical approaches\r\nEmmanuel Vazqueza, Julien Villemonteixb, Maryan Sidorkiewiczb and Éric Walterc")]
    3435  public class PluginExpectedImprovement : ExpectedImprovementBase {
    3536
    3637    #region HL-Constructors, Serialization and Cloning
    3738    [StorableConstructor]
    38     protected PluginExpectedImprovement(bool deserializing) : base(deserializing) { }
     39    protected PluginExpectedImprovement(StorableConstructorFlag deserializing) : base(deserializing) { }
    3940    protected PluginExpectedImprovement(PluginExpectedImprovement original, Cloner cloner) : base(original, cloner) { }
    4041    public PluginExpectedImprovement() { }

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/CorrelationAnalyzer.cs

    r15338 r17332  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Problems.DataAnalysis;
    3434
    3535namespace HeuristicLab.Algorithms.EGO {
    3636  [Item("CorrelationAnalyzer", "Analyzes the correlation between perdictions and actual fitness values")]
    37   [StorableClass]
    38   public class CorrelationAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
     37    [StorableType("f0dec41c-e5c6-4785-a8f8-af1f40c598b9")]
     38    public class CorrelationAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
    3939    public override bool CanChangeName => true;
    4040    public bool EnabledByDefault => false;
    … …  
    4949
    5050    [StorableConstructor]
    51     protected CorrelationAnalyzer(bool deserializing) : base(deserializing) { }
     51    protected CorrelationAnalyzer(StorableConstructorFlag deserializing) : base(deserializing) { }
    5252    protected CorrelationAnalyzer(CorrelationAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5353    public CorrelationAnalyzer() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/EvaluatedSolutionsAnalyzer.cs

    r15343 r17332  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333
    3434namespace HeuristicLab.Algorithms.EGO {
    3535  [Item("EvaluatedSolutionsAnalyzer", "Displays the evaluated Solutions for one or two dimensional problems")]
    36   [StorableClass]
    37   public class EvaluatedSolutionsAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
     36    [StorableType("95349254-796c-47cc-b17a-0581e8c1dce7")]
     37    public class EvaluatedSolutionsAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
    3838    public override bool CanChangeName => true;
    3939    public bool EnabledByDefault => false;
    … …  
    5050
    5151    [StorableConstructor]
    52     protected EvaluatedSolutionsAnalyzer(bool deserializing) : base(deserializing) { }
     52    protected EvaluatedSolutionsAnalyzer(StorableConstructorFlag deserializing) : base(deserializing) { }
    5353    protected EvaluatedSolutionsAnalyzer(EvaluatedSolutionsAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5454    public EvaluatedSolutionsAnalyzer() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/FitnessClusteringAnalyzer.cs

    r15976 r17332  
    2323using System.Linq;
    2424using System.Threading;
     25using HEAL.Attic;
    2526using HeuristicLab.Algorithms.DataAnalysis;
    2627using HeuristicLab.Analysis;
    … …  
    3132using HeuristicLab.Optimization;
    3233using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3434using HeuristicLab.Problems.DataAnalysis;
    3535
    3636namespace HeuristicLab.Algorithms.EGO {
    3737  [Item("FitnessClusteringAnalyzer", "Analyzes the correlation between perdictions and actual fitness values")]
    38   [StorableClass]
    39   public class FitnessClusteringAnalyzer : SingleSuccessorOperator, IAnalyzer, IStochasticOperator, IResultsOperator {
     38    [StorableType("3e92b03f-eba4-4bb0-a53c-921c51372389")]
     39    public class FitnessClusteringAnalyzer : SingleSuccessorOperator, IAnalyzer, IStochasticOperator, IResultsOperator {
    4040    public override bool CanChangeName => true;
    4141    public bool EnabledByDefault => false;
    … …  
    5151
    5252    [StorableConstructor]
    53     protected FitnessClusteringAnalyzer(bool deserializing) : base(deserializing) { }
     53    protected FitnessClusteringAnalyzer(StorableConstructorFlag deserializing) : base(deserializing) { }
    5454
    5555    protected FitnessClusteringAnalyzer(FitnessClusteringAnalyzer original, Cloner cloner) : base(original, cloner) { }

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/InfillSolver.cs

    r15343 r17332  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2829using HeuristicLab.Optimization;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232
    3333namespace HeuristicLab.Algorithms.EGO {
    3434  [Item("InfillSolver", "A RealVectorCreator that creates candidates by optimizing an infill-subproblem")]
    35   [StorableClass]
    36   public class InfillSolver : RealVectorCreator, ICancellableOperator {
     35    [StorableType("b1ba4532-ed8d-46a2-8115-30b21e9c595a")]
     36    public class InfillSolver : RealVectorCreator, ICancellableOperator {
    3737
    3838    public ILookupParameter<IAlgorithm> InfillOptimizationAlgorithmParamter => (ILookupParameter<IAlgorithm>)Parameters["InfillAlgorithm"];
    … …  
    4646
    4747    [StorableConstructor]
    48     protected InfillSolver(bool deserializing) : base(deserializing) { }
     48    protected InfillSolver(StorableConstructorFlag deserializing) : base(deserializing) { }
    4949    protected InfillSolver(InfillSolver original, Cloner cloner) : base(original, cloner) { }
    5050    public InfillSolver() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/ModelBuilder.cs

    r15343 r17332  
    2323using System.Linq;
    2424using System.Threading;
     25using HEAL.Attic;
    2526using HeuristicLab.Algorithms.DataAnalysis;
    2627using HeuristicLab.Common;
    … …  
    3536namespace HeuristicLab.Algorithms.EGO {
    3637  [Item("ModelBuilder", "Builds a model from a dataset and a given RegressionAlgorithm")]
    37   [StorableClass]
    38   public class ModelBuilder : InstrumentedOperator, IStochasticOperator, ICancellableOperator {
     38    [StorableType("8b80026f-b6a5-4892-9826-86ffba1e4e10")]
     39    public class ModelBuilder : InstrumentedOperator, IStochasticOperator, ICancellableOperator {
    3940    public override bool CanChangeName => true;
    4041    public CancellationToken Cancellation { get; set; }
    … …  
    5051
    5152    [StorableConstructor]
    52     protected ModelBuilder(bool deserializing) : base(deserializing) { }
     53    protected ModelBuilder(StorableConstructorFlag deserializing) : base(deserializing) { }
    5354    protected ModelBuilder(ModelBuilder original, Cloner cloner) : base(original, cloner) { }
    5455    public ModelBuilder() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/ModelQualityAnalyzer.cs

    r15343 r17332  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Analysis;
    2324using HeuristicLab.Common;
    … …  
    2627using HeuristicLab.Optimization;
    2728using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    3131namespace HeuristicLab.Algorithms.EGO {
    3232  [Item("ModelQualityAnalyzer", "Collects RealVectors into a modifiablbe dataset")]
    33   [StorableClass]
    34   public class ModelQualityAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
     33    [StorableType("12c5a773-4397-45eb-ad25-0ffc897513f8")]
     34    public class ModelQualityAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
    3535    public override bool CanChangeName => true;
    3636    public bool EnabledByDefault => false;
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ModelQualityAnalyzer(bool deserializing) : base(deserializing) { }
     49    protected ModelQualityAnalyzer(StorableConstructorFlag deserializing) : base(deserializing) { }
    5050    protected ModelQualityAnalyzer(ModelQualityAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5151    public ModelQualityAnalyzer() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/SampleCollector.cs

    r15976 r17332  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2829using HeuristicLab.Operators;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232
    3333namespace HeuristicLab.Algorithms.EGO {
    3434  [Item("SampleCollector", "Collects RealVectors into a modifiablbe dataset")]
    35   [StorableClass]
    36   public class SampleCollector : InstrumentedOperator {
     35    [StorableType("f207dfb7-2f26-4a2a-9d23-eebf2c7df1de")]
     36    public class SampleCollector : InstrumentedOperator {
    3737    public override bool CanChangeName => true;
    3838
    … …  
    4242
    4343    [StorableConstructor]
    44     protected SampleCollector(bool deserializing) : base(deserializing) { }
     44    protected SampleCollector(StorableConstructorFlag deserializing) : base(deserializing) { }
    4545    protected SampleCollector(SampleCollector original, Cloner cloner) : base(original, cloner) { }
    4646    public SampleCollector() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Operators/VariableVariabilityAnalyzer.cs

    r15338 r17332  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    … …  
    2930using HeuristicLab.Optimization;
    3031using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333
    3434namespace HeuristicLab.Algorithms.EGO {
    3535  [Item("VariableVariabilityAnalyzer", "Analyzes the correlation between perdictions and actual fitness values")]
    36   [StorableClass]
    37   public class VariableVariabilityAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
     36    [StorableType("3bc82bbb-e9dd-4a50-8241-cfcf230be8c9")]
     37    public class VariableVariabilityAnalyzer : SingleSuccessorOperator, IAnalyzer, IResultsOperator {
    3838    public override bool CanChangeName => true;
    3939    public bool EnabledByDefault => false;
    … …  
    4848
    4949    [StorableConstructor]
    50     protected VariableVariabilityAnalyzer(bool deserializing) : base(deserializing) { }
     50    protected VariableVariabilityAnalyzer(StorableConstructorFlag deserializing) : base(deserializing) { }
    5151    protected VariableVariabilityAnalyzer(VariableVariabilityAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5252    public VariableVariabilityAnalyzer() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/Problems/InfillProblem.cs

    r15064 r17332  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    … …  
    3233
    3334namespace HeuristicLab.Algorithms.EGO {
    34   [StorableClass]
    35   [Item("InfillProblem", "A problem for finding the most interesing potential new sampling Points by optimizing some InfillCriterion")]
     35    [StorableType("4f14a2dd-b68c-4713-918c-46b264087212")]
     36    [Item("InfillProblem", "A problem for finding the most interesing potential new sampling Points by optimizing some InfillCriterion")]
    3637  public sealed class InfillProblem : SingleObjectiveBasicProblem<RealVectorEncoding> {
    3738
    … …  
    6061    #region Constructors
    6162    [StorableConstructor]
    62     private InfillProblem(bool deserializing) : base(deserializing) { }
     63    private InfillProblem(StorableConstructorFlag deserializing) : base(deserializing) { }
    6364    private InfillProblem(InfillProblem original, Cloner cloner) : base(original, cloner) {
    6465      infillCriterion = cloner.Clone(original.infillCriterion);

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/SamplingMethods/LatinHyperCubeDesignCreator.cs

    r15343 r17332  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    … …  
    3536namespace HeuristicLab.Algorithms.EGO {
    3637
    37   [StorableClass]
    38   [Item("LatinHyperCubeDesignCreator", "A latin hypercube sampling strategy for real valued optimization")]
     38    [StorableType("03d03890-d122-4730-b7bf-378a40d90a22")]
     39    [Item("LatinHyperCubeDesignCreator", "A latin hypercube sampling strategy for real valued optimization")]
    3940  public class LatinHyperCubeDesignCreator : RealVectorCreator, IInitialSampling<RealVector> {
    4041    private IValueLookupParameter<IntValue> DesignSize => (IValueLookupParameter<IntValue>)Parameters["DesignSize"];
    … …  
    4344
    4445    [StorableConstructor]
    45     protected LatinHyperCubeDesignCreator(bool deserializing) : base(deserializing) { }
     46    protected LatinHyperCubeDesignCreator(StorableConstructorFlag deserializing) : base(deserializing) { }
    4647
    4748    protected LatinHyperCubeDesignCreator(LatinHyperCubeDesignCreator original, Cloner cloner) : base(original, cloner) {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/SamplingMethods/UniformRandomDiscreteSampling.cs

    r15343 r17332  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Optimization;
    2526using HeuristicLab.Encodings.IntegerVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828// ReSharper disable once CheckNamespace
    2929namespace HeuristicLab.Algorithms.EGO {
    3030
    31   [StorableClass]
    32   [Item("UniformRandomDiscreteSampling", "A uniform random sampling strategy for real valued optimization")]
     31    [StorableType("6c6474ee-b8f2-409e-a2e4-61b7c01e1fa2")]
     32    [Item("UniformRandomDiscreteSampling", "A uniform random sampling strategy for real valued optimization")]
    3333  public class UniformRandomDiscreteSampling : ParameterizedNamedItem, IInitialSampling<IntegerVector> {
    3434
    3535    #region HL-Constructors, Serialization and Cloning
    3636    [StorableConstructor]
    37     protected UniformRandomDiscreteSampling(bool deserializing) : base(deserializing) { }
     37    protected UniformRandomDiscreteSampling(StorableConstructorFlag deserializing) : base(deserializing) { }
    3838    protected UniformRandomDiscreteSampling(UniformRandomDiscreteSampling original, Cloner cloner) : base(original, cloner) { }
    3939    public UniformRandomDiscreteSampling() {

  • branches/2745_EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/SamplingMethods/UniformRandomSampling.cs

    r15343 r17332  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Optimization;
    2526using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828// ReSharper disable once CheckNamespace
    2929namespace HeuristicLab.Algorithms.EGO {
    3030
    31   [StorableClass]
    32   [Item("UniformRandomSampling", "A uniform random sampling strategy for real valued optimization")]
     31    [StorableType("5e725905-0d77-4379-bbb9-8ca6ae392e59")]
     32    [Item("UniformRandomSampling", "A uniform random sampling strategy for real valued optimization")]
    3333  public class UniformRandomSampling : ParameterizedNamedItem, IInitialSampling<RealVector> {
    3434
    3535    #region HL-Constructors, Serialization and Cloning
    3636    [StorableConstructor]
    37     protected UniformRandomSampling(bool deserializing) : base(deserializing) { }
     37    protected UniformRandomSampling(StorableConstructorFlag deserializing) : base(deserializing) { }
    3838    protected UniformRandomSampling(UniformRandomSampling original, Cloner cloner) : base(original, cloner) { }
    3939    public UniformRandomSampling() {
Note: See TracChangeset for help on using the changeset viewer.