X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Fgraph%2Ftest%2Fmake_bicon_planar_test.cpp;fp=ceph%2Fsrc%2Fboost%2Flibs%2Fgraph%2Ftest%2Fmake_bicon_planar_test.cpp;h=b58e4c660a2857693aa1cf751ae57c5de2ea6da6;hb=f67539c23b11f3b8a2ecaeeddf7a403ae1c442a8;hp=9e31c4c11320daf05e050702caeca77b14e4b697;hpb=64a4c04e6850c6d9086e4c37f57c4eada541b05e;p=ceph.git

diff --git a/ceph/src/boost/libs/graph/test/make_bicon_planar_test.cpp b/ceph/src/boost/libs/graph/test/make_bicon_planar_test.cpp
index 9e31c4c11..b58e4c660 100644
--- a/ceph/src/boost/libs/graph/test/make_bicon_planar_test.cpp
+++ b/ceph/src/boost/libs/graph/test/make_bicon_planar_test.cpp
@@ -13,157 +13,124 @@
 #include <boost/graph/boyer_myrvold_planar_test.hpp>
 #include <boost/property_map/property_map.hpp>
 #include <boost/property_map/vector_property_map.hpp>
-#include <boost/test/minimal.hpp>
-
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost;
 
-
-template <typename Graph>
-void reset_edge_index(Graph& g)
+template < typename Graph > void reset_edge_index(Graph& g)
 {
-  typename property_map<Graph, edge_index_t>::type index = get(edge_index, g);
-  typename graph_traits<Graph>::edge_iterator ei, ei_end;
-  typename graph_traits<Graph>::edges_size_type cnt = 0;
-  for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
-    put(index, *ei, cnt++);
+    typename property_map< Graph, edge_index_t >::type index
+        = get(edge_index, g);
+    typename graph_traits< Graph >::edge_iterator ei, ei_end;
+    typename graph_traits< Graph >::edges_size_type cnt = 0;
+    for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
+        put(index, *ei, cnt++);
 }
 
-
-template <typename Graph>
-void make_line_graph(Graph& g, int size)
+template < typename Graph > void make_line_graph(Graph& g, int size)
 {
-  typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
+    typedef typename graph_traits< Graph >::vertex_descriptor vertex_t;
 
-  vertex_t prev_vertex = add_vertex(g);
+    vertex_t prev_vertex = add_vertex(g);
 
-  for(int i = 1; i < size; ++i)
+    for (int i = 1; i < size; ++i)
     {
-      vertex_t curr_vertex = add_vertex(g);
-      add_edge(curr_vertex, prev_vertex, g);
-      prev_vertex = curr_vertex;
+        vertex_t curr_vertex = add_vertex(g);
+        add_edge(curr_vertex, prev_vertex, g);
+        prev_vertex = curr_vertex;
     }
 }
 
-
 struct UpdateVertexIndex
 {
-  template <typename Graph>
-  void update(Graph& g)
-  {
-    typename property_map<Graph, vertex_index_t>::type index = get(vertex_index, g);
-    typename graph_traits<Graph>::vertex_iterator vi, vi_end;
-    typename graph_traits<Graph>::vertices_size_type cnt = 0;
-    for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
-      put(index, *vi, cnt++);
-  }
+    template < typename Graph > void update(Graph& g)
+    {
+        typename property_map< Graph, vertex_index_t >::type index
+            = get(vertex_index, g);
+        typename graph_traits< Graph >::vertex_iterator vi, vi_end;
+        typename graph_traits< Graph >::vertices_size_type cnt = 0;
+        for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
+            put(index, *vi, cnt++);
+    }
 };
 
-
 struct NoVertexIndexUpdater
 {
-  template <typename Graph> void update(Graph&) {}
+    template < typename Graph > void update(Graph&) {}
 };
 
+template < typename Graph, typename VertexIndexUpdater >
+void test_line_graph(VertexIndexUpdater vertex_index_updater, int size)
+{
 
+    Graph g;
+    make_line_graph(g, size);
+    vertex_index_updater.update(g);
+    reset_edge_index(g);
+
+    typedef std::vector< typename graph_traits< Graph >::edge_descriptor >
+        edge_vector_t;
+    typedef std::vector< edge_vector_t > embedding_storage_t;
+    typedef iterator_property_map< typename embedding_storage_t::iterator,
+        typename property_map< Graph, vertex_index_t >::type >
+        embedding_t;
+
+    embedding_storage_t embedding_storage(num_vertices(g));
+    embedding_t embedding(embedding_storage.begin(), get(vertex_index, g));
+
+    typename graph_traits< Graph >::vertex_iterator vi, vi_end;
+    for (boost::tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
+        std::copy(out_edges(*vi, g).first, out_edges(*vi, g).second,
+            std::back_inserter(embedding[*vi]));
+
+    BOOST_TEST(biconnected_components(
+                    g, make_vector_property_map< int >(get(edge_index, g)))
+        > 1);
+    BOOST_TEST(boyer_myrvold_planarity_test(g));
+    make_biconnected_planar(g, embedding);
+    reset_edge_index(g);
+    BOOST_TEST(biconnected_components(
+                    g, make_vector_property_map< int >(get(edge_index, g)))
+        == 1);
+    BOOST_TEST(boyer_myrvold_planarity_test(g));
+}
 
-template <typename Graph, typename VertexIndexUpdater>
-void test_line_graph(VertexIndexUpdater vertex_index_updater, int size)
+int main(int, char*[])
 {
+    typedef adjacency_list< vecS, vecS, undirectedS,
+        property< vertex_index_t, int >, property< edge_index_t, int > >
+        VVgraph_t;
 
-  Graph g;
-  make_line_graph(g, size);
-  vertex_index_updater.update(g);
-  reset_edge_index(g);
-  
-  typedef std::vector< typename graph_traits<Graph>::edge_descriptor > edge_vector_t;
-  typedef std::vector< edge_vector_t > embedding_storage_t;
-  typedef iterator_property_map
-    < typename embedding_storage_t::iterator, 
-      typename property_map<Graph, vertex_index_t>::type
-    > embedding_t;
-  
-  embedding_storage_t embedding_storage(num_vertices(g));
-  embedding_t embedding(embedding_storage.begin(), get(vertex_index, g));
-
-  typename graph_traits<Graph>::vertex_iterator vi, vi_end;
-  for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
-    std::copy(out_edges(*vi,g).first, out_edges(*vi,g).second, std::back_inserter(embedding[*vi]));
-
-  BOOST_CHECK(biconnected_components(g, make_vector_property_map<int>(get(edge_index,g))) > 1);
-  BOOST_CHECK(boyer_myrvold_planarity_test(g));
-  make_biconnected_planar(g, embedding);
-  reset_edge_index(g);
-  BOOST_CHECK(biconnected_components(g, make_vector_property_map<int>(get(edge_index,g))) == 1);
-  BOOST_CHECK(boyer_myrvold_planarity_test(g));
+    typedef adjacency_list< vecS, listS, undirectedS,
+        property< vertex_index_t, int >, property< edge_index_t, int > >
+        VLgraph_t;
 
-}
+    typedef adjacency_list< listS, vecS, undirectedS,
+        property< vertex_index_t, int >, property< edge_index_t, int > >
+        LVgraph_t;
 
+    typedef adjacency_list< listS, listS, undirectedS,
+        property< vertex_index_t, int >, property< edge_index_t, int > >
+        LLgraph_t;
 
+    typedef adjacency_list< setS, setS, undirectedS,
+        property< vertex_index_t, int >, property< edge_index_t, int > >
+        SSgraph_t;
 
+    test_line_graph< VVgraph_t >(NoVertexIndexUpdater(), 10);
+    test_line_graph< VVgraph_t >(NoVertexIndexUpdater(), 50);
 
+    test_line_graph< VLgraph_t >(UpdateVertexIndex(), 3);
+    test_line_graph< VLgraph_t >(UpdateVertexIndex(), 30);
 
-int test_main(int, char* [])
-{
-  typedef adjacency_list 
-    <vecS, 
-    vecS, 
-    undirectedS,
-    property<vertex_index_t, int>,
-    property<edge_index_t, int>
-    > 
-    VVgraph_t;
-  
-  typedef adjacency_list 
-    <vecS, 
-    listS, 
-    undirectedS,
-    property<vertex_index_t, int>,
-    property<edge_index_t, int>
-    > 
-    VLgraph_t;
-
-  typedef adjacency_list
-    <listS, 
-    vecS, 
-    undirectedS,
-    property<vertex_index_t, int>,
-    property<edge_index_t, int>
-    > 
-    LVgraph_t;
-
-  typedef adjacency_list 
-    <listS, 
-    listS, 
-    undirectedS,
-    property<vertex_index_t, int>,
-    property<edge_index_t, int>
-    > 
-    LLgraph_t;
-
-  typedef adjacency_list 
-    <setS, 
-    setS, 
-    undirectedS,
-    property<vertex_index_t, int>,
-    property<edge_index_t, int>
-    > 
-    SSgraph_t;
-
-  test_line_graph<VVgraph_t>(NoVertexIndexUpdater(), 10);
-  test_line_graph<VVgraph_t>(NoVertexIndexUpdater(), 50);
-
-  test_line_graph<VLgraph_t>(UpdateVertexIndex(), 3);
-  test_line_graph<VLgraph_t>(UpdateVertexIndex(), 30);
-
-  test_line_graph<LVgraph_t>(NoVertexIndexUpdater(), 15);
-  test_line_graph<LVgraph_t>(NoVertexIndexUpdater(), 45);
-
-  test_line_graph<LLgraph_t>(UpdateVertexIndex(), 8);
-  test_line_graph<LLgraph_t>(UpdateVertexIndex(), 19);
-
-  test_line_graph<SSgraph_t>(UpdateVertexIndex(), 13);
-  test_line_graph<SSgraph_t>(UpdateVertexIndex(), 20);
-
-  return 0;
+    test_line_graph< LVgraph_t >(NoVertexIndexUpdater(), 15);
+    test_line_graph< LVgraph_t >(NoVertexIndexUpdater(), 45);
+
+    test_line_graph< LLgraph_t >(UpdateVertexIndex(), 8);
+    test_line_graph< LLgraph_t >(UpdateVertexIndex(), 19);
+
+    test_line_graph< SSgraph_t >(UpdateVertexIndex(), 13);
+    test_line_graph< SSgraph_t >(UpdateVertexIndex(), 20);
+
+    return boost::report_errors();
 }