graphs_tools: search methods working

Author: Wandalen

module/move/graphs_tools/src/abs.rs

@@ -76,7 +76,7 @@ crate::mod_interface!
 {
   own use
   {
-    _IterTrait,
+    // _IterTrait,
     IdentityInterface,
     NodeId,
     Node,

module/move/graphs_tools/src/search.rs

@@ -1,22 +1,25 @@
 mod private
 {
+
+  // xxx : write setters and default
   /// Options for configuring a graph search.
   #[ derive( Debug ) ]
-  pub struct Options< 'a, Method, NodeId, Node, Visit >
+  pub struct Options< 'a, Method, Graph, Visit >
   where
-    NodeId : crate::abs::NodeId,
-    Node : crate::abs::Node + 'a,
-    Visit : FnMut( &'a Node ),
+    Graph : crate::abs::GraphDirected< 'a > + ?Sized,
+    // NodeId : Graph::NodeId,
+    // Node : Graph::Node + 'a,
+    Visit : FnMut( &'a Graph::Node ),
     Method : super::Method,
   {
     /// Starting node ID for the search.
-    pub start_id : NodeId,
+    pub start_id : Graph::NodeId,
     /// Function to call on each visited node.
     pub visit : Visit,
     /// Additional options specific to the search method.
     pub _extra : Method::ExtraOptions,
     /// Phantom data to associate types and lifetimes.
-    pub _phantom : std::marker::PhantomData< ( Method, Node, &'a () ) >,
+    pub _phantom : std::marker::PhantomData< ( Method, Graph::Node, &'a () ) >,
   }
 
   /// Trait for performing searches on directed graphs.
@@ -26,7 +29,7 @@ mod private
     fn search< Visit, Method >
     (
       &'a self,
-      o : Options< 'a, Method, Self::NodeId, Self::Node, Visit >,
+      o : Options< 'a, Method, Self, Visit >,
     )
     where
       Visit : FnMut( &'a Self::Node ),
@@ -52,7 +55,7 @@ mod private
     fn _search< 'a, Graph, Visit >
     (
       graph : &'a Graph,
-      o : Options< 'a, Self, Graph::NodeId, Graph::Node, Visit >,
+      o : Options< 'a, Self, Graph, Visit >,
     )
     where
       Visit : FnMut( &'a Graph::Node ),
@@ -72,7 +75,7 @@ mod private
     fn _search< 'a, Graph, Visit >
     (
       graph : &'a Graph,
-      mut o : Options< 'a, Self, Graph::NodeId, Graph::Node, Visit >,
+      mut o : Options< 'a, Self, Graph, Visit >,
     )
     where
       Visit : FnMut( &'a Graph::Node ),
@@ -109,7 +112,7 @@ mod private
     fn _search< 'a, Graph, Visit >
     (
       graph : &'a Graph,
-      mut o : Options< 'a, Self, Graph::NodeId, Graph::Node, Visit >,
+      mut o : Options< 'a, Self, Graph, Visit >,
     )
     where
       Visit : FnMut( &'a Graph::Node ),
@@ -133,6 +136,7 @@ mod private
       }
     }
   }
+
 }
 
 crate::mod_interface!

module/move/graphs_tools/tests/inc/search/dfs.rs

@@ -126,19 +126,19 @@ fn test_dfs()
   };
 
   // Create search options
-  let search_options : search::Options< '_, search::Dfs, _, _, _ > = search::Options
+  let search_options : search::Options< '_, search::Dfs, _, _ > = search::Options
+  // let search_options = search::Options
   {
     start_id : NodeId( 1 ),
     visit,
     _extra : (),
     _phantom : std::marker::PhantomData,
   };
 
-// xxx
-//   // Perform DFS
-//   graph.search( search_options );
-//
-//   // Assert the order of visited nodes
-//   assert_eq!( visited_nodes, vec![ NodeId( 1 ), NodeId( 4 ), NodeId( 3 ), NodeId( 2 ) ] );
+  // Perform DFS
+  graph.search( search_options );
+
+  // Assert the order of visited nodes
+  assert_eq!( visited_nodes, vec![ NodeId( 1 ), NodeId( 4 ), NodeId( 3 ), NodeId( 2 ) ] );
 
 }