Changeset 3076 for trunk/sources

Timestamp:

03/17/10 00:38:34 (14 years ago)

Author:

swagner

Message:

Fixed bug when reselecting a previously selected operator in UpdateSelectors, UpdateCrossovers and UpdateMutators in SGA (#898)

File:

• trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGA.cs (modified) (3 diffs)

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

@@ -283 +283 @@
         foreach (ISelector selector in Selectors.OrderBy(x => x.Name))
           SelectorParameter.ValidValues.Add(selector);
-        if (oldSelector != null)
-          SelectorParameter.Value = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
+        if (oldSelector != null) {
+          ISelector selector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
+          if (selector != null) SelectorParameter.Value = selector;
+        }
       }
     }
@@ -292 +294 @@
       foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
         CrossoverParameter.ValidValues.Add(crossover);
-      if (oldCrossover != null)
-        CrossoverParameter.Value = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
+      if (oldCrossover != null) {
+        ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
+        if (crossover != null) CrossoverParameter.Value = crossover;
+      }
     }
     private void UpdateMutators() {
@@ -300 +304 @@
       foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
         MutatorParameter.ValidValues.Add(mutator);
-      if (oldMutator != null)
-        MutatorParameter.Value = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
+      if (oldMutator != null) {
+        IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
+        if (mutator != null) MutatorParameter.Value = mutator;
+      }
     }
     #endregion