Changeset 4757 for branches/ParameterBinding/HeuristicLab.Problems.TravelingSalesman

Timestamp:

11/09/10 15:46:55 (14 years ago)

Author:

abeham

Message:

#1258

• worked on parameter binding (wip)

File:

• branches/ParameterBinding/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (3 diffs)

branches/ParameterBinding/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -239 +239 @@
       ParameterizeAnalyzers();
     }
-    private void MoveGenerator_InversionMoveParameter_ActualNameChanged(object sender, EventArgs e) {
-      string name = ((ILookupParameter<InversionMove>)sender).ActualName;
-      foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) {
-        op.InversionMoveParameter.ActualName = name;
-      }
-    }
     private void MoveGenerator_TranslocationMoveParameter_ActualNameChanged(object sender, EventArgs e) {
       string name = ((ILookupParameter<TranslocationMove>)sender).ActualName;
@@ -285 +279 @@
     }
     private void InitializeMoveGenerators() {
-      foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) {
-        if (op is IMoveGenerator) {
-          op.InversionMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_InversionMoveParameter_ActualNameChanged);
+      foreach (IPermutationInversionMoveOperator moveGen in Operators.OfType<IMoveGenerator>().OfType<IPermutationInversionMoveOperator>()) {
+        foreach (IPermutationInversionMoveOperator moveOp in Operators.Where(x => ! (x is IMoveGenerator)).OfType<IPermutationInversionMoveOperator>()) {
+          ParameterActualNameBinding binding = new ParameterActualNameBinding(
+            moveGen.InversionMoveParameter,
+            moveOp.InversionMoveParameter);
+          ParameterBindingList.Add(binding);
+          binding.Bind();
         }
       }
-      foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>()) {
-        if (op is IMoveGenerator) {
-          op.TranslocationMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TranslocationMoveParameter_ActualNameChanged);
+      foreach (IPermutationTranslocationMoveOperator moveGen in Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>()) {
+        foreach (IPermutationTranslocationMoveOperator moveOp in Operators.Where(x => !(x is IMoveGenerator)).OfType<IPermutationTranslocationMoveOperator>()) {
+          ParameterActualNameBinding binding = new ParameterActualNameBinding(
+            moveGen.TranslocationMoveParameter,
+            moveOp.TranslocationMoveParameter);
+          ParameterBindingList.Add(binding);
+          binding.Bind();
         }
       }
@@ -310 +312 @@
     }
     private void ParameterizeEvaluator() {
+      ParameterSecondLevelActualNameBinding binding = new ParameterSecondLevelActualNameBinding(
+        SolutionCreatorParameter, EvaluatorParameter,
+        "PermutationParameter", "PermutationParameter"
+        );
+      ParameterBindingList.Add(binding);
+      binding.Bind();
+
       if (Evaluator is ITSPPathEvaluator)
         ((ITSPPathEvaluator)Evaluator).PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;