Merge pull request #878 from compas-dev/ds-datakey-generation-fix

Use str representation of sorted tuples to be compatible with literal eval

Author: tomvanmele

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed data schema of `compas.geometry.Polyline`, `compas.geometry.Polygon`, `compas.geometry.Pointcloud`.
 * Fixed `Configuration.from_data` to be backward-compatible with JSON data generated before `compas 1.3.0`.
 * Changed `compas_rhino.drawing.draw_breps` to assume provided polygon is closed and automatically add missing corner to polycurve constructor.
+* Changed conversion of edges and faces to uniques keys for the data dicts to use the string representation of a sorted tuple of identifiers.
 * Added `dtype` to JSON decoding error message.
 
 ### Removed

src/compas/datastructures/mesh/core/halfedge.py

@@ -1278,7 +1278,7 @@ def edge_attribute(self, edge, name, value=None):
         u, v = edge
         if u not in self.halfedge or v not in self.halfedge[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = str(tuple(sorted(edge)))
         if value is not None:
             if key not in self.edgedata:
                 self.edgedata[key] = {}
@@ -1312,7 +1312,7 @@ def unset_edge_attribute(self, edge, name):
         u, v = edge
         if u not in self.halfedge or v not in self.halfedge[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = str(tuple(sorted(edge)))
         if key in self.edgedata and name in self.edgedata[key]:
             del self.edgedata[key][name]
 
@@ -1352,7 +1352,7 @@ def edge_attributes(self, edge, names=None, values=None):
             return
         # use it as a getter
         if not names:
-            key = "-".join(map(str, sorted(edge)))
+            key = str(tuple(sorted(edge)))
             # get the entire attribute dict
             return EdgeAttributeView(self.default_edge_attributes, self.edgedata.setdefault(key, {}))
         # get only the values of the named attributes

src/compas/datastructures/volmesh/core/halfface.py

@@ -900,7 +900,7 @@ def edge_attribute(self, edge, name, value=None):
         u, v = edge
         if u not in self._plane or v not in self._plane[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = str(tuple(sorted(edge)))
         if value is not None:
             if key not in self._edge_data:
                 self._edge_data[key] = {}
@@ -934,7 +934,7 @@ def unset_edge_attribute(self, edge, name):
         u, v = edge
         if u not in self._plane or v not in self._plane[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = str(tuple(sorted(edge)))
         if key in self._edge_data and name in self._edge_data[key]:
             del self._edge_data[key][name]
 
@@ -967,7 +967,7 @@ def edge_attributes(self, edge, names=None, values=None):
         u, v = edge
         if u not in self._plane or v not in self._plane[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = str(tuple(sorted(edge)))
         if values:
             for name, value in zip(names, values):
                 if key not in self._edge_data:
@@ -1097,7 +1097,7 @@ def face_attribute(self, face, name, value=None):
         """
         if face not in self._halfface:
             raise KeyError(face)
-        key = "-".join(map(str, sorted(self.halfface_vertices(face))))
+        key = str(tuple(sorted(self.halfface_vertices(face))))
         if value is not None:
             if key not in self._face_data:
                 self._face_data[key] = {}
@@ -1130,7 +1130,7 @@ def unset_face_attribute(self, face, name):
         """
         if face not in self._halfface:
             raise KeyError(face)
-        key = "-".join(map(str, sorted(self.halfface_vertices(face))))
+        key = str(tuple(sorted(self.halfface_vertices(face))))
         if key in self._face_data and name in self._face_data[key]:
             del self._face_data[key][name]
 
@@ -1162,7 +1162,7 @@ def face_attributes(self, face, names=None, values=None):
         """
         if face not in self._halfface:
             raise KeyError(face)
-        key = "-".join(map(str, sorted(self.halfface_vertices(face))))
+        key = str(tuple(sorted(self.halfface_vertices(face))))
         if values:
             for name, value in zip(names, values):
                 if key not in self._face_data:

tests/compas/datastructures/test_graph.py

@@ -23,6 +23,21 @@ def graph():
 # ==============================================================================
 
 
+# def test_edgedata_directionality(graph):
+#     graph.update_default_edge_attributes({'index': 0})
+#     for index, (u, v) in enumerate(graph.edges()):
+#         graph.edge_attribute((u, v), 'index', index)
+#     assert all(graph.edge_attribute((u, v), 'index') != graph.edge_attribute((v, u), 'index') for u, v in graph.edges())
+
+
+def test_edgedata_io(graph):
+    graph.update_default_edge_attributes({'index': 0})
+    for index, (u, v) in enumerate(graph.edges()):
+        graph.edge_attribute((u, v), 'index', index)
+    other = Graph.from_data(graph.data)
+    assert all(other.edge_attribute(edge, 'index') == index for index, edge in enumerate(other.edges()))
+
+
 def test_data_schema(graph):
     if compas.IPY:
         return

tests/compas/datastructures/test_halfedge.py

@@ -40,6 +40,21 @@ def edge_key():
 # ==============================================================================
 
 
+def test_edgedata_nondirectionality(mesh):
+    mesh.update_default_edge_attributes({'index': 0})
+    for index, (u, v) in enumerate(mesh.edges()):
+        mesh.edge_attribute((u, v), 'index', index)
+    assert all(mesh.edge_attribute((u, v), 'index') == mesh.edge_attribute((v, u), 'index') for u, v in mesh.edges())
+
+
+def test_edgedata_io(mesh):
+    mesh.update_default_edge_attributes({'index': 0})
+    for index, (u, v) in enumerate(mesh.edges()):
+        mesh.edge_attribute((u, v), 'index', index)
+    other = HalfEdge.from_data(mesh.data)
+    assert all(other.edge_attribute(edge, 'index') == index for index, edge in enumerate(other.edges()))
+
+
 def test_data_schema(mesh):
     if not compas.IPY:
         mesh.validate_data()