Changeset 7669 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Timestamp:

03/28/12 15:47:26 (13 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (4 diffs)

branches/HeuristicLab.Hive.Azure

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.Hive.Azure/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();

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user