Changeset 2917 for trunk/sources/HeuristicLab.Problems.TSP

Timestamp:

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

Author:

swagner

Message:

Operator architecture refactoring (#95)

• implemented reviewers' comments

File:

• trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs

@@ -94 +94 @@
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
 
-      var ops = ApplicationManager.Manager.GetInstances<IPermutationOperator>();
-      foreach (IPermutationCrossover op in ops.OfType<IPermutationCrossover>()) {
-        op.ParentsParameter.ActualName = creator.PermutationParameter.ActualName;
-        op.ChildParameter.ActualName = creator.PermutationParameter.ActualName;
+      operators = new OperatorSet();
+      if (ApplicationManager.Manager != null) {
+        var ops = ApplicationManager.Manager.GetInstances<IPermutationOperator>();
+        foreach (IPermutationCrossover op in ops.OfType<IPermutationCrossover>()) {
+          op.ParentsParameter.ActualName = creator.PermutationParameter.ActualName;
+          op.ChildParameter.ActualName = creator.PermutationParameter.ActualName;
+        }
+        foreach (IPermutationManipulator op in ops.OfType<IPermutationManipulator>()) {
+          op.PermutationParameter.ActualName = creator.PermutationParameter.ActualName;
+        }
+        foreach (IPermutationOperator op in ops)
+          operators.Add(op);
       }
-      foreach (IPermutationManipulator op in ops.OfType<IPermutationManipulator>()) {
-        op.PermutationParameter.ActualName = creator.PermutationParameter.ActualName;
-      }
-      operators = new OperatorSet(ops.Cast<IOperator>());
     }