Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (5 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.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAEqualweightedRecombinator.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    2727  [Item("CMA Equal-weighted Recombinator", "Calculates weighted mean using equal weights.")]
    28   [StorableClass]
     28  [StorableType("989FE031-C410-4435-B5F5-17A22C4A97BC")]
    2929  public class CMAEqualweightedRecombinator : CMARecombinator {
    3030
    3131    [StorableConstructor]
    32     protected CMAEqualweightedRecombinator(bool deserializing) : base(deserializing) { }
     32    protected CMAEqualweightedRecombinator(StorableConstructorFlag _) : base(_) { }
    3333    protected CMAEqualweightedRecombinator(CMAEqualweightedRecombinator original, Cloner cloner) : base(original, cloner) { }
    3434    public CMAEqualweightedRecombinator() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAInitializer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using System;
    3030using System.Collections.Generic;
    … …  
    3333namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3434  [Item("CMAInitializer", "Initializes the covariance matrix and step size variables.")]
    35   [StorableClass]
     35  [StorableType("AEE40FF4-A610-474B-B969-032A54D814CE")]
    3636  public class CMAInitializer : SingleSuccessorOperator, ICMAInitializer, IIterationBasedOperator {
    3737
    … …  
    7979
    8080    [StorableConstructor]
    81     protected CMAInitializer(bool deserializing) : base(deserializing) { }
     81    protected CMAInitializer(StorableConstructorFlag _) : base(_) { }
    8282    protected CMAInitializer(CMAInitializer original, Cloner cloner) : base(original, cloner) { }
    8383    public CMAInitializer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMALinearweightedRecombinator.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    2727  [Item("CMA Linear-weighted Recombinator", "Calculates weighted mean using linear decreasing weights.")]
    28   [StorableClass]
     28  [StorableType("628D27E7-AD3F-418B-A44D-E5338017CA69")]
    2929  public class CMALinearweightedRecombinator : CMARecombinator {
    3030
    3131    [StorableConstructor]
    32     protected CMALinearweightedRecombinator(bool deserializing) : base(deserializing) { }
     32    protected CMALinearweightedRecombinator(StorableConstructorFlag _) : base(_) { }
    3333    protected CMALinearweightedRecombinator(CMALinearweightedRecombinator original, Cloner cloner) : base(original, cloner) { }
    3434    public CMALinearweightedRecombinator() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMALogweightedRecombinator.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    2929  [Item("CMA Log-weighted Recombinator", "Calculates weighted mean based on a logarithmic decreasing weights.")]
    30   [StorableClass]
     30  [StorableType("83A47E81-FF87-4A28-AEB4-DE453B55B680")]
    3131  public class CMALogweightedRecombinator : CMARecombinator {
    3232
    3333    [StorableConstructor]
    34     protected CMALogweightedRecombinator(bool deserializing) : base(deserializing) { }
     34    protected CMALogweightedRecombinator(StorableConstructorFlag _) : base(_) { }
    3535    protected CMALogweightedRecombinator(CMALogweightedRecombinator original, Cloner cloner) : base(original, cloner) { }
    3636    public CMALogweightedRecombinator() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAMutator.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Random;
    3232
    3333namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3434  [Item("CMAMutator", "Mutates the solution vector according to the CMA-ES scheme.")]
    35   [StorableClass]
     35  [StorableType("13539C1A-1D94-4CD7-8514-2173C661333D")]
    3636  public sealed class CMAMutator : SingleSuccessorOperator, IStochasticOperator, ICMAManipulator, IIterationBasedOperator {
    3737
    … …  
    8383
    8484    [StorableConstructor]
    85     private CMAMutator(bool deserializing) : base(deserializing) { }
     85    private CMAMutator(StorableConstructorFlag _) : base(_) { }
    8686    private CMAMutator(CMAMutator original, Cloner cloner) : base(original, cloner) { }
    8787    public CMAMutator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMARecombinator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using System;
    2929
    3030namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3131  [Item("CMARecombinator", "Base class that calculates the weighted mean of a number of offspring.")]
    32   [StorableClass]
     32  [StorableType("C0798B4D-1685-4720-828A-17E40879000B")]
    3333  public abstract class CMARecombinator : SingleSuccessorOperator, ICMARecombinator {
    3434
    … …  
    5656
    5757    [StorableConstructor]
    58     protected CMARecombinator(bool deserializing) : base(deserializing) { }
     58    protected CMARecombinator(StorableConstructorFlag _) : base(_) { }
    5959    protected CMARecombinator(CMARecombinator original, Cloner cloner) : base(original, cloner) { }
    6060    protected CMARecombinator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAUpdater.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using System;
    3131using System.Linq;
    … …  
    3333namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3434  [Item("CMAUpdater", "Updates the covariance matrix and strategy parameters of CMA-ES.")]
    35   [StorableClass]
     35  [StorableType("872D120A-1CBE-4C01-8250-E34BF8BBD9DA")]
    3636  public class CMAUpdater : SingleSuccessorOperator, ICMAUpdater, IIterationBasedOperator, ISingleObjectiveOperator {
    3737
    … …  
    7979
    8080    [StorableConstructor]
    81     protected CMAUpdater(bool deserializing) : base(deserializing) { }
     81    protected CMAUpdater(StorableConstructorFlag _) : base(_) { }
    8282    protected CMAUpdater(CMAUpdater original, Cloner cloner) : base(original, cloner) { }
    8383    public CMAUpdater()
Note: See TracChangeset for help on using the changeset viewer.