Changeset 3099

Timestamp:

03/18/10 11:56:42 (14 years ago)

Author:

abeham

Message:

extended name change of move parameter to all operators not just all except move generators #898

File:

• trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs (modified) (5 diffs)

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

@@ -202 +202 @@
       string name = ((ILookupParameter<TwoOptMove>)sender).ActualName;
       foreach (ITwoOptPermutationMoveOperator op in Operators.OfType<ITwoOptPermutationMoveOperator>()) {
-        if (!(op is IMoveGenerator)) op.TwoOptMoveParameter.ActualName = name;
+        op.TwoOptMoveParameter.ActualName = name;
       }
     }
@@ -208 +208 @@
       string name = ((ILookupParameter<ThreeOptMove>)sender).ActualName;
       foreach (IThreeOptPermutationMoveOperator op in Operators.OfType<IThreeOptPermutationMoveOperator>()) {
-        if (!(op is IMoveGenerator)) op.ThreeOptMoveParameter.ActualName = name;
+        op.ThreeOptMoveParameter.ActualName = name;
       }
     }
@@ -224 +224 @@
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
     }
+    private void InitializeOperators() {
+      operators = new List<IPermutationOperator>();
+      if (ApplicationManager.Manager != null) {
+        operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
+        ParameterizeOperators();
+      }
+      InitializeMoveGenerators();
+    }
+    private void InitializeMoveGenerators() {
+      foreach (ITwoOptPermutationMoveOperator op in Operators.OfType<ITwoOptPermutationMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.TwoOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TwoOptMoveParameter_ActualNameChanged);
+        }
+      }
+      foreach (IThreeOptPermutationMoveOperator op in Operators.OfType<IThreeOptPermutationMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.ThreeOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_ThreeOptMoveParameter_ActualNameChanged);
+        }
+      }
+    }
     private void ParameterizeSolutionCreator() {
       SolutionCreator.LengthParameter.Value = new IntValue(Coordinates.Rows);
@@ -237 +257 @@
       }
     }
-    private void InitializeOperators() {
-      operators = new List<IPermutationOperator>();
-      if (ApplicationManager.Manager != null) {
-        operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
-        ParameterizeOperators();
-      }
-      InitializeMoveGenerators();
-    }
     private void ParameterizeOperators() {
       foreach (IPermutationCrossover op in Operators.OfType<IPermutationCrossover>()) {
@@ -262 +274 @@
       }
     }
-    private void InitializeMoveGenerators() {
-      foreach (ITwoOptPermutationMoveOperator op in Operators.OfType<ITwoOptPermutationMoveOperator>()) {
-        if (op is IMoveGenerator) {
-          op.TwoOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TwoOptMoveParameter_ActualNameChanged);
-        }
-      }
-      foreach (IThreeOptPermutationMoveOperator op in Operators.OfType<IThreeOptPermutationMoveOperator>()) {
-        if (op is IMoveGenerator) {
-          op.ThreeOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_ThreeOptMoveParameter_ActualNameChanged);
-        }
-      }
-    }
 
     private void ClearDistanceMatrix() {