Changeset 15091 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleCreator.cs

Timestamp:

06/29/17 15:26:16 (7 years ago)

Author:

abeham

Message:

#2797:

• Updated PSO to make it more compatible with SPSO 2011
• Removed truncation of velocity vector and instead rescaled it given the maximum velocity
• Added non-zero initial velocity according to SPSO 2011
• Removed complicated bouncing code due to box constraints and instead implemented as described in SPSO 2011
• Calculating neighbor best has been changed to use personal best
• Avoiding local and global particle update and instead relying on neighborbest
• More randomization during velocity update by using a separate random numbers per dimension
• Reusing problem specific solution creator in RealVectorParticleCreator instead of always using UniformRandomRealVectorCreator

File:

• trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorParticleCreator.cs (modified) (5 diffs)

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

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -30 +31 @@
   [Item("RealVectorParticleCreator", "Creates a particle with position, zero velocity vector and personal best.")]
   [StorableClass]
-  public class RealVectorParticleCreator : AlgorithmOperator, IRealVectorParticleCreator {
+  public class RealVectorParticleCreator : AlgorithmOperator, IRealVectorParticleCreator, IStochasticOperator {
 
     #region Parameters
-    public ILookupParameter<IntValue> ProblemSizeParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["ProblemSize"]; }
+    public ILookupParameter<IRandom> RandomParameter {
+      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
     public IValueLookupParameter<DoubleMatrix> BoundsParameter {
@@ -48 +49 @@
       get { return (ILookupParameter<RealVector>)Parameters["Velocity"]; }
     }
-    #endregion
-
-    #region Parameter Values
-    protected int ProblemSize {
-      get { return ProblemSizeParameter.ActualValue.Value; }
-    }
-    protected RealVector Velocity {
-      set { VelocityParameter.ActualValue = value; }
+    public ILookupParameter<ISolutionCreator> SolutionCreatorParameter {
+      get { return (ILookupParameter<ISolutionCreator>)Parameters["SolutionCreator"]; }
     }
     #endregion
-
+    
     #region Construction & Cloning
     [StorableConstructor]
@@ -65 +60 @@
     public RealVectorParticleCreator()
       : base() {
-      Parameters.Add(new LookupParameter<IntValue>("ProblemSize", "The dimension of the problem."));
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
       Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds in each dimension."));
       Parameters.Add(new LookupParameter<RealVector>("RealVector", "Particle's current solution"));
       Parameters.Add(new LookupParameter<RealVector>("PersonalBest", "Particle's personal best solution."));
       Parameters.Add(new LookupParameter<RealVector>("Velocity", "Particle's current velocity."));
+      Parameters.Add(new LookupParameter<ISolutionCreator>("SolutionCreator", "The operator that creates the initial position."));
 
-      UniformRandomRealVectorCreator realVectorCreater = new UniformRandomRealVectorCreator();
+      Placeholder realVectorCreater = new Placeholder();
       Assigner personalBestPositionAssigner = new Assigner();
+      RealVectorVelocityInitializer velocityInitializer = new RealVectorVelocityInitializer();
 
       OperatorGraph.InitialOperator = realVectorCreater;
 
-      realVectorCreater.RealVectorParameter.ActualName = RealVectorParameter.Name;
-      realVectorCreater.LengthParameter.ActualName = ProblemSizeParameter.Name;
-      realVectorCreater.BoundsParameter.ActualName = BoundsParameter.Name;
+      realVectorCreater.OperatorParameter.ActualName = SolutionCreatorParameter.Name;
       realVectorCreater.Successor = personalBestPositionAssigner;
 
       personalBestPositionAssigner.LeftSideParameter.ActualName = PersonalBestParameter.Name;
       personalBestPositionAssigner.RightSideParameter.ActualName = RealVectorParameter.Name;
-      personalBestPositionAssigner.Successor = null;
+      personalBestPositionAssigner.Successor = velocityInitializer;
+
+      velocityInitializer.BoundsParameter.ActualName = BoundsParameter.Name;
+      velocityInitializer.RandomParameter.ActualName = RandomParameter.Name;
+      velocityInitializer.RealVectorParameter.ActualName = RealVectorParameter.Name;
+      velocityInitializer.VelocityParameter.ActualName = VelocityParameter.Name;
+      velocityInitializer.Successor = null;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -89 +90 @@
     }
     #endregion
-
-    public override IOperation Apply() {
-      Velocity = new RealVector(ProblemSize);
-      return base.Apply();
-    }
-
-
   }
 }