Changeset 7509

Timestamp:

02/24/12 08:23:08 (13 years ago)

Author:

mkommend

Message:

#1691: Corrected setting of default operators in the GeneticAlgorithm & OSGA.

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (1 diff)

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

@@ -361 +361 @@
         ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
         if (crossover != null) CrossoverParameter.Value = crossover;
-      } else if (defaultCrossover != null)
+        else oldCrossover = null;
+      }
+      if (oldCrossover == null && defaultCrossover != null)
         CrossoverParameter.Value = defaultCrossover;
     }

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

@@ -455 +455 @@
         ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
         if (crossover != null) CrossoverParameter.Value = crossover;
-      } else if (defaultCrossover != null)
+        else oldCrossover = null;
+      }
+      if (oldCrossover == null && defaultCrossover != null)
         CrossoverParameter.Value = defaultCrossover;
     }