move matrices

Author: tomvanmele

src/compas/datastructures/graph/graph.py

@@ -18,6 +18,7 @@
 from compas.geometry import Point
 from compas.geometry import Vector
 from compas.geometry import Line
+from compas.geometry import Box
 from compas.geometry import centroid_points
 from compas.geometry import subtract_vectors
 from compas.geometry import distance_point_point
@@ -26,6 +27,8 @@
 from compas.geometry import add_vectors
 from compas.geometry import scale_vector
 from compas.geometry import transform_points
+from compas.geometry import bounding_box
+from compas.geometry import oriented_bounding_box
 from compas.topology import astar_shortest_path
 from compas.topology import breadth_first_traverse
 from compas.topology import connected_components
@@ -2245,7 +2248,7 @@ def edge_length(self, edge):
         return distance_point_point(a, b)
 
     # --------------------------------------------------------------------------
-    # Transformations
+    # Transformations and BBox
     # --------------------------------------------------------------------------
 
     def transform(self, transformation):
@@ -2266,6 +2269,28 @@ def transform(self, transformation):
         for point, node in zip(points, self.nodes()):
             self.node_attributes(node, "xyz", point)
 
+    def aabb(self):
+        """Calculate the axis aligned bounding box of the graph.
+
+        Returns
+        -------
+        :class:`compas.geometry.Box`
+
+        """
+        nodes = self.nodes_attributes("xyz")
+        return Box.from_bounding_box(bounding_box(nodes))
+
+    def obb(self):
+        """Calculate the oriented bounding box of the graph.
+
+        Returns
+        -------
+        :class:`compas.geometry.Box`
+
+        """
+        nodes = self.nodes_attributes("xyz")
+        return Box.from_bounding_box(oriented_bounding_box(nodes))
+
     # --------------------------------------------------------------------------
     # Other Methods
     # --------------------------------------------------------------------------
@@ -2380,7 +2405,7 @@ def adjacency_matrix(self, rtype="array"):
             Constructed adjacency matrix.
 
         """
-        from compas.topology import adjacency_matrix
+        from compas.matrices import adjacency_matrix
 
         node_index = self.node_index()
         adjacency = [[node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()]
@@ -2400,7 +2425,7 @@ def connectivity_matrix(self, rtype="array"):
             Constructed connectivity matrix.
 
         """
-        from compas.topology import connectivity_matrix
+        from compas.matrices import connectivity_matrix
 
         node_index = self.node_index()
         edges = [(node_index[u], node_index[v]) for u, v in self.edges()]
@@ -2420,7 +2445,7 @@ def degree_matrix(self, rtype="array"):
             Constructed degree matrix.
 
         """
-        from compas.topology import degree_matrix
+        from compas.matrices import degree_matrix
 
         node_index = self.node_index()
         adjacency = [[node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()]
@@ -2448,7 +2473,7 @@ def laplacian_matrix(self, normalize=False, rtype="array"):
         vectors could be used in a more natural way ``c = xyz + d``.
 
         """
-        from compas.topology import laplacian_matrix
+        from compas.matrices import laplacian_matrix
 
         node_index = self.node_index()
         edges = [(node_index[u], node_index[v]) for u, v in self.edges()]

src/compas/datastructures/mesh/mesh.py

@@ -28,6 +28,7 @@
 from compas.geometry import Circle
 from compas.geometry import Frame
 from compas.geometry import Polyhedron
+from compas.geometry import Box
 from compas.geometry import angle_points
 from compas.geometry import area_polygon
 from compas.geometry import bestfit_plane
@@ -3927,24 +3928,22 @@ def aabb(self):
 
         Returns
         -------
-        list[[float, float, float]]
-            XYZ coordinates of 8 points defining a box.
+        :class:`compas.geometry.Box`
 
         """
         xyz = self.vertices_attributes("xyz")
-        return bounding_box(xyz)
+        return Box.from_bounding_box(bounding_box(xyz))
 
     def obb(self):
         """Calculate the oriented bounding box of the mesh.
 
         Returns
         -------
-        list[[float, float, float]]
-            XYZ coordinates of 8 points defining a box.
+        :class:`compas.geometry.Box`
 
         """
         xyz = self.vertices_attributes("xyz")
-        return oriented_bounding_box(xyz)
+        return Box.from_bounding_box(oriented_bounding_box(xyz))
 
     # --------------------------------------------------------------------------
     # Vertex geometry
@@ -4842,7 +4841,7 @@ def adjacency_matrix(self, rtype="array"):
             The adjacency matrix.
 
         """
-        from compas.topology import adjacency_matrix
+        from compas.matrices import adjacency_matrix
 
         vertex_index = self.vertex_index()
         adjacency = [[vertex_index[nbr] for nbr in self.vertex_neighbors(vertex)] for vertex in self.vertices()]
@@ -4862,7 +4861,7 @@ def connectivity_matrix(self, rtype="array"):
             The connectivity matrix.
 
         """
-        from compas.topology import connectivity_matrix
+        from compas.matrices import connectivity_matrix
 
         vertex_index = self.vertex_index()
         adjacency = [[vertex_index[nbr] for nbr in self.vertex_neighbors(vertex)] for vertex in self.vertices()]
@@ -4882,7 +4881,7 @@ def degree_matrix(self, rtype="array"):
             The degree matrix.
 
         """
-        from compas.topology import degree_matrix
+        from compas.matrices import degree_matrix
 
         vertex_index = self.vertex_index()
         adjacency = [[vertex_index[nbr] for nbr in self.vertex_neighbors(vertex)] for vertex in self.vertices()]
@@ -4936,7 +4935,7 @@ def face_matrix(self, rtype="array"):
         True
 
         """
-        from compas.topology import face_matrix
+        from compas.matrices import face_matrix
 
         vertex_index = self.vertex_index()
         faces = [[vertex_index[vertex] for vertex in self.face_vertices(face)] for face in self.faces()]
@@ -4993,7 +4992,7 @@ def laplacian_matrix(self, rtype="array"):
         >>> d = L.dot(xyz)
 
         """
-        from compas.topology import laplacian_matrix
+        from compas.matrices import laplacian_matrix
 
         vertex_index = self.vertex_index()
         adjacency = [[vertex_index[nbr] for nbr in self.vertex_neighbors(vertex)] for vertex in self.vertices()]

src/compas/datastructures/volmesh/volmesh.py

@@ -19,6 +19,7 @@
 from compas.geometry import Line
 from compas.geometry import Polygon
 from compas.geometry import Polyhedron
+from compas.geometry import Box
 from compas.geometry import add_vectors
 from compas.geometry import bestfit_plane
 from compas.geometry import centroid_points
@@ -33,6 +34,7 @@
 from compas.geometry import subtract_vectors
 from compas.geometry import bounding_box
 from compas.geometry import transform_points
+from compas.geometry import oriented_bounding_box
 
 from compas.utilities import linspace
 from compas.utilities import pairwise
@@ -951,12 +953,22 @@ def aabb(self):
 
         Returns
         -------
-        list[[float, float, float]]
-            XYZ coordinates of 8 points defining a box.
+        :class:`compas.geometry.Box`
 
         """
         xyz = self.vertices_attributes("xyz")
-        return bounding_box(xyz)
+        return Box.from_bounding_box(bounding_box(xyz))
+
+    def obb(self):
+        """Calculate the oriented bounding box of the datastructure.
+
+        Returns
+        -------
+        :class:`compas.geometry.Box`
+
+        """
+        xyz = self.vertices_attributes("xyz")
+        return Box.from_bounding_box(oriented_bounding_box(xyz))
 
     # --------------------------------------------------------------------------
     # VolMesh Topology