differt-core 0.0.12__tar.gz → 0.0.13__tar.gz

{differt_core-0.0.12 → differt_core-0.0.13}/Cargo.lock

@@ -238,7 +238,7 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "differt-core"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "criterion",
  "log",

{differt_core-0.0.12 → differt_core-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: differt-core
-Version: 0.0.12
+Version: 0.0.13
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -31,7 +31,6 @@ Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 [![Latest Release][pypi-version-badge]][pypi-version-url]
 [![Python version][pypi-python-version-badge]][pypi-version-url]
 [![Documentation][documentation-badge]][documentation-url]
-[![Codecov][codecov-badge]][codecov-url]
 
 </div>
 
@@ -54,6 +53,4 @@ are shared with the
 [pypi-python-version-badge]: https://img.shields.io/pypi/pyversions/DiffeRT-core?color=orange
 [documentation-badge]: https://readthedocs.org/projects/differt/badge/?version=latest
 [documentation-url]: https://differt.readthedocs.io/latest/?badge=latest
-[codecov-badge]: https://codecov.io/gh/jeertmans/DiffeRT-core/branch/main/graph/badge.svg?token=8P4DY9JCE4
-[codecov-url]: https://codecov.io/gh/jeertmans/DiffeRT-core
 

{differt_core-0.0.12 → differt_core-0.0.13}/differt-core/Cargo.toml

@@ -32,4 +32,4 @@ name = "differt_core"
 edition = "2021"
 name = "differt-core"
 rust-version = "1.75.0"
-version = "0.0.12"
+version = "0.0.13"

{differt_core-0.0.12 → differt_core-0.0.13}/differt-core/README.md

@@ -9,7 +9,6 @@
 [![Latest Release][pypi-version-badge]][pypi-version-url]
 [![Python version][pypi-python-version-badge]][pypi-version-url]
 [![Documentation][documentation-badge]][documentation-url]
-[![Codecov][codecov-badge]][codecov-url]
 
 </div>
 
@@ -32,5 +31,3 @@ are shared with the
 [pypi-python-version-badge]: https://img.shields.io/pypi/pyversions/DiffeRT-core?color=orange
 [documentation-badge]: https://readthedocs.org/projects/differt/badge/?version=latest
 [documentation-url]: https://differt.readthedocs.io/latest/?badge=latest
-[codecov-badge]: https://codecov.io/gh/jeertmans/DiffeRT-core/branch/main/graph/badge.svg?token=8P4DY9JCE4
-[codecov-url]: https://codecov.io/gh/jeertmans/DiffeRT-core

{differt_core-0.0.12 → differt_core-0.0.13}/differt-core/src/rt/graph.rs

@@ -133,7 +133,7 @@ pub mod complete {
         }
 
         /// Return an iterator over all paths of length ``depth``
-        /// from node ``from`` to node ``to``.
+        /// from node ``from_`` to node ``to``.
         ///
         /// .. note::
         ///
@@ -174,7 +174,7 @@ pub mod complete {
         ///     from\_ (int): The node index to find the paths from.
         ///     to (int): The node index to find the paths to.
         ///     depth (int): The number of nodes to include in each path.
-        ///     include_from_and_to (bool): Whether to include or not ``from``
+        ///     include_from_and_to (bool): Whether to include or not ``from_``
         ///         and ``to`` nodes in the output paths. If set to
         ///         :py:data:`False`, the output paths will include
         ///         ``depth - 2`` nodes.
@@ -194,13 +194,13 @@ pub mod complete {
         }
 
         /// Return an array of all paths of length ``depth``
-        /// from node ``from`` to node ``to``.
+        /// from node ``from_`` to node ``to``.
         ///
         /// Args:
         ///     from\_ (int): The node index to find the paths from.
         ///     to (int): The node index to find the paths to.
         ///     depth (int): The number of nodes to include in each path.
-        ///     include_from_and_to (bool): Whether to include or not ``from``
+        ///     include_from_and_to (bool): Whether to include or not ``from_``
         ///         and ``to`` nodes in the output paths. If set to
         ///         :py:data:`False`, the output paths will include
         ///         ``depth - 2`` nodes.
@@ -224,14 +224,14 @@ pub mod complete {
         }
 
         /// Return an iterator over all paths of length ``depth``
-        /// from node ``from`` to node ``to``, grouped in chunks of
+        /// from node ``from_`` to node ``to``, grouped in chunks of
         /// size of max. ``chunk_size``.
         ///
         /// Args:
         ///     from\_ (int): The node index to find the paths from.
         ///     to (int): The node index to find the paths to.
         ///     depth (int): The number of nodes to include in each path.
-        ///     include_from_and_to (bool): Whether to include or not ``from``
+        ///     include_from_and_to (bool): Whether to include or not ``from_``
         ///         and ``to`` nodes in the output paths. If set to
         ///         :py:data:`False`, the output paths will include
         ///         ``depth - 2`` nodes.
@@ -301,9 +301,6 @@ pub mod complete {
 
             let mut visited = Vec::with_capacity(depth);
             let mut counter = Vec::with_capacity(depth);
-            visited.push(from);
-            counter.push(graph.num_nodes); // num_nodes means we visited all
-            // first nodes, because first not is fixed
 
             let paths_count = 0;
             let paths_total_count = match depth.cmp(&2) {
@@ -361,6 +358,14 @@ pub mod complete {
                 },
             };
 
+            if paths_total_count > 0 {
+                // Avoid visiting any node if no path exists
+                visited.push(from);
+                counter.push(graph.num_nodes);
+                // `num_nodes` means we visited all
+                // first nodes, because the first node is fixed
+            }
+
             Self {
                 graph,
                 to,
@@ -609,19 +614,20 @@ pub mod directed {
             graph.into()
         }
 
-        /// Insert two additional nodes in the graph:
+        /// Insert two additional nodes in the graph: ``from_`` and ``to``.
+        ///
+        /// The nodes satisfy the following conditions:
         ///
-        /// - a ``from`` node, that is connected to every other node in the
-        ///   graph;
-        /// - and a ``to`` node, where every other node is connected to this
-        ///   node.
+        /// - ``from_`` is connected to every other node in the graph;
+        /// - and ``to`` is an `endpoint`, where every other node is connected
+        ///   to this node.
         ///
-        /// If ``direct_path`` is :py:data:`True`, then the ``from`` node is
-        /// connected to the ``to`` node.
+        /// If ``direct_path`` is :py:data:`True`, then the ``from_`` node is
+        /// also connected to the ``to`` node.
         ///
         /// Args:
         ///     direct_path (bool): Whether to create a direction connection
-        ///         between ``from`` and ``to`` nodes.
+        ///         between ``from_`` and ``to`` nodes.
         ///
         /// Return:
         ///     tuple[int, int]:
@@ -654,13 +660,13 @@ pub mod directed {
         }
 
         /// Return an iterator over all paths of length ``depth``
-        /// from node ``from`` to node ``to``.
+        /// from node ``from_`` to node ``to``.
         ///
         /// Args:
         ///     from\_ (int): The node index to find the paths from.
         ///     to (int): The node index to find the paths to.
         ///     depth (int): The number of nodes to include in each path.
-        ///     include_from_and_to (bool): Whether to include or not ``from``
+        ///     include_from_and_to (bool): Whether to include or not ``from_``
         ///         and ``to`` nodes in the output paths. If set to
         ///         :py:data:`False`, the output paths will include
         ///         ``depth - 2`` nodes.
@@ -680,13 +686,13 @@ pub mod directed {
         }
 
         /// Return an array of all paths of length ``depth``
-        /// from node ``from`` to node ``to``.
+        /// from node ``from_`` to node ``to``.
         ///
         /// Args:
         ///     from\_ (int): The node index to find the paths from.
         ///     to (int): The node index to find the paths to.
         ///     depth (int): The number of nodes to include in each path.
-        ///     include_from_and_to (bool): Whether to include or not ``from``
+        ///     include_from_and_to (bool): Whether to include or not ``from_``
         ///         and ``to`` nodes in the output paths. If set to
         ///         :py:data:`False`, the output paths will include
         ///         ``depth - 2`` nodes.
@@ -710,14 +716,14 @@ pub mod directed {
         }
 
         /// Return an iterator over all paths of length ``depth``
-        /// from node ``from`` to node ``to``, grouped in chunks of
+        /// from node ``from_`` to node ``to``, grouped in chunks of
         /// size of max. ``chunk_size``.
         ///
         /// Args:
         ///     from\_ (int): The node index to find the paths from.
         ///     to (int): The node index to find the paths to.
         ///     depth (int): The number of nodes to include in each path.
-        ///     include_from_and_to (bool): Whether to include or not ``from``
+        ///     include_from_and_to (bool): Whether to include or not ``from_``
         ///         and ``to`` nodes in the output paths. If set to
         ///         :py:data:`False`, the output paths will include
         ///         ``depth - 2`` nodes.
@@ -1029,6 +1035,28 @@ mod tests {
         assert_eq!(got, expected);
     }
 
+    #[rstest]
+    #[case(0, 2, 0, 1, 1)] // One path of depth 2 [0, 1]
+    #[case(0, 2, 0, 0, 0)] // No path of depth 2 (because can't be [0, 0])
+    #[case(4, 2, 0, 1, 1)] // One path of depth 2 [0, 1]
+    #[case(1, 3, 1, 2, 1)] // One path of depth 3 [1, 0, 2]
+    #[case(0, 1, 0, 1, 0)] // No path of depth 1
+    #[case(0, 2, 0, 1, 1)] // One path of depth 2
+    #[case(0, 3, 0, 1, 0)] // No path of depth 3
+    #[case(0, 4, 0, 1, 0)] // No path of depth 4
+    fn test_complete_graph_edge_cases(
+        #[case] num_nodes: usize,
+        #[case] depth: usize,
+        #[case] from: usize,
+        #[case] to: usize,
+        #[case] expected: usize,
+    ) {
+        let iter = CompleteGraph::new(num_nodes).all_paths(from, to, depth, false);
+        let got = iter.count();
+
+        assert_eq!(got, expected);
+    }
+
     #[test]
     #[should_panic(expected = "adjacency matrix must be square")]
     fn test_di_graph_from_nonsquare_matrix() {