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

Timestamp:

02/24/11 19:22:39 (14 years ago)

Author:

mkofler

Message:

#852: Code refactoring. Worked on swarm updater.

File:

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

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

@@ -114 +114 @@
     private ParticleSwarmOptimizationMainLoop mainLoop;
 
+    [Storable]
+    private CombinedOperator swarmUpdater;
+
     public ITopologyInitializer TopologyInitializer {
       get { return TopologyInitializerParameter.Value; }
@@ -141 +144 @@
       qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
       solutionsCreator = cloner.Clone(original.solutionsCreator);
-      mainLoop = cloner.Clone(original.mainLoop); 
+      mainLoop = cloner.Clone(original.mainLoop);
+      swarmUpdater = cloner.Clone(original.swarmUpdater); 
       Initialize();
     }
@@ -166 +170 @@
       ResultsCollector resultsCollector = new ResultsCollector(); 
       Placeholder analyzerPlaceholder = new Placeholder();
-      RealVectorSwarmUpdater swarmUpdater = new RealVectorSwarmUpdater();
+      swarmUpdater = new CombinedOperator();
       mainLoop = new ParticleSwarmOptimizationMainLoop();
 
@@ -206 +210 @@
       mainLoop.RandomParameter.ActualName = randomCreator.RandomParameter.ActualName;
       mainLoop.ResultsParameter.ActualName = "Results";
-      mainLoop.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name; 
      // mainLoop.EvaluatedMovesParameter.ActualName = "EvaluatedMoves";
 
@@ -212 +215 @@
       ////InitVelocityBoundsUpdater();
       InitializeParticleCreator();
+      InitializeSwarmUpdater();
       ParameterizeSolutionsCreator(); 
       UpdateAnalyzers();
@@ -252 +256 @@
       UpdateTopologyParameters();
       InitializeParticleCreator();
+      InitializeSwarmUpdater();
       ParameterizeSolutionsCreator(); 
       base.OnProblemChanged();
@@ -395 +400 @@
 
     private void ParameterizeMainLoop() {
-      mainLoop.MaxIterationsParameter.ActualName = MaxIterationsParameter.Name;
+      if (Problem != null) { 
+        mainLoop.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
+      }
+    }
+
+    private void InitializeSwarmUpdater() {
+      if (Problem != null) {
+        ISwarmUpdater updater = Problem.Operators.OfType<ISwarmUpdater>().FirstOrDefault();
+        swarmUpdater.OperatorGraph.InitialOperator = updater;
+      }
     }
     #endregion