Changeset 5645 for trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs

Timestamp:

03/09/11 13:46:14 (13 years ago)

Author:

epitzer

Message:

Set CurrentInertia inside operator graph and make sure all operators use it
Set default end value to epsilon instead of zero (#852)

File:

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

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

@@ -48 +48 @@
     }
     public IValueLookupParameter<DoubleValue> InertiaParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters["Inertia"]; }
+      get { return (IValueLookupParameter<DoubleValue>)Parameters["CurrentInertia"]; }
     }
     public IValueLookupParameter<DoubleValue> PersonalBestAttractionParameter {
@@ -105 +105 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
 
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("Inertia", "Inertia weight on a particle's movement (omega)."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentInertia", "Inertia weight on a particle's movement (omega)."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("PersonalBestAttraction", "Weight for particle's pull towards its personal best soution (phi_p)."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("NeighborBestAttraction", "Weight for pull towards the neighborhood best solution or global best solution in case of a totally connected topology (phi_g)."));
@@ -141 +141 @@
       #region Create operator graph
       OperatorGraph.InitialOperator = resultsCollector;
-      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", null, "CurrentIteration"));
-      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Current Inertia", null, "CurrentInertia"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("CurrentInertia"));
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Solutions", null, "EvaluatedSolutions"));
       resultsCollector.ResultsParameter.ActualName = "Results";
@@ -170 +170 @@
       subScopesCounter.Name = "Increment EvaluatedSolutions";
       subScopesCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
-      subScopesCounter.Successor = topologyUpdaterPlaceholder; 
+      subScopesCounter.Successor = topologyUpdaterPlaceholder;
 
       topologyUpdaterPlaceholder.Name = "(TopologyUpdater)";