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.Encodings.RealVectorEncoding/3.3/ParticleOperators
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorNeighborhoodParticleUpdater.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    2828namespace HeuristicLab.Encodings.RealVectorEncoding {
    2929  [Item("Neighborhood Particle Updater", "Updates the particle's position using (among other things) the best neighbor's position. Point = Point + Velocity*Inertia + (PersonalBestPoint-Point)*Phi_P*r_p + (BestNeighborPoint-Point)*Phi_G*r_g.")]
    30   [StorableClass]
     30  [StorableType("D30B72C0-247D-466C-B677-0C99DBFEB2E4")]
    3131  [NonDiscoverableType]
    3232  [Obsolete("Use SPSO2011ParticleUpdater")]
    … …  
    3535    #region Construction & Cloning
    3636    [StorableConstructor]
    37     private RealVectorNeighborhoodParticleUpdater(bool deserializing) : base(deserializing) { }
     37    private RealVectorNeighborhoodParticleUpdater(StorableConstructorFlag _) : base(_) { }
    3838    private RealVectorNeighborhoodParticleUpdater(RealVectorNeighborhoodParticleUpdater original, Cloner cloner) : base(original, cloner) { }
    3939    public RealVectorNeighborhoodParticleUpdater() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleCreator.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.PluginInfrastructure;
    3131
    3232namespace HeuristicLab.Encodings.RealVectorEncoding {
    3333  [Item("RealVectorParticleCreator", "Creates a particle with position, zero velocity vector and personal best.")]
    34   [StorableClass]
     34  [StorableType("C2C2600B-BB18-4A97-960C-74C9303D2A33")]
    3535  [NonDiscoverableType]
    3636  [Obsolete("Use SPSOParticleCreator")]
    … …  
    6969    #region Construction & Cloning
    7070    [StorableConstructor]
    71     protected RealVectorParticleCreator(bool deserializing) : base(deserializing) { }
     71    protected RealVectorParticleCreator(StorableConstructorFlag _) : base(_) { }
    7272    protected RealVectorParticleCreator(RealVectorParticleCreator original, Cloner cloner) : base(original, cloner) { }
    7373    public RealVectorParticleCreator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleUpdater.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.PluginInfrastructure;
    3030
    … …  
    3232
    3333  [Item("RealVectorParticleUpdater", "Updates a certain particle taking the current position and velocity into account, as well as the best point and the best point in a local neighborhood.")]
    34   [StorableClass]
     34  [StorableType("1396AC75-4875-4A0F-B6C9-640047078E6E")]
    3535  [NonDiscoverableType]
    3636  [Obsolete("Use SPSO2011ParticleUpdater")]
    … …  
    120120    #region Construction & Cloning
    121121    [StorableConstructor]
    122     protected RealVectorParticleUpdater(bool deserializing) : base(deserializing) { }
     122    protected RealVectorParticleUpdater(StorableConstructorFlag _) : base(_) { }
    123123    protected RealVectorParticleUpdater(RealVectorParticleUpdater original, Cloner cloner) : base(original, cloner) { }
    124124    public RealVectorParticleUpdater()

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorSwarmUpdater.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.PluginInfrastructure;
    3333
    3434namespace HeuristicLab.Encodings.RealVectorEncoding {
    3535  [Item("RealVectorSwarmUpdater", "Updates personal best point and quality as well as global best point and quality.")]
    36   [StorableClass]
     36  [StorableType("190172D5-090F-49DA-B2FB-AD2DF8064F77")]
    3737  [NonDiscoverableType]
    3838  [Obsolete("Use SPSOSwarmUpdater")]
    … …  
    176176
    177177    [StorableConstructor]
    178     private RealVectorSwarmUpdater(bool deserializing) : base(deserializing) { }
     178    private RealVectorSwarmUpdater(StorableConstructorFlag _) : base(_) { }
    179179    private RealVectorSwarmUpdater(RealVectorSwarmUpdater original, Cloner cloner)
    180180      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorTotallyConnectedParticleUpdater.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    2828namespace HeuristicLab.Encodings.RealVectorEncoding {
    2929  [Item("Totally Connected Particle Updater", "Updates the particle's position using (among other things) the global best position. Use together with the empty topology initialzer. Point = Point + Velocity*Inertia + (PersonalBestPoint-Point)*Phi_P*r_p + (BestPoint-Point)*Phi_G*r_g")]
    30   [StorableClass]
     30  [StorableType("39FC0C08-AE80-4FA1-8C04-F54DE266C19E")]
    3131  [NonDiscoverableType]
    3232  [Obsolete("Use SPSO2011ParticleUpdater")]
    … …  
    3535    #region Construction & Cloning
    3636    [StorableConstructor]
    37     private RealVectorTotallyConnectedParticleUpdater(bool deserializing) : base(deserializing) { }
     37    private RealVectorTotallyConnectedParticleUpdater(StorableConstructorFlag _) : base(_) { }
    3838    private RealVectorTotallyConnectedParticleUpdater(RealVectorTotallyConnectedParticleUpdater original, Cloner cloner) : base(original, cloner) { }
    3939    public RealVectorTotallyConnectedParticleUpdater() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSO2007ParticleUpdater.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2827
    2928namespace HeuristicLab.Encodings.RealVectorEncoding {
    3029  [Item("SPSO 2007 Particle Updater", "Updates the particle's position according to the formulae described in SPSO 2007.")]
    31   [StorableClass]
     30  [StorableType("60C34D7A-CA73-432C-9EB1-05E503D8D2DD")]
    3231  public sealed class SPSO2007ParticleUpdater : SPSOParticleUpdater {
    3332
    3433    #region Construction & Cloning
    3534    [StorableConstructor]
    36     private SPSO2007ParticleUpdater(bool deserializing) : base(deserializing) { }
     35    private SPSO2007ParticleUpdater(StorableConstructorFlag _) : base(_) { }
    3736    private SPSO2007ParticleUpdater(SPSO2007ParticleUpdater original, Cloner cloner) : base(original, cloner) { }
    3837    public SPSO2007ParticleUpdater() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSO2007VelocityInitializer.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Encodings.RealVectorEncoding {
    2727  [Item("Velocity Initializer (SPSO 2007)", "Initializes the velocity vector.")]
    28   [StorableClass]
     28  [StorableType("40B46512-D94E-45E5-ABE5-6D9AA5B7D13A")]
    2929  public class SPSO2007VelocityInitializer : SPSOVelocityInitializer {
    3030   
    3131    #region Construction & Cloning
    3232    [StorableConstructor]
    33     protected SPSO2007VelocityInitializer(bool deserializing) : base(deserializing) { }
     33    protected SPSO2007VelocityInitializer(StorableConstructorFlag _) : base(_) { }
    3434    protected SPSO2007VelocityInitializer(SPSO2007VelocityInitializer original, Cloner cloner) : base(original, cloner) { }
    3535    public SPSO2007VelocityInitializer() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSO2011ParticleUpdater.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Random;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    3030  [Item("SPSO 2011 Particle Updater", "Updates the particle's position according to the formulae described in SPSO 2011.")]
    31   [StorableClass]
     31  [StorableType("C680E305-159C-4A76-83E5-53982B583F9B")]
    3232  public sealed class SPSO2011ParticleUpdater : SPSOParticleUpdater {
    3333    #region Construction & Cloning
    3434    [StorableConstructor]
    35     private SPSO2011ParticleUpdater(bool deserializing) : base(deserializing) { }
     35    private SPSO2011ParticleUpdater(StorableConstructorFlag _) : base(_) { }
    3636    private SPSO2011ParticleUpdater(SPSO2011ParticleUpdater original, Cloner cloner) : base(original, cloner) { }
    3737    public SPSO2011ParticleUpdater() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSO2011VelocityInitializer.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Encodings.RealVectorEncoding {
    2727  [Item("Velocity Initializer (SPSO 2011)", "Initializes the velocity vector.")]
    28   [StorableClass]
     28  [StorableType("E844F8B9-068B-433D-8693-9416CA9140FB")]
    2929  public class SPSO2011VelocityInitializer : SPSOVelocityInitializer {
    3030   
    3131    #region Construction & Cloning
    3232    [StorableConstructor]
    33     protected SPSO2011VelocityInitializer(bool deserializing) : base(deserializing) { }
     33    protected SPSO2011VelocityInitializer(StorableConstructorFlag _) : base(_) { }
    3434    protected SPSO2011VelocityInitializer(SPSO2011VelocityInitializer original, Cloner cloner) : base(original, cloner) { }
    3535    public SPSO2011VelocityInitializer() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSOParticleCreator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Encodings.RealVectorEncoding {
    3131  [Item("Particle Creator (SPSO)", "Creates a particle with position, velocity vector and personal best.")]
    32   [StorableClass]
     32  [StorableType("A2BB1DB9-7E4A-4DEA-B469-612F26645E0B")]
    3333  public class SPSOParticleCreator : AlgorithmOperator, IRealVectorParticleCreator, IStochasticOperator {
    3434
    … …  
    5959    #region Construction & Cloning
    6060    [StorableConstructor]
    61     protected SPSOParticleCreator(bool deserializing) : base(deserializing) { }
     61    protected SPSOParticleCreator(StorableConstructorFlag _) : base(_) { }
    6262    protected SPSOParticleCreator(SPSOParticleCreator original, Cloner cloner) : base(original, cloner) { }
    6363    public SPSOParticleCreator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSOParticleUpdater.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Encodings.RealVectorEncoding {
    3131
    3232  [Item("Particle Updater (SPSO)", "Updates a certain particle taking the current position and velocity into account, as well as the best point and the best point in a local neighborhood.")]
    33   [StorableClass]
     33  [StorableType("D29959F9-476B-47E3-8426-B358C9C07E01")]
    3434  public abstract class SPSOParticleUpdater : SingleSuccessorOperator, IRealVectorParticleUpdater {
    3535
    … …  
    7575    #region Construction & Cloning
    7676    [StorableConstructor]
    77     protected SPSOParticleUpdater(bool deserializing) : base(deserializing) { }
     77    protected SPSOParticleUpdater(StorableConstructorFlag _) : base(_) { }
    7878    protected SPSOParticleUpdater(SPSOParticleUpdater original, Cloner cloner) : base(original, cloner) { }
    7979    public SPSOParticleUpdater()

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSOSwarmUpdater.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    3535namespace HeuristicLab.Encodings.RealVectorEncoding {
    3636  [Item("Swarm Updater (SPSO)", "Updates personal best point and quality as well as neighbor best point and quality.")]
    37   [StorableClass]
     37  [StorableType("B8244196-9DB9-477C-A0A1-C1EB5BF4E1C1")]
    3838  public sealed class SPSOSwarmUpdater : SingleSuccessorOperator, IRealVectorSwarmUpdater, ISingleObjectiveOperator {
    3939
    … …  
    109109
    110110    [StorableConstructor]
    111     private SPSOSwarmUpdater(bool deserializing) : base(deserializing) { }
     111    private SPSOSwarmUpdater(StorableConstructorFlag _) : base(_) { }
    112112    private SPSOSwarmUpdater(SPSOSwarmUpdater original, Cloner cloner)
    113113      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSOVelocityInitializer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Encodings.RealVectorEncoding {
    3131  [Item("Velocity Initializer (SPSO)", "Initializes the velocity vector.")]
    32   [StorableClass]
     32  [StorableType("BB130DA2-221C-4C56-BF8D-9492BFA8E3C2")]
    3333  public abstract class SPSOVelocityInitializer : SingleSuccessorOperator, IStochasticOperator {
    3434    #region Parameters
    … …  
    4949    #region Construction & Cloning
    5050    [StorableConstructor]
    51     protected SPSOVelocityInitializer(bool deserializing) : base(deserializing) { }
     51    protected SPSOVelocityInitializer(StorableConstructorFlag _) : base(_) { }
    5252    protected SPSOVelocityInitializer(SPSOVelocityInitializer original, Cloner cloner) : base(original, cloner) { }
    5353    protected SPSOVelocityInitializer()
Note: See TracChangeset for help on using the changeset viewer.