Changeset 5641 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment

Timestamp:

03/09/11 03:23:32 (14 years ago)

Author:

abeham

Message:

#1330

• worked on visualization (and MDS)

Location:

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3

Files:

• QAPAssignment.cs (modified) (2 diffs)
• QuadraticAssignmentProblem.cs (modified) (4 diffs)

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

@@ -21 +21 @@
     }
 
-    public DoubleMatrix ViewCoordinates { get; set; }
+    [Storable]
+    private DoubleMatrix viewCoordinates;
+    public DoubleMatrix ViewCoordinates {
+      get { return viewCoordinates; }
+      set {
+        bool changed = (viewCoordinates != value);
+        viewCoordinates = value;
+        if (changed) OnPropertyChanged("ViewCoordinates");
+      }
+    }
 
     [Storable]
@@ -76 +85 @@
       assignment = cloner.Clone(original.assignment);
       quality = cloner.Clone(original.quality);
+      viewCoordinates = cloner.Clone(original.viewCoordinates);
     }
     public QAPAssignment(DoubleMatrix weights, Permutation assignment) {

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

@@ -47 +47 @@
 
     #region Parameter Properties
-    public ValueParameter<Permutation> BestKnownSolutionParameter {
-      get { return (ValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
-    }
-    public ValueParameter<DoubleMatrix> CoordinatesParameter {
-      get { return (ValueParameter<DoubleMatrix>)Parameters["Coordinates"]; }
-    }
-    public ValueParameter<DoubleMatrix> WeightsParameter {
-      get { return (ValueParameter<DoubleMatrix>)Parameters["Weights"]; }
-    }
-    public ValueParameter<DoubleMatrix> DistanceMatrixParameter {
-      get { return (ValueParameter<DoubleMatrix>)Parameters["DistanceMatrix"]; }
+    public IValueParameter<Permutation> BestKnownSolutionParameter {
+      get { return (IValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
+    }
+    public IValueParameter<DoubleMatrix> CoordinatesParameter {
+      get { return (IValueParameter<DoubleMatrix>)Parameters["Coordinates"]; }
+    }
+    public IValueParameter<DoubleMatrix> WeightsParameter {
+      get { return (IValueParameter<DoubleMatrix>)Parameters["Weights"]; }
+    }
+    public IValueParameter<DoubleMatrix> DistanceMatrixParameter {
+      get { return (IValueParameter<DoubleMatrix>)Parameters["DistanceMatrix"]; }
     }
     #endregion
@@ -288 +288 @@
       QAPLIBParser parser = new QAPLIBParser();
       parser.Parse(filename);
+      if (parser.Error != null) throw parser.Error;
       Coordinates = new DoubleMatrix();
       DistanceMatrix = new DoubleMatrix(parser.Distances);
@@ -303 +304 @@
         QAPLIBParser parser = new QAPLIBParser();
         parser.Parse(stream);
+        if (parser.Error != null) throw parser.Error;
         Coordinates = new DoubleMatrix();
         DistanceMatrix = new DoubleMatrix(parser.Distances);
@@ -319 +321 @@
           QAPLIBSolutionParser solParser = new QAPLIBSolutionParser();
           solParser.Parse(solStream);
+          if (solParser.Error != null) throw solParser.Error;
           BestKnownQuality = new DoubleValue(solParser.Qualiy);
           BestKnownSolution = new Permutation(PermutationTypes.Absolute, solParser.Assignment);