Changeset 5568 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleUpdater.cs

Timestamp:

02/28/11 17:25:28 (14 years ago)

Author:

epitzer

Message:

Continue working on SwarmUpdater (#852)

File:

• trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleUpdater.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleUpdater.cs

@@ -45 +45 @@
       get { return (ILookupParameter<RealVector>)Parameters["PersonalBest"]; }
     }
-    public ILookupParameter<RealVector> NeighborsBestParameter {
-      get { return (ILookupParameter<RealVector>)Parameters["NeighborsBest"]; }
+    public ILookupParameter<RealVector> NeighborBestParameter {
+      get { return (ILookupParameter<RealVector>)Parameters["NeighborBest"]; }
+    }
+    public LookupParameter<RealVector> BestPointParameter {
+      get { return (LookupParameter<RealVector>)Parameters["BestPoint"]; }
     }
     public ILookupParameter<RealVector> RealVectorParameter {
@@ -63 +66 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["PersonalBestAttraction"]; }
     }
-    public ILookupParameter<DoubleValue> NeighborsBestAttractionParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["NeighborsBestAttraction"]; }
+    public ILookupParameter<DoubleValue> NeighborBestAttractionParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["NeighborBestAttraction"]; }
     }
     #endregion
@@ -79 +82 @@
       get { return PersonalBestParameter.ActualValue; }
     }
+    protected RealVector BestPoint {
+      get { return BestPointParameter.ActualValue; }
+    }
     protected RealVector RealVector {
       get { return RealVectorParameter.ActualValue; }
       set { RealVectorParameter.ActualValue = value; }
     }
-    protected RealVector NeighborsBest {
-      get { return NeighborsBestParameter.ActualValue; }
+    protected RealVector NeighborBest {
+      get { return NeighborBestParameter.ActualValue; }
     }
     protected DoubleMatrix Bounds {
@@ -98 +104 @@
       get { return PersonalBestAttractionParameter.ActualValue; }
     }
-    protected DoubleValue NeighborsBestAttraction {
-      get { return NeighborsBestAttractionParameter.ActualValue; }
+    protected DoubleValue NeighborBestAttraction {
+      get { return NeighborBestAttractionParameter.ActualValue; }
     }
     #endregion
@@ -108 +114 @@
     protected RealVectorParticleUpdater(bool deserializing) : base(deserializing) { }
     protected RealVectorParticleUpdater(RealVectorParticleUpdater original, Cloner cloner) : base(original, cloner) { }
-    
+
     public RealVectorParticleUpdater()
       : base() {
@@ -116 +122 @@
       Parameters.Add(new LookupParameter<RealVector>("PersonalBest", "Particle's personal best solution."));
       Parameters.Add(new LookupParameter<RealVector>("BestPoint", "Global best position."));
-      Parameters.Add(new LookupParameter<RealVector>("NeighborsBest", "Best neighboring solution."));
+      Parameters.Add(new LookupParameter<RealVector>("NeighborBest", "Best neighboring solution."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds for each dimension of the position vector for the current problem."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("VelocityBounds", "Upper and lower bounds for the particle's velocity vector."));
       Parameters.Add(new LookupParameter<DoubleValue>("Inertia", "The weight for the particle's velocity vector."));
       Parameters.Add(new LookupParameter<DoubleValue>("PersonalBestAttraction", "The weight for the particle's personal best position."));
-      Parameters.Add(new LookupParameter<DoubleValue>("NeighborsBestAttraction", "The weight for the global best position."));
+      Parameters.Add(new LookupParameter<DoubleValue>("NeighborBestAttraction", "The weight for the global best position."));
     }