Changeset 5435 for trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/SwarmUpdater.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/SwarmUpdater.cs (modified) (5 diffs)

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
-
   [Item("Swarm Updater", "Updates personal best point and quality as well as global best point and quality.")]
   [StorableClass]
-  public class SwarmUpdater : SingleSuccessorOperator {
+  public sealed class SwarmUpdater : SingleSuccessorOperator {
+    public override bool CanChangeName {
+      get { return false; }
+    }
 
     #region Parameter properties
@@ -59 +61 @@
 
     #region Parameter values
-    public double Quality {
+    private double Quality {
       get { return QualityParameter.ActualValue.Value; }
     }
-    public double PersonalBestQuality {
+    private double PersonalBestQuality {
       get { return PersonalBestQualityParameter.ActualValue.Value; }
       set { PersonalBestQualityParameter.ActualValue = new DoubleValue(value); }
     }
-    public double BestQuality {
+    private double BestQuality {
       get { return BestQualityParameter.ActualValue.Value; }
       set { BestQualityParameter.ActualValue = new DoubleValue(value); }
     }
-    public RealVector Point {
+    private RealVector Point {
       get { return PointParameter.ActualValue; }
     }
-    public RealVector PersonalBestPoint {
+    private RealVector PersonalBestPoint {
       get { return PersonalBestPointParameter.ActualValue; }
       set { PersonalBestPointParameter.ActualValue = value; }
     }
-    public RealVector BestPoint {
+    private RealVector BestPoint {
       get { return BestPointParameter.ActualValue; }
       set { BestPointParameter.ActualValue = value; }
     }
-    public bool Maximization {
+    private bool Maximization {
       get { return MaximizationParameter.ActualValue.Value; }
     }
@@ -89 +91 @@
 
     [StorableConstructor]
-    protected SwarmUpdater(bool deserializing) : base(deserializing) { }
-    protected SwarmUpdater(SwarmUpdater original, Cloner cloner)
-      : base(original, cloner) {
-    }
-
+    private SwarmUpdater(bool deserializing) : base(deserializing) { }
+    private SwarmUpdater(SwarmUpdater original, Cloner cloner) : base(original, cloner) { }
     public SwarmUpdater()
       : base() {
@@ -112 +111 @@
 
     public override IOperation Apply() {
-
       if (Maximization && Quality > PersonalBestQuality ||
          !Maximization && Quality < PersonalBestQuality) {
@@ -125 +123 @@
       return base.Apply();
     }
-
-    public override bool CanChangeName {
-      get { return false; }
-    }
   }
 }