add support on all 3

Author: tomvanmele

CHANGELOG.md

@@ -33,6 +33,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `compas_ghpython.artists.MeshArtist.draw_vertexlabels` to use the colors of the vertex color dict.
 * Changed `compas_ghpython.artists.MeshArtist.draw_edgelabels` to use the colors of the edge color dict.
 * Changed `compas_ghpython.artists.MeshArtist.draw_facelabels` to use the colors of the face color dict.
+* Changed `compas.datastructures.Graph.nodes_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Graph.edges_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfedge.vertices_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfedge.edges_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfedge.faces_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.vertices_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.edges_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.faces_where` to accept conditions as kwargs.
+* Changed `compas.datastructures.Halfface.cells_where` to accept conditions as kwargs.
 
 ### Removed
 

src/compas/datastructures/graph/graph.py

@@ -622,7 +622,7 @@ def nodes(self, data=False):
             else:
                 yield key, self.node_attributes(key)
 
-    def nodes_where(self, conditions, data=False):
+    def nodes_where(self, conditions, data=False, **kwargs):
         """Get nodes for which a certain condition or set of conditions is true.
 
         Parameters
@@ -641,6 +641,9 @@ def nodes_where(self, conditions, data=False):
             If `data` is True, the next node and its attributes.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for key, attr in self.nodes(True):
             is_match = True
 
@@ -740,7 +743,7 @@ def edges(self, data=False):
                 else:
                     yield u, v
 
-    def edges_where(self, conditions, data=False):
+    def edges_where(self, conditions, data=False, **kwargs):
         """Get edges for which a certain condition or set of conditions is true.
 
         Parameters
@@ -751,6 +754,8 @@ def edges_where(self, conditions, data=False):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the edge attributes in addition to the edge identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -759,6 +764,9 @@ def edges_where(self, conditions, data=False):
             If `data` is True, the next edge identifier and its attributes as a ((u, v), attr) tuple.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for key in self.edges():
             is_match = True
 

src/compas/datastructures/halfedge/halfedge.py

@@ -631,6 +631,8 @@ def vertices_where(self, conditions=None, data=False, **kwargs):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the vertex attributes in addition to the vertex identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -724,7 +726,7 @@ def vertices_where_predicate(self, predicate, data=False):
                 else:
                     yield key
 
-    def edges_where(self, conditions, data=False):
+    def edges_where(self, conditions, data=False, **kwargs):
         """Get edges for which a certain condition or set of conditions is true.
 
         Parameters
@@ -735,6 +737,8 @@ def edges_where(self, conditions, data=False):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the edge attributes in addition to the edge identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -743,6 +747,9 @@ def edges_where(self, conditions, data=False):
             If `data` is True, the next edge as a (u, v, data) tuple.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for key in self.edges():
             is_match = True
 
@@ -806,7 +813,7 @@ def edges_where_predicate(self, predicate, data=False):
                 else:
                     yield key
 
-    def faces_where(self, conditions, data=False):
+    def faces_where(self, conditions, data=False, **kwargs):
         """Get faces for which a certain condition or set of conditions is true.
 
         Parameters
@@ -817,6 +824,8 @@ def faces_where(self, conditions, data=False):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the face attributes in addition to face identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -825,6 +834,9 @@ def faces_where(self, conditions, data=False):
             If `data` is True, the next face and its attributes.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for fkey in self.faces():
             is_match = True
 

src/compas/datastructures/halfface/halfface.py

@@ -715,7 +715,7 @@ def cells(self, data=False):
             else:
                 yield cell, self.cell_attributes(cell)
 
-    def vertices_where(self, conditions, data=False):
+    def vertices_where(self, conditions, data=False, **kwargs):
         """Get vertices for which a certain condition or set of conditions is true.
 
         Parameters
@@ -726,6 +726,8 @@ def vertices_where(self, conditions, data=False):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the vertex attributes in addition to the identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -734,6 +736,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
 
@@ -811,7 +816,7 @@ def vertices_where_predicate(self, predicate, data=False):
                 else:
                     yield key
 
-    def edges_where(self, conditions, data=False):
+    def edges_where(self, conditions, data=False, **kwargs):
         """Get edges for which a certain condition or set of conditions is true.
 
         Parameters
@@ -822,6 +827,8 @@ def edges_where(self, conditions, data=False):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the edge attributes in addition to the identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -830,6 +837,9 @@ def edges_where(self, conditions, data=False):
             If `data` is True, the next edge as a (u, v, data) tuple.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for key in self.edges():
             is_match = True
 
@@ -891,7 +901,7 @@ def edges_where_predicate(self, predicate, data=False):
                 else:
                     yield key
 
-    def faces_where(self, conditions, data=False):
+    def faces_where(self, conditions, data=False, **kwargs):
         """Get faces for which a certain condition or set of conditions is true.
 
         Parameters
@@ -902,6 +912,8 @@ def faces_where(self, conditions, data=False):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the face attributes in addition to the identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -910,6 +922,9 @@ def faces_where(self, conditions, data=False):
             If `data` is True, the next face and its attributes.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for fkey in self.faces():
             is_match = True
 
@@ -971,7 +986,7 @@ def faces_where_predicate(self, predicate, data=False):
                 else:
                     yield fkey
 
-    def cells_where(self, conditions, data=False):
+    def cells_where(self, conditions, data=False, **kwargs):
         """Get cells for which a certain condition or set of conditions is true.
 
         Parameters
@@ -982,6 +997,8 @@ def cells_where(self, conditions, data=False):
             values or ranges of attribute values in the form of min/max pairs.
         data : bool, optional
             If True, yield the cell attributes in addition to the identifiers.
+        **kwargs : dict[str, Any], optional
+            Additional conditions provided as named function arguments.
 
         Yields
         ------
@@ -990,6 +1007,9 @@ def cells_where(self, conditions, data=False):
             If `data` is True, the next cell and its attributes.
 
         """
+        conditions = conditions or {}
+        conditions.update(kwargs)
+
         for ckey in self.cells():
             is_match = True