Changeset 2917 for trunk/sources/HeuristicLab.Algorithms.SGA

Timestamp:

03/03/10 06:46:30 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• implemented reviewers' comments

Location:

trunk/sources/HeuristicLab.Algorithms.SGA/3.3

Files:

• SGA.cs (modified) (2 diffs)
• Tests/SGA.hl (modified) (previous)
• Tests/UnitTest.cs (modified) (3 diffs)

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

@@ -108 +108 @@
       OperatorGraph.InitialOperator = randomCreator;
 
-      var selectors = ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector));
-      foreach (ISelector selector in selectors) {
-        selector.CopySelected = new BoolData(true);
-        selector.NumberOfSelectedSubScopesParameter.Value = new IntData(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value));
-        if (selector is IStochasticOperator) ((IStochasticOperator)selector).RandomParameter.ActualName = "Random";
-        SelectorParameter.ValidValues.Add(selector);
+      if (ApplicationManager.Manager != null) {
+        var selectors = ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name);
+        foreach (ISelector selector in selectors) {
+          selector.CopySelected = new BoolData(true);
+          selector.NumberOfSelectedSubScopesParameter.Value = new IntData(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value));
+          if (selector is IStochasticOperator) ((IStochasticOperator)selector).RandomParameter.ActualName = "Random";
+          SelectorParameter.ValidValues.Add(selector);
+        }
       }
     }
@@ -159 +161 @@
       }
 
+      ICrossover oldCrossover = CrossoverParameter.Value;
       CrossoverParameter.ValidValues.Clear();
-      foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>())
+      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());
+      }
+
+      IManipulator oldMutator = MutatorParameter.Value;
       MutatorParameter.ValidValues.Clear();
-      foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>())
+      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());
+      }
 
       base.OnProblemChanged();

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

@@ -22 +22 @@
 using System;
 using System.Threading;
+using HeuristicLab.Common;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.Xml;
@@ -76 +77 @@
 
     private EventWaitHandle trigger = new AutoResetEvent(false);
+    private Exception ex;
 
     [TestMethod]
     [DeploymentItem(@"SGA.hl")]
     public void SGAPerformanceTest() {
+      ex = null;
       IAlgorithm sga = (IAlgorithm)XmlParser.Deserialize("SGA.hl");
+      sga.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(sga_ExceptionOccurred);
       sga.Stopped += new EventHandler(sga_Stopped);
       sga.Prepare();
@@ -86 +90 @@
       trigger.WaitOne();
       TestContext.WriteLine("Runtime: {0}", sga.ExecutionTime.ToString());
+      if (ex != null) throw ex;
+    }
+
+    void sga_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+      ex = e.Value;
     }