Changeset 3139 for trunk/sources/HeuristicLab.Problems.TSP

Timestamp:

03/20/10 06:18:48 (14 years ago)

Author:

swagner

Message:

Finished first version of TSP tour visualization (#924).

Location:

trunk/sources/HeuristicLab.Problems.TSP/3.3

Files:

• PathTSPTour.cs (modified) (3 diffs)
• TSP.cs (modified) (3 diffs)

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

@@ -39 +39 @@
       get { return coordinates; }
       set {
-        if (value == null) throw new ArgumentNullException();
         if (coordinates != value) {
           if (coordinates != null) DeregisterCoordinatesEvents();
@@ -53 +52 @@
       get { return permutation; }
       set {
-        if (value == null) throw new ArgumentNullException();
         if (permutation != value) {
           if (permutation != null) DeregisterPermutationEvents();
@@ -63 +61 @@
     }
 
-    private PathTSPTour() : base() { }
-    public PathTSPTour(DoubleMatrix coordinates, Permutation permutation)
+    public PathTSPTour() : base() { }
+    public PathTSPTour(DoubleMatrix coordinates)
       : base() {
       Coordinates = coordinates;
+    }
+    public PathTSPTour(DoubleMatrix coordinates, Permutation permutation)
+      : this(coordinates) {
       Permutation = permutation;
     }

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

@@ -218 +218 @@
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
+      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       ParameterizeEvaluator();
       ParameterizeVisualizer();
       ClearDistanceMatrix();
       OnEvaluatorChanged();
+    }
+    private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
+      ParameterizeVisualizer();
     }
     private void VisualizerParameter_ValueChanged(object sender, EventArgs e) {
@@ -251 +255 @@
       SolutionCreator.PermutationParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
+      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       VisualizerParameter.ValueChanged += new EventHandler(VisualizerParameter_ValueChanged);
     }
+
     private void InitializeOperators() {
       operators = new List<IPermutationOperator>();
@@ -287 +293 @@
     }
     private void ParameterizeVisualizer() {
-      Visualizer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      if (Visualizer is ICoordinatesTSPSolutionsVisualizer)
-        ((ICoordinatesTSPSolutionsVisualizer)Visualizer).CoordinatesParameter.ActualName = CoordinatesParameter.Name;
-      if (Visualizer is IPathCoordinatesTSPSolutionsVisualizer)
-        ((IPathCoordinatesTSPSolutionsVisualizer)Visualizer).PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+      if (Visualizer != null) {
+        Visualizer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        if (Visualizer is ICoordinatesTSPSolutionsVisualizer)
+          ((ICoordinatesTSPSolutionsVisualizer)Visualizer).CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+        if (Visualizer is IPathCoordinatesTSPSolutionsVisualizer)
+          ((IPathCoordinatesTSPSolutionsVisualizer)Visualizer).PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+      }
     }
     private void ParameterizeOperators() {