Changeset 5581 for trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization

Timestamp:

03/01/11 16:38:39 (14 years ago)

Author:

mkofler

Message:

#852: PSO code refactoring. Fixed wiring in main loop (Analyzer was not in loop) and fixed small issue in RealVectorSwarmUpdater.

Location:

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Files:

• BestPointInitializer.cs (deleted)
• HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj (modified) (1 diff)
• ParticleSwarmOptimization.cs (modified) (1 diff)
• ParticleSwarmOptimizationMainLoop.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj

@@ -106 +106 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BestPointInitializer.cs" />
     <Compile Include="MultiPSOTopologyUpdater.cs" />
     <Compile Include="ParticleSwarmOptimizationMainLoop.cs" />

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

@@ -286 +286 @@
     private void InitializeAnalyzers() {
       qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      qualityAnalyzer.ResultsParameter.ActualName = "Results";
       ParameterizeAnalyzers();
     }

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

@@ -187 +187 @@
       conditionalBranch.Name = "ContinueIteration?";
       conditionalBranch.ConditionParameter.ActualName = "ContinueIteration";
-      conditionalBranch.TrueBranch = uniformSubScopeProcessor;
+      conditionalBranch.TrueBranch = analyzerPlaceholder;
       #endregion
     }