diff -r da142c310d02 -r 4274224f8a7d lemon/topology.h
--- a/lemon/topology.h	Tue Oct 24 16:49:41 2006 +0000
+++ b/lemon/topology.h	Tue Oct 24 17:19:16 2006 +0000
@@ -25,8 +25,8 @@
 #include <lemon/graph_adaptor.h>
 #include <lemon/maps.h>
 
-#include <lemon/concept/graph.h>
-#include <lemon/concept/ugraph.h>
+#include <lemon/concepts/graph.h>
+#include <lemon/concepts/ugraph.h>
 #include <lemon/concept_check.h>
 
 #include <lemon/bin_heap.h>
@@ -53,7 +53,7 @@
   /// \note By definition, the empty graph is connected.
   template <typename UGraph>
   bool connected(const UGraph& graph) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::NodeIt NodeIt;
     if (NodeIt(graph) == INVALID) return true;
     Dfs<UGraph> dfs(graph);
@@ -78,7 +78,7 @@
   /// of zero connected components.
   template <typename UGraph>
   int countConnectedComponents(const UGraph &graph) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::Node Node;
     typedef typename UGraph::Edge Edge;
 
@@ -126,10 +126,10 @@
   ///
   template <class UGraph, class NodeMap>
   int connectedComponents(const UGraph &graph, NodeMap &compMap) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::Node Node;
     typedef typename UGraph::Edge Edge;
-    checkConcept<concept::WriteMap<Node, int>, NodeMap>();
+    checkConcept<concepts::WriteMap<Node, int>, NodeMap>();
 
     typedef NullMap<Node, Edge> PredMap;
     typedef NullMap<Node, int> DistMap;
@@ -244,7 +244,7 @@
   /// \note By definition, the empty graph is strongly connected.
   template <typename Graph>
   bool stronglyConnected(const Graph& graph) {
-    checkConcept<concept::Graph, Graph>();
+    checkConcept<concepts::Graph, Graph>();
 
     typedef typename Graph::Node Node;
     typedef typename Graph::NodeIt NodeIt;
@@ -302,7 +302,7 @@
   /// strongly connected components.
   template <typename Graph>
   int countStronglyConnectedComponents(const Graph& graph) {
-    checkConcept<concept::Graph, Graph>();
+    checkConcept<concepts::Graph, Graph>();
 
     using namespace _topology_bits;
 
@@ -371,10 +371,10 @@
   ///
   template <typename Graph, typename NodeMap>
   int stronglyConnectedComponents(const Graph& graph, NodeMap& compMap) {
-    checkConcept<concept::Graph, Graph>();
+    checkConcept<concepts::Graph, Graph>();
     typedef typename Graph::Node Node;
     typedef typename Graph::NodeIt NodeIt;
-    checkConcept<concept::WriteMap<Node, int>, NodeMap>();
+    checkConcept<concepts::WriteMap<Node, int>, NodeMap>();
 
     using namespace _topology_bits;
     
@@ -434,11 +434,11 @@
   /// \return The number of cut edges
   template <typename Graph, typename EdgeMap>
   int stronglyConnectedCutEdges(const Graph& graph, EdgeMap& cutMap) {
-    checkConcept<concept::Graph, Graph>();
+    checkConcept<concepts::Graph, Graph>();
     typedef typename Graph::Node Node;
     typedef typename Graph::Edge Edge;
     typedef typename Graph::NodeIt NodeIt;
-    checkConcept<concept::WriteMap<Edge, bool>, EdgeMap>();
+    checkConcept<concepts::WriteMap<Edge, bool>, EdgeMap>();
 
     using namespace _topology_bits;
     
@@ -730,7 +730,7 @@
   /// \return The number of components.
   template <typename UGraph>
   int countBiNodeConnectedComponents(const UGraph& graph) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::NodeIt NodeIt;
 
     using namespace _topology_bits;
@@ -774,10 +774,10 @@
   template <typename UGraph, typename UEdgeMap>
   int biNodeConnectedComponents(const UGraph& graph, 
 				UEdgeMap& compMap) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::NodeIt NodeIt;
     typedef typename UGraph::UEdge UEdge;
-    checkConcept<concept::WriteMap<UEdge, int>, UEdgeMap>();
+    checkConcept<concepts::WriteMap<UEdge, int>, UEdgeMap>();
 
     using namespace _topology_bits;
 
@@ -814,10 +814,10 @@
   /// \return The number of the cut nodes.
   template <typename UGraph, typename NodeMap>
   int biNodeConnectedCutNodes(const UGraph& graph, NodeMap& cutMap) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::Node Node;
     typedef typename UGraph::NodeIt NodeIt;
-    checkConcept<concept::WriteMap<Node, bool>, NodeMap>();
+    checkConcept<concepts::WriteMap<Node, bool>, NodeMap>();
 
     using namespace _topology_bits;
 
@@ -1057,7 +1057,7 @@
   /// \return The number of components.
   template <typename UGraph>
   int countBiEdgeConnectedComponents(const UGraph& graph) { 
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::NodeIt NodeIt;
 
     using namespace _topology_bits;
@@ -1100,10 +1100,10 @@
   ///
   template <typename UGraph, typename NodeMap>
   int biEdgeConnectedComponents(const UGraph& graph, NodeMap& compMap) { 
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::NodeIt NodeIt;
     typedef typename UGraph::Node Node;
-    checkConcept<concept::WriteMap<Node, int>, NodeMap>();
+    checkConcept<concepts::WriteMap<Node, int>, NodeMap>();
 
     using namespace _topology_bits;
 
@@ -1141,10 +1141,10 @@
   /// \return The number of cut edges.
   template <typename UGraph, typename UEdgeMap>
   int biEdgeConnectedCutEdges(const UGraph& graph, UEdgeMap& cutMap) { 
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::NodeIt NodeIt;
     typedef typename UGraph::UEdge UEdge;
-    checkConcept<concept::WriteMap<UEdge, bool>, UEdgeMap>();
+    checkConcept<concepts::WriteMap<UEdge, bool>, UEdgeMap>();
 
     using namespace _topology_bits;
 
@@ -1205,8 +1205,8 @@
   void topologicalSort(const Graph& graph, NodeMap& order) {
     using namespace _topology_bits;
 
-    checkConcept<concept::Graph, Graph>();
-    checkConcept<concept::WriteMap<typename Graph::Node, int>, NodeMap>();
+    checkConcept<concepts::Graph, Graph>();
+    checkConcept<concepts::WriteMap<typename Graph::Node, int>, NodeMap>();
 
     typedef typename Graph::Node Node;
     typedef typename Graph::NodeIt NodeIt;
@@ -1247,8 +1247,8 @@
   bool checkedTopologicalSort(const Graph& graph, NodeMap& order) {
     using namespace _topology_bits;
 
-    checkConcept<concept::Graph, Graph>();
-    checkConcept<concept::ReadWriteMap<typename Graph::Node, int>, NodeMap>();
+    checkConcept<concepts::Graph, Graph>();
+    checkConcept<concepts::ReadWriteMap<typename Graph::Node, int>, NodeMap>();
 
     typedef typename Graph::Node Node;
     typedef typename Graph::NodeIt NodeIt;
@@ -1290,7 +1290,7 @@
   template <typename Graph>
   bool dag(const Graph& graph) {
 
-    checkConcept<concept::Graph, Graph>();
+    checkConcept<concepts::Graph, Graph>();
 
     typedef typename Graph::Node Node;
     typedef typename Graph::NodeIt NodeIt;
@@ -1331,7 +1331,7 @@
   /// \see dag
   template <typename UGraph>
   bool acyclic(const UGraph& graph) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::Node Node;
     typedef typename UGraph::NodeIt NodeIt;
     typedef typename UGraph::Edge Edge;
@@ -1364,7 +1364,7 @@
   /// \return %True when the graph is acyclic and connected.
   template <typename UGraph>
   bool tree(const UGraph& graph) {
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     typedef typename UGraph::Node Node;
     typedef typename UGraph::NodeIt NodeIt;
     typedef typename UGraph::Edge Edge;
@@ -1402,7 +1402,7 @@
   /// \author Balazs Attila Mihaly  
   template<typename UGraph>
   inline bool bipartite(const UGraph &graph){
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     
     typedef typename UGraph::NodeIt NodeIt;
     typedef typename UGraph::EdgeIt EdgeIt;
@@ -1439,7 +1439,7 @@
   /// \image latex bipartite_partitions.eps "Bipartite partititions" width=\textwidth
   template<typename UGraph, typename NodeMap>
   inline bool bipartitePartitions(const UGraph &graph, NodeMap &partMap){
-    checkConcept<concept::UGraph, UGraph>();
+    checkConcept<concepts::UGraph, UGraph>();
     
     typedef typename UGraph::Node Node;
     typedef typename UGraph::NodeIt NodeIt;