Changeset 9306 for branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman

Timestamp:

03/11/13 16:47:11 (12 years ago)

Author:

sforsten

Message:

#2018:

• renamed the structs and methods in IStringConvertibleMatrix
• added MatrixValuesChangedEventArgs in IStringConvertibleMatrix
• added methods SetValues(MatrixValues<T>) in ValueTypeMatrix
• fixed bugs in StringConvertibleMatrixView: DataGridView has now at least one column and dataGridView_CellValidating does not set e.Cancel to true anymore.

Location:

branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

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

branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using HeuristicLab.Common;
@@ -145 +144 @@
 
     private void RegisterCoordinatesEvents() {
-      Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
+      Coordinates.ItemsChanged += new EventHandler<MatrixValuesChangedEventArgs>(Coordinates_ItemChanged);
       Coordinates.Reset += new EventHandler(Coordinates_Reset);
     }
     private void DeregisterCoordinatesEvents() {
-      Coordinates.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
+      Coordinates.ItemsChanged -= new EventHandler<MatrixValuesChangedEventArgs>(Coordinates_ItemChanged);
       Coordinates.Reset -= new EventHandler(Coordinates_Reset);
     }
@@ -167 +166 @@
     }
 
-    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
+    private void Coordinates_ItemChanged(object sender, MatrixValuesChangedEventArgs e) {
       OnCoordinatesChanged();
     }

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

@@ -158 +158 @@
     private void CoordinatesParameter_ValueChanged(object sender, EventArgs e) {
       if (Coordinates != null) {
-        Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
+        Coordinates.ItemsChanged += new EventHandler<MatrixValuesChangedEventArgs>(Coordinates_ItemChanged);
         Coordinates.Reset += new EventHandler(Coordinates_Reset);
       }
@@ -166 +166 @@
       }
     }
-    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
+    private void Coordinates_ItemChanged(object sender, MatrixValuesChangedEventArgs e) {
       if (Evaluator is ITSPCoordinatesPathEvaluator) {
         ClearDistanceMatrix();
@@ -223 +223 @@
       CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
       if (Coordinates != null) {
-        Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
+        Coordinates.ItemsChanged += new EventHandler<MatrixValuesChangedEventArgs>(Coordinates_ItemChanged);
         Coordinates.Reset += new EventHandler(Coordinates_Reset);
       }