Skip to content

Commit cac9526

Browse files
committed
formatting
1 parent 64b4d60 commit cac9526

2 files changed

Lines changed: 10 additions & 35 deletions

File tree

src/compas/datastructures/graph/graph.py

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -134,21 +134,15 @@ def __data__(self):
134134

135135
def __before_json_dump__(self, data):
136136
data["node"] = {repr(key): attr for key, attr in data["node"].items()}
137-
data["edge"] = {
138-
repr(u): {repr(v): attr for v, attr in nbrs.items()}
139-
for u, nbrs in data["edge"].items()
140-
}
137+
data["edge"] = {repr(u): {repr(v): attr for v, attr in nbrs.items()} for u, nbrs in data["edge"].items()}
141138
return data
142139

143140
def __after_json_load__(self, data):
144141
l_e = literal_eval
145142
nodes = data["node"] or {}
146143
edges = data["edge"] or {}
147144
data["node"] = {l_e(node): attr for node, attr in nodes.items()}
148-
data["edge"] = {
149-
l_e(u): {l_e(v): attr for v, attr in nbrs.items()}
150-
for u, nbrs in edges.items()
151-
}
145+
data["edge"] = {l_e(u): {l_e(v): attr for v, attr in nbrs.items()} for u, nbrs in edges.items()}
152146
return data
153147

154148
@classmethod
@@ -1974,9 +1968,7 @@ def has_edge(self, edge, directed=True):
19741968
u, v = edge
19751969
if directed:
19761970
return u in self.edge and v in self.edge[u]
1977-
return (u in self.edge and v in self.edge[u]) or (
1978-
v in self.edge and u in self.edge[v]
1979-
)
1971+
return (u in self.edge and v in self.edge[u]) or (v in self.edge and u in self.edge[v])
19801972

19811973
# --------------------------------------------------------------------------
19821974
# Node geometry
@@ -2064,11 +2056,7 @@ def node_neighborhood_centroid(self, key):
20642056
:meth:`node_coordinates`, :meth:`node_point`, :meth:`node_laplacian`
20652057
20662058
"""
2067-
return Point(
2068-
*centroid_points(
2069-
[self.node_coordinates(nbr) for nbr in self.neighbors(key)]
2070-
)
2071-
)
2059+
return Point(*centroid_points([self.node_coordinates(nbr) for nbr in self.neighbors(key)]))
20722060

20732061
# --------------------------------------------------------------------------
20742062
# Edge geometry
@@ -2348,10 +2336,7 @@ def connected_edges(self):
23482336
:meth:`connected_nodes`
23492337
23502338
"""
2351-
return [
2352-
[(u, v) for u in nodes for v in self.neighbors(u) if u < v]
2353-
for nodes in self.connected_nodes()
2354-
]
2339+
return [[(u, v) for u in nodes for v in self.neighbors(u) if u < v] for nodes in self.connected_nodes()]
23552340

23562341
def exploded(self):
23572342
"""Explode the graph into its connected components.
@@ -2438,9 +2423,7 @@ def adjacency_matrix(self, rtype="array"):
24382423
from compas.matrices import adjacency_matrix
24392424

24402425
node_index = self.node_index()
2441-
adjacency = [
2442-
[node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()
2443-
]
2426+
adjacency = [[node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()]
24442427
return adjacency_matrix(adjacency, rtype=rtype)
24452428

24462429
def connectivity_matrix(self, rtype="array"):
@@ -2480,9 +2463,7 @@ def degree_matrix(self, rtype="array"):
24802463
from compas.matrices import degree_matrix
24812464

24822465
node_index = self.node_index()
2483-
adjacency = [
2484-
[node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()
2485-
]
2466+
adjacency = [[node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()]
24862467
return degree_matrix(adjacency, rtype=rtype)
24872468

24882469
def laplacian_matrix(self, normalize=False, rtype="array"):

src/compas/geometry/polyhedron.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ def lines(self):
319319

320320
@property
321321
def polygons(self):
322-
return [
323-
Polygon([self.vertices[index] for index in face]) for face in self.faces
324-
]
322+
return [Polygon([self.vertices[index] for index in face]) for face in self.faces]
325323

326324
@property
327325
def planes(self):
@@ -390,9 +388,7 @@ def from_platonicsolid(cls, f):
390388
elif f == 20:
391389
vertices, faces = icosahedron()
392390
else:
393-
raise ValueError(
394-
"The number of sides of a platonic solid must be one of: 4, 6, 8, 12, 20."
395-
)
391+
raise ValueError("The number of sides of a platonic solid must be one of: 4, 6, 8, 12, 20.")
396392
solid = cls(vertices, faces)
397393
return solid
398394

@@ -443,9 +439,7 @@ def from_halfspaces(cls, halfspaces, interior_point):
443439
interior_point = asarray(interior_point, dtype=float)
444440
hsi = HalfspaceIntersection(halfspaces, interior_point)
445441
hull = ConvexHull(hsi.intersections)
446-
mesh = Mesh.from_vertices_and_faces(
447-
[hsi.intersections[i] for i in hull.vertices], hull.simplices
448-
)
442+
mesh = Mesh.from_vertices_and_faces([hsi.intersections[i] for i in hull.vertices], hull.simplices)
449443
mesh.unify_cycles()
450444
to_merge = []
451445
for a, b in combinations(mesh.faces(), 2):

0 commit comments

Comments
 (0)