Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (5 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
13 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/AdaptiveRandomTopologyUpdater.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    23 using System.Linq;
    2422using HeuristicLab.Common;
    2523using HeuristicLab.Core;
    … …  
    2826using HeuristicLab.Optimization;
    2927using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    3129
    3230namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3331  [Item("SPSO Adaptive Random Topology Updater", "Each unsuccessful iteration the topology initializer is applied again.")]
    34   [StorableClass]
     32  [StorableType("F0FC17DF-44B3-4005-9CC3-EDBA7945544A")]
    3533  public sealed class SPSOAdaptiveRandomTopologyUpdater : SingleSuccessorOperator, ITopologyUpdater, ISingleObjectiveOperator {
    3634
    … …  
    5957    #region Construction & Cloning
    6058    [StorableConstructor]
    61     private SPSOAdaptiveRandomTopologyUpdater(bool deserializing) : base(deserializing) { }
     59    private SPSOAdaptiveRandomTopologyUpdater(StorableConstructorFlag _) : base(_) { }
    6260    private SPSOAdaptiveRandomTopologyUpdater(SPSOAdaptiveRandomTopologyUpdater original, Cloner cloner) : base(original, cloner) { }
    6361    public SPSOAdaptiveRandomTopologyUpdater()

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj

    r15181 r16565  
    1111    <RootNamespace>HeuristicLab.Algorithms.ParticleSwarmOptimization</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
    … …  
    9898  </PropertyGroup>
    9999  <ItemGroup>
     100    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     101      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     102    </Reference>
     103    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     104      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     105    </Reference>
    100106    <Reference Include="System" />
    101107    <Reference Include="System.Core">
    … …  
    103109    </Reference>
    104110    <Reference Include="System.Drawing" />
     111    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     112      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     113    </Reference>
    105114    <Reference Include="System.Xml.Linq">
    106115      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    127136  <ItemGroup>
    128137    <None Include="HeuristicLab.snk" />
     138    <None Include="packages.config" />
    129139    <None Include="Plugin.cs.frame" />
    130140    <None Include="Properties\AssemblyInfo.cs.frame" />

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/MultiPSOTopologyUpdater.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3333  [Item("Multi PSO Topology Updater", "Splits swarm into NrOfSwarms non-overlapping sub-swarms. Swarms are re-grouped every regroupingPeriod iteration. The operator is implemented as described in Liang, J.J. and Suganthan, P.N 2005. Dynamic multi-swarm particle swarm optimizer. IEEE Swarm Intelligence Symposium, pp. 124-129.")]
    34   [StorableClass]
     34  [StorableType("F5436478-B901-4357-AEE8-B63E5EB13AAF")]
    3535  public sealed class MultiPSOTopologyUpdater : SingleSuccessorOperator, ITopologyUpdater, IStochasticOperator {
    3636
    … …  
    8484    #region Construction & Cloning
    8585    [StorableConstructor]
    86     private MultiPSOTopologyUpdater(bool deserializing) : base(deserializing) { }
     86    private MultiPSOTopologyUpdater(StorableConstructorFlag _) : base(_) { }
    8787    private MultiPSOTopologyUpdater(MultiPSOTopologyUpdater original, Cloner cloner) : base(original, cloner) { }
    8888    public MultiPSOTopologyUpdater()

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Linq;
    2524using HeuristicLab.Analysis;
    … …  
    3130using HeuristicLab.Optimization.Operators;
    3231using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3433using HeuristicLab.PluginInfrastructure;
    3534using HeuristicLab.Random;
    … …  
    3837  [Item("Particle Swarm Optimization (PSO)", "A particle swarm optimization algorithm based on Standard PSO (SPSO) as described in Clerc, M. (2012). Standard particle swarm optimisation.")]
    3938  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 300)]
    40   [StorableClass]
     39  [StorableType("068A0951-B08D-41D3-A142-BA345D0AD47E")]
    4140  public sealed class ParticleSwarmOptimization : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4241    #region Parameter Properties
    … …  
    165164
    166165    [StorableConstructor]
    167     private ParticleSwarmOptimization(bool deserializing) : base(deserializing) { }
     166    private ParticleSwarmOptimization(StorableConstructorFlag _) : base(_) { }
    168167    private ParticleSwarmOptimization(ParticleSwarmOptimization original, Cloner cloner)
    169168      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3232  [Item("ParticleSwarmOptimizationMainLoop", "An operator which represents the main loop of a particle swarm optimization algorithm.")]
    33   [StorableClass]
     33  [StorableType("C9824DCA-F791-4540-8EC8-F27C8FBC6BF5")]
    3434  public class ParticleSwarmOptimizationMainLoop : AlgorithmOperator {
    3535
    … …  
    8585
    8686    [StorableConstructor]
    87     protected ParticleSwarmOptimizationMainLoop(bool deserializing) : base(deserializing) { }
     87    protected ParticleSwarmOptimizationMainLoop(StorableConstructorFlag _) : base(_) { }
    8888    protected ParticleSwarmOptimizationMainLoop(ParticleSwarmOptimizationMainLoop original, Cloner cloner)
    8989      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/Plugin.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/Properties/AssemblyInfo.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/RandomTopologyInitializer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3232  [Item("Random Distinct Topology Initializer", "Each particle is informed by exactly k+1 distinct other particles (including itself).")]
    33   [StorableClass]
     33  [StorableType("50A4DB55-5C5C-4C0E-A438-6C7DE14EA8A6")]
    3434  public sealed class RandomTopologyInitializer : TopologyInitializer, IStochasticOperator {
    3535    #region Parameters
    … …  
    4444    #region Construction & Cloning
    4545    [StorableConstructor]
    46     private RandomTopologyInitializer(bool deserializing) : base(deserializing) { }
     46    private RandomTopologyInitializer(StorableConstructorFlag _) : base(_) { }
    4747    private RandomTopologyInitializer(RandomTopologyInitializer original, Cloner cloner) : base(original, cloner) { }
    4848    public RandomTopologyInitializer() {

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/RingTopologyInitializer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Data;
    2626
    2727namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    2828  [Item("Ring Topology Initializer", "Each particle is informed by its preceeding and its succeeding particle wrapping around at the beginning and the end of the swarm (in addition each particle also informs itself).")]
    29   [StorableClass]
     29  [StorableType("B09A84CE-E1CC-4F38-BC84-1E541A792EBB")]
    3030  public sealed class RingTopologyInitializer : TopologyInitializer {
    3131    #region Construction & Cloning
    3232
    3333    [StorableConstructor]
    34     private RingTopologyInitializer(bool deserializing) : base(deserializing) { }
     34    private RingTopologyInitializer(StorableConstructorFlag _) : base(_) { }
    3535    private RingTopologyInitializer(RingTopologyInitializer original, Cloner cloner) : base(original, cloner) { }
    3636    public RingTopologyInitializer() : base() { }

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/SPSORandomTopologyInitializer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3232  [Item("SPSO Random Topology Initializer", "Each particle informs k+1 other particles (including itself). The same particle (including itself) can be informed multiple times.")]
    33   [StorableClass]
     33  [StorableType("3A589247-0629-44E4-8A49-610DE0FEC642")]
    3434  public sealed class SPSORandomTopologyInitializer : TopologyInitializer, IStochasticOperator {
    3535    #region Parameters
    … …  
    4444    #region Construction & Cloning
    4545    [StorableConstructor]
    46     private SPSORandomTopologyInitializer(bool deserializing) : base(deserializing) { }
     46    private SPSORandomTopologyInitializer(StorableConstructorFlag _) : base(_) { }
    4747    private SPSORandomTopologyInitializer(SPSORandomTopologyInitializer original, Cloner cloner) : base(original, cloner) { }
    4848    public SPSORandomTopologyInitializer() {

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/TopologyInitializer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3131  [Item("TopologyInitializer", "Groups the particles into neighborhoods according to a certain strategy.")]
    32   [StorableClass]
     32  [StorableType("B1D32055-D844-4163-9D89-1423CCE2B4C3")]
    3333  public abstract class TopologyInitializer : SingleSuccessorOperator, ITopologyInitializer {
    3434    public override bool CanChangeName {
    … …  
    4747    #region Construction & Cloning
    4848    [StorableConstructor]
    49     protected TopologyInitializer(bool deserializing) : base(deserializing) { }
     49    protected TopologyInitializer(StorableConstructorFlag _) : base(_) { }
    5050    protected TopologyInitializer(TopologyInitializer original, Cloner cloner) : base(original, cloner) { }
    5151   

  • trunk/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/VonNeumannTopologyInitializer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Data;
    2626
    2727namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    2828  [Item("Von Neumann Topology Initializer", "Every particle is informed by the two following and the two previous particles wrapping around at the beginning and the end of the swarm (in addition each particle also informs itself).")]
    29   [StorableClass]
     29  [StorableType("F1516EBD-DA8D-462E-94DD-44391191ED8A")]
    3030  public sealed class VonNeumannTopologyInitializer : TopologyInitializer {
    3131
    … …  
    3333
    3434    [StorableConstructor]
    35     private VonNeumannTopologyInitializer(bool deserializing) : base(deserializing) { }
     35    private VonNeumannTopologyInitializer(StorableConstructorFlag _) : base(_) { }
    3636    private VonNeumannTopologyInitializer(VonNeumannTopologyInitializer original, Cloner cloner) : base(original, cloner) { }
    3737    public VonNeumannTopologyInitializer() : base() { }
Note: See TracChangeset for help on using the changeset viewer.