Free cookie consent management tool by TermsFeed Policy Generator

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/DiscreteEGO
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • 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() {
Note: See TracChangeset for help on using the changeset viewer.