release: 0.1.30

[lilypond.git] / flower / directed-graph.cc

diff --git a/flower/directed-graph.cc b/flower/directed-graph.cc
index 2c55688011c804ea4265abed04789fa0a491b58d..b13203e4fa19ca307eb39f7e9c2afd6bb9c3f592 100644 (file)
--- a/flower/directed-graph.cc
+++ b/flower/directed-graph.cc
@@ -18,13 +18,13 @@
 Link_array<Directed_graph_node> const &
 Directed_graph_node::get_in_edge_arr() const
 {
-    return edge_in_l_arr_;
+  return edge_in_l_arr_;
 }
 
 Link_array<Directed_graph_node> const &
-Directed_graph_node::get_out_edge_arr()const
+Directed_graph_node::get_out_edge_arr() const
 {
-    return edge_out_l_arr_;
+  return edge_out_l_arr_;
 }
 
 /**
@@ -37,7 +37,7 @@ Directed_graph_node::Directed_graph_node (Directed_graph_node const&)
 void
 Directed_graph_node::copy_edges_out (Directed_graph_node const &s)
 {
-    for (int i=0; i < s.edge_out_l_arr_.size(); i++)
+  for (int i=0; i < s.edge_out_l_arr_.size(); i++)
        add (s.edge_out_l_arr_[i]);
 }
 
@@ -45,64 +45,66 @@ void
 Directed_graph_node::OK() const
 { 
 #ifndef NDEBUG
-    for (int i=0; i < edge_out_l_arr_.size(); i++) {
+  for (int i=0; i < edge_out_l_arr_.size(); i++) 
+    {
        assert (edge_out_l_arr_[i]->
               edge_in_l_arr_.find_l (this));
     }
-    for (int i=0; i < edge_in_l_arr_.size(); i++)
+  for (int i=0; i < edge_in_l_arr_.size(); i++)
        assert (edge_in_l_arr_[i]->contains_b (this));
 #endif
 }
 
 bool
-Directed_graph_node::contains_b (const Directed_graph_node *d)const
+Directed_graph_node::contains_b (const Directed_graph_node *d) const
 {
-    return edge_out_l_arr_.find_l ((Directed_graph_node*)d);
+  return edge_out_l_arr_.find_l ((Directed_graph_node*)d);
 }
-    
+  
 void
 Directed_graph_node::remove_edge_out_idx (int i)
 {
-    PARANOID_OK();
-    Directed_graph_node * d_l = edge_out_l_arr_.get (i);
+  PARANOID_OK();
+  Directed_graph_node * d_l = edge_out_l_arr_.get (i);
 
-    int j = d_l->edge_in_l_arr_.find_i (this);
-    assert (j>=0);
-    d_l->edge_in_l_arr_.unordered_del (j);
-    PARANOID_OK();
+  int j = d_l->edge_in_l_arr_.find_i (this);
+  assert (j>=0);
+  d_l->edge_in_l_arr_.unordered_del (j);
+  PARANOID_OK();
 }
 
 void
 Directed_graph_node::remove_edge_in (Directed_graph_node *d_l)
 {
-    PARANOID_OK();
-    d_l->remove_edge_out (this);
-    PARANOID_OK();
+  PARANOID_OK();
+  d_l->remove_edge_out (this);
+  PARANOID_OK();
 }
  
 void
 Directed_graph_node::remove_edge_out (Directed_graph_node *d_l)
 {
-    PARANOID_OK();
-    for (int i=0; i < edge_out_l_arr_.size();) {
+  PARANOID_OK();
+  for (int i=0; i < edge_out_l_arr_.size();) 
+    {
        if (edge_out_l_arr_[i]== d_l)
            remove_edge_out_idx (i);
        else
            i++;
     }
-    PARANOID_OK();
+  PARANOID_OK();
 }
 bool
-Directed_graph_node::linked_b()const
+Directed_graph_node::linked_b() const
 {
-    return edge_out_l_arr_.size() || edge_in_l_arr_.size ();
+  return edge_out_l_arr_.size() || edge_in_l_arr_.size ();
 }
 
 void
 Directed_graph_node::junk_links()
 {
-    edge_in_l_arr_.set_size (0);
-    edge_out_l_arr_.set_size (0);
+  edge_in_l_arr_.set_size (0);
+  edge_out_l_arr_.set_size (0);
 }
 
 
@@ -116,7 +118,7 @@ Directed_graph_node::unlink()
        t.concat (edge_in_l_arr_);
 #endif
 
-       while ( edge_out_l_arr_.size())
+       while (edge_out_l_arr_.size())
            remove_edge_out_idx (0);
        
        while (edge_in_l_arr_.size())
@@ -130,21 +132,21 @@ Directed_graph_node::unlink()
 
 Directed_graph_node::~Directed_graph_node()
 {
-    assert (!linked_b());
+  assert (!linked_b());
 }
 
-    
+  
 void
 Directed_graph_node::add (Directed_graph_node* dep_l)
 {
-    PARANOID_OK();
-    if (!dep_l)
+  PARANOID_OK();
+  if (!dep_l)
        return ;
-    dep_l->edge_in_l_arr_.push (this);
-    edge_out_l_arr_.push (dep_l);
-    PARANOID_OK();
+  dep_l->edge_in_l_arr_.push (this);
+  edge_out_l_arr_.push (dep_l);
+  PARANOID_OK();
 }
-    
+  
 
 Directed_graph_node::Directed_graph_node()
 {