Merge remote-tracking branch 'origin/main' into sceneobjects

Author: Licini

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0-beta.1
+current_version = 2.0.0-beta.2
 message = Bump version to {new_version}
 commit = True
 tag = True

CHANGELOG.md

@@ -8,6 +8,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
+
+* Added `compas.dtastructures.Network` as alias of `compas.datastructures.Graph`.
+* Added `compas.data.Data.name` and included it in serialisation in case `compas.data.Data._name is not None`.
+
+### Changed
+
+* Merged `compas.datastructures.Halfedge` into `compas.datastructures.Mesh`.
+* Merged `compas.datastructures.Network` into `compas.datastructures.Graph`.
+* Merged `compas.datastructures.Halfface` into `compas.datastructures.VolMesh`.
+
+### Removed
+
+* Removed `compas.datastructures.Network`.
+* Removed `compas.datastructures.Halfedge`.
+* Removed `compas.datastructures.Halfface`.
+* Removed `compas.data.Data.attributes`.
+* Removed `compas.data.Datastructure.attributes`.
+* Removed `attributes` from `compas.datastructures.Assembly.data`.
+* Removed `attributes` from `compas.datastructures.CellNetwork.data`.
+* Removed `attributes` from `compas.datastructures.Graph.data`.
+* Removed `attributes` from `compas.datastructures.Mesh.data`.
+* Removed `attributes` from `compas.datastructures.Tree.data`.
+* Removed `attributes` from `compas.datastructures.VolMesh.data`.
+
+## [2.0.0-beta.2] 2024-01-12
+
+### Added
+
 * Added `viewerinstance` in `compas.scene.Scene` to support viewers context detection.
 * Added `compas_rhino8` as starting point for Rhino8 support.
 * Added `compas.scene.SceneObjectNode`.
@@ -33,21 +61,92 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `show_edges` flag to `compas.scene.VolMeshObject`.
 * Added `show_faces` flag to `compas.scene.VolMeshObject`.
 * Added `show_cells` flag to `compas.scene.VolMeshObject`.
+* Added `compas.data.Data.to_jsonstring` and `compas.data.Data.from_jsonstring`.
+* Added `compas.data.Data.attributes`.
+* Added optional param `working_directory` to `compas.rpc.Proxy` to be able to start services defined in random locations.
+* Added `compas.datastructures.Datastructure.transform` and `compas.datastructures.Datastructure.transformed`.
+* Added `compas.datastructures.Datastructure.transform_numpy` and `compas.datastructures.Datastructure.transformed_numpy`.
+* Added `compas.datastructures.Halfedge.flip_cycles`.
+* Added `compas.datastructures.Halfedge.is_connected`, `compas.datastructures.Halfedge.connected_vertices`, `compas.datastructures.Halfedge.connected_faces`.
+* Added `compas.datastructures.Mesh.join`.
+* Added `compas.datastructures.Mesh.weld` and `compas.datastructures.Mesh.remove_duplicate_vertices`.
+* Added `compas.datastructures.Mesh.quads_to_triangles`.
+* Added `compas.datastructures.Mesh.unify_cycles`.
+* Added `compas.datastructures.Mesh.aabb` and `compas.datastructures.Mesh.obb`.
+* Added `compas.datastructures.Mesh.offset` and `compas.datastructures.Mesh.thickened`.
+* Added `compas.datastructures.Mesh.exploded`.
+* Added `compas.datastructures.Mesh.adjacency_matrix`, `compas.datastructures.Mesh.connectivity_matrix`, `compas.datastructures.Mesh.degree_matrix`, `compas.datastructures.Mesh.laplacian_matrix`.
+* Added `compas.topology.vertex_adjacency_from_edges`, `compas.topology.vertex_adjacency_from_faces`, `compas.topology.edges_from_faces`, `compas.topology.faces_from_edges`.
+* Added `compas.datastructures.Network.split_edge`, `compas.datastructures.Network.join_edges`.
+* Added `compas.datastructures.Network.smooth`.
+* Added `compas.datastructures.Network.is_crossed`, `compas.datastructures.Network.is_xy`, `compas.datastructures.Network.is_planar`, `compas.datastructures.Network.is_planar_embedding`, `compas.datastructures.Network.count_crossings`, `compas.datastructures.Network.find_crossings`, `compas.datastructures.Network.embed_in_plane`.
+* Added `compas.datastructures.Network.find_cycles`.
+* Added `compas.datastructures.Network.shortest_path`.
+* Added `compas.datastructures.Network.transform`.
+* Added `compas.datastructures.Graph.is_connected`.
+* Added `compas.datastructures.Graph.adjacency_matrix`, `compas.datastructures.Graph.connectivity_matrix`, `compas.datastructures.Graph.degree_matrix`, `compas.datastructures.Graph.laplacian_matrix`.
 
 ### Changed
 
 * Changed the `__str__` of `compas.geometry.Point` and `compas.geometry.Vector` to use a limited number of decimals (determined by `Tolerance.PRECISION`). Note: `__repr__` will instead maintain full precision.
-* In pull requests, `docs` Workflow are now only triggered on review approval.
-* The `draw` implementations of `compas.scene.SceneObject` will now always use the `worldtransformation` of the `SceneObject`.
+* Changed `docs` Workflow to only be triggered on review approval in pull requests.
+* Changed `draw` implementations of `compas.scene.SceneObject` to always use the `worldtransformation` of the `SceneObject`.
 * Fixed typo in name `Rhino.Geometry.MeshingParameters` in `compas_rhino.geometry.RhinoBrep.to_meshes()`.
 * Fixed `TypeErrorException` when serializing a `Mesh` which has been converted from Rhino.
 * Fixed color conversions in `compas_rhion.conversions.mesh_to_compas`.
 * Allowed `SceneObject` registration for `None` context.
+* Changed `compas.data.Data.name` to be stored in `compas.data.Data.attributes`.
+* Changed `compas.data.Data.__jsondump__` to include `compas.data.Data.attributes` if the dict is not empty.
+* Changed `compas.data.Data.__jsonload__` to update `compas.data.Data.attributes` if the attribute dict is provided.
+* Changed `compas.datastructures.Graph` to take additional `**kwargs`, instead of only `name=None` specifically.
+* Changed `compas.datastructures.Network` to take additional `**kwargs`, instead of only `name=None` specifically.
+* Changed `compas.datastructures.Halfedge` to take additional `**kwargs`, instead of only `name=None` specifically.
+* Changed `compas.datastructures.Mesh` to take additional `**kwargs`, instead of only `name=None` specifically.
+* Moved registration of `ping` and `remote_shutdown` of the RPC server to `compas.rpc.Server.__init__()`.
+* Moved `FileWatcherService` to `compas.rpc.services.watcher` so it can be reused.
+* Changed `compas.datastructures.Mesh.subdivide` to `compas.datastructures.Mesh.subdivided`.
+* Moved `compas.numerical.pca_numpy` to `compas.geometry.pca_numpy`.
+* Moved `compas.numerical.scalafield_contours` to `compas.geometry.scalarfield_contours`.
+* Moved `compas.numerical.matrices` to `compas.topology.matrices`.
+* Moved `compas.numerical.linalg` to `compas.geometry.linalg`.
+* Changed `watchdog` dependency to be only required for platforms other than `emscripten`.
+* Changed `compas.geometry.earclip_polygon` algorithm because the current one does not handle several cases.
 
 ### Removed
 
 * Removed `compas_rhino.forms`. Forms will be moved to `compas_ui`.
 * Removed `compas.scene.NoSceneObjectContextError`.
+* Removed `compas.datastructures.Datastructure.attributes` and `compas.datastructures.Datastructure.name` (moved to `compas.data.Data`).
+* Removed `attributes` from `compas.datastructures.Graph.data`.
+* Removed `attributes` from `compas.datastructures.Network.data`.
+* Removed `attributes` from `compas.datastructures.Halfedge.data`.
+* Removed `attributes` from `compas.datastructures.Mesh.data`.
+* Removed `compas.datastructures.mesh_bounding_box` and `compas.datastructures.mesh_bounding_box_xy`.
+* Removed `compas.datastructures.mesh_oriented_bounding_box_numpy` and `compas.datastructures.mesh_oriented_bounding_box_xy_numpy`.
+* Removed `compas.datastructures.mesh_delete_duplicate_vertices`.
+* Removed `compas.datastructures.mesh_is_connected` and `compas.datastructures.mesh_connected_components`.
+* Removed `compas.datastructures.mesh_isolines_numpy` and `compas.datastructures.mesh_contours_numpy`.
+* Removed `compas.datastructures.trimesh_gaussian_curvature`.
+* Removed `compas.datastructures.trimesh_descent`.
+* Removed `compas.datastructures.mesh_disconnected_vertices`, `compas.datastructures.mesh_disconnected_faces` and `compas.datastructures.mesh_explode`.
+* Removed `compas.datastructures.mesh_geodesic_distances_numpy`.
+* Removed `compas.datastructures.trimesh_face_circle`.
+* Removed `compas.datastructures.mesh_weld`, `compas.datastructures.meshes_join`, `compas.datastructures.meshes_join_and_weld`.
+* Removed `compas.datastructures.mesh_offset` and `compas.datastructures.mesh_thicken`.
+* Removed `compas.datastructures.mesh_face_adjacency` and `compas.datastructures.mesh_unify_cycles`.
+* Removed `compas.datastructures.mesh_transform`, `compas.datastructures.mesh_transformed`, `compas.datastructures.mesh_transform_numpy`, `compas.datastructures.mesh_transformed_numpy`.
+* Removed `compas.datastructures.mesh_quads_to_triangles`.
+* Removed `compas.datastructures.volmesh_bounding_box`.
+* Removed `compas.datastructures.volmesh_transform` and `compas.datastructures.volmesh_transformed`.
+* Removed `compas.topology.unify_cycles_numpy` and `compas.topology.face_adjacency_numpy`.
+* Removed `compas.topology.unify_cycles_rhino` and `compas.topology.face_adjacency_rhino`.
+* Removed `compas.datastructures.network_is_connected`.
+* Removed `compas.datastructures.network_complement`.
+* Removed `compas.datastructures.network_disconnected_nodes`, `compas.datastructures.network_disconnected_edges`, `compas.datastructures.network_explode`.
+* Removed `compas.datastructures.network_adjacency_matrix`, `compas.datastructures.network_connectivity_matrix`, `compas.datastructures.network_degree_matrix`, `compas.datastructures.network_laplacian_matrix`.
+* Removed `compas.datastructures.network_transform`, `compas.datastructures.network_transformed`.
+* Removed `compas.datastructures.network_shortest_path`.
+* Removed `compas.numerical`.
 
 ## [2.0.0-beta.1] 2023-12-20
 

docs/api/compas.datastructures.Assembly.rst

@@ -0,0 +1,109 @@
+******************************************************************************
+Assembly
+******************************************************************************
+
+.. currentmodule:: compas.datastructures
+
+.. autoclass:: Assembly
+
+Methods
+=======
+
+Constructors
+------------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    ~Assembly.from_json
+
+
+Conversions
+-----------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    ~Assembly.to_json
+
+
+Builders and Modifiers
+----------------------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Accessors
+---------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Attributes
+----------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+Topology
+--------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Geometry
+--------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Paths
+-----
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Matrices
+--------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Mappings
+--------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Utilities
+---------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Other
+-----
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+