Changeset 3303 for trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Timestamp:

04/12/10 01:29:35 (14 years ago)

Author:

swagner

Message:

Removed unnecessary checks if the application manager is not null (#954).

Location:

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• GeneticAlgorithm.cs (modified) (2 diffs)
• Tests/GA_TSP.hl (modified) (previous)
• Tests/UnitTest.cs (modified) (2 diffs)

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

@@ -283 +283 @@
     private void InitializeSelectors() {
       selectors = new List<ISelector>();
-      if (ApplicationManager.Manager != null) selectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
+      selectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
       ParameterizeSelectors();
     }
@@ -300 +300 @@
     }
     private void UpdateSelectors() {
-      if (ApplicationManager.Manager != null) {
-        ISelector oldSelector = SelectorParameter.Value;
-        SelectorParameter.ValidValues.Clear();
-        foreach (ISelector selector in Selectors.OrderBy(x => x.Name))
-          SelectorParameter.ValidValues.Add(selector);
-        if (oldSelector != null) {
-          ISelector selector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
-          if (selector != null) SelectorParameter.Value = selector;
-        }
+      ISelector oldSelector = SelectorParameter.Value;
+      SelectorParameter.ValidValues.Clear();
+      foreach (ISelector selector in Selectors.OrderBy(x => x.Name))
+        SelectorParameter.ValidValues.Add(selector);
+      if (oldSelector != null) {
+        ISelector selector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
+        if (selector != null) SelectorParameter.Value = selector;
       }
     }
     private void UpdateCrossovers() {
-      if (ApplicationManager.Manager != null) {
-        ICrossover oldCrossover = CrossoverParameter.Value;
-        CrossoverParameter.ValidValues.Clear();
-        foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
-          CrossoverParameter.ValidValues.Add(crossover);
-        if (oldCrossover != null) {
-          ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
-          if (crossover != null) CrossoverParameter.Value = crossover;
-        }
+      ICrossover oldCrossover = CrossoverParameter.Value;
+      CrossoverParameter.ValidValues.Clear();
+      foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
+        CrossoverParameter.ValidValues.Add(crossover);
+      if (oldCrossover != null) {
+        ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
+        if (crossover != null) CrossoverParameter.Value = crossover;
       }
     }
     private void UpdateMutators() {
-      if (ApplicationManager.Manager != null) {
-        IManipulator oldMutator = MutatorParameter.Value;
-        MutatorParameter.ValidValues.Clear();
-        foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
-          MutatorParameter.ValidValues.Add(mutator);
-        if (oldMutator != null) {
-          IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
-          if (mutator != null) MutatorParameter.Value = mutator;
-        }
+      IManipulator oldMutator = MutatorParameter.Value;
+      MutatorParameter.ValidValues.Clear();
+      foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
+        MutatorParameter.ValidValues.Add(mutator);
+      if (oldMutator != null) {
+        IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
+        if (mutator != null) MutatorParameter.Value = mutator;
       }
     }

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

@@ -23 +23 @@
 using System.Threading;
 using HeuristicLab.Common;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.Xml;
@@ -90 +91 @@
       trigger.WaitOne();
       TestContext.WriteLine("Runtime: {0}", ga.ExecutionTime.ToString());
+
+      double expectedBestQuality = 12332.0;
+      double expectedAverageQuality = 13123.2;
+      double expectedWorstQuality = 14538.0;
+      double bestQuality = (ga.Results["Current Best Quality"].Value as DoubleValue).Value;
+      double averageQuality = (ga.Results["Current Average Quality"].Value as DoubleValue).Value;
+      double worstQuality = (ga.Results["Current Worst Quality"].Value as DoubleValue).Value;
+
+      TestContext.WriteLine("");
+      TestContext.WriteLine("Current Best Quality: {0} (should be {1})", bestQuality, expectedBestQuality);
+      TestContext.WriteLine("Current Average Quality: {0} (should be {1})", averageQuality, expectedAverageQuality);
+      TestContext.WriteLine("Current Worst Quality: {0} (should be {1})", worstQuality, expectedWorstQuality);
+
+      Assert.AreEqual(bestQuality, expectedBestQuality);
+      Assert.AreEqual(averageQuality, expectedAverageQuality);
+      Assert.AreEqual(worstQuality, expectedWorstQuality);
+
       if (ex != null) throw ex;
     }