Changeset 7470 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

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

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs (modified) (2 diffs)

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;