diff -r 6c59b1386fe8 -r 58455e2aa13e lemon/topology.h --- a/lemon/topology.h Fri Nov 04 15:48:06 2005 +0000 +++ b/lemon/topology.h Fri Nov 04 15:52:24 2005 +0000 @@ -696,17 +696,17 @@ /// \ingroup topology /// - /// \brief Checks the graph is node biconnected. + /// \brief Checks the graph is bi-node-connected. /// - /// This function checks that the undirected graph is node biconnected - /// graph. The graph is node biconnected if any two undirected edge is + /// This function checks that the undirected graph is bi-node-connected + /// graph. The graph is bi-node-connected if any two undirected edge is /// on same circle. /// /// \param graph The graph. - /// \return %True when the graph node biconnected. + /// \return %True when the graph bi-node-connected. /// \todo Make it faster. template - bool nodeBiconnected(const UndirGraph& graph) { + bool biNodeConnected(const UndirGraph& graph) { return countNodeBiconnectedComponents(graph) == 1; } @@ -714,7 +714,7 @@ /// /// \brief Count the biconnected components. /// - /// This function finds the node biconnected components in an undirected + /// This function finds the bi-node-connected components in an undirected /// graph. The biconnected components are the classes of an equivalence /// relation on the undirected edges. Two undirected edge is in relationship /// when they are on same circle. @@ -747,15 +747,15 @@ /// \ingroup topology /// - /// \brief Find the node biconnected components. + /// \brief Find the bi-node-connected components. /// - /// This function finds the node biconnected components in an undirected - /// graph. The node biconnected components are the classes of an equivalence + /// This function finds the bi-node-connected components in an undirected + /// graph. The bi-node-connected components are the classes of an equivalence /// relation on the undirected edges. Two undirected edge are in relationship /// when they are on same circle. /// /// \image html node_biconnected_components.png - /// \image latex node_biconnected_components.eps "Node biconnected components" width=\textwidth + /// \image latex node_biconnected_components.eps "bi-node-connected components" width=\textwidth /// /// \param graph The graph. /// \retval comp A writable undir edge map. The values will be set from 0 to @@ -765,7 +765,7 @@ /// \return The number of components. /// template - int nodeBiconnectedComponents(const UndirGraph& graph, + int biNodeConnectedComponents(const UndirGraph& graph, UndirEdgeMap& compMap) { checkConcept(); typedef typename UndirGraph::NodeIt NodeIt; @@ -793,10 +793,10 @@ /// \ingroup topology /// - /// \brief Find the node biconnected cut nodes. + /// \brief Find the bi-node-connected cut nodes. /// - /// This function finds the node biconnected cut nodes in an undirected - /// graph. The node biconnected components are the classes of an equivalence + /// This function finds the bi-node-connected cut nodes in an undirected + /// graph. The bi-node-connected components are the classes of an equivalence /// relation on the undirected edges. Two undirected edges are in /// relationship when they are on same circle. The biconnected components /// are separted by nodes which are the cut nodes of the components. @@ -806,7 +806,7 @@ /// the node separate two or more components. /// \return The number of the cut nodes. template - int nodeBiconnectedCutNodes(const UndirGraph& graph, NodeMap& cutMap) { + int biNodeConnectedCutNodes(const UndirGraph& graph, NodeMap& cutMap) { checkConcept(); typedef typename UndirGraph::Node Node; typedef typename UndirGraph::NodeIt NodeIt; @@ -1023,26 +1023,26 @@ /// \ingroup topology /// - /// \brief Checks that the graph is edge biconnected. + /// \brief Checks that the graph is bi-edge-connected. /// - /// This function checks that the graph is edge biconnected. The undirected - /// graph is edge biconnected when any two nodes are connected with two + /// This function checks that the graph is bi-edge-connected. The undirected + /// graph is bi-edge-connected when any two nodes are connected with two /// edge-disjoint paths. /// /// \param graph The undirected graph. /// \return The number of components. /// \todo Make it faster. template - bool edgeBiconnected(const UndirGraph& graph) { + bool biEdgeConnected(const UndirGraph& graph) { return countEdgeBiconnectedComponents(graph) == 1; } /// \ingroup topology /// - /// \brief Count the edge biconnected components. + /// \brief Count the bi-edge-connected components. /// - /// This function count the edge biconnected components in an undirected - /// graph. The edge biconnected components are the classes of an equivalence + /// This function count the bi-edge-connected components in an undirected + /// graph. The bi-edge-connected components are the classes of an equivalence /// relation on the nodes. Two nodes are in relationship when they are /// connected with at least two edge-disjoint paths. /// @@ -1074,15 +1074,15 @@ /// \ingroup topology /// - /// \brief Find the edge biconnected components. + /// \brief Find the bi-edge-connected components. /// - /// This function finds the edge biconnected components in an undirected - /// graph. The edge biconnected components are the classes of an equivalence + /// This function finds the bi-edge-connected components in an undirected + /// graph. The bi-edge-connected components are the classes of an equivalence /// relation on the nodes. Two nodes are in relationship when they are /// connected at least two edge-disjoint paths. /// /// \image html edge_biconnected_components.png - /// \image latex edge_biconnected_components.eps "Edge biconnected components" width=\textwidth + /// \image latex edge_biconnected_components.eps "bi-edge-connected components" width=\textwidth /// /// \param graph The graph. /// \retval comp A writable node map. The values will be set from 0 to @@ -1092,7 +1092,7 @@ /// \return The number of components. /// template - int edgeBiconnectedComponents(const UndirGraph& graph, NodeMap& compMap) { + int biEdgeConnectedComponents(const UndirGraph& graph, NodeMap& compMap) { checkConcept(); typedef typename UndirGraph::NodeIt NodeIt; typedef typename UndirGraph::Node Node; @@ -1119,12 +1119,12 @@ /// \ingroup topology /// - /// \brief Find the edge biconnected cut edges. + /// \brief Find the bi-edge-connected cut edges. /// - /// This function finds the edge biconnected components in an undirected - /// graph. The edge biconnected components are the classes of an equivalence + /// This function finds the bi-edge-connected components in an undirected + /// graph. The bi-edge-connected components are the classes of an equivalence /// relation on the nodes. Two nodes are in relationship when they are - /// connected with at least two edge-disjoint paths. The edge biconnected + /// connected with at least two edge-disjoint paths. The bi-edge-connected /// components are separted by edges which are the cut edges of the /// components. /// @@ -1133,7 +1133,7 @@ /// edge is a cut edge. /// \return The number of cut edges. template - int edgeBiconnectedCutEdges(const UndirGraph& graph, UndirEdgeMap& cutMap) { + int biEdgeConnectedCutEdges(const UndirGraph& graph, UndirEdgeMap& cutMap) { checkConcept(); typedef typename UndirGraph::NodeIt NodeIt; typedef typename UndirGraph::UndirEdge UndirEdge;