Changeset 7470 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBParser.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/TSPLIBParser.cs (modified) (2 diffs)

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) {