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

Timestamp:

02/04/11 21:34:45 (14 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/RandomTopologyInitializer.cs (modified) (5 diffs)

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

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
 namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
-
   [Item("Random Topology Initializer", "Randomly connectes every particle with k other particles.")]
   [StorableClass]
-  public class RandomTopologyInitializer : TopologyInitializer {
-
+  public sealed class RandomTopologyInitializer : TopologyInitializer {
     #region Parameters
     public ILookupParameter<IRandom> RandomParameter {
@@ -44 +43 @@
 
     #region Parameter Values
-    public IRandom Random {
+    private IRandom Random {
       get { return RandomParameter.ActualValue; }
     }
-    public int NrOfConnections {
+    private int NrOfConnections {
       get { return NrOfConnectionsParameter.ActualValue.Value; }
     }
@@ -53 +52 @@
 
     #region Construction & Cloning
+    [StorableConstructor]
+    private RandomTopologyInitializer(bool deserializing) : base(deserializing) { }
+    private RandomTopologyInitializer(RandomTopologyInitializer original, Cloner cloner) : base(original, cloner) { }
     public RandomTopologyInitializer() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "A random number generation."));
       Parameters.Add(new ValueLookupParameter<IntValue>("NrOfConnections", "Nr of connected neighbors.", new IntValue(3)));
     }
-    [StorableConstructor]
-    protected RandomTopologyInitializer(bool deserializing) : base(deserializing) { }
-    protected RandomTopologyInitializer(RandomTopologyInitializer original, Cloner cloner)
-      : base(original, cloner) {
-    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RandomTopologyInitializer(this, cloner);
@@ -69 +67 @@
     public override IOperation Apply() {
       ItemArray<IntegerVector> neighbors = new ItemArray<IntegerVector>(SwarmSize);
-      for (int i = 0; i<SwarmSize; i++) {
+      for (int i = 0; i < SwarmSize; i++) {
         var numbers = Enumerable.Range(0, SwarmSize).ToList();
         numbers.RemoveAt(i);
         var selectedNumbers = new List<int>(NrOfConnections);
-        for (int j = 0; j<NrOfConnections && numbers.Count > 0; j++) {
+        for (int j = 0; j < NrOfConnections && numbers.Count > 0; j++) {
           int index = Random.Next(numbers.Count);
           selectedNumbers.Add(numbers[index]);
@@ -83 +81 @@
       return base.Apply();
     }
-
   }
 }