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

Timestamp:

11/13/10 02:14:39 (14 years ago)

Author:

abeham

Message:

#1258

• Updated binding according to discussion
• Added small test case for the TSP

File:

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

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

@@ -178 +178 @@
       InitializeOperators();
       AttachEventHandlers();
+
+      AddBinding("BestTSPSolutionAnalyzer.QualityParameter.ActualName", "Evaluator.QualityParameter.ActualName");
+      AddBinding("BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName", "CoordinatesParameter.Name");
+      AddBinding("BestTSPSolutionAnalyzer.PermutationParameter.ActualName", "SolutionCreator.PermutationParameter.ActualName");
+      AddBinding("BestTSPSolutionAnalyzer.BestKnownQualityParameter.ActualName", "BestKnownQualityParameter.Name");
+      AddBinding("BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName", "BestKnownSolutionParameter.Name");
+      AddBinding("BestTSPSolutionAnalyzer.MaximizationParameter.ActualName", "MaximizationParameter.Name");
+      BestTSPSolutionAnalyzer.ResultsParameter.ActualName = "Results";
     }
 
@@ -320 +328 @@
     }
     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
+      /*if (BestTSPSolutionAnalyzer != null) {
         BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
         BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
@@ -365 +336 @@
         BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
         BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-        #endregion
-      }
+      }*/
 
       if (TSPAlleleFrequencyAnalyzer != null) {