graphs tools : refactoring

Author: Wandalen

module/core/format_tools/src/format/print.rs

@@ -230,7 +230,7 @@ mod private
   pub struct RowDescriptor
   {
 
-    
+
     /// Index of the row.
     pub irow : usize,
     /// Height of the row.
@@ -387,7 +387,7 @@ mod private
 
       let rows = table.rows().map( | r |
       {
-        let mut unsorted : Vec< ( usize, Cow< 'data, str > ) > = r.cells().map( | ( key, c ) | 
+        let mut unsorted : Vec< ( usize, Cow< 'data, str > ) > = r.cells().map( | ( key, c ) |
         {
           if !key_to_ikey.contains_key( key.borrow() )
           {
@@ -557,7 +557,7 @@ mod private
 
       mchars[ 0 ] = col_descriptors.iter().fold( 0, | acc, col | acc + col.width );
       mchars[ 1 ] = row_descriptors.iter().fold( 0, | acc, row | acc + if row.vis { row.height } else { 0 } );
-      
+
       let mut x = InputExtract::< '_ >
       {
         mcells,

module/move/graphs_tools/src/abs.rs

@@ -67,8 +67,6 @@ mod private
     /// Iterate over out nodes of
     fn node_out_nodes( &'a self, node_id : Self::NodeId ) -> BoxedIter< 'a, Self::NodeId >;
 
-
-
   }
 
 }

module/move/graphs_tools/src/lib.rs

@@ -43,6 +43,9 @@ mod_interface!
   // #[ cfg( not( feature = "no_std" ) ) ]
   // layer algo;
 
+  /// Print tree.
+  layer tree_print;
+
   // own use ::meta_tools::prelude::*;
 }
 

module/move/graphs_tools/src/tree_print.rs

@@ -0,0 +1,83 @@
+
+/// Define a private namespace for all its items.
+mod private
+{
+
+  use crate::*;
+  pub use iter_tools::{ _IterTrait, IterTrait, BoxedIter };
+
+  use std::
+  {
+    hash::Hash,
+    fmt,
+  };
+
+//   /// Represent directed graph. Can be zero-sized structure if nodes own all the information.
+//   pub trait GraphDirected< 'a >
+//   {
+//     /// Uniquely identify a node.
+//     type NodeId : NodeId;
+//     /// Node itself.
+//     type Node : Node + 'a;
+//
+//     /// Get a reference on a node by its id.
+//     fn node_ref( &'a self, node_id : Self::NodeId ) -> &'a Self::Node;
+//     /// Get id by its node reference.
+//     fn node_id( &self, node_id : &'a Self::Node ) -> Self::NodeId;
+//
+//     /// Iterate over out nodes of
+//     fn node_out_nodes( &'a self, node_id : Self::NodeId ) -> BoxedIter< 'a, Self::NodeId >;
+//
+//   }
+
+  /// Print directed graph as a tree.
+  pub trait GraphDirectedPrintAsTree< 'g >
+  where
+    Self : abs::GraphDirected< 'g >,
+  {
+
+    /// Print directed graph as a tree.
+    fn _print_as_tree< 'w >( &self, write : &'w mut ( dyn core::fmt::Write + 'w ), node : Self::NodeId ) -> fmt::Result
+    {
+      // let node = self.node_ref( node );
+      write.write_fmt( format_args!( "{:?}", node ) )
+    }
+
+    /// Print directed graph as a tree.
+    fn print_as_tree< 'w >( &self, node : Self::NodeId ) -> String
+    {
+      // let node = self.node_ref( node );
+      let mut result = String::new();
+      self._print_as_tree( &mut result, node ).unwrap();
+      result
+    }
+
+  }
+
+  impl< 'g, T > GraphDirectedPrintAsTree< 'g > for T
+  where
+    Self : abs::GraphDirected< 'g >,
+  {
+  }
+
+  // impl fmt::Debug for Context< '_ >
+  // {
+  //   fn fmt( &self, c : &mut fmt::Formatter< '_ > ) -> fmt::Result
+  //   {
+  //     c
+  //     .debug_struct( "Context" )
+  //     .field( "buf", &"dyn fmt::Write" )
+  //     .field( "printer", &self.printer )
+  //     .finish()
+  //   }
+  // }
+
+}
+
+crate::mod_interface!
+{
+  own use
+  {
+    GraphDirectedPrintAsTree,
+  };
+}

module/move/graphs_tools/tests/inc/graph/map_of_nodes.rs

@@ -3,6 +3,7 @@ use super::*;
 use derive_tools::From;
 use the_module::abs;
 use iter_tools::{ _IterTrait, IterTrait, BoxedIter };
+use std::fmt;
 
 #[ derive( Debug ) ]
 pub struct Node
@@ -13,6 +14,7 @@ pub struct Node
 
 impl the_module::abs::Node for Node {}
 
+#[ allow( dead_code ) ]
 impl Node
 {
   pub fn new< IntoId : Into< NodeId > >( id : IntoId ) -> Node
@@ -49,6 +51,7 @@ pub struct Graph
   nodes : HashMap< NodeId, Node >,
 }
 
+#[ allow( dead_code ) ]
 impl Graph
 {
 
@@ -99,14 +102,23 @@ impl< 'a > abs::GraphDirected< 'a > for Graph
   }
 }
 
-#[ derive( Debug, Copy, Clone, Hash, PartialEq, Eq, From ) ]
+#[ derive( Copy, Clone, Hash, PartialEq, Eq, From ) ]
 pub struct NodeId( usize );
 
+impl fmt::Debug for NodeId
+{
+  fn fmt( &self, c : &mut fmt::Formatter< '_ > ) -> fmt::Result
+  {
+    c
+    .write_fmt( format_args!( "node::{:?}", self.0 ) )
+  }
+}
+
 impl the_module::abs::NodeId for NodeId {}
 
-// xxx
+// Constructors
 
-use std::cell::RefCell;
+#[ allow( dead_code ) ]
 impl Graph
 {
 

module/move/graphs_tools/tests/inc/mod.rs

@@ -7,3 +7,4 @@ pub mod graph;
 mod basic_test;
 mod nodes_test;
 mod search_test;
+mod tree_print_test;

module/move/graphs_tools/tests/inc/search_test/dfs_test.rs

@@ -105,7 +105,7 @@ fn test_dfs()
   // use the_module::search;
   // use the_module::abs;
   use the_module::search::ForGraphDirected;
-  let mut graph = Graph::duplet();
+  let graph = Graph::duplet();
 
   // Prepare a vector to collect visited nodes
   let mut visited_nodes = Vec::new();

module/move/graphs_tools/tests/inc/tree_print_test.rs

@@ -0,0 +1,22 @@
+use super::*;
+
+use graph::map_of_nodes::
+{
+  Node, NodeId, Graph,
+};
+
+// =
+
+#[ test ]
+fn _print_as_tree()
+{
+  use the_module::tree_print::GraphDirectedPrintAsTree;
+  let graph = Graph::duplet();
+
+  let mut got = String::new();
+  let r = graph._print_as_tree( &mut got, 1.into() );
+  let exp = "node::1";
+  assert_eq!( got, exp );
+  assert!( r.is_ok() );
+
+}