Changeset 5855 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3

Timestamp:

03/29/11 01:42:41 (14 years ago)

Author:

abeham

Message:

#1330

• Fixed calculation of normalized stress value
• Fixed a few bugs

File:

• branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (4 diffs)

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -104 +104 @@
       : base() {
       Parameters.Add(new OptionalValueParameter<Permutation>("BestKnownSolution", "The best known solution which is updated whenever a new better solution is found or may be the optimal solution if it is known beforehand.", null));
-      Parameters.Add(new ValueParameter<DoubleMatrix>("Coordinates", "The coordinates of the locations. If this is changed the distance matrix is calculated automatically using the euclidean distance."));
+      Parameters.Add(new OptionalValueParameter<DoubleMatrix>("Coordinates", "The coordinates of the locations. If this is changed the distance matrix is calculated automatically using the euclidean distance."));
       Parameters.Add(new ValueParameter<DoubleMatrix>("Weights", "The strength of the connection between the facilities.", new DoubleMatrix(5, 5)));
       Parameters.Add(new ValueParameter<DoubleMatrix>("Distances", "The distance matrix which can either be specified directly without the coordinates, or can be calculated automatically from the coordinates.", new DoubleMatrix(5, 5)));
@@ -178 +178 @@
     private void WeightsParameter_ValueChanged(object sender, EventArgs e) {
       Weights.RowsChanged += new EventHandler(Weights_RowsChanged);
+      Weights.ColumnsChanged += new EventHandler(Weights_ColumnsChanged);
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
       ParameterizeOperators();
+      AdjustDistanceMatrix();
     }
     private void Weights_RowsChanged(object sender, EventArgs e) {
+      if (Weights.Rows != Weights.Columns)
+        ((IStringConvertibleMatrix)Weights).Columns = Weights.Rows;
+      else {
+        ParameterizeSolutionCreator();
+        ParameterizeEvaluator();
+        ParameterizeOperators();
+        AdjustDistanceMatrix();
+      }
+    }
+    private void Weights_ColumnsChanged(object sender, EventArgs e) {
+      if (Weights.Rows != Weights.Columns)
+        ((IStringConvertibleMatrix)Weights).Rows = Weights.Columns;
+      else {
+        ParameterizeSolutionCreator();
+        ParameterizeEvaluator();
+        ParameterizeOperators();
+        AdjustDistanceMatrix();
+      }
+    }
+    private void DistancesParameter_ValueChanged(object sender, EventArgs e) {
+      Distances.RowsChanged += new EventHandler(Distances_RowsChanged);
+      Distances.ColumnsChanged += new EventHandler(Distances_ColumnsChanged);
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
       ParameterizeOperators();
+      AdjustWeightsMatrix();
+    }
+    private void Distances_RowsChanged(object sender, EventArgs e) {
+      if (Distances.Rows != Distances.Columns)
+        ((IStringConvertibleMatrix)Distances).Columns = Distances.Rows;
+      else {
+        ParameterizeSolutionCreator();
+        ParameterizeEvaluator();
+        ParameterizeOperators();
+        AdjustWeightsMatrix();
+      }
+    }
+    private void Distances_ColumnsChanged(object sender, EventArgs e) {
+      if (Distances.Rows != Distances.Columns)
+        ((IStringConvertibleMatrix)Distances).Rows = Distances.Columns;
+      else {
+        ParameterizeSolutionCreator();
+        ParameterizeEvaluator();
+        ParameterizeOperators();
+        AdjustWeightsMatrix();
+      }
     }
     private void CoordinatesParameter_ValueChanged(object sender, EventArgs e) {
-      Coordinates.Reset += new EventHandler(Coordinates_Reset);
-      Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
-      UpdateDistanceMatrix();
+      if (Coordinates != null) {
+        Coordinates.Reset += new EventHandler(Coordinates_Reset);
+        Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
+        UpdateDistancesFromCoordinates();
+      }
     }
     private void Coordinates_ItemChanged(object sender, EventArgs<int, int> e) {
-      UpdateDistanceMatrix();
+      UpdateDistancesFromCoordinates();
     }
     private void Coordinates_Reset(object sender, EventArgs e) {
-      UpdateDistanceMatrix();
+      UpdateDistancesFromCoordinates();
     }
     #endregion
@@ -211 +258 @@
       WeightsParameter.ValueChanged += new EventHandler(WeightsParameter_ValueChanged);
       Weights.RowsChanged += new EventHandler(Weights_RowsChanged);
+      Weights.ColumnsChanged += new EventHandler(Weights_ColumnsChanged);
+      DistancesParameter.ValueChanged += new EventHandler(DistancesParameter_ValueChanged);
+      Distances.RowsChanged += new EventHandler(Distances_RowsChanged);
+      Distances.ColumnsChanged += new EventHandler(Distances_ColumnsChanged);
       CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
       Coordinates.Reset += new EventHandler(Coordinates_Reset);
@@ -273 +324 @@
     }
 
-    private void UpdateDistanceMatrix() {
+    private void AdjustDistanceMatrix() {
+      if (Distances.Rows != Weights.Rows || Distances.Columns != Weights.Columns) {
+        ((IStringConvertibleMatrix)Distances).Rows = Weights.Rows;
+      }
+    }
+
+    private void AdjustWeightsMatrix() {
+      if (Weights.Rows != Distances.Rows || Weights.Columns != Distances.Columns) {
+        ((IStringConvertibleMatrix)Weights).Rows = Distances.Rows;
+      }
+    }
+
+    private void UpdateDistancesFromCoordinates() {
       if (Coordinates != null && Coordinates.Columns == 2 && Coordinates.Rows > 1) {
         DoubleMatrix distance = new DoubleMatrix(Coordinates.Rows, Coordinates.Rows);