surface and polyhedron fixes

Author: tomvanmele

CHANGELOG.md

@@ -11,13 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added `compas.scene.Scene.add_group()` for adding group.
 * Added `compas.scene.Group.add_from_list()` for adding a list of items to a group.
+* Added implementation for `compas.geometry.SphericalSurface.isocurve_u`.
+* Added implementation for `compas.geometry.SphericalSurface.isocurve_v`.
+* Added implementation for `compas.geometry.CylindricalSurface.isocurve_u`.
+* Added implementation for `compas.geometry.CylindricalSurface.isocurve_v`.
 
 ### Changed
 
 * Fixed error in `circle_to_compas` from Rhino.
 * Fixed Rhino to Rhino brep serialization.
 * Upated `compas.scene.Group.add()` to pass on group kwargs as default for child items.
 * Fixed bug in context detection, which wrongly defaults to `Viewer` instead of `None`.
+* Fixed bug in calculation of `compas.geometry.Polyhedron.edges` if geometry is computed using numpy.
+* Fixed bug in `Grpah.from_pointcloud` which uses degree parameter wrongly.
 
 ### Removed
 

src/compas/datastructures/graph/graph.py

@@ -5,6 +5,8 @@
 from ast import literal_eval
 from itertools import combinations
 from random import sample
+from random import choice
+from random import shuffle
 
 import compas
 
@@ -132,15 +134,21 @@ def __data__(self):
 
     def __before_json_dump__(self, data):
         data["node"] = {repr(key): attr for key, attr in data["node"].items()}
-        data["edge"] = {repr(u): {repr(v): attr for v, attr in nbrs.items()} for u, nbrs in data["edge"].items()}
+        data["edge"] = {
+            repr(u): {repr(v): attr for v, attr in nbrs.items()}
+            for u, nbrs in data["edge"].items()
+        }
         return data
 
     def __after_json_load__(self, data):
         l_e = literal_eval
         nodes = data["node"] or {}
         edges = data["edge"] or {}
         data["node"] = {l_e(node): attr for node, attr in nodes.items()}
-        data["edge"] = {l_e(u): {l_e(v): attr for v, attr in nbrs.items()} for u, nbrs in edges.items()}
+        data["edge"] = {
+            l_e(u): {l_e(v): attr for v, attr in nbrs.items()}
+            for u, nbrs in edges.items()
+        }
         return data
 
     @classmethod
@@ -159,7 +167,13 @@ def __from_data__(cls, data):
         graph._max_node = data.get("max_node", graph._max_node)
         return graph
 
-    def __init__(self, default_node_attributes=None, default_edge_attributes=None, name=None, **kwargs):
+    def __init__(
+        self,
+        default_node_attributes=None,
+        default_edge_attributes=None,
+        name=None,
+        **kwargs,
+    ):
         super(Graph, self).__init__(kwargs, name=name)
         self._max_node = -1
         self.node = {}
@@ -375,8 +389,16 @@ def from_pointcloud(cls, cloud, degree=3):
         graph = cls()
         for x, y, z in cloud:
             graph.add_node(x=x, y=y, z=z)
+        nodes = list(graph.nodes())
         for u in graph.nodes():
-            for v in graph.node_sample(size=degree):
+            shuffle(nodes)
+            for v in nodes:
+                if v == u:
+                    continue
+                if graph.degree(v) == degree:
+                    continue
+                if graph.degree(u) == degree:
+                    break
                 graph.add_edge(u, v)
         return graph
 
@@ -1952,7 +1974,9 @@ def has_edge(self, edge, directed=True):
         u, v = edge
         if directed:
             return u in self.edge and v in self.edge[u]
-        return (u in self.edge and v in self.edge[u]) or (v in self.edge and u in self.edge[v])
+        return (u in self.edge and v in self.edge[u]) or (
+            v in self.edge and u in self.edge[v]
+        )
 
     # --------------------------------------------------------------------------
     # Node geometry
@@ -2040,7 +2064,11 @@ def node_neighborhood_centroid(self, key):
         :meth:`node_coordinates`, :meth:`node_point`, :meth:`node_laplacian`
 
         """
-        return Point(*centroid_points([self.node_coordinates(nbr) for nbr in self.neighbors(key)]))
+        return Point(
+            *centroid_points(
+                [self.node_coordinates(nbr) for nbr in self.neighbors(key)]
+            )
+        )
 
     # --------------------------------------------------------------------------
     # Edge geometry
@@ -2320,7 +2348,10 @@ def connected_edges(self):
         :meth:`connected_nodes`
 
         """
-        return [[(u, v) for u in nodes for v in self.neighbors(u) if u < v] for nodes in self.connected_nodes()]
+        return [
+            [(u, v) for u in nodes for v in self.neighbors(u) if u < v]
+            for nodes in self.connected_nodes()
+        ]
 
     def exploded(self):
         """Explode the graph into its connected components.
@@ -2407,7 +2438,9 @@ def adjacency_matrix(self, rtype="array"):
         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()]
+        adjacency = [
+            [node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()
+        ]
         return adjacency_matrix(adjacency, rtype=rtype)
 
     def connectivity_matrix(self, rtype="array"):
@@ -2447,7 +2480,9 @@ def degree_matrix(self, rtype="array"):
         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()]
+        adjacency = [
+            [node_index[nbr] for nbr in self.neighbors(key)] for key in self.nodes()
+        ]
         return degree_matrix(adjacency, rtype=rtype)
 
     def laplacian_matrix(self, normalize=False, rtype="array"):

src/compas/geometry/polyhedron.py

@@ -301,7 +301,9 @@ def faces(self, faces):
     def edges(self):
         seen = set()
         for face in self.faces:
-            for u, v in pairwise(face + face[:1]):
+            for i in range(-1, len(face) - 1):
+                u = face[i]
+                v = face[i + 1]
                 if (u, v) not in seen:
                     seen.add((u, v))
                     seen.add((v, u))
@@ -317,7 +319,9 @@ def lines(self):
 
     @property
     def polygons(self):
-        return [Polygon([self.vertices[index] for index in face]) for face in self.faces]
+        return [
+            Polygon([self.vertices[index] for index in face]) for face in self.faces
+        ]
 
     @property
     def planes(self):
@@ -386,7 +390,9 @@ def from_platonicsolid(cls, f):
         elif f == 20:
             vertices, faces = icosahedron()
         else:
-            raise ValueError("The number of sides of a platonic solid must be one of: 4, 6, 8, 12, 20.")
+            raise ValueError(
+                "The number of sides of a platonic solid must be one of: 4, 6, 8, 12, 20."
+            )
         solid = cls(vertices, faces)
         return solid
 
@@ -437,7 +443,9 @@ def from_halfspaces(cls, halfspaces, interior_point):
         interior_point = asarray(interior_point, dtype=float)
         hsi = HalfspaceIntersection(halfspaces, interior_point)
         hull = ConvexHull(hsi.intersections)
-        mesh = Mesh.from_vertices_and_faces([hsi.intersections[i] for i in hull.vertices], hull.simplices)
+        mesh = Mesh.from_vertices_and_faces(
+            [hsi.intersections[i] for i in hull.vertices], hull.simplices
+        )
         mesh.unify_cycles()
         to_merge = []
         for a, b in combinations(mesh.faces(), 2):

src/compas/geometry/surfaces/cylindrical.py

@@ -8,6 +8,7 @@
 
 from compas.geometry import Circle
 from compas.geometry import Frame
+from compas.geometry import Line
 from compas.geometry import Point
 from compas.geometry import Vector
 
@@ -162,6 +163,39 @@ def from_three_points(cls, a, b, c):
     # Methods
     # =============================================================================
 
+    def isocurve_u(self, u):
+        """Compute the isoparametric curve at parameter u.
+
+        Parameters
+        ----------
+        u : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Line`
+
+        """
+        base = self.point_at(u=u, v=0.5)
+        return Line.from_point_direction_length(base, self.frame.zaxis, 1.0)
+
+    def isocurve_v(self, v):
+        """Compute the isoparametric curve at parameter v.
+
+        Parameters
+        ----------
+        v : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Circle`
+
+        """
+        point = self.center + self.frame.zaxis * v
+        xaxis = self.frame.xaxis
+        yaxis = self.frame.yaxis
+        frame = Frame(point, xaxis, yaxis)
+        return Circle(radius=self.radius, frame=frame)
+
     def point_at(self, u, v, world=True):
         """Compute a point on the surface at the given parameters.
 

src/compas/geometry/surfaces/spherical.py

@@ -191,6 +191,44 @@ def from_points(cls, points):
     # Methods
     # =============================================================================
 
+    def isocurve_u(self, u):
+        """Compute the isoparametric curve at parameter u.
+
+        Parameters
+        ----------
+        u : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Circle`
+
+        """
+        origin = self.center
+        xaxis = self.point_at(u=u, v=0) - origin
+        yaxis = self.point_at(u=u, v=0.25) - origin
+        frame = Frame(origin, xaxis, yaxis)
+        return Circle(radius=xaxis.length, frame=frame)
+
+    def isocurve_v(self, v):
+        """Compute the isoparametric curve at parameter v.
+
+        Parameters
+        ----------
+        v : float
+
+        Returns
+        -------
+        :class:`compas.geometry.Circle`
+
+        """
+        x = self.point_at(u=0, v=v)
+        y = self.point_at(u=0.25, v=v)
+        origin = self.center + self.frame.zaxis * (x - self.center).dot(self.frame.zaxis)
+        xaxis = x - origin
+        yaxis = y - origin
+        frame = Frame(origin, xaxis, yaxis)
+        return Circle(radius=xaxis.length, frame=frame)
+
     def point_at(self, u, v, world=True):
         """Construct a point on the sphere.
 

src/compas/geometry/surfaces/surface.py

@@ -474,7 +474,7 @@ def isocurve_v(self, v):
 
         Returns
         -------
-        :class:`compas_occ.geometry.Curve`
+        :class:`compas.geometry.Curve`
 
         """
         raise NotImplementedError