get rid of all unstructured stuff

Author: tomvanmele

src/compas/colors/color.py

@@ -40,6 +40,8 @@ class Color(Data):
         Transparency setting.
         If ``alpha = 0.0``, the color is fully transparent.
         If ``alpha = 1.0``, the color is fully opaque.
+    name : str, optional
+        The name of the color.
 
     Attributes
     ----------
@@ -152,8 +154,12 @@ class Color(Data):
         "required": ["red", "green", "blue", "alpha"],
     }
 
-    def __init__(self, red, green, blue, alpha=1.0, **kwargs):
-        super(Color, self).__init__(**kwargs)
+    @property
+    def __data__(self):
+        return {"red": self.r, "green": self.g, "blue": self.b, "alpha": self.a}
+
+    def __init__(self, red, green, blue, alpha=1.0, name=None):
+        super(Color, self).__init__(name=name)
         self._r = 1.0
         self._g = 1.0
         self._b = 1.0
@@ -184,14 +190,6 @@ def __iter__(self):
     def __eq__(self, other):
         return all(a == b for a, b in zip(self, other))
 
-    # --------------------------------------------------------------------------
-    # Data
-    # --------------------------------------------------------------------------
-
-    @property
-    def __data__(self):
-        return {"red": self.r, "green": self.g, "blue": self.b, "alpha": self.a}
-
     # --------------------------------------------------------------------------
     # Properties
     # --------------------------------------------------------------------------

src/compas/colors/colordict.py

@@ -13,6 +13,8 @@ class ColorDict(Data):
     ----------
     default : :class:`compas.colors.Color`
         The default color to use if the requested key is not in the dictionary.
+    name : str, optional
+        The name of the color dictionary.
 
     Attributes
     ----------
@@ -21,8 +23,12 @@ class ColorDict(Data):
 
     """
 
-    def __init__(self, default, **kwargs):
-        super(ColorDict, self).__init__(**kwargs)
+    @property
+    def __data__(self):
+        return {"default": self.default.__data__, "dict": self._dict}
+
+    def __init__(self, default, name=None):
+        super(ColorDict, self).__init__(name=name)
         self._default = None
         self.default = default
         self._dict = {}
@@ -57,10 +63,6 @@ def __len__(self):
     def __contains__(self, key):
         return key in self._dict
 
-    @property
-    def __data__(self):
-        return {"default": self.default.data, "dict": self._dict}
-
     def items(self):
         return self._dict.items()
 

src/compas/datastructures/assembly/assembly.py

@@ -14,6 +14,8 @@ class Assembly(Datastructure):
     ----------
     name : str, optional
         The name of the assembly.
+    **kwargs : dict, optional
+        Additional keyword arguments, which are stored in the attributes dict.
 
     Attributes
     ----------
@@ -49,8 +51,8 @@ def __from_data__(cls, data):
         assembly._parts = {part.guid: part.key for part in assembly.parts()}  # type: ignore
         return assembly
 
-    def __init__(self, name=None):
-        super(Assembly, self).__init__(name=name)
+    def __init__(self, name=None, **kwargs):
+        super(Assembly, self).__init__(kwargs, name=name)
         self.graph = Graph()
         self._parts = {}
 

src/compas/datastructures/cell_network/cell_network.py

@@ -54,6 +54,8 @@ class CellNetwork(Datastructure):
         Default values for cell attributes.
     name : str, optional
         The name of the cell network.
+    **kwargs : dict, optional
+        Additional keyword arguments, which are stored in the attributes dict.
 
     Attributes
     ----------
@@ -228,8 +230,9 @@ def __init__(
         default_face_attributes=None,
         default_cell_attributes=None,
         name=None,
+        **kwargs
     ):
-        super(CellNetwork, self).__init__(name=name)
+        super(CellNetwork, self).__init__(kwargs, name=name)
         self._max_vertex = -1
         self._max_face = -1
         self._max_cell = -1

src/compas/datastructures/datastructure.py

@@ -8,6 +8,10 @@
 class Datastructure(Data):
     """Base class for all data structures."""
 
+    def __init__(self, attributes=None, name=None):
+        super(Datastructure, self).__init__(name=name)
+        self.attributes = attributes or {}
+
     def transform(self, transformation):
         """Transforms the data structure.
 

src/compas/datastructures/graph/graph.py

@@ -59,6 +59,8 @@ class Graph(Datastructure):
         Default values for edge attributes.
     name : str, optional
         The name of the graph.
+    **kwargs : dict, optional
+        Additional keyword arguments, which are stored in the attributes dict.
 
     Attributes
     ----------
@@ -152,8 +154,8 @@ 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):
-        super(Graph, self).__init__(name=None)
+    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 = {}
         self.edge = {}

src/compas/datastructures/mesh/mesh.py

@@ -92,6 +92,8 @@ class Mesh(Datastructure):
         Default values for face attributes.
     name : str, optional
         Then name of the mesh.
+    **kwargs : dict, optional
+        Additional keyword arguments, which are stored in the attributes dict.
 
     Attributes
     ----------
@@ -229,9 +231,14 @@ def __from_data__(cls, data):
         return mesh
 
     def __init__(
-        self, default_vertex_attributes=None, default_edge_attributes=None, default_face_attributes=None, name=None
+        self,
+        default_vertex_attributes=None,
+        default_edge_attributes=None,
+        default_face_attributes=None,
+        name=None,
+        **kwargs
     ):
-        super(Mesh, self).__init__(name=name)
+        super(Mesh, self).__init__(kwargs, name=name)
         self._max_vertex = -1
         self._max_face = -1
         self.vertex = {}

src/compas/datastructures/tree/tree.py

@@ -201,12 +201,15 @@ def traverse(self, strategy="depthfirst", order="preorder"):
 
 
 class Tree(Datastructure):
-    """A hierarchical data structure that organizes elements into parent-child relationships. The tree starts from a unique root node, and every node (excluding the root) has exactly one parent.
+    """A hierarchical data structure that organizes elements into parent-child relationships.
+    The tree starts from a unique root node, and every node (excluding the root) has exactly one parent.
 
     Parameters
     ----------
     name : str, optional
         The name of the tree.
+    **kwargs : dict, optional
+        Additional keyword arguments, which are stored in the attributes dict.
 
     Attributes
     ----------
@@ -260,8 +263,8 @@ def __from_data__(cls, data):
         tree.add(root)
         return tree
 
-    def __init__(self, name=None):
-        super(Tree, self).__init__(name=name)
+    def __init__(self, name=None, **kwargs):
+        super(Tree, self).__init__(kwargs, name=name)
         self._root = None
 
     @property

src/compas/datastructures/volmesh/volmesh.py

@@ -61,6 +61,8 @@ class VolMesh(Datastructure):
         Default values for cell attributes.
     name : str, optional
         The name of the volmesh.
+    **kwargs : dict, optional
+        Additional keyword arguments, which are stored in the attributes dict.
 
     Attributes
     ----------
@@ -201,8 +203,9 @@ def __init__(
         default_face_attributes=None,
         default_cell_attributes=None,
         name=None,
+        **kwargs
     ):
-        super(VolMesh, self).__init__(name=name)
+        super(VolMesh, self).__init__(kwargs, name=name)
         self._max_vertex = -1
         self._max_face = -1
         self._max_cell = -1

src/compas/geometry/brep/brep.py

@@ -76,6 +76,11 @@ class Brep(Geometry):
     This class serves as an interface for a Brep and allows instantiating a Brep object depending on the available Backend.
     Note: this is not a full implementation of Brep and rather relies on COMPAS's plugin system for actual implementation.
 
+    Parameters
+    ----------
+    name : str, optional
+        The name of the Brep.
+
     Attributes
     ----------
     area : float, read-only
@@ -149,8 +154,8 @@ def __from_data__(cls, data):
     def __new__(cls, *args, **kwargs):
         return new_brep(cls, *args, **kwargs)
 
-    def __init__(self, *args, **kwargs):
-        super(Brep, self).__init__(*args, **kwargs)
+    def __init__(self, *args, name=None):
+        super(Brep, self).__init__(*args, name=name)
 
     def __str__(self):
         lines = [