Changeset 5581

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

Files:

• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/BestPointInitializer.cs (deleted)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimizationMainLoop.cs (modified) (1 diff)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorSwarmUpdater.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
     }

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

@@ -206 +206 @@
         }
         for (int i = 0; i < RealVector.Length; i++) {
-          if (Maximization && PersonalBestQuality[i].Value > NeighborBestQuality[i].Value ||
-             !Maximization && PersonalBestQuality[i].Value < NeighborBestQuality[i].Value) {
+          if (Maximization && PersonalBestQuality[i].Value > neighborBestQuality[i].Value ||
+             !Maximization && PersonalBestQuality[i].Value < neighborBestQuality[i].Value) {
             neighborBestQuality[i].Value = PersonalBestQuality[i].Value;
             neighborBest[i] = PersonalBest[i];