Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (8 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/MultiPSOTopologyUpdater.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("3c9ea42b-959f-4a52-b0a0-829a32cfcf2d")]
    3535  public sealed class MultiPSOTopologyUpdater : SingleSuccessorOperator, ITopologyUpdater {
    3636
    … …  
    105105
    106106        var particles = Enumerable.Range(0, SwarmSize).ToList();
    107         for (int i = SwarmSize-1; i>0; i--) {
    108           int j = Random.Next(i+1);
     107        for (int i = SwarmSize - 1; i > 0; i--) {
     108          int j = Random.Next(i + 1);
    109109          int t = particles[j];
    110110          particles[j] = particles[i];
    … …  
    112112        }
    113113
    114         for (int partitionNr = 0; partitionNr<NrOfSwarms; partitionNr++) {
    115           int start = partitionNr*SwarmSize/NrOfSwarms;
    116           int end = (partitionNr+1)*SwarmSize/NrOfSwarms;
    117           for (int i = start; i<end; i++)
     114        for (int partitionNr = 0; partitionNr < NrOfSwarms; partitionNr++) {
     115          int start = partitionNr * SwarmSize / NrOfSwarms;
     116          int end = (partitionNr + 1) * SwarmSize / NrOfSwarms;
     117          for (int i = start; i < end; i++)
    118118            neighbors[particles[i]] = GetSegment(particles, start, end, i);
    119119        }
    … …  
    127127      return new IntArray(list
    128128        .Skip(start)
    129         .Take(end-start)
    130         .Where((p, j) => start+j != excludedIndex)
     129        .Take(end - start)
     130        .Where((p, j) => start + j != excludedIndex)
    131131        .ToArray());
    132132    }

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

    r14185 r14927  
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HeuristicLab.Persistence;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
    … …  
    3737  [Item("Particle Swarm Optimization (PSO)", "A particle swarm optimization algorithm based on the description in Pedersen, M.E.H. (2010). PhD thesis. University of Southampton.")]
    3838  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 300)]
    39   [StorableClass]
     39  [StorableType("b9bf87f6-758e-416d-9d7a-c9b839cac55b")]
    4040  public sealed class ParticleSwarmOptimization : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4141    #region Parameter Properties

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs

    r14185 r14927  
    2727using HeuristicLab.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    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("93749643-6078-44a3-943e-a723e564af18")]
    3434  public class ParticleSwarmOptimizationMainLoop : AlgorithmOperator {
    3535

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/RandomTopologyInitializer.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3131  [Item("Random Topology Initializer", "Randomly connectes every particle with k other particles.")]
    32   [StorableClass]
     32  [StorableType("cdf2be63-a554-4311-a904-5b035437c21e")]
    3333  public sealed class RandomTopologyInitializer : TopologyInitializer {
    3434    #region Parameters

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/RingTopologyInitializer.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.Data;
    2626
    2727namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    2828  [Item("Ring Topology Initializer", "Connected every particle with its preceeding and its following particle.")]
    29   [StorableClass]
     29  [StorableType("bb20715f-5836-4c9f-9e80-f4c5f9924e85")]
    3030  public sealed class RingTopologyInitializer : TopologyInitializer {
    3131    #region Construction & Cloning

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/TopologyInitializer.cs

    r14185 r14927  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    3131  [Item("TopologyInitializer", "Groups the particles into neighborhoods according to a certain strategy.")]
    32   [StorableClass]
     32  [StorableType("701cef7e-eb73-476a-a84c-9dcaa9aa1c61")]
    3333  public abstract class TopologyInitializer : SingleSuccessorOperator, ITopologyInitializer {
    3434    public override bool CanChangeName {
    … …  
    6161    protected TopologyInitializer(bool deserializing) : base(deserializing) { }
    6262    protected TopologyInitializer(TopologyInitializer original, Cloner cloner) : base(original, cloner) { }
    63    
     63
    6464    public TopologyInitializer() {
    6565      Parameters.Add(new ScopeTreeLookupParameter<IntArray>("Neighbors", "The list of neighbors for each particle."));

  • branches/PersistenceReintegration/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/VonNeumannTopologyInitializer.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.Data;
    2626
    2727namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
    2828  [Item("Von Neumann Topology Initializer", "Every particle is connected with the two following and the two previous particles wrapping around at the beginning and the end of the population.")]
    29   [StorableClass]
     29  [StorableType("8a75290e-7bd7-4cc2-93ee-9137cbc5a299")]
    3030  public sealed class VonNeumannTopologyInitializer : TopologyInitializer {
    3131
Note: See TracChangeset for help on using the changeset viewer.