allow for kwargs

Author: tomvanmele

src/compas/datastructures/halfedge/halfedge.py

@@ -620,7 +620,7 @@ def edges(self, data=False):
                 else:
                     yield key, self.edge_attributes(key)
 
-    def vertices_where(self, conditions, data=False):
+    def vertices_where(self, conditions=None, data=False, **kwargs):
         """Get vertices for which a certain condition or set of conditions is true.
 
         Parameters
@@ -639,6 +639,9 @@ def vertices_where(self, conditions, data=False):
             If `data` is True, the next vertex and its attributes.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for key, attr in self.vertices(True):
             is_match = True
 

src/compas/datastructures/halfface/halfface.py

@@ -725,8 +725,7 @@ def vertices_where(self, conditions, data=False):
             The keys should be attribute names. The values can be attribute
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
-            Yield the vertices and their data attributes.
-            Default is ``False``.
+            If True, yield the vertex attributes in addition to the identifiers.
 
         Yields
         ------
@@ -793,11 +792,10 @@ def vertices_where_predicate(self, predicate, data=False):
         Parameters
         ----------
         predicate : callable
-            The condition you want to evaluate. The callable takes 2 parameters:
-            ``key``, ``attr`` and should return ``True`` or ``False``.
+            The condition you want to evaluate.
+            The callable takes 2 parameters: the vertex identifier and the vertex attributes, and should return True or False.
         data : bool, optional
-            Yield the vertices and their data attributes.
-            Default is ``False``.
+            If True, yield the vertex attributes in addition to the identifiers.
 
         Yields
         ------
@@ -823,8 +821,7 @@ def edges_where(self, conditions, data=False):
             The keys should be attribute names. The values can be attribute
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
-            Yield the edges and their data attributes.
-            Default is ``False``.
+            If True, yield the edge attributes in addition to the identifiers.
 
         Yields
         ------
@@ -875,11 +872,10 @@ def edges_where_predicate(self, predicate, data=False):
         Parameters
         ----------
         predicate : callable
-            The condition you want to evaluate. The callable takes 3 parameters:
-            ``u``, ``v``, ``attr`` and should return ``True`` or ``False``.
+            The condition you want to evaluate.
+            The callable takes 2 parameters: the edge identifier and the edge attributes, and should return True or False.
         data : bool, optional
-            Yield the vertices and their data attributes.
-            Default is ``False``.
+            If True, yield the edge attributes in addition to the identifiers.
 
         Yields
         ------
@@ -905,8 +901,7 @@ def faces_where(self, conditions, data=False):
             The keys should be attribute names. The values can be attribute
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
-            Yield the faces and their data attributes.
-            Default is ``False``.
+            If True, yield the face attributes in addition to the identifiers.
 
         Yields
         ------
@@ -957,11 +952,10 @@ def faces_where_predicate(self, predicate, data=False):
         Parameters
         ----------
         predicate : callable
-            The condition you want to evaluate. The callable takes 2 parameters:
-            ``key``, ``attr`` and should return ``True`` or ``False``.
+            The condition you want to evaluate.
+            The callable takes 2 parameters: the face identifier and the the face attributes, and should return True or False.
         data : bool, optional
-            Yield the faces and their data attributes.
-            Default is ``False``.
+            If True, yield the face attributes in addition to the identifiers.
 
         Yields
         ------
@@ -987,8 +981,7 @@ def cells_where(self, conditions, data=False):
             The keys should be attribute names. The values can be attribute
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
-            Yield the cells and their data attributes.
-            Default is ``False``.
+            If True, yield the cell attributes in addition to the identifiers.
 
         Yields
         ------
@@ -1039,11 +1032,10 @@ def cells_where_predicate(self, predicate, data=False):
         Parameters
         ----------
         predicate : callable
-            The condition you want to evaluate. The callable takes 2 parameters:
-            ``key``, ``attr`` and should return ``True`` or ``False``.
+            The condition you want to evaluate.
+            The callable takes 2 parameters: the cell identifier and the cell attributes, and should return True or False.
         data : bool, optional
-            Yield the cells and their data attributes.
-            Default is ``False``.
+            If True, yield the cell attributes in addition to the identifiers.
 
         Yields
         ------