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

Timestamp:

03/15/12 09:11:17 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

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

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

@@ -288 +288 @@
       if (Problem != null) {
         IParticleCreator oldParticleCreator = ParticleCreator;
+        IParticleCreator defaultParticleCreator = Problem.Operators.OfType<IParticleCreator>().FirstOrDefault();
         ParticleCreatorParameter.ValidValues.Clear();
         foreach (IParticleCreator Creator in Problem.Operators.OfType<IParticleCreator>().OrderBy(x => x.Name)) {
@@ -295 +296 @@
           IParticleCreator creator = ParticleCreatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldParticleCreator.GetType());
           if (creator != null) ParticleCreator = creator;
-        }
+          else oldParticleCreator = null;
+        }
+        if (oldParticleCreator == null && defaultParticleCreator != null)
+          ParticleCreator = defaultParticleCreator;
       }
     }
@@ -372 +376 @@
       ClearTopologyParameters();
       if (Problem != null) {
+        IParticleUpdater defaultParticleUpdater = null;
         if (TopologyInitializer != null) {
           foreach (ITopologyUpdater topologyUpdater in ApplicationManager.Manager.GetInstances<ITopologyUpdater>())
             TopologyUpdaterParameter.ValidValues.Add(topologyUpdater);
+          defaultParticleUpdater = Problem.Operators.OfType<ILocalParticleUpdater>().FirstOrDefault();
           foreach (IParticleUpdater particleUpdater in Problem.Operators.OfType<ILocalParticleUpdater>().OrderBy(x => x.Name))
             ParticleUpdaterParameter.ValidValues.Add(particleUpdater);
         } else {
+          defaultParticleUpdater = Problem.Operators.OfType<IGlobalParticleUpdater>().FirstOrDefault();
           foreach (IParticleUpdater particleUpdater in Problem.Operators.OfType<IGlobalParticleUpdater>().OrderBy(x => x.Name))
             ParticleUpdaterParameter.ValidValues.Add(particleUpdater);
@@ -388 +395 @@
           IParticleUpdater newParticleUpdater = ParticleUpdaterParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldParticleUpdater.GetType());
           if (newParticleUpdater != null) ParticleUpdater = newParticleUpdater;
-        }
+          else oldParticleUpdater = null;
+        }
+        if (oldParticleUpdater == null && defaultParticleUpdater != null)
+          ParticleUpdater = defaultParticleUpdater;
 
         ParameterizeTopologyUpdaters();