Merge pull request #1 from PatrickOHara/edge-list-fix

Edge list fix

tests/fields/test_edge_data_field.py

@@ -12,12 +12,12 @@ def field():
 @pytest.mark.parametrize('text,value,exc', [
     ('1 2\n2 3\n-1', [(1, 2), (2, 3)], None),
     ('1 2\n2 x\n-1', [(1, 2), (2, 3)], E.ParsingError),
-    ('1 2 3\n2 3\n-1', {1: [2, 3], 2: [3]}, None),
+    ('1 2 3 -1\n2 3 -1\n-1', {1: [2, 3], 2: [3]}, None),
     ('1 x 3\n2 3\n-1', {1: [2, 3], 2: [3]}, E.ParsingError),
 ])
 def test_parse(field, text, value, exc):
     if exc:
         with pytest.raises(exc):
             field.parse(text)
     else:
-        field.parse(text) == value
+        assert field.parse(text) == value

tests/fields/test_edge_list_field.py

@@ -9,7 +9,7 @@ def edge_list_field():
 
 
 def test_parse(edge_list_field):
-    assert edge_list_field.parse('1 2\n3 4\n-1') == [[1, 2], [3, 4]]
+    assert edge_list_field.parse('1 2\n3 4\n-1') == [(1, 2), (3, 4)]
 
 
 def test_render(edge_list_field):

tsplib95/fields.py

@@ -237,8 +237,8 @@ class AdjacencyListField(TransformerField):
     @classmethod
     def build_transformer(cls):
         return T.MapT(key=T.FuncT(func=int),
-                      value=T.ListT(value=T.FuncT(func=int)),
-                      sep=('-1', ' -1\n'),
+                      value=T.ListT(value=T.FuncT(func=int), terminal='-1'),
+                      sep='\n',
                       terminal='-1')
 
 
@@ -249,7 +249,7 @@ class EdgeListField(TransformerField):
 
     @classmethod
     def build_transformer(cls):
-        edge = T.ListT(value=T.FuncT(func=int), size=2)
+        edge = T.TupleT(value=T.FuncT(func=int), size=2)
         return T.ListT(value=edge, terminal='-1', sep='\n')
 
 
@@ -273,7 +273,7 @@ class EdgeDataField(TransformerField):
     def build_transformer(cls):
         adj_list = AdjacencyListField.build_transformer()
         edge_list = EdgeListField.build_transformer()
-        return T.UnionT(adj_list, edge_list)
+        return T.UnionT(edge_list, adj_list)
 
 
 class DepotsField(TransformerField):

tsplib95/transformers.py

@@ -244,6 +244,14 @@ def pack(self, items):
     def unpack(self, container):
         return list(container)
 
+class TupleT(ContainerT):
+    """Transformer for tuples"""
+
+    def pack(self, items):
+        return tuple(items)
+
+    def unpack(self, container):
+        return tuple(container)
 
 class MapT(ContainerT):
     """Transformer for a key-value mapping of items.