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

Timestamp:

03/29/11 15:19:20 (13 years ago)

Author:

epitzer

Message:

• Remove superfluous placeholders
• Hide ParticleUpdater
• Add CurrentVelocityBounds parameter analogous to CurrentInertia
• Add (Current)VelocityBounds to results
• Merge VelocityBoundsModifier directly into SwarmUpdater (#852)

File:

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

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

@@ -163 +163 @@
       Parameters.Add(new OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>("InertiaUpdater", "Updates the omega parameter."));
       Parameters.Add(new ConstrainedValueParameter<ISwarmUpdater>("SwarmUpdater", "Encoding-specific parameter which is provided by the problem. May provide additional encoding-specific parameters, such as velocity bounds for real valued problems"));
+      ParticleUpdaterParameter.Hidden = true;
 
       RandomCreator randomCreator = new RandomCreator();
       VariableCreator variableCreator = new VariableCreator();
-      Assigner assigner = new Assigner();
+      Assigner currentInertiaAssigner = new Assigner();
       solutionsCreator = new SolutionsCreator();
       SubScopesCounter subScopesCounter = new SubScopesCounter();
       Placeholder topologyInitializerPlaceholder = new Placeholder();
-      Placeholder analyzerPlaceholder = new Placeholder();
       mainLoop = new ParticleSwarmOptimizationMainLoop();
 
@@ -180 +180 @@
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentIteration", new IntValue(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("CurrentVelocityBounds", new DoubleValue(0)));
-      variableCreator.Successor = assigner;
-
-      assigner.Name = "CurrentInertia := Inertia";
-      assigner.LeftSideParameter.ActualName = "CurrentInertia";
-      assigner.RightSideParameter.ActualName = "Inertia";
-      assigner.Successor = solutionsCreator;
+      variableCreator.Successor = currentInertiaAssigner;
+
+      currentInertiaAssigner.Name = "CurrentInertia := Inertia";
+      currentInertiaAssigner.LeftSideParameter.ActualName = "CurrentInertia";
+      currentInertiaAssigner.RightSideParameter.ActualName = "Inertia";
+      currentInertiaAssigner.Successor = solutionsCreator;
 
       solutionsCreator.NumberOfSolutionsParameter.ActualName = "SwarmSize";