Changeset 4770 for branches/ParameterBinding/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

Timestamp:

11/11/10 14:03:24 (14 years ago)

Author:

abeham

Message:

#1258

• worked on parameter binding

File:

• branches/ParameterBinding/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (5 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;
@@ -279 +285 @@
     }
     private void InitializeMoveGenerators() {
-      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 (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.InversionMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_InversionMoveParameter_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();
+      foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.TranslocationMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TranslocationMoveParameter_ActualNameChanged);
         }
       }
@@ -312 +310 @@
     }
     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;
@@ -330 +321 @@
     private void ParameterizeAnalyzers() {
       if (BestTSPSolutionAnalyzer != null) {
+        #region Using First Level Bindings
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.QualityParameter,
+          Evaluator.QualityParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.CoordinatesParameter,
+          CoordinatesParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.PermutationParameter,
+          SolutionCreator.PermutationParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.BestKnownQualityParameter,
+          BestKnownQualityParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.BestKnownSolutionParameter,
+          BestKnownSolutionParameter
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterNameBinding(
+          BestTSPSolutionAnalyzer.MaximizationParameter,
+          MaximizationParameter
+          ));
+        #endregion
+        #region Using Second Level Bindings
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterSecondLevelNameBinding(
+          BestTSPSolutionAnalyzer.QualityParameter,
+          EvaluatorParameter, "QualityParameter"
+          ));
+        BestTSPSolutionAnalyzer.ParameterBindingList.Add(new ParameterSecondLevelNameBinding(
+           BestTSPSolutionAnalyzer.PermutationParameter,
+           SolutionCreatorParameter, "PermutationParameter"
+           ));
+        #endregion
+        #region Old
         BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
         BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
@@ -337 +365 @@
         BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
         BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        #endregion
       }