Changeset 3303 for trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

Timestamp:

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

Author:

swagner

Message:

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

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -295 +295 @@
     private void InitializeOperators() {
       operators = new List<IPermutationOperator>();
-      if (ApplicationManager.Manager != null) operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
+      operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
       ParameterizeOperators();
       UpdateMoveEvaluators();
@@ -313 +313 @@
     }
     private void UpdateMoveEvaluators() {
-      if (ApplicationManager.Manager != null) {
-        foreach (ITSPPathMoveEvaluator op in Operators.OfType<ITSPPathMoveEvaluator>().ToList())
-          operators.Remove(op);
-        foreach (ITSPPathMoveEvaluator op in ApplicationManager.Manager.GetInstances<ITSPPathMoveEvaluator>())
-          if (op.EvaluatorType == Evaluator.GetType()) {
-            operators.Add(op);
-          }
-        ParameterizeOperators();
-        OnOperatorsChanged();
-      }
+      foreach (ITSPPathMoveEvaluator op in Operators.OfType<ITSPPathMoveEvaluator>().ToList())
+        operators.Remove(op);
+      foreach (ITSPPathMoveEvaluator op in ApplicationManager.Manager.GetInstances<ITSPPathMoveEvaluator>())
+        if (op.EvaluatorType == Evaluator.GetType()) {
+          operators.Add(op);
+        }
+      ParameterizeOperators();
+      OnOperatorsChanged();
     }
     private void ParameterizeSolutionCreator() {