Changeset 5435 for trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

Timestamp:

02/04/11 21:34:45 (13 years ago)

Author:

abeham

Message:

#852

• Made public properties that redirect to ActualValue.Value private or protected
• Sealed all of the specific operators
• Removed files that are present in the repository, but are not included in the project
• Removed .sln file (is this still needed?)
• Added license headers to some files
• Unified the pattern for writing the constructors similar to other files in the trunk
• Corrected assembly and plugin version from 3.3.0.x to 3.3.2.x
• Fixed the wiring in the VelocityBoundsModifier

File:

• trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (3 diffs)

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

@@ -34 +34 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
-
   [Item("Particle Swarm Optimization", "A particle swarm optimization algorithm based on the description in Pedersen, M.E.H. (2010). PhD thesis. University of Southampton.")]
   [Creatable("Algorithms")]
   [StorableClass]
-  public class ParticleSwarmOptimization : EngineAlgorithm, IStorableContent {
+  public sealed class ParticleSwarmOptimization : EngineAlgorithm, IStorableContent {
 
     #region Problem Properties
@@ -135 +133 @@
 
     [StorableConstructor]
-    protected ParticleSwarmOptimization(bool deserializing)
-      : base(deserializing) {
-    }
-    protected ParticleSwarmOptimization(ParticleSwarmOptimization original, Cloner cloner)
+    private ParticleSwarmOptimization(bool deserializing) : base(deserializing) { }
+    private ParticleSwarmOptimization(ParticleSwarmOptimization original, Cloner cloner)
       : base(original, cloner) {
       qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
       Initialize();
     }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      Initialize();
-    }
-
     public ParticleSwarmOptimization()
       : base() {
@@ -288 +278 @@
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     public override void Prepare() {
       if (Problem != null) {