lint, formatting and migrations

Author: tomvanmele

src/compas_assembly/__init__.py

@@ -1,33 +1,13 @@
-"""
-********************************************************************************
-compas_assembly
-********************************************************************************
-
-.. currentmodule:: compas_assembly
-
-
-.. toctree::
-    :maxdepth: 1
-
-    compas_assembly.algorithms
-    compas_assembly.artists
-    compas_assembly.datastructures
-    compas_assembly.geometry
-    compas_assembly.rhino
-    compas_assembly.viewer
-
-"""
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
 
 import os
 
-__author__ = ["Tom Van Mele <van.mele@arch.ethz.ch>"]
-__copyright__ = "Block Research Group - ETH Zurich"
+__author__ = ["Tom Van Mele"]
+__copyright__ = "ETH Zurich - Block Research Group"
 __license__ = "MIT License"
-__email__ = "van.mele@arch.ethz.ch"
-
+__email__ = "tom.v.mele@gmail.com"
 __version__ = "0.6.2"
 
 

src/compas_assembly/algorithms/__init__.py

@@ -1,26 +1,3 @@
-"""
-********************************************************************************
-compas_assembly.algorithms
-********************************************************************************
-
-.. currentmodule:: compas_assembly.algorithms
-
-
-Functions
-=========
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-
-    assembly_hull
-    assembly_hull_numpy
-    assembly_interfaces
-    assembly_interfaces_numpy
-    mesh_mesh_interfaces
-    merge_coplanar_interfaces
-
-"""
 from __future__ import absolute_import
 
 import compas

src/compas_assembly/algorithms/hull.py

@@ -2,8 +2,8 @@
 from __future__ import division
 from __future__ import print_function
 
-from compas.utilities import flatten
 from compas.geometry import convex_hull
+from compas.itertools import flatten
 from compas.topology import unify_cycles
 
 
@@ -36,7 +36,7 @@ def assembly_hull(assembly, keys=None, unify=True):
     points = []
     for key in keys:
         block = assembly.blocks[key]
-        points.extend(block.vertices_attributes('xyz'))
+        points.extend(block.vertices_attributes("xyz"))
 
     faces = convex_hull(points)
     vertices = list(set(flatten(faces)))

src/compas_assembly/algorithms/hull_numpy.py

@@ -21,8 +21,8 @@ def assembly_hull_numpy(assembly, keys=None, unify=True):
     tuple
         The vertices and faces of the hull.
 
-    Warning
-    -------
+    Warnings
+    --------
     This function requires Numpy and cannot be used directly inside Rhino.
 
     Examples
@@ -34,7 +34,7 @@ def assembly_hull_numpy(assembly, keys=None, unify=True):
     points = []
     for key in keys:
         block = assembly.blocks[key]
-        points.extend(block.vertices_attributes('xyz'))
+        points.extend(block.vertices_attributes("xyz"))
 
     vertices, faces = convex_hull_numpy(points)
 

src/compas_assembly/algorithms/interfaces.py

@@ -1,29 +1,22 @@
-from typing import List
-
 from math import fabs
+from typing import List
 
 from shapely.geometry import Polygon as ShapelyPolygon
 
+from compas.datastructures import Mesh
 from compas.geometry import Frame
-from compas.geometry import Transformation
 from compas.geometry import Plane
 from compas.geometry import Polygon
+from compas.geometry import Transformation
 from compas.geometry import centroid_polygon
-
-# from compas.geometry import bestfit_frame_numpy
-from compas.geometry import transform_points
-from compas.geometry import is_coplanar
 from compas.geometry import is_colinear
-
+from compas.geometry import is_coplanar
+from compas.geometry import transform_points
 from compas.utilities import window
-
-from compas.datastructures import Mesh
-from compas.datastructures import mesh_merge_faces
-
+from compas_assembly.algorithms.nnbrs import find_nearest_neighbours
 from compas_assembly.datastructures import Assembly
 from compas_assembly.datastructures import Block
 from compas_assembly.datastructures import Interface
-from compas_assembly.algorithms.nnbrs import find_nearest_neighbours
 
 
 def assembly_interfaces(
@@ -76,7 +69,7 @@ def assembly_interfaces(
                 # a block has no interfaces with itself
                 continue
 
-            if assembly.graph.has_edge(n, node, directed=False):
+            if assembly.graph.has_edge((n, node), directed=False):
                 # the interfaces between these two blocks have already been identified
                 continue
 
@@ -148,7 +141,6 @@ def mesh_mesh_interfaces(
             coords = transform_points(coords, matrix.inverted())[:-1]
 
             interface = Interface(
-                type="face_face",
                 size=area,
                 points=coords,
                 frame=Frame(
@@ -216,7 +208,7 @@ def merge_coplanar_interfaces(assembly, tol=1e-6):
                                 points.append(temp.vertex_coordinates(vertex))
 
                         if is_coplanar(points, tol=tol):
-                            mesh_merge_faces(temp, [face, nbr])
+                            temp.merge_faces([face, nbr])
                             has_merged = True
                             reconstruct = True
                             break
@@ -232,11 +224,8 @@ def merge_coplanar_interfaces(assembly, tol=1e-6):
                 for face in temp.faces():
                     points = temp.face_coordinates(face)
                     area = temp.face_area(face)
-                    frame = Frame.from_plane(
-                        Plane(temp.face_centroid(face), temp.face_normal(face))
-                    )
+                    frame = Frame.from_plane(Plane(temp.face_centroid(face), temp.face_normal(face)))
                     interface = Interface(
-                        type="face_face",
                         size=area,
                         points=points,
                         frame=frame,

src/compas_assembly/algorithms/interfaces_numpy.py

@@ -6,13 +6,12 @@
 from shapely.geometry import Polygon
 
 from compas.geometry import Frame
-from compas.geometry import local_to_world_coordinates_numpy
 from compas.geometry import centroid_points
-
+from compas.geometry import local_to_world_coordinates_numpy
+from compas_assembly.algorithms.nnbrs import find_nearest_neighbours
 from compas_assembly.datastructures import Assembly
 from compas_assembly.datastructures import Block
 from compas_assembly.datastructures import Interface
-from compas_assembly.algorithms.nnbrs import find_nearest_neighbours
 
 
 def assembly_interfaces_numpy(
@@ -125,7 +124,6 @@ def mesh_mesh_interfaces(
         rst = {key: rst[k_i[key]] for key in b.vertices()}
 
         for f1 in b.faces():
-
             rst1 = [rst[key] for key in b.face_vertices(f1)]
 
             if any(fabs(t) > tmax for r, s, t in rst1):
@@ -146,11 +144,8 @@ def mesh_mesh_interfaces(
                 continue
 
             coords = [[x, y, 0.0] for x, y, z in intersection.exterior.coords]
-            coords = local_to_world_coordinates_numpy(
-                Frame(o, A[0], A[1]), coords[:-1]
-            ).tolist()
+            coords = local_to_world_coordinates_numpy(Frame(o, A[0], A[1]), coords[:-1]).tolist()
             interface = Interface(
-                type="face_face",
                 size=area,
                 points=coords,
                 frame=Frame(