Changeset 7842 for branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.ParticleSwarmOptimization

Timestamp:

05/16/12 16:28:49 (13 years ago)

Author:

gkronber

Message:

merged r7609:7840 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

@@ -258 +258 @@
     }
 
-    public override void Prepare() {
-      if (Problem != null && ParticleCreator != null && ParticleUpdater != null) {
-        base.Prepare();
-      }
-    }
-
     #region Events
     protected override void OnProblemChanged() {
@@ -412 +406 @@
       if (Problem != null) {
         solutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
-        solutionsCreator.SolutionCreatorParameter.ActualName = ParticleCreatorParameter.Name;
+        if (ParticleCreatorParameter.Value != null)
+          solutionsCreator.SolutionCreatorParameter.ActualName = ParticleCreatorParameter.Name;
+        else
+          solutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
       }
     }