Changeset 7470

Timestamp:

02/15/12 17:28:37 (12 years ago)

Author:

abeham

Message:

#1614

• Removed incompatible problem linhp318.tsp (contains fixed edges)
• Fixed AssemblyInfo for TSPLIB
• Added unit tests
• Worked on assignment / solution view

Location:

branches/GeneralizedQAP

Files:

• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs (modified) (11 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs (modified) (6 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPSolutionArchiveAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs (modified) (3 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IBestKnownSolutionAwareGQAPOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/Data/TSP/linhp318.tsp (deleted)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/Properties/AssemblyInfo.frame (deleted)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBParser.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs (modified) (2 diffs)
• UnitTests/ElloumiCTAPInstanceProviderTest.cs (added)
• UnitTests/QAPLIBInstanceProviderTest.cs (added)
• UnitTests/TSPLIBInstanceProviderTest.cs (modified) (1 diff)
• UnitTests/UnitTests.csproj (modified) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs

@@ -56 +56 @@
       this.label3 = new System.Windows.Forms.Label();
       this.flowDistanceQualityLabel = new System.Windows.Forms.Label();
+      this.assignmentSplitContainer = new System.Windows.Forms.SplitContainer();
+      this.assignmentView = new HeuristicLab.Data.Views.StringConvertibleArrayView();
       this.assignmentGroupBox.SuspendLayout();
       this.characteristicsGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.assignmentSplitContainer)).BeginInit();
+      this.assignmentSplitContainer.Panel1.SuspendLayout();
+      this.assignmentSplitContainer.Panel2.SuspendLayout();
+      this.assignmentSplitContainer.SuspendLayout();
       this.SuspendLayout();
       // 
       // assignmentTreeView
       // 
-      this.assignmentTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.assignmentTreeView.Location = new System.Drawing.Point(6, 19);
+      this.assignmentTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.assignmentTreeView.Location = new System.Drawing.Point(0, 0);
       this.assignmentTreeView.Margin = new System.Windows.Forms.Padding(3, 6, 3, 3);
       this.assignmentTreeView.Name = "assignmentTreeView";
-      this.assignmentTreeView.Size = new System.Drawing.Size(228, 331);
+      this.assignmentTreeView.Size = new System.Drawing.Size(78, 337);
       this.assignmentTreeView.TabIndex = 3;
       this.assignmentTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.assignmentTreeView_AfterSelect);
@@ -95 +99 @@
       // assignmentGroupBox
       // 
-      this.assignmentGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.assignmentGroupBox.Controls.Add(this.assignmentTreeView);
+      this.assignmentGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.assignmentGroupBox.Controls.Add(this.assignmentSplitContainer);
       this.assignmentGroupBox.Location = new System.Drawing.Point(217, 3);
       this.assignmentGroupBox.Name = "assignmentGroupBox";
@@ -108 +112 @@
       // characteristicsGroupBox
       // 
-      this.characteristicsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)));
+      this.characteristicsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
       this.characteristicsGroupBox.Controls.Add(this.label7);
       this.characteristicsGroupBox.Controls.Add(this.overbookedCapacityLabel);
@@ -185 +189 @@
       this.flowDistanceQualityLabel.Text = "-";
       // 
+      // assignmentSplitContainer
+      // 
+      this.assignmentSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.assignmentSplitContainer.Location = new System.Drawing.Point(3, 16);
+      this.assignmentSplitContainer.Name = "assignmentSplitContainer";
+      // 
+      // assignmentSplitContainer.Panel1
+      // 
+      this.assignmentSplitContainer.Panel1.Controls.Add(this.assignmentTreeView);
+      // 
+      // assignmentSplitContainer.Panel2
+      // 
+      this.assignmentSplitContainer.Panel2.Controls.Add(this.assignmentView);
+      this.assignmentSplitContainer.Size = new System.Drawing.Size(234, 337);
+      this.assignmentSplitContainer.SplitterDistance = 78;
+      this.assignmentSplitContainer.TabIndex = 4;
+      // 
+      // assignmentView
+      // 
+      this.assignmentView.Caption = "StringConvertibleArray View";
+      this.assignmentView.Content = null;
+      this.assignmentView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.assignmentView.Location = new System.Drawing.Point(0, 0);
+      this.assignmentView.Name = "assignmentView";
+      this.assignmentView.ReadOnly = false;
+      this.assignmentView.Size = new System.Drawing.Size(152, 337);
+      this.assignmentView.TabIndex = 0;
+      // 
       // GQAPAssignmentView
       // 
@@ -196 +228 @@
       this.characteristicsGroupBox.ResumeLayout(false);
       this.characteristicsGroupBox.PerformLayout();
+      this.assignmentSplitContainer.Panel1.ResumeLayout(false);
+      this.assignmentSplitContainer.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.assignmentSplitContainer)).EndInit();
+      this.assignmentSplitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -213 +249 @@
     private System.Windows.Forms.Label label5;
     private System.Windows.Forms.Label installationQualityLabel;
+    private System.Windows.Forms.SplitContainer assignmentSplitContainer;
+    private Data.Views.StringConvertibleArrayView assignmentView;
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs

@@ -49 +49 @@
     protected override void DeregisterContentEvents() {
       Content.PropertyChanged -= new PropertyChangedEventHandler(Content_PropertyChanged);
-      Content.Solution.PropertyChanged -= new PropertyChangedEventHandler(ContentSolution_PropertyChanged);
       base.DeregisterContentEvents();
     }
@@ -55 +54 @@
       base.RegisterContentEvents();
       Content.PropertyChanged += new PropertyChangedEventHandler(Content_PropertyChanged);
-      Content.Solution.PropertyChanged += new PropertyChangedEventHandler(ContentSolution_PropertyChanged);
     }
     #endregion
@@ -75 +73 @@
     private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
       switch (e.PropertyName) {
-        case "EquipmentNames": UpdateAssignment(); break;
-        case "LocationNames": UpdateAssignment(); break;
-        default: break;
-      }
-    }
-    private void ContentSolution_PropertyChanged(object sender, PropertyChangedEventArgs e) {
-      switch (e.PropertyName) {
         case "Quality": UpdateQuality(); break;
         case "FlowDistanceQuality": UpdateFlowDistanceQuality(); break;
@@ -87 +78 @@
         case "OverbookedCapacity": UpdateOverbookedCapacity(); break;
         case "Assignment": UpdateAssignment(); break;
+        case "EquipmentNames": UpdateAssignment(); break;
+        case "LocationNames": UpdateAssignment(); break;
         default: break;
       }
+    }
+
+    private void Content_Assignment_ToStringChanged(object sender, EventArgs e) {
+      UpdateAssignment();
     }
     #endregion
@@ -129 +126 @@
           qualityLabel.Text = "-";
         } else {
-          qualityLabel.Text = Content.Solution.Quality.ToString();
+          qualityLabel.Text = Content.Quality.ToString();
         }
       }
@@ -137 +134 @@
       if (InvokeRequired) Invoke((Action)UpdateFlowDistanceQuality);
       else {
-        if (Content == null || Content.Solution.FlowDistanceQuality == null) {
+        if (Content == null || Content.FlowDistanceQuality == null) {
           flowDistanceQualityLabel.Text = "-";
         } else {
-          flowDistanceQualityLabel.Text = Content.Solution.FlowDistanceQuality.ToString();
+          flowDistanceQualityLabel.Text = Content.FlowDistanceQuality.ToString();
         }
       }
@@ -148 +145 @@
       if (InvokeRequired) Invoke((Action)UpdateInstallationQuality);
       else {
-        if (Content == null || Content.Solution.InstallationQuality == null) {
+        if (Content == null || Content.InstallationQuality == null) {
           installationQualityLabel.Text = "-";
         } else {
-          installationQualityLabel.Text = Content.Solution.InstallationQuality.ToString();
+          installationQualityLabel.Text = Content.InstallationQuality.ToString();
         }
       }
@@ -159 +156 @@
       if (InvokeRequired) Invoke((Action)UpdateOverbookedCapacity);
       else {
-        if (Content == null || Content.Solution.OverbookedCapacity == null) {
+        if (Content == null || Content.OverbookedCapacity == null) {
           overbookedCapacityLabel.Text = "-";
         } else {
-          overbookedCapacityLabel.Text = Content.Solution.OverbookedCapacity.ToString();
+          overbookedCapacityLabel.Text = Content.OverbookedCapacity.ToString();
         }
       }
@@ -172 +169 @@
         assignmentTreeView.Nodes.Clear();
         if (Content != null) {
-          IntegerVector assignment = Content.Solution.Assignment;
+          IntegerVector assignment = Content.Assignment;
           Dictionary<int, TreeNode> locationNodes = new Dictionary<int, TreeNode>();
           for (int i = 0; i < assignment.Length; i++) {
@@ -202 +199 @@
       var installationCosts = new Dictionary<EquipmentNode, double>();
       foreach (var node in GetAllSubNodes(assignmentTreeView.Nodes).OfType<EquipmentNode>()) {
-        int location = Content.Solution.Assignment[node.Equipment];
+        int location = Content.Assignment[node.Equipment];
         installationCosts[node] = Content.InstallationCosts[node.Equipment, location];
       }
@@ -249 +246 @@
 
     private void ColorByWeight(LocationNode selectedNode) {
-      var equipments = new HashSet<int>(Content.Solution.Assignment.Select((v, i) => new { Index = i, Value = v })
+      var equipments = new HashSet<int>(Content.Assignment.Select((v, i) => new { Index = i, Value = v })
         .Where(x => x.Value == selectedNode.Location).Select(x => x.Index));
       var rowSums = new Dictionary<int, double>(equipments.Count);

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj

@@ -54 +54 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Data.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.IntegerVectorEncoding-3.3.dll</HintPath>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.cs

@@ -60 +60 @@
       var instance = (IInstanceDescriptor)instancesComboBox.SelectedItem;
       if (!Content.FeedConsumer(instance)) {
-        MessageBox.Show("Loading the problem instance " + instance.Name + " failed.");
+        MessageBox.Show("This problem does not support the instance " + instance.Name + ".", "Cannot load instance");
       }
     }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs

@@ -41 +41 @@
     IDemandsAwareGQAPOperator, ICapacitiesAwareGQAPOperator, ITransportationCostsAwareGQAPOperator,
     IOverbookedCapacityPenaltyAwareGQAPOperator, IEquipmentNamesAwareGQAPOperator, ILocationNamesAwareGQAPOperator,
-    IBestKnownQualityAwareGQAPOperator, IBestKnownSolutionAwareGQAPOperator, IBestKnownSolutionsAwareGQAPOperator,
-    IAnalyzer {
+    IBestKnownQualityAwareGQAPOperator, IBestKnownSolutionAwareGQAPOperator, IAnalyzer {
 
     public bool EnabledByDefault {
@@ -97 +96 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
     }
-    public ILookupParameter<GQAPSolution> BestKnownSolutionParameter {
-      get { return (ILookupParameter<GQAPSolution>)Parameters["BestKnownSolution"]; }
-    }
-    public ILookupParameter<GQAPAssignmentArchive> BestKnownSolutionsParameter {
-      get { return (ILookupParameter<GQAPAssignmentArchive>)Parameters["BestKnownSolutions"]; }
+    public ILookupParameter<GQAPAssignment> BestKnownSolutionParameter {
+      get { return (ILookupParameter<GQAPAssignment>)Parameters["BestKnownSolution"]; }
     }
     public ILookupParameter<GQAPAssignment> BestSolutionParameter {
@@ -135 +131 @@
       Parameters.Add(new LookupParameter<StringArray>("LocationNames", GeneralizedQuadraticAssignmentProblem.LocationNamesDescription));
       Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", GeneralizedQuadraticAssignmentProblem.BestKnownQualityDescription));
-      Parameters.Add(new LookupParameter<GQAPSolution>("BestKnownSolution", GeneralizedQuadraticAssignmentProblem.BestKnownSolutionDescription));
-      Parameters.Add(new LookupParameter<GQAPAssignmentArchive>("BestKnownSolutions", GeneralizedQuadraticAssignmentProblem.BestKnownSolutionsDescription));
+      Parameters.Add(new LookupParameter<GQAPAssignment>("BestKnownSolution", GeneralizedQuadraticAssignmentProblem.BestKnownSolutionDescription));
       Parameters.Add(new LookupParameter<GQAPAssignment>("BestSolution", "The best GQAP solution found so far."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best GQAP solution should be stored."));
@@ -159 +154 @@
       var maximization = MaximizationParameter.ActualValue.Value;
       var bestKnownQuality = BestKnownQualityParameter.ActualValue;
-      var bestKnownSolutions = BestKnownSolutionsParameter.ActualValue;
 
       int bestIndex;
@@ -168 +162 @@
       if (bestKnownQuality == null || HasSolutionImproved(bestKnownQuality.Value, qualities[bestIndex].Value, maximization)) {
         BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[bestIndex].Value);
-        BestKnownSolutionParameter.ActualValue = new GQAPSolution((IntegerVector)assignments[bestIndex].Clone(), qualities[bestIndex], flowDistanceQualities[bestIndex], installationQualities[bestIndex], overbookedCapacities[bestIndex]);
+        BestKnownSolutionParameter.ActualValue = new GQAPAssignment((IntegerVector)assignments[bestIndex].Clone(), (DoubleValue)qualities[bestIndex].Clone(), flowDistanceQualities[bestIndex], installationQualities[bestIndex], overbookedCapacities[bestIndex], equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts, overbookedCapacityPenalty);
       }
 
-      GQAPAssignment assignment = BestSolutionParameter.ActualValue;
+      var assignment = BestSolutionParameter.ActualValue;
       if (assignment == null) {
         assignment = new GQAPAssignment((IntegerVector)assignments[bestIndex].Clone(), (DoubleValue)qualities[bestIndex].Clone(), flowDistanceQualities[bestIndex], installationQualities[bestIndex], overbookedCapacities[bestIndex], equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts, overbookedCapacityPenalty);
         assignment.Distances = distances;
         BestSolutionParameter.ActualValue = assignment;
-        results.Add(new Result("Best GQAP Solution", assignment));
       } else {
-        if (HasSolutionImproved(assignment.Solution.Quality.Value, qualities[bestIndex].Value, maximization)) {
-          assignment.Solution = new GQAPSolution((IntegerVector)assignments[bestIndex].Clone(),
-            (DoubleValue)qualities[bestIndex].Clone(), (DoubleValue)flowDistanceQualities[bestIndex].Clone(),
-            (DoubleValue)installationQualities[bestIndex].Clone(), (DoubleValue)overbookedCapacities[bestIndex].Clone());
+        if (HasSolutionImproved(assignment.Quality.Value, qualities[bestIndex].Value, maximization)) {
+          assignment.Assignment = (IntegerVector)assignments[bestIndex].Clone();
+          assignment.Quality = (DoubleValue)qualities[bestIndex].Clone();
+          assignment.FlowDistanceQuality = (DoubleValue)flowDistanceQualities[bestIndex].Clone();
+          assignment.InstallationQuality = (DoubleValue)installationQualities[bestIndex].Clone();
+          assignment.OverbookedCapacity = (DoubleValue)overbookedCapacities[bestIndex].Clone();
           assignment.EquipmentNames = equipmentNames;
           assignment.LocationNames = locationNames;
@@ -193 +188 @@
         }
       }
-
-      GQAPAssignmentArchive archive = BestKnownSolutionsParameter.ActualValue;
-      if (archive == null) {
-        archive = new GQAPAssignmentArchive(equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts, overbookedCapacityPenalty);
-        BestKnownSolutionsParameter.ActualValue = archive;
-      } else {
-        var solutions = Enumerable.Range(0, assignments.Length)
-        .Select(i => new GQAPSolution(assignments[i], qualities[i], flowDistanceQualities[i], installationQualities[i], overbookedCapacities[i]))
-        .Concat(archive.Solutions);
-        archive.Solutions = GQAPSolutionArchiveUpdater.GetFeasibleParetoFront(solutions);
-      }
+      if (!results.ContainsKey("Best GQAP Assignment"))
+        results.Add(new Result("Best GQAP Assignment", assignment));
 
       return base.Apply();

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPSolutionArchiveAnalyzer.cs

@@ -40 +40 @@
     IDemandsAwareGQAPOperator, ICapacitiesAwareGQAPOperator, ITransportationCostsAwareGQAPOperator,
     IOverbookedCapacityPenaltyAwareGQAPOperator, IEquipmentNamesAwareGQAPOperator, ILocationNamesAwareGQAPOperator,
-    IAnalyzer {
+    IBestKnownSolutionsAwareGQAPOperator, IAnalyzer {
 
     public bool EnabledByDefault {
-      get { return false; }
+      get { return true; }
     }
 
@@ -94 +94 @@
       get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
+    public ILookupParameter<GQAPAssignmentArchive> BestKnownSolutionsParameter {
+      get { return (ILookupParameter<GQAPAssignmentArchive>)Parameters["BestKnownSolutions"]; }
+    }
 
     [StorableConstructor]
@@ -119 +122 @@
       Parameters.Add(new LookupParameter<StringArray>("LocationNames", GeneralizedQuadraticAssignmentProblem.LocationNamesDescription));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best GQAP solution should be stored."));
+      Parameters.Add(new LookupParameter<GQAPAssignmentArchive>("BestKnownSolutions", GeneralizedQuadraticAssignmentProblem.BestKnownSolutionsDescription));
     }
 
@@ -160 +164 @@
       archive.Solutions = GQAPSolutionArchiveUpdater.GetFeasibleParetoFront(solutions);
 
+      GQAPAssignmentArchive bestKnownArchive = BestKnownSolutionsParameter.ActualValue;
+      if (bestKnownArchive == null) {
+        bestKnownArchive = new GQAPAssignmentArchive();
+        BestKnownSolutionsParameter.ActualValue = bestKnownArchive;
+      } else {
+        var archiveSolutions = Enumerable.Range(0, assignments.Length)
+        .Select(i => new GQAPSolution(assignments[i], qualities[i], flowDistanceQualities[i], installationQualities[i], overbookedCapacities[i]))
+        .Concat(archive.Solutions);
+        bestKnownArchive.Solutions = GQAPSolutionArchiveUpdater.GetFeasibleParetoFront(archiveSolutions);
+      }
+
       return base.Apply();
     }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs

@@ -33 +33 @@
 
     [Storable]
-    private GQAPSolution solution;
-    public GQAPSolution Solution {
-      get { return solution; }
-      set {
-        bool changed = (solution != value);
-        solution = value;
-        if (changed) OnPropertyChanged("Solution");
+    private IntegerVector assignment;
+    public IntegerVector Assignment {
+      get { return assignment; }
+      set {
+        bool changed = (assignment != value);
+        assignment = value;
+        if (changed) OnPropertyChanged("Assignment");
+      }
+    }
+
+    [Storable]
+    private DoubleValue quality;
+    public DoubleValue Quality {
+      get { return quality; }
+      set {
+        bool changed = (quality != value);
+        quality = value;
+        if (changed) OnPropertyChanged("Quality");
+      }
+    }
+
+    [Storable]
+    private DoubleValue flowDistanceQuality;
+    public DoubleValue FlowDistanceQuality {
+      get { return flowDistanceQuality; }
+      set {
+        bool changed = (flowDistanceQuality != value);
+        flowDistanceQuality = value;
+        if (changed) OnPropertyChanged("FlowDistanceQuality");
+      }
+    }
+
+    [Storable]
+    private DoubleValue installationQuality;
+    public DoubleValue InstallationQuality {
+      get { return installationQuality; }
+      set {
+        bool changed = (installationQuality != value);
+        installationQuality = value;
+        if (changed) OnPropertyChanged("InstallationQuality");
+      }
+    }
+
+    [Storable]
+    private DoubleValue overbookedCapacity;
+    public DoubleValue OverbookedCapacity {
+      get { return overbookedCapacity; }
+      set {
+        bool changed = (overbookedCapacity != value);
+        overbookedCapacity = value;
+        if (changed) OnPropertyChanged("OverbookedCapacity");
       }
     }
@@ -146 +190 @@
     private GQAPAssignment(GQAPAssignment original, Cloner cloner)
       : base(original, cloner) {
+      assignment = cloner.Clone(original.assignment);
+      quality = cloner.Clone(original.quality);
+      flowDistanceQuality = cloner.Clone(original.flowDistanceQuality);
+      installationQuality = cloner.Clone(original.installationQuality);
+      overbookedCapacity = cloner.Clone(original.overbookedCapacity);
       equipmentNames = cloner.Clone(original.equipmentNames);
       locationNames = cloner.Clone(original.locationNames);
@@ -156 +205 @@
       overbookedCapacityPenalty = cloner.Clone(original.overbookedCapacityPenalty);
     }
-    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, DoubleValue flowDistanceQuality, DoubleValue installationQuality, DoubleValue overbookedCapacity)
+    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, DoubleValue flowDistanceQuality, DoubleValue installationQuality, DoubleValue overbookedCapacity, StringArray equipmentNames, StringArray locationNames, DoubleMatrix distances, DoubleMatrix weights, DoubleMatrix installationCosts, DoubleArray demands, DoubleArray capacities, DoubleValue transportationCosts, DoubleValue overbookedCapacityPenalty)
       : base() {
-      this.solution = new GQAPSolution(assignment, quality, flowDistanceQuality, installationQuality, overbookedCapacity);
-    }
-    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, DoubleValue flowDistanceQuality, DoubleValue installationQuality, DoubleValue overbookedCapacity, StringArray equipmentNames, StringArray locationNames, DoubleMatrix distances, DoubleMatrix weights, DoubleMatrix installationCosts, DoubleArray demands, DoubleArray capacities, DoubleValue transportationCosts, DoubleValue overbookedCapacityPenalty)
-      : this(assignment, quality, flowDistanceQuality, installationQuality, overbookedCapacity) {
+      this.assignment = assignment;
+      this.quality = quality;
+      this.flowDistanceQuality = flowDistanceQuality;
+      this.installationQuality = installationQuality;
+      this.overbookedCapacity = overbookedCapacity;
       this.equipmentNames = equipmentNames;
       this.locationNames = locationNames;

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

@@ -84 +84 @@
       get { return (FixedValueParameter<DoubleValue>)Parameters["OverbookedCapacityPenalty"]; }
     }
-    public OptionalValueParameter<GQAPSolution> BestKnownSolutionParameter {
-      get { return (OptionalValueParameter<GQAPSolution>)Parameters["BestKnownSolution"]; }
+    public OptionalValueParameter<GQAPAssignment> BestKnownSolutionParameter {
+      get { return (OptionalValueParameter<GQAPAssignment>)Parameters["BestKnownSolution"]; }
     }
     public OptionalValueParameter<GQAPAssignmentArchive> BestKnownSolutionsParameter {
@@ -135 +135 @@
       set { LocationNamesParameter.Value = value; }
     }
-    public GQAPSolution BestKnownSolution {
+    public GQAPAssignment BestKnownSolution {
       get { return BestKnownSolutionParameter.Value; }
       set { BestKnownSolutionParameter.Value = value; }
@@ -266 +266 @@
       try {
         if (instance.Dimension > 1000) return false;
-        
+
         Name = instance.Name;
         Description = instance.Description;
@@ -335 +335 @@
         out flowDistanceQuality, out installationQuality, out overbookedCapacity);
       double quality = GQAPEvaluator.GetCombinedQuality(flowDistanceQuality, installationQuality, overbookedCapacity, TransportationCosts.Value, OverbookedCapacityPenalty.Value);
-      BestKnownSolution = new GQAPSolution(assignment, new DoubleValue(quality), new DoubleValue(flowDistanceQuality), new DoubleValue(installationQuality), new DoubleValue(overbookedCapacity));
+      BestKnownSolution = new GQAPAssignment(assignment, new DoubleValue(quality),
+        new DoubleValue(flowDistanceQuality), new DoubleValue(installationQuality),
+        new DoubleValue(overbookedCapacity), EquipmentNames, LocationNames, Distances, Weights, InstallationCosts,
+        Demands, Capacities, TransportationCosts, OverbookedCapacityPenalty);
       BestKnownQuality = new DoubleValue(quality);
       BestKnownSolutions = new GQAPAssignmentArchive(EquipmentNames, LocationNames, Distances, Weights, InstallationCosts, Demands, Capacities, TransportationCosts, OverbookedCapacityPenalty);
-      BestKnownSolutions.Solutions.Add((GQAPSolution)BestKnownSolution.Clone());
+      BestKnownSolutions.Solutions.Add(BestKnownSolution);
     }
 

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IBestKnownSolutionAwareGQAPOperator.cs

@@ -24 +24 @@
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   public interface IBestKnownSolutionAwareGQAPOperator : IGQAPOperator {
-    ILookupParameter<GQAPSolution> BestKnownSolutionParameter { get; }
+    ILookupParameter<GQAPAssignment> BestKnownSolutionParameter { get; }
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj

@@ -132 +132 @@
     <EmbeddedResource Include="Data\TSP\lin105.tsp" />
     <EmbeddedResource Include="Data\TSP\lin318.tsp" />
-    <EmbeddedResource Include="Data\TSP\linhp318.tsp" />
     <EmbeddedResource Include="Data\TSP\nrw1379.tsp" />
     <EmbeddedResource Include="Data\TSP\p654.tsp" />
@@ -234 +233 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="Properties\AssemblyInfo.frame" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
   <ItemGroup>

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBParser.cs

@@ -439 +439 @@
           break;
         default:
-          throw new InvalidDataException("Input files does not specify a valid node coord type.");
+          throw new InvalidDataException("Input files does not specify a valid display data type.");
       }
 
@@ -525 +525 @@
         || edgeWeightFormat == TSPLIBEdgeWeightFormats.UPPER_ROW;
 
-      int dim1 = !triangular && !upperTriangular ? (diagonal ? 0 : 1) : 0;
-      int dim2 = !triangular && upperTriangular ? (diagonal ? 0 : 1) : 0;
+      int dim1 = triangular && !upperTriangular ? (diagonal ? 0 : 1) : 0;
+      int dim2 = triangular && upperTriangular ? (diagonal ? 0 : 1) : 0;
       bool finished = false;
       while (!finished) {

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.Instances.TSPLIB {
   public class TSPLIBTSPInstanceProvider : ProblemInstanceProvider<ITSPInstance> {
-    
+
     public override string Name {
       get { return "TSPLIB (symmetric TSP)"; }
@@ -64 +64 @@
         var parser = new TSPLIBParser(stream);
         parser.Parse();
+        if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab.");
+
         instance.Dimension = parser.Dimension;
         instance.Coordinates = parser.Vertices != null ? parser.Vertices : parser.DisplayVertices;

branches/GeneralizedQAP/UnitTests/TSPLIBInstanceProviderTest.cs

@@ -4 +4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTests
-{
-    
-    
-    /// <summary>
-    ///This is a test class for TSPLIBInstanceProviderTest and is intended
-    ///to contain all TSPLIBInstanceProviderTest Unit Tests
-    ///</summary>
+namespace UnitTests {
   [TestClass()]
   public class TSPLIBInstanceProviderTest {
-    /// <summary>
-    ///A test for GetInstance
-    ///</summary>
+
     [TestMethod()]
     public void GetTSPLIBTSPInstanceTest() {
-      TSPLIBTSPInstanceProvider target = new TSPLIBTSPInstanceProvider();
+      var target = new TSPLIBTSPInstanceProvider();
+      StringBuilder erroneousInstances = new StringBuilder();
+      int count = 0;
+      foreach (var id in target.GetInstanceDescriptors()) {
+        try {
+          target.GetInstance(id);
+        } catch (Exception ex) {
+          erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
+        }
+        count++;
+      }
+      Assert.IsTrue(count > 0, "No problem instances were found.");
+      Assert.IsTrue(erroneousInstances.Length == 0, "Some instances could not be parsed: " + Environment.NewLine + erroneousInstances.ToString());
+    }
+
+    [TestMethod()]
+    public void GetTSPLIBATSPInstanceTest() {
+      var target = new TSPLIBATSPInstanceProvider();
+      StringBuilder erroneousInstances = new StringBuilder();
+      int count = 0;
+      foreach (var id in target.GetInstanceDescriptors()) {
+        try {
+          target.GetInstance(id);
+        } catch (Exception ex) {
+          erroneousInstances.AppendLine(id.Name + ": " + ex.Message);
+        }
+        count++;
+      }
+      Assert.IsTrue(count > 0, "No problem instances were found.");
+      Assert.IsTrue(erroneousInstances.Length == 0, "Some instances could not be parsed: " + Environment.NewLine + erroneousInstances.ToString());
+    }
+
+    [TestMethod()]
+    public void GetTSPLIBCVRPInstanceTest() {
+      var target = new TSPLIBCVRPInstanceProvider();
       StringBuilder erroneousInstances = new StringBuilder();
       int count = 0;

branches/GeneralizedQAP/UnitTests/UnitTests.csproj

@@ -97 +97 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ElloumiCTAPInstanceProviderTest.cs" />
+    <Compile Include="QAPLIBInstanceProviderTest.cs" />
     <Compile Include="GQAPNMoveEvaluatorTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -109 +111 @@
       <Project>{C739E6D2-5680-4804-A810-8017DA0C238F}</Project>
       <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.ElloumiCTAP\3.3\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj">
+      <Project>{CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}</Project>
+      <Name>HeuristicLab.Problems.Instances.ElloumiCTAP-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.QAPLIB\3.3\HeuristicLab.Problems.Instances.QAPLIB-3.3.csproj">
+      <Project>{73F29D43-5714-4069-8FAB-0D18FEB5F175}</Project>
+      <Name>HeuristicLab.Problems.Instances.QAPLIB-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.Instances.TSPLIB\3.3\HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj">