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

Author: Licini

CHANGELOG.md

@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Changed `SceneObject.frame` to read-only result of `Frame.from_transformation(SceneObject.worldtransformation)`, representing the local coordinate system of the scene object in world coordinates.
 * Changed `SceneObject.worldtransformation` to the multiplication of all transformations from the scene object to the root of the scene tree, there will no longer be an additional transformation in relation to the object's frame.
+* Fixed call to `astar_shortest_path` in `Graph.shortest_path`.
+
+### Removed
 
 
 ## [2.10.0] 2025-03-03

src/compas/datastructures/graph/graph.py

@@ -1204,7 +1204,7 @@ def shortest_path(self, u, v):
         :meth:`compas.topology.astar_shortest_path`
 
         """
-        return astar_shortest_path(self.adjacency, u, v)
+        return astar_shortest_path(self, u, v)
 
     # --------------------------------------------------------------------------
     # Default attributes

tests/compas/datastructures/test_graph.py

@@ -117,6 +117,38 @@ def test_graph_data2():
         assert Graph.validate_data(other.__data__)
 
 
+def test_shortest_path():
+    graph = Graph()
+    graph.add_edge(1, 2)
+    graph.add_edge(2, 3)
+    graph.add_edge(3, 4)
+    graph.add_edge(5, 6)
+
+    # Test shortest path from node 1 to node 4
+    path = graph.shortest_path(1, 4)
+    assert path == [1, 2, 3, 4]
+
+    # Test shortest path from node 1 to node 3
+    path = graph.shortest_path(1, 3)
+    assert path == [1, 2, 3]
+
+    # Test shortest path from node 2 to node 4
+    path = graph.shortest_path(2, 4)
+    assert path == [2, 3, 4]
+
+    # Test shortest path from node 4 to node 1
+    path = graph.shortest_path(4, 1)
+    assert path == [4, 3, 2, 1]
+
+    # Test shortest path from node 5 to node 6
+    path = graph.shortest_path(5, 6)
+    assert path == [5, 6]
+
+    # Test shortest path from node 3 to node 5 (should be None)
+    path = graph.shortest_path(3, 5)
+    assert path is None
+
+
 # ==============================================================================
 # Properties
 # ==============================================================================