[Lemon-commits] [lemon_svn] alpar: r3016 - in hugo/trunk: . doc lemon lemon/bits lemon/concept lemon/concepts test
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 21:51:51 CET 2006
Author: alpar
Date: Tue Oct 24 19:19:16 2006
New Revision: 3016
Added:
hugo/trunk/lemon/concepts/
- copied from r3014, /hugo/trunk/lemon/concept/
Removed:
hugo/trunk/lemon/concept/
Modified:
hugo/trunk/Makefile.am
hugo/trunk/doc/graphs.dox
hugo/trunk/doc/groups.dox
hugo/trunk/doc/maps.dox
hugo/trunk/doc/namespaces.dox
hugo/trunk/lemon/Makefile.am
hugo/trunk/lemon/bellman_ford.h
hugo/trunk/lemon/bfs.h
hugo/trunk/lemon/bits/array_map.h
hugo/trunk/lemon/bits/base_extender.h
hugo/trunk/lemon/bits/debug_map.h
hugo/trunk/lemon/bits/graph_extender.h
hugo/trunk/lemon/bits/map_extender.h
hugo/trunk/lemon/bits/vector_map.h
hugo/trunk/lemon/color.h
hugo/trunk/lemon/concepts/bpugraph.h
hugo/trunk/lemon/concepts/graph.h
hugo/trunk/lemon/concepts/graph_components.h
hugo/trunk/lemon/concepts/heap.h
hugo/trunk/lemon/concepts/maps.h
hugo/trunk/lemon/concepts/matrix_maps.h
hugo/trunk/lemon/concepts/path.h
hugo/trunk/lemon/concepts/ugraph.h
hugo/trunk/lemon/dag_shortest_path.h
hugo/trunk/lemon/dfs.h
hugo/trunk/lemon/dijkstra.h
hugo/trunk/lemon/edge_set.h
hugo/trunk/lemon/floyd_warshall.h
hugo/trunk/lemon/fredman_tarjan.h
hugo/trunk/lemon/full_graph.h
hugo/trunk/lemon/graph_adaptor.h
hugo/trunk/lemon/grid_ugraph.h
hugo/trunk/lemon/hypercube_graph.h
hugo/trunk/lemon/johnson.h
hugo/trunk/lemon/kruskal.h
hugo/trunk/lemon/lemon_reader.h
hugo/trunk/lemon/lemon_writer.h
hugo/trunk/lemon/list_graph.h
hugo/trunk/lemon/lp_base.h
hugo/trunk/lemon/maps.h
hugo/trunk/lemon/matrix_maps.h
hugo/trunk/lemon/min_cost_arborescence.h
hugo/trunk/lemon/min_cut.h
hugo/trunk/lemon/prim.h
hugo/trunk/lemon/smart_graph.h
hugo/trunk/lemon/topology.h
hugo/trunk/lemon/vmap.h
hugo/trunk/test/bfs_test.cc
hugo/trunk/test/bpugraph_test.cc
hugo/trunk/test/dfs_test.cc
hugo/trunk/test/dijkstra_test.cc
hugo/trunk/test/edge_set_test.cc
hugo/trunk/test/graph_adaptor_test.cc
hugo/trunk/test/graph_factory_test.cc
hugo/trunk/test/graph_test.cc
hugo/trunk/test/heap_test.cc
hugo/trunk/test/kruskal_test.cc
hugo/trunk/test/maps_test.cc
hugo/trunk/test/matrix_maps_test.cc
hugo/trunk/test/path_test.cc
hugo/trunk/test/preflow_test.cc
hugo/trunk/test/test_tools.h
hugo/trunk/test/ugraph_test.cc
Log:
concept -> concepts (namespace & directory)
Modified: hugo/trunk/Makefile.am
==============================================================================
--- hugo/trunk/Makefile.am (original)
+++ hugo/trunk/Makefile.am Tue Oct 24 19:19:16 2006
@@ -13,7 +13,7 @@
pkgconfigdir = $(libdir)/pkgconfig
lemondir = $(pkgincludedir)
bitsdir = $(lemondir)/bits
-conceptdir = $(lemondir)/concept
+conceptdir = $(lemondir)/concepts
pkgconfig_DATA =
lib_LTLIBRARIES =
lemon_HEADERS =
Modified: hugo/trunk/doc/graphs.dox
==============================================================================
--- hugo/trunk/doc/graphs.dox (original)
+++ hugo/trunk/doc/graphs.dox Tue Oct 24 19:19:16 2006
@@ -11,29 +11,29 @@
functionalities to list the nodes and the edges of the graph as well
as incoming and outgoing edges of a given node.
-Each graph should meet the \ref lemon::concept::Graph "Graph" concept.
+Each graph should meet the \ref lemon::concepts::Graph "Graph" concept.
This concept does not make it possible to change the graph (i.e. it is
not possible to add or delete edges or nodes). Most of the graph
algorithms will run on these graphs.
In case of graphs meeting the full feature
-\ref lemon::concept::ErasableGraph "ErasableGraph"
+\ref lemon::concepts::ErasableGraph "ErasableGraph"
concept
you can also erase individual edges and nodes in arbitrary order.
The implemented graph structures are the following.
\li \ref lemon::ListGraph "ListGraph" is the most versatile graph class. It meets
-the \ref lemon::concept::ErasableGraph "ErasableGraph" concept
+the \ref lemon::concepts::ErasableGraph "ErasableGraph" concept
and it also has some convenient extra features.
\li \ref lemon::SmartGraph "SmartGraph" is a more memory
efficient version of \ref lemon::ListGraph "ListGraph". The
price of this is that it only meets the
-\ref lemon::concept::ExtendableGraph "ExtendableGraph" concept,
+\ref lemon::concepts::ExtendableGraph "ExtendableGraph" concept,
so you cannot delete individual edges or nodes.
\li \ref lemon::FullGraph "FullGraph"
implements a complete graph. It is a
-\ref lemon::concept::Graph "Graph", so you cannot
+\ref lemon::concepts::Graph "Graph", so you cannot
change the number of nodes once it is constructed. It is extremely memory
efficient: it uses constant amount of memory independently from the number of
the nodes of the graph. Of course, the size of the \ref maps-page "NodeMap"'s and
Modified: hugo/trunk/doc/groups.dox
==============================================================================
--- hugo/trunk/doc/groups.dox (original)
+++ hugo/trunk/doc/groups.dox Tue Oct 24 19:19:16 2006
@@ -76,7 +76,7 @@
Map adaptors are used to create "implicit" maps from other maps.
-Most of them are \ref lemon::concept::ReadMap "ReadMap"s. They can
+Most of them are \ref lemon::concepts::ReadMap "ReadMap"s. They can
make arithmetic operations between one or two maps (negation, scaling,
addition, multiplication etc.) or e.g. convert a map to another one
of different Value type.
@@ -102,7 +102,7 @@
using a standard Builder subclass. This make is easy to have e.g. the Dijkstra
algorithm to store its result in any kind of path structure.
-\sa lemon::concept::Path
+\sa lemon::concepts::Path
*/
Modified: hugo/trunk/doc/maps.dox
==============================================================================
--- hugo/trunk/doc/maps.dox (original)
+++ hugo/trunk/doc/maps.dox Tue Oct 24 19:19:16 2006
@@ -13,11 +13,11 @@
\endcode
A map can be
-\e readable (\ref lemon::concept::ReadMap "ReadMap", for short),
-\e writable (\ref lemon::concept::WriteMap "WriteMap") or both
-(\ref lemon::concept::ReadWriteMap "ReadWriteMap").
+\e readable (\ref lemon::concepts::ReadMap "ReadMap", for short),
+\e writable (\ref lemon::concepts::WriteMap "WriteMap") or both
+(\ref lemon::concepts::ReadWriteMap "ReadWriteMap").
There also exists a special type of
-ReadWrite map called \ref lemon::concept::ReferenceMap "reference map".
+ReadWrite map called \ref lemon::concepts::ReferenceMap "reference map".
In addition that you can
read and write the values of a key, a reference map
can also give you a reference to the
Modified: hugo/trunk/doc/namespaces.dox
==============================================================================
--- hugo/trunk/doc/namespaces.dox (original)
+++ hugo/trunk/doc/namespaces.dox Tue Oct 24 19:19:16 2006
@@ -8,5 +8,5 @@
/// The namespace of LEMON concepts and concept checking classes
///
- namespace concept {}
+ namespace concepts {}
}
Modified: hugo/trunk/lemon/Makefile.am
==============================================================================
--- hugo/trunk/lemon/Makefile.am (original)
+++ hugo/trunk/lemon/Makefile.am Tue Oct 24 19:19:16 2006
@@ -121,11 +121,11 @@
concept_HEADERS += \
lemon/concept_check.h \
- lemon/concept/bpugraph.h \
- lemon/concept/graph.h \
- lemon/concept/graph_components.h \
- lemon/concept/heap.h \
- lemon/concept/maps.h \
- lemon/concept/matrix_maps.h \
- lemon/concept/path.h \
- lemon/concept/ugraph.h
+ lemon/concepts/bpugraph.h \
+ lemon/concepts/graph.h \
+ lemon/concepts/graph_components.h \
+ lemon/concepts/heap.h \
+ lemon/concepts/maps.h \
+ lemon/concepts/matrix_maps.h \
+ lemon/concepts/path.h \
+ lemon/concepts/ugraph.h
Modified: hugo/trunk/lemon/bellman_ford.h
==============================================================================
--- hugo/trunk/lemon/bellman_ford.h (original)
+++ hugo/trunk/lemon/bellman_ford.h Tue Oct 24 19:19:16 2006
@@ -92,7 +92,7 @@
/// \brief The type of the map that stores the edge lengths.
///
/// The type of the map that stores the edge lengths.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _LengthMap LengthMap;
// The type of the length of the edges.
@@ -110,7 +110,7 @@
///
/// The type of the map that stores the last
/// edges of the shortest paths.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename _Graph::Edge> PredMap;
@@ -125,7 +125,7 @@
/// \brief The type of the map that stores the dists of the nodes.
///
/// The type of the map that stores the dists of the nodes.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename _LengthMap::Value>
DistMap;
@@ -146,7 +146,7 @@
/// \ingroup flowalgs
/// This class provides an efficient implementation of \c Bellman-Ford
/// algorithm. The edge lengths are passed to the algorithm using a
- /// \ref concept::ReadMap "ReadMap", so it is easy to change it to any
+ /// \ref concepts::ReadMap "ReadMap", so it is easy to change it to any
/// kind of length.
///
/// The Bellman-Ford algorithm solves the shortest path from one node
@@ -158,13 +158,13 @@
/// The maximal time complexity of the algorithm is \f$ O(ne) \f$.
///
/// The type of the length is determined by the
- /// \ref concept::ReadMap::Value "Value" of the length map.
+ /// \ref concepts::ReadMap::Value "Value" of the length map.
///
/// \param _Graph The graph type the algorithm runs on. The default value
/// is \ref ListGraph. The value of _Graph is not used directly by
/// BellmanFord, it is only passed to \ref BellmanFordDefaultTraits.
/// \param _LengthMap This read-only EdgeMap determines the lengths of the
- /// edges. The default map type is \ref concept::Graph::EdgeMap
+ /// edges. The default map type is \ref concepts::Graph::EdgeMap
/// "Graph::EdgeMap<int>". The value of _LengthMap is not used directly
/// by BellmanFord, it is only passed to \ref BellmanFordDefaultTraits.
/// \param _Traits Traits class to set various data types used by the
@@ -790,7 +790,7 @@
/// \brief The type of the map that stores the edge lengths.
///
/// The type of the map that stores the edge lengths.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _LengthMap LengthMap;
/// \brief The value type of the length map.
@@ -808,7 +808,7 @@
///
/// The type of the map that stores the last
/// edges of the shortest paths.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
typedef NullMap <typename _Graph::Node,typename _Graph::Edge> PredMap;
/// \brief Instantiates a PredMap.
@@ -820,7 +820,7 @@
/// \brief The type of the map that stores the dists of the nodes.
///
/// The type of the map that stores the dists of the nodes.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
typedef NullMap<typename Graph::Node, Value> DistMap;
/// \brief Instantiates a DistMap.
///
Modified: hugo/trunk/lemon/bfs.h
==============================================================================
--- hugo/trunk/lemon/bfs.h (original)
+++ hugo/trunk/lemon/bfs.h Tue Oct 24 19:19:16 2006
@@ -47,7 +47,7 @@
///
///The type of the map that stores the last
///edges of the shortest paths.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename GR::Edge> PredMap;
///Instantiates a PredMap.
@@ -62,7 +62,7 @@
///The type of the map that indicates which nodes are processed.
///The type of the map that indicates which nodes are processed.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef NullMap<typename Graph::Node,bool> ProcessedMap;
///Instantiates a ProcessedMap.
@@ -81,7 +81,7 @@
///The type of the map that indicates which nodes are reached.
///The type of the map that indicates which nodes are reached.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef typename Graph::template NodeMap<bool> ReachedMap;
///Instantiates a ReachedMap.
@@ -96,7 +96,7 @@
///The type of the map that stores the dists of the nodes.
///The type of the map that stores the dists of the nodes.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<int> DistMap;
///Instantiates a DistMap.
@@ -705,7 +705,7 @@
///
///The type of the map that stores the last
///edges of the shortest paths.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef NullMap<typename Graph::Node,typename GR::Edge> PredMap;
///Instantiates a PredMap.
@@ -725,7 +725,7 @@
///The type of the map that indicates which nodes are processed.
///The type of the map that indicates which nodes are processed.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef NullMap<typename Graph::Node,bool> ProcessedMap;
///Instantiates a ProcessedMap.
@@ -744,7 +744,7 @@
///The type of the map that indicates which nodes are reached.
///The type of the map that indicates which nodes are reached.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef typename Graph::template NodeMap<bool> ReachedMap;
///Instantiates a ReachedMap.
@@ -759,7 +759,7 @@
///The type of the map that stores the dists of the nodes.
///The type of the map that stores the dists of the nodes.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef NullMap<typename Graph::Node,int> DistMap;
///Instantiates a DistMap.
Modified: hugo/trunk/lemon/bits/array_map.h
==============================================================================
--- hugo/trunk/lemon/bits/array_map.h (original)
+++ hugo/trunk/lemon/bits/array_map.h Tue Oct 24 19:19:16 2006
@@ -24,7 +24,7 @@
#include <lemon/bits/traits.h>
#include <lemon/bits/alteration_notifier.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
/// \ingroup graphbits
/// \file
@@ -141,7 +141,7 @@
/// is assigned by the value of the given ReadMap.
template <typename CMap>
ArrayMap& operator=(const CMap& cmap) {
- checkConcept<concept::ReadMap<Key, _Value>, CMap>();
+ checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
const typename Parent::Notifier* notifier = Parent::getNotifier();
Item it;
for (notifier->first(it); it != INVALID; notifier->next(it)) {
Modified: hugo/trunk/lemon/bits/base_extender.h
==============================================================================
--- hugo/trunk/lemon/bits/base_extender.h (original)
+++ hugo/trunk/lemon/bits/base_extender.h Tue Oct 24 19:19:16 2006
@@ -26,7 +26,7 @@
#include <lemon/bits/default_map.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
///\ingroup graphbits
///\file
Modified: hugo/trunk/lemon/bits/debug_map.h
==============================================================================
--- hugo/trunk/lemon/bits/debug_map.h (original)
+++ hugo/trunk/lemon/bits/debug_map.h Tue Oct 24 19:19:16 2006
@@ -29,7 +29,7 @@
#include <lemon/bits/alteration_notifier.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
///\ingroup graphbits
///
@@ -186,7 +186,7 @@
/// is assigned by the value of the given ReadMap.
template <typename CMap>
DebugMap& operator=(const CMap& cmap) {
- checkConcept<concept::ReadMap<Key, _Value>, CMap>();
+ checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
const typename Parent::Notifier* notifier = Parent::getNotifier();
Item it;
for (notifier->first(it); it != INVALID; notifier->next(it)) {
Modified: hugo/trunk/lemon/bits/graph_extender.h
==============================================================================
--- hugo/trunk/lemon/bits/graph_extender.h (original)
+++ hugo/trunk/lemon/bits/graph_extender.h Tue Oct 24 19:19:16 2006
@@ -26,7 +26,7 @@
#include <lemon/bits/default_map.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
///\ingroup graphbits
///\file
@@ -1128,7 +1128,7 @@
template <typename CMap>
NodeMap& operator=(const CMap& cmap) {
- checkConcept<concept::ReadMap<Node, _Value>, CMap>();
+ checkConcept<concepts::ReadMap<Node, _Value>, CMap>();
aNodeMap = cmap;
bNodeMap = cmap;
return *this;
Modified: hugo/trunk/lemon/bits/map_extender.h
==============================================================================
--- hugo/trunk/lemon/bits/map_extender.h (original)
+++ hugo/trunk/lemon/bits/map_extender.h Tue Oct 24 19:19:16 2006
@@ -24,7 +24,7 @@
#include <lemon/bits/traits.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
///\file
///\brief Extenders for iterable maps.
@@ -206,7 +206,7 @@
template <typename CMap>
SubMapExtender& operator=(const CMap& cmap) {
- checkConcept<concept::ReadMap<Key, Value>, CMap>();
+ checkConcept<concepts::ReadMap<Key, Value>, CMap>();
Item it;
for (graph.first(it); it != INVALID; graph.next(it)) {
Parent::set(it, cmap[it]);
Modified: hugo/trunk/lemon/bits/vector_map.h
==============================================================================
--- hugo/trunk/lemon/bits/vector_map.h (original)
+++ hugo/trunk/lemon/bits/vector_map.h Tue Oct 24 19:19:16 2006
@@ -28,7 +28,7 @@
#include <lemon/bits/alteration_notifier.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
///\ingroup graphbits
///
@@ -133,7 +133,7 @@
/// is assigned by the value of the given ReadMap.
template <typename CMap>
VectorMap& operator=(const CMap& cmap) {
- checkConcept<concept::ReadMap<Key, _Value>, CMap>();
+ checkConcept<concepts::ReadMap<Key, _Value>, CMap>();
const typename Parent::Notifier* notifier = Parent::getNotifier();
Item it;
for (notifier->first(it); it != INVALID; notifier->next(it)) {
Modified: hugo/trunk/lemon/color.h
==============================================================================
--- hugo/trunk/lemon/color.h (original)
+++ hugo/trunk/lemon/color.h Tue Oct 24 19:19:16 2006
@@ -100,7 +100,7 @@
///to each <tt>int</tt>. It is possible to change the colors as well as their
///number. The integer range is cyclically mapped to the provided set of colors.
///
-///This is a true \ref concept::ReferenceMap "reference map", so you can also
+///This is a true \ref concepts::ReferenceMap "reference map", so you can also
///change the actual colors.
class Palette : public MapBase<int,Color>
Modified: hugo/trunk/lemon/concepts/bpugraph.h
==============================================================================
--- /hugo/trunk/lemon/concept/bpugraph.h (original)
+++ hugo/trunk/lemon/concepts/bpugraph.h Tue Oct 24 19:19:16 2006
@@ -24,15 +24,15 @@
#ifndef LEMON_CONCEPT_BPUGRAPH_H
#define LEMON_CONCEPT_BPUGRAPH_H
-#include <lemon/concept/graph_components.h>
+#include <lemon/concepts/graph_components.h>
-#include <lemon/concept/graph.h>
-#include <lemon/concept/ugraph.h>
+#include <lemon/concepts/graph.h>
+#include <lemon/concepts/ugraph.h>
#include <lemon/bits/utility.h>
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \addtogroup graph_concepts
/// @{
@@ -49,7 +49,7 @@
/// will not run properly, of course.
///
/// In LEMON bipartite undirected graphs also fulfill the concept of
- /// the undirected graphs (\ref lemon::concept::UGraph "UGraph Concept").
+ /// the undirected graphs (\ref lemon::concepts::UGraph "UGraph Concept").
///
/// You can assume that all undirected bipartite graph can be handled
/// as an undirected graph and consequently as a static graph.
Modified: hugo/trunk/lemon/concepts/graph.h
==============================================================================
--- /hugo/trunk/lemon/concept/graph.h (original)
+++ hugo/trunk/lemon/concepts/graph.h Tue Oct 24 19:19:16 2006
@@ -25,12 +25,12 @@
#include <lemon/bits/invalid.h>
#include <lemon/bits/utility.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/graph_components.h>
+#include <lemon/concepts/graph_components.h>
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \addtogroup graph_concepts
/// @{
@@ -447,7 +447,7 @@
};
// @}
- } //namespace concept
+ } //namespace concepts
} //namespace lemon
Modified: hugo/trunk/lemon/concepts/graph_components.h
==============================================================================
--- /hugo/trunk/lemon/concept/graph_components.h (original)
+++ hugo/trunk/lemon/concepts/graph_components.h Tue Oct 24 19:19:16 2006
@@ -25,12 +25,12 @@
#define LEMON_CONCEPT_GRAPH_COMPONENTS_H
#include <lemon/bits/invalid.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
#include <lemon/bits/alteration_notifier.h>
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \brief Skeleton class for graph Node and Edge types
///
Modified: hugo/trunk/lemon/concepts/heap.h
==============================================================================
--- /hugo/trunk/lemon/concept/heap.h (original)
+++ hugo/trunk/lemon/concepts/heap.h Tue Oct 24 19:19:16 2006
@@ -27,7 +27,7 @@
#include <lemon/bits/invalid.h>
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \addtogroup concept
/// @{
Modified: hugo/trunk/lemon/concepts/maps.h
==============================================================================
--- /hugo/trunk/lemon/concept/maps.h (original)
+++ hugo/trunk/lemon/concepts/maps.h Tue Oct 24 19:19:16 2006
@@ -28,7 +28,7 @@
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \addtogroup concept
/// @{
@@ -187,6 +187,6 @@
// @}
- } //namespace concept
+ } //namespace concepts
} //namespace lemon
#endif // LEMON_CONCEPT_MAPS_H
Modified: hugo/trunk/lemon/concepts/matrix_maps.h
==============================================================================
--- /hugo/trunk/lemon/concept/matrix_maps.h (original)
+++ hugo/trunk/lemon/concepts/matrix_maps.h Tue Oct 24 19:19:16 2006
@@ -28,7 +28,7 @@
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \addtogroup concept
/// @{
@@ -202,6 +202,6 @@
// @}
- } //namespace concept
+ } //namespace concepts
} //namespace lemon
#endif // LEMON_CONCEPT_MATRIX_MAPS_H
Modified: hugo/trunk/lemon/concepts/path.h
==============================================================================
--- /hugo/trunk/lemon/concept/path.h (original)
+++ hugo/trunk/lemon/concepts/path.h Tue Oct 24 19:19:16 2006
@@ -29,7 +29,7 @@
#include <lemon/concept_check.h>
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \addtogroup concept
/// @{
Modified: hugo/trunk/lemon/concepts/ugraph.h
==============================================================================
--- /hugo/trunk/lemon/concept/ugraph.h (original)
+++ hugo/trunk/lemon/concepts/ugraph.h Tue Oct 24 19:19:16 2006
@@ -24,12 +24,12 @@
#ifndef LEMON_CONCEPT_UGRAPH_H
#define LEMON_CONCEPT_UGRAPH_H
-#include <lemon/concept/graph_components.h>
-#include <lemon/concept/graph.h>
+#include <lemon/concepts/graph_components.h>
+#include <lemon/concepts/graph.h>
#include <lemon/bits/utility.h>
namespace lemon {
- namespace concept {
+ namespace concepts {
/// \addtogroup graph_concepts
/// @{
@@ -46,7 +46,7 @@
/// run properly, of course.
///
/// The LEMON undirected graphs also fulfill the concept of
- /// directed graphs (\ref lemon::concept::Graph "Graph
+ /// directed graphs (\ref lemon::concepts::Graph "Graph
/// Concept"). Each undirected edges can be seen as two opposite
/// directed edge and consequently the undirected graph can be
/// seen as the direceted graph of these directed edges. The
Modified: hugo/trunk/lemon/dag_shortest_path.h
==============================================================================
--- hugo/trunk/lemon/dag_shortest_path.h (original)
+++ hugo/trunk/lemon/dag_shortest_path.h Tue Oct 24 19:19:16 2006
@@ -93,7 +93,7 @@
/// \brief The type of the map that stores the edge lengths.
///
/// The type of the map that stores the edge lengths.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _LengthMap LengthMap;
// The type of the length of the edges.
@@ -111,7 +111,7 @@
///
/// The type of the map that stores the last
/// edges of the shortest paths.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename _Graph::Edge> PredMap;
@@ -128,7 +128,7 @@
/// \brief The type of the map that stores the dists of the nodes.
///
/// The type of the map that stores the dists of the nodes.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename _LengthMap::Value>
DistMap;
@@ -205,7 +205,7 @@
/// \brief The type of the map that stores the edge lengths.
///
/// The type of the map that stores the edge lengths.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _LengthMap LengthMap;
// The type of the length of the edges.
@@ -223,7 +223,7 @@
///
/// The type of the map that stores the last
/// edges of the longest paths.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename _Graph::Edge> PredMap;
@@ -240,7 +240,7 @@
/// \brief The type of the map that stores the dists of the nodes.
///
/// The type of the map that stores the dists of the nodes.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename _LengthMap::Value>
DistMap;
@@ -262,19 +262,19 @@
/// \ingroup flowalgs
/// This class provides an efficient implementation of a Dag sortest path
/// searching algorithm. The edge lengths are passed to the algorithm
- /// using a \ref concept::ReadMap "ReadMap", so it is easy to change it
+ /// using a \ref concepts::ReadMap "ReadMap", so it is easy to change it
/// to any kind of length.
///
/// The complexity of the algorithm is O(n + e).
///
/// The type of the length is determined by the
- /// \ref concept::ReadMap::Value "Value" of the length map.
+ /// \ref concepts::ReadMap::Value "Value" of the length map.
///
/// \param _Graph The graph type the algorithm runs on. The default value
/// is \ref ListGraph. The value of _Graph is not used directly by
/// DagShortestPath, it is only passed to \ref DagShortestPathDefaultTraits.
/// \param _LengthMap This read-only EdgeMap determines the lengths of the
- /// edges. The default map type is \ref concept::Graph::EdgeMap
+ /// edges. The default map type is \ref concepts::Graph::EdgeMap
/// "Graph::EdgeMap<int>". The value of _LengthMap is not used directly
/// by DagShortestPath, it is only passed to \ref DagShortestPathDefaultTraits.
/// \param _Traits Traits class to set various data types used by the
@@ -811,7 +811,7 @@
/// \brief The type of the map that stores the edge lengths.
///
/// The type of the map that stores the edge lengths.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _LengthMap LengthMap;
/// \brief The value type of the length map.
@@ -829,7 +829,7 @@
///
/// The type of the map that stores the last
/// edges of the shortest paths.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
typedef NullMap <typename _Graph::Node,typename _Graph::Edge> PredMap;
/// \brief Instantiates a PredMap.
@@ -841,7 +841,7 @@
/// \brief The type of the map that stores the dists of the nodes.
///
/// The type of the map that stores the dists of the nodes.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
typedef NullMap<typename Graph::Node, Value> DistMap;
/// \brief Instantiates a DistMap.
///
Modified: hugo/trunk/lemon/dfs.h
==============================================================================
--- hugo/trunk/lemon/dfs.h (original)
+++ hugo/trunk/lemon/dfs.h Tue Oct 24 19:19:16 2006
@@ -48,7 +48,7 @@
///
///The type of the map that stores the last
///edges of the %DFS paths.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename GR::Edge> PredMap;
///Instantiates a PredMap.
@@ -64,7 +64,7 @@
///The type of the map that indicates which nodes are processed.
///The type of the map that indicates which nodes are processed.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef NullMap<typename Graph::Node,bool> ProcessedMap;
///Instantiates a ProcessedMap.
@@ -83,7 +83,7 @@
///The type of the map that indicates which nodes are reached.
///The type of the map that indicates which nodes are reached.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef typename Graph::template NodeMap<bool> ReachedMap;
///Instantiates a ReachedMap.
@@ -98,7 +98,7 @@
///The type of the map that stores the dists of the nodes.
///The type of the map that stores the dists of the nodes.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<int> DistMap;
///Instantiates a DistMap.
@@ -752,7 +752,7 @@
///
///The type of the map that stores the last
///edges of the %DFS paths.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef NullMap<typename Graph::Node,typename GR::Edge> PredMap;
///Instantiates a PredMap.
@@ -772,7 +772,7 @@
///The type of the map that indicates which nodes are processed.
///The type of the map that indicates which nodes are processed.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef NullMap<typename Graph::Node,bool> ProcessedMap;
///Instantiates a ProcessedMap.
@@ -791,7 +791,7 @@
///The type of the map that indicates which nodes are reached.
///The type of the map that indicates which nodes are reached.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///\todo named parameter to set this type, function to read and write.
typedef typename Graph::template NodeMap<bool> ReachedMap;
///Instantiates a ReachedMap.
@@ -806,7 +806,7 @@
///The type of the map that stores the dists of the nodes.
///The type of the map that stores the dists of the nodes.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef NullMap<typename Graph::Node,int> DistMap;
///Instantiates a DistMap.
@@ -1168,7 +1168,7 @@
/// \brief The type of the map that indicates which nodes are reached.
///
/// The type of the map that indicates which nodes are reached.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
/// \todo named parameter to set this type, function to read and write.
typedef typename Graph::template NodeMap<bool> ReachedMap;
Modified: hugo/trunk/lemon/dijkstra.h
==============================================================================
--- hugo/trunk/lemon/dijkstra.h (original)
+++ hugo/trunk/lemon/dijkstra.h Tue Oct 24 19:19:16 2006
@@ -48,7 +48,7 @@
///The type of the map that stores the edge lengths.
///The type of the map that stores the edge lengths.
- ///It must meet the \ref concept::ReadMap "ReadMap" concept.
+ ///It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef LM LengthMap;
//The type of the length of the edges.
typedef typename LM::Value Value;
@@ -86,7 +86,7 @@
///
///The type of the map that stores the last
///edges of the shortest paths.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename GR::Edge> PredMap;
///Instantiates a PredMap.
@@ -102,7 +102,7 @@
///The type of the map that stores whether a nodes is processed.
///The type of the map that stores whether a nodes is processed.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///By default it is a NullMap.
///\todo If it is set to a real map,
///Dijkstra::processed() should read this.
@@ -124,7 +124,7 @@
///The type of the map that stores the dists of the nodes.
///The type of the map that stores the dists of the nodes.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename Graph::template NodeMap<typename LM::Value> DistMap;
///Instantiates a DistMap.
@@ -142,11 +142,11 @@
/// \ingroup flowalgs
///This class provides an efficient implementation of %Dijkstra algorithm.
///The edge lengths are passed to the algorithm using a
- ///\ref concept::ReadMap "ReadMap",
+ ///\ref concepts::ReadMap "ReadMap",
///so it is easy to change it to any kind of length.
///
///The type of the length is determined by the
- ///\ref concept::ReadMap::Value "Value" of the length map.
+ ///\ref concepts::ReadMap::Value "Value" of the length map.
///
///It is also possible to change the underlying priority heap.
///
@@ -157,7 +157,7 @@
///edges. It is read once for each edge, so the map may involve in
///relatively time consuming process to compute the edge length if
///it is necessary. The default map type is \ref
- ///concept::Graph::EdgeMap "Graph::EdgeMap<int>". The value
+ ///concepts::Graph::EdgeMap "Graph::EdgeMap<int>". The value
///of LM is not used directly by Dijkstra, it is only passed to \ref
///DijkstraDefaultTraits. \param TR Traits class to set
///various data types used by the algorithm. The default traits
@@ -819,7 +819,7 @@
///The type of the map that stores the edge lengths.
///The type of the map that stores the edge lengths.
- ///It must meet the \ref concept::ReadMap "ReadMap" concept.
+ ///It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef LM LengthMap;
//The type of the length of the edges.
typedef typename LM::Value Value;
@@ -861,7 +861,7 @@
///
///The type of the map that stores the last
///edges of the shortest paths.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef NullMap <typename GR::Node,typename GR::Edge> PredMap;
///Instantiates a PredMap.
@@ -880,7 +880,7 @@
///The type of the map that stores whether a nodes is processed.
///The type of the map that stores whether a nodes is processed.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///By default it is a NullMap.
///\todo If it is set to a real map,
///Dijkstra::processed() should read this.
@@ -902,7 +902,7 @@
///The type of the map that stores the dists of the nodes.
///The type of the map that stores the dists of the nodes.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef NullMap<typename Graph::Node,typename LM::Value> DistMap;
///Instantiates a DistMap.
Modified: hugo/trunk/lemon/edge_set.h
==============================================================================
--- hugo/trunk/lemon/edge_set.h (original)
+++ hugo/trunk/lemon/edge_set.h Tue Oct 24 19:19:16 2006
@@ -238,11 +238,11 @@
/// original graph.
///
/// \param _Graph The type of the graph which shares its node set with
- /// this class. Its interface must conform to the \ref concept::Graph
+ /// this class. Its interface must conform to the \ref concepts::Graph
/// "Graph" concept.
///
/// In the edge extension and removing it conforms to the
- /// \ref concept::Graph "Graph" concept.
+ /// \ref concepts::Graph "Graph" concept.
template <typename _Graph>
class ListEdgeSet : public EdgeSetExtender<ListEdgeSetBase<_Graph> > {
@@ -330,11 +330,11 @@
/// original graph.
///
/// \param _Graph The type of the graph which shares its node set with
- /// this class. Its interface must conform to the \ref concept::Graph
+ /// this class. Its interface must conform to the \ref concepts::Graph
/// "Graph" concept.
///
/// In the edge extension and removing it conforms to the
- /// \ref concept::UGraph "UGraph" concept.
+ /// \ref concepts::UGraph "UGraph" concept.
template <typename _Graph>
class ListUEdgeSet
: public UEdgeSetExtender<UndirGraphExtender<ListEdgeSetBase<_Graph> > > {
@@ -567,11 +567,11 @@
/// original graph.
///
/// \param _Graph The type of the graph which shares its node set with
- /// this class. Its interface must conform to the \ref concept::Graph
+ /// this class. Its interface must conform to the \ref concepts::Graph
/// "Graph" concept.
///
/// In the edge extension and removing it conforms to the
- /// \ref concept::Graph "Graph" concept.
+ /// \ref concepts::Graph "Graph" concept.
template <typename _Graph>
class SmartEdgeSet : public EdgeSetExtender<SmartEdgeSetBase<_Graph> > {
@@ -671,11 +671,11 @@
/// original graph.
///
/// \param _Graph The type of the graph which shares its node set with
- /// this class. Its interface must conform to the \ref concept::Graph
+ /// this class. Its interface must conform to the \ref concepts::Graph
/// "Graph" concept.
///
/// In the edge extension and removing it conforms to the
- /// \ref concept::UGraph "UGraph" concept.
+ /// \ref concepts::UGraph "UGraph" concept.
template <typename _Graph>
class SmartUEdgeSet
: public UEdgeSetExtender<UndirGraphExtender<SmartEdgeSetBase<_Graph> > > {
Modified: hugo/trunk/lemon/floyd_warshall.h
==============================================================================
--- hugo/trunk/lemon/floyd_warshall.h (original)
+++ hugo/trunk/lemon/floyd_warshall.h Tue Oct 24 19:19:16 2006
@@ -94,7 +94,7 @@
/// \brief The type of the map that stores the edge lengths.
///
/// The type of the map that stores the edge lengths.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _LengthMap LengthMap;
// The type of the length of the edges.
@@ -129,7 +129,7 @@
/// \brief The type of the map that stores the dists of the nodes.
///
/// The type of the map that stores the dists of the nodes.
- /// It must meet the \ref concept::WriteMatrixMap "WriteMatrixMap" concept.
+ /// It must meet the \ref concepts::WriteMatrixMap "WriteMatrixMap" concept.
///
typedef DynamicMatrixMap<Graph, typename Graph::Node, Value> DistMap;
@@ -149,7 +149,7 @@
/// \ingroup flowalgs
/// This class provides an efficient implementation of \c Floyd-Warshall
/// algorithm. The edge lengths are passed to the algorithm using a
- /// \ref concept::ReadMap "ReadMap", so it is easy to change it to any
+ /// \ref concepts::ReadMap "ReadMap", so it is easy to change it to any
/// kind of length.
///
/// The algorithm solves the shortest path problem for each pair
@@ -162,7 +162,7 @@
/// The complexity of this algorithm is \f$ O(n^3+e) \f$.
///
/// The type of the length is determined by the
- /// \ref concept::ReadMap::Value "Value" of the length map.
+ /// \ref concepts::ReadMap::Value "Value" of the length map.
///
/// \param _Graph The graph type the algorithm runs on. The default value
/// is \ref ListGraph. The value of _Graph is not used directly by
@@ -171,7 +171,7 @@
/// edges. It is read once for each edge, so the map may involve in
/// relatively time consuming process to compute the edge length if
/// it is necessary. The default map type is \ref
- /// concept::Graph::EdgeMap "Graph::EdgeMap<int>". The value
+ /// concepts::Graph::EdgeMap "Graph::EdgeMap<int>". The value
/// of _LengthMap is not used directly by FloydWarshall, it is only passed
/// to \ref FloydWarshallDefaultTraits. \param _Traits Traits class to set
/// various data types used by the algorithm. The default traits
Modified: hugo/trunk/lemon/fredman_tarjan.h
==============================================================================
--- hugo/trunk/lemon/fredman_tarjan.h (original)
+++ hugo/trunk/lemon/fredman_tarjan.h Tue Oct 24 19:19:16 2006
@@ -36,7 +36,7 @@
#include <lemon/bits/traits.h>
#include <lemon/graph_utils.h>
-#include <lemon/concept/ugraph.h>
+#include <lemon/concepts/ugraph.h>
namespace lemon {
@@ -52,7 +52,7 @@
///The type of the map that stores the edge costs.
///The type of the map that stores the edge costs.
- ///It must meet the \ref concept::ReadMap "ReadMap" concept.
+ ///It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef CM CostMap;
//The type of the cost of the edges.
typedef typename CM::Value Value;
@@ -61,7 +61,7 @@
///The type of the map that stores whether an edge is in the
///spanning tree or not.
- ///It must meet the \ref concept::ReadWriteMap "ReadWriteMap" concept.
+ ///It must meet the \ref concepts::ReadWriteMap "ReadWriteMap" concept.
///By default it is a BoolEdgeMap.
typedef typename UGraph::template UEdgeMap<bool> TreeMap;
///Instantiates a TreeMap.
@@ -88,11 +88,11 @@
/// \f$ \log^{i+1}(n)=\log(\log^{i}(n)) \f$
///
///The edge costs are passed to the algorithm using a \ref
- ///concept::ReadMap "ReadMap", so it is easy to change it to any
+ ///concepts::ReadMap "ReadMap", so it is easy to change it to any
///kind of cost.
///
///The type of the cost is determined by the \ref
- ///concept::ReadMap::Value "Value" of the cost map.
+ ///concepts::ReadMap::Value "Value" of the cost map.
///
///\param GR The graph type the algorithm runs on. The default value
///is \ref ListUGraph. The value of GR is not used directly by
@@ -103,7 +103,7 @@
///edges. It is read once for each edge, so the map may involve in
///relatively time consuming process to compute the edge cost if it
///is necessary. The default map type is \ref
- ///concept::UGraph::UEdgeMap "UGraph::UEdgeMap<int>". The value of
+ ///concepts::UGraph::UEdgeMap "UGraph::UEdgeMap<int>". The value of
///CM is not used directly by FredmanTarjan, it is only passed to
///\ref FredmanTarjanDefaultTraits.
///
@@ -365,7 +365,7 @@
graph(&_graph), cost(&_cost),
_tree(0), local_tree(false)
{
- checkConcept<concept::UGraph, UGraph>();
+ checkConcept<concepts::UGraph, UGraph>();
}
///Destructor.
Modified: hugo/trunk/lemon/full_graph.h
==============================================================================
--- hugo/trunk/lemon/full_graph.h (original)
+++ hugo/trunk/lemon/full_graph.h Tue Oct 24 19:19:16 2006
@@ -167,11 +167,11 @@
/// It is completely static, so you can neither add nor delete either
/// edges or nodes.
/// Thus it conforms to
- /// the \ref concept::Graph "Graph" concept and
+ /// the \ref concepts::Graph "Graph" concept and
///it also has an
///important extra feature that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
- /// \sa concept::Graph.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
+ /// \sa concepts::Graph.
///
/// \sa FullUGraph
///
@@ -384,7 +384,7 @@
///
///It also has an
///important extra feature that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
/// \sa FullGraph
///
Modified: hugo/trunk/lemon/graph_adaptor.h
==============================================================================
--- hugo/trunk/lemon/graph_adaptor.h (original)
+++ hugo/trunk/lemon/graph_adaptor.h Tue Oct 24 19:19:16 2006
@@ -2492,7 +2492,7 @@
/// The full code can be found in the \ref disjoint_paths_demo.cc demo file.
///
/// This graph adaptor is fully conform to the
- /// \ref concept::Graph "Graph" concept and
+ /// \ref concepts::Graph "Graph" concept and
/// contains some additional member functions and types. The
/// documentation of some member functions may be found just in the
/// SplitGraphAdaptorBase class.
Modified: hugo/trunk/lemon/grid_ugraph.h
==============================================================================
--- hugo/trunk/lemon/grid_ugraph.h (original)
+++ hugo/trunk/lemon/grid_ugraph.h Tue Oct 24 19:19:16 2006
@@ -292,10 +292,10 @@
/// }
///\endcode
///
- /// The graph type is fully conform to the \ref concept::UGraph
+ /// The graph type is fully conform to the \ref concepts::UGraph
/// "Undirected Graph" concept, and it also has an
///important extra feature that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
///
/// \author Balazs Dezso
Modified: hugo/trunk/lemon/hypercube_graph.h
==============================================================================
--- hugo/trunk/lemon/hypercube_graph.h (original)
+++ hugo/trunk/lemon/hypercube_graph.h Tue Oct 24 19:19:16 2006
@@ -189,8 +189,8 @@
/// reasons. This way the maximal dimension of this implementation
/// is 26.
///
- /// The graph type is fully conform to the \ref concept::Graph
- /// concept but it does not conform to the \ref concept::UGraph.
+ /// The graph type is fully conform to the \ref concepts::Graph
+ /// concept but it does not conform to the \ref concepts::UGraph.
///
/// \author Balazs Dezso
class HyperCubeGraph : public ExtendedHyperCubeGraphBase {
Modified: hugo/trunk/lemon/johnson.h
==============================================================================
--- hugo/trunk/lemon/johnson.h (original)
+++ hugo/trunk/lemon/johnson.h Tue Oct 24 19:19:16 2006
@@ -96,7 +96,7 @@
/// \brief The type of the map that stores the edge lengths.
///
/// The type of the map that stores the edge lengths.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _LengthMap LengthMap;
// The type of the length of the edges.
@@ -162,7 +162,7 @@
/// \brief The type of the matrix map that stores the dists of the nodes.
///
/// The type of the matrix map that stores the dists of the nodes.
- /// It must meet the \ref concept::WriteMatrixMap "WriteMatrixMap" concept.
+ /// It must meet the \ref concepts::WriteMatrixMap "WriteMatrixMap" concept.
///
typedef DynamicMatrixMap<Graph, typename Graph::Node, Value> DistMap;
@@ -182,7 +182,7 @@
/// \ingroup flowalgs
/// This class provides an efficient implementation of \c %Johnson
/// algorithm. The edge lengths are passed to the algorithm using a
- /// \ref concept::ReadMap "ReadMap", so it is easy to change it to any
+ /// \ref concepts::ReadMap "ReadMap", so it is easy to change it to any
/// kind of length.
///
/// The algorithm solves the shortest path problem for each pair
@@ -197,7 +197,7 @@
/// Floyd-Warshall algorithm.
///
/// The type of the length is determined by the
- /// \ref concept::ReadMap::Value "Value" of the length map.
+ /// \ref concepts::ReadMap::Value "Value" of the length map.
///
/// \param _Graph The graph type the algorithm runs on. The default value
/// is \ref ListGraph. The value of _Graph is not used directly by
@@ -206,7 +206,7 @@
/// edges. It is read once for each edge, so the map may involve in
/// relatively time consuming process to compute the edge length if
/// it is necessary. The default map type is \ref
- /// concept::Graph::EdgeMap "Graph::EdgeMap<int>". The value
+ /// concepts::Graph::EdgeMap "Graph::EdgeMap<int>". The value
/// of _LengthMap is not used directly by Johnson, it is only passed
/// to \ref JohnsonDefaultTraits. \param _Traits Traits class to set
/// various data types used by the algorithm. The default traits
Modified: hugo/trunk/lemon/kruskal.h
==============================================================================
--- hugo/trunk/lemon/kruskal.h (original)
+++ hugo/trunk/lemon/kruskal.h Tue Oct 24 19:19:16 2006
@@ -44,8 +44,8 @@
/// Due to hard C++ hacking, it accepts various input and output types.
///
/// \param g The graph the algorithm runs on.
- /// It can be either \ref concept::Graph "directed" or
- /// \ref concept::UGraph "undirected".
+ /// It can be either \ref concepts::Graph "directed" or
+ /// \ref concepts::UGraph "undirected".
/// If the graph is directed, the algorithm consider it to be
/// undirected by disregarding the direction of the edges.
///
@@ -83,7 +83,7 @@
/// \return The cost of the found tree.
///
/// \warning If kruskal runs on an
- /// \ref lemon::concept::UGraph "undirected graph", be sure that the
+ /// \ref lemon::concepts::UGraph "undirected graph", be sure that the
/// map storing the tree is also undirected
/// (e.g. ListUGraph::UEdgeMap<bool>, otherwise the values of the
/// half of the edges will not be set.
Modified: hugo/trunk/lemon/lemon_reader.h
==============================================================================
--- hugo/trunk/lemon/lemon_reader.h (original)
+++ hugo/trunk/lemon/lemon_reader.h Tue Oct 24 19:19:16 2006
@@ -41,7 +41,7 @@
#include <lemon/dim2.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
namespace lemon {
@@ -831,7 +831,7 @@
template <typename Reader, typename Map, typename MapParameter>
NodeSetReader& _readMap(std::string name, MapParameter map,
const Reader& reader = Reader()) {
- checkConcept<concept::WriteMap<Node, typename Map::Value>, Map>();
+ checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
@@ -1061,7 +1061,7 @@
template <typename Reader, typename Map, typename MapParameter>
EdgeSetReader& _readMap(std::string name, MapParameter map,
const Reader& reader = Reader()) {
- checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
+ checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
@@ -1305,7 +1305,7 @@
template <typename Reader, typename Map, typename MapParameter>
UEdgeSetReader& _readMap(std::string name, MapParameter map,
const Reader& reader = Reader()) {
- checkConcept<concept::WriteMap<UEdge, typename Map::Value>, Map>();
+ checkConcept<concepts::WriteMap<UEdge, typename Map::Value>, Map>();
checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
if (readers.find(name) != readers.end()) {
ErrorMessage msg;
@@ -1376,7 +1376,7 @@
UEdgeSetReader& _readDirMap(std::string name, MapParameter map,
const Reader& reader = Reader()) {
checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
- checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
+ checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
readMap("+" + name,
_reader_bits::forwardComposeMap(graph, map), reader);
readMap("-" + name,
Modified: hugo/trunk/lemon/lemon_writer.h
==============================================================================
--- hugo/trunk/lemon/lemon_writer.h (original)
+++ hugo/trunk/lemon/lemon_writer.h Tue Oct 24 19:19:16 2006
@@ -40,7 +40,7 @@
#include <lemon/dim2.h>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
namespace lemon {
@@ -483,7 +483,7 @@
template <typename Writer, typename Map>
NodeSetWriter& writeNodeMap(std::string name, const Map& map,
const Writer& writer = Writer()) {
- checkConcept<concept::ReadMap<Node, typename Map::Value>, Map>();
+ checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
writers.push_back(
make_pair(name, new _writer_bits::
@@ -672,7 +672,7 @@
template <typename Writer, typename Map>
EdgeSetWriter& writeEdgeMap(std::string name, const Map& map,
const Writer& writer = Writer()) {
- checkConcept<concept::ReadMap<Edge, typename Map::Value>, Map>();
+ checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
writers.push_back(
make_pair(name, new _writer_bits::
@@ -878,7 +878,7 @@
template <typename Writer, typename Map>
UEdgeSetWriter& writeUEdgeMap(std::string name, const Map& map,
const Writer& writer = Writer()) {
- checkConcept<concept::ReadMap<UEdge, typename Map::Value>, Map>();
+ checkConcept<concepts::ReadMap<UEdge, typename Map::Value>, Map>();
checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
writers.push_back(
make_pair(name, new _writer_bits::
@@ -901,7 +901,7 @@
template <typename Writer, typename Map>
UEdgeSetWriter& writeEdgeMap(std::string name, const Map& map,
const Writer& writer = Writer()) {
- checkConcept<concept::ReadMap<Edge, typename Map::Value>, Map>();
+ checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
writeUEdge("+" + name,
_writer_bits::forwardComposeMap(graph, map), writer);
Modified: hugo/trunk/lemon/list_graph.h
==============================================================================
--- hugo/trunk/lemon/list_graph.h (original)
+++ hugo/trunk/lemon/list_graph.h Tue Oct 24 19:19:16 2006
@@ -318,15 +318,15 @@
///This is a simple and fast graph implementation.
///
- ///It conforms to the \ref concept::Graph "Graph concept" and it
+ ///It conforms to the \ref concepts::Graph "Graph concept" and it
///also provides several additional useful extra functionalities.
///The most of the member functions and nested classes are
///documented only in the concept class.
///
///An important extra feature of this graph implementation is that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
- ///\sa concept::Graph.
+ ///\sa concepts::Graph.
class ListGraph : public ExtendedListGraphBase {
private:
@@ -748,12 +748,12 @@
///This is a simple and fast undirected graph implementation.
///
///An important extra feature of this graph implementation is that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
///It conforms to the
- ///\ref concept::UGraph "UGraph concept".
+ ///\ref concepts::UGraph "UGraph concept".
///
- ///\sa concept::UGraph.
+ ///\sa concepts::UGraph.
///
class ListUGraph : public ExtendedListUGraphBase {
private:
@@ -1497,12 +1497,12 @@
/// \brief A smart bipartite undirected graph class.
///
/// This is a bipartite undirected graph implementation.
- /// It is conforms to the \ref concept::BpUGraph "BpUGraph concept".
+ /// It is conforms to the \ref concepts::BpUGraph "BpUGraph concept".
///
///An important extra feature of this graph implementation is that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
- /// \sa concept::BpUGraph.
+ /// \sa concepts::BpUGraph.
///
class ListBpUGraph : public ExtendedListBpUGraphBase {
/// \brief ListBpUGraph is \e not copy constructible.
Modified: hugo/trunk/lemon/lp_base.h
==============================================================================
--- hugo/trunk/lemon/lp_base.h (original)
+++ hugo/trunk/lemon/lp_base.h Tue Oct 24 19:19:16 2006
@@ -665,7 +665,7 @@
///\code
///std::map<AnyType,LpSolverBase::Col>
///\endcode
- ///- an iterable lemon \ref concept::WriteMap "write map" like
+ ///- an iterable lemon \ref concepts::WriteMap "write map" like
///\code
///ListGraph::NodeMap<LpSolverBase::Col>
///ListGraph::EdgeMap<LpSolverBase::Col>
@@ -765,7 +765,7 @@
///\code
///std::map<AnyType,LpSolverBase::Row>
///\endcode
- ///- an iterable lemon \ref concept::WriteMap "write map" like
+ ///- an iterable lemon \ref concepts::WriteMap "write map" like
///\code
///ListGraph::NodeMap<LpSolverBase::Row>
///ListGraph::EdgeMap<LpSolverBase::Row>
Modified: hugo/trunk/lemon/maps.h
==============================================================================
--- hugo/trunk/lemon/maps.h (original)
+++ hugo/trunk/lemon/maps.h Tue Oct 24 19:19:16 2006
@@ -29,7 +29,7 @@
///\ingroup maps
///\brief Miscellaneous property maps
///
-///\todo This file has the same name as the concept file in concept/,
+///\todo This file has the same name as the concept file in concepts/,
/// and this is not easily detectable in docs...
#include <map>
@@ -252,7 +252,7 @@
///Convert the \c Value of a map to another type.
- ///This \ref concept::ReadMap "read only map"
+ ///This \ref concepts::ReadMap "read only map"
///converts the \c Value of a maps to type \c T.
///Its \c Key is inherited from \c M.
template <typename M, typename T>
@@ -289,7 +289,7 @@
///Simple wrapping of the map
- ///This \ref concept::ReadMap "read only map" returns the simple
+ ///This \ref concepts::ReadMap "read only map" returns the simple
///wrapping of the given map. Sometimes the reference maps cannot be
///combined with simple read maps. This map adaptor wraps the given
///map to simple read map.
@@ -309,7 +309,7 @@
///Simple writeable wrapping of the map
- ///This \ref concept::ReadMap "read only map" returns the simple
+ ///This \ref concepts::ReadMap "read only map" returns the simple
///wrapping of the given map. Sometimes the reference maps cannot be
///combined with simple read-write maps. This map adaptor wraps the
///given map to simple read-write map.
@@ -330,7 +330,7 @@
///Sum of two maps
- ///This \ref concept::ReadMap "read only map" returns the sum of the two
+ ///This \ref concepts::ReadMap "read only map" returns the sum of the two
///given maps. Its \c Key and \c Value will be inherited from \c M1.
///The \c Key and \c Value of M2 must be convertible to those of \c M1.
@@ -363,7 +363,7 @@
///Shift a map with a constant.
- ///This \ref concept::ReadMap "read only map" returns the sum of the
+ ///This \ref concepts::ReadMap "read only map" returns the sum of the
///given map and a constant value.
///Its \c Key and \c Value is inherited from \c M.
///
@@ -396,7 +396,7 @@
///Shift a map with a constant.
- ///This \ref concept::ReadWriteMap "read-write map" returns the sum of the
+ ///This \ref concepts::ReadWriteMap "read-write map" returns the sum of the
///given map and a constant value. It makes also possible to write the map.
///Its \c Key and \c Value is inherited from \c M.
///
@@ -445,7 +445,7 @@
///Difference of two maps
- ///This \ref concept::ReadMap "read only map" returns the difference
+ ///This \ref concepts::ReadMap "read only map" returns the difference
///of the values of the two
///given maps. Its \c Key and \c Value will be inherited from \c M1.
///The \c Key and \c Value of \c M2 must be convertible to those of \c M1.
@@ -476,7 +476,7 @@
///Product of two maps
- ///This \ref concept::ReadMap "read only map" returns the product of the
+ ///This \ref concepts::ReadMap "read only map" returns the product of the
///values of the two
///given
///maps. Its \c Key and \c Value will be inherited from \c M1.
@@ -507,7 +507,7 @@
///Scales a maps with a constant.
- ///This \ref concept::ReadMap "read only map" returns the value of the
+ ///This \ref concepts::ReadMap "read only map" returns the value of the
///given map multiplied from the left side with a constant value.
///Its \c Key and \c Value is inherited from \c M.
///
@@ -540,7 +540,7 @@
///Scales a maps with a constant.
- ///This \ref concept::ReadWriteMap "read-write map" returns the value of the
+ ///This \ref concepts::ReadWriteMap "read-write map" returns the value of the
///given map multiplied from the left side with a constant value. It can
///be used as write map also if the given multiplier is not zero.
///Its \c Key and \c Value is inherited from \c M.
@@ -580,7 +580,7 @@
///Quotient of two maps
- ///This \ref concept::ReadMap "read only map" returns the quotient of the
+ ///This \ref concepts::ReadMap "read only map" returns the quotient of the
///values of the two
///given maps. Its \c Key and \c Value will be inherited from \c M1.
///The \c Key and \c Value of \c M2 must be convertible to those of \c M1.
@@ -610,7 +610,7 @@
///Composition of two maps
- ///This \ref concept::ReadMap "read only map" returns the composition of
+ ///This \ref concepts::ReadMap "read only map" returns the composition of
///two
///given maps. That is to say, if \c m1 is of type \c M1 and \c m2 is
///of \c M2,
@@ -655,7 +655,7 @@
///Combines of two maps using an STL (binary) functor.
///
///
- ///This \ref concept::ReadMap "read only map" takes two maps and a
+ ///This \ref concepts::ReadMap "read only map" takes two maps and a
///binary functor and returns the composition of
///the two
///given maps unsing the functor.
@@ -727,7 +727,7 @@
///Negative value of a map
- ///This \ref concept::ReadMap "read only map" returns the negative
+ ///This \ref concepts::ReadMap "read only map" returns the negative
///value of the
///value returned by the
///given map. Its \c Key and \c Value will be inherited from \c M.
@@ -748,7 +748,7 @@
///Negative value of a map
- ///This \ref concept::ReadWriteMap "read-write map" returns the negative
+ ///This \ref concepts::ReadWriteMap "read-write map" returns the negative
///value of the value returned by the
///given map. Its \c Key and \c Value will be inherited from \c M.
///The unary \c - operator must be defined for \c Value, of course.
@@ -783,7 +783,7 @@
///Absolute value of a map
- ///This \ref concept::ReadMap "read only map" returns the absolute value
+ ///This \ref concepts::ReadMap "read only map" returns the absolute value
///of the
///value returned by the
///given map. Its \c Key and \c Value will be inherited
@@ -832,7 +832,7 @@
///Converts an STL style functor to a map
- ///This \ref concept::ReadMap "read only map" returns the value
+ ///This \ref concepts::ReadMap "read only map" returns the value
///of a
///given map.
///
@@ -890,7 +890,7 @@
///that is it provides an <tt>operator()</tt> to read its values.
///
///For the sake of convenience it also works as
- ///a ususal \ref concept::ReadMap "readable map",
+ ///a ususal \ref concepts::ReadMap "readable map",
///i.e. <tt>operator[]</tt> and the \c Key and \c Value typedefs also exist.
template <typename M>
@@ -925,7 +925,7 @@
///Applies all map setting operations to two maps
- ///This map has two \ref concept::ReadMap "readable map"
+ ///This map has two \ref concepts::ReadMap "readable map"
///parameters and each read request will be passed just to the
///first map. This class is the just readable map type of the ForkWriteMap.
///
@@ -949,9 +949,9 @@
///Applies all map setting operations to two maps
- ///This map has two \ref concept::WriteMap "writable map"
+ ///This map has two \ref concepts::WriteMap "writable map"
///parameters and each write request will be passed to both of them.
- ///If \c M1 is also \ref concept::ReadMap "readable",
+ ///If \c M1 is also \ref concepts::ReadMap "readable",
///then the read operations will return the
///corresponding values of \c M1.
///
@@ -996,7 +996,7 @@
///Logical 'not' of a map
- ///This bool \ref concept::ReadMap "read only map" returns the
+ ///This bool \ref concepts::ReadMap "read only map" returns the
///logical negation of
///value returned by the
///given map. Its \c Key and will be inherited from \c M,
@@ -1017,7 +1017,7 @@
///Logical 'not' of a map with writing possibility
- ///This bool \ref concept::ReadWriteMap "read-write map" returns the
+ ///This bool \ref concepts::ReadWriteMap "read-write map" returns the
///logical negation of value returned by the given map. When it is set,
///the opposite value is set to the original map.
///Its \c Key and will be inherited from \c M,
Modified: hugo/trunk/lemon/matrix_maps.h
==============================================================================
--- hugo/trunk/lemon/matrix_maps.h (original)
+++ hugo/trunk/lemon/matrix_maps.h Tue Oct 24 19:19:16 2006
@@ -25,13 +25,13 @@
#include <lemon/bits/invalid.h>
#include <lemon/maps.h>
-#include <lemon/concept/matrix_maps.h>
+#include <lemon/concepts/matrix_maps.h>
/// \file
/// \ingroup matrices
/// \brief Maps indexed with pairs of items.
///
-/// \todo This file has the same name as the concept file in concept/,
+/// \todo This file has the same name as the concept file in concepts/,
/// and this is not easily detectable in docs...
namespace lemon {
@@ -295,7 +295,7 @@
///type of the two map shall be the same.
template <typename CMap>
DynamicMatrixMap& operator=(const CMap& _cmap){
- checkConcept<concept::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
+ checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
typename Parent::Notifier* notifier = Parent::getNotifier();
Key first, second;
for(notifier->first(first); first != INVALID;
@@ -432,7 +432,7 @@
///type of the two map shall be the same.
template <typename CMap>
DynamicSymMatrixMap& operator=(const CMap& _cmap){
- checkConcept<concept::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
+ checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
typename Parent::Notifier* notifier = Parent::getNotifier();
Key first, second;
for(notifier->first(first); first != INVALID;
@@ -519,7 +519,7 @@
///content change, so it is updated automaticly whenever it is
///needed.
///
- ///This map meet with the concept::ReferenceMatrixMap<typename K1,
+ ///This map meet with the concepts::ReferenceMatrixMap<typename K1,
///typename K2, typename V, typename R, typename CR> called as
///"ReferenceMatrixMap".
///
@@ -860,7 +860,7 @@
///type of the two map shall be the same.
template <typename CMap>
DynamicAsymMatrixMap& operator=(const CMap& _cdmap){
- checkConcept<concept::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
+ checkConcept<concepts::ReadMatrixMap<FirstKey, SecondKey, Value>, CMap>();
const typename FirstKeyProxy::Notifier* notifierFirstKey =
_first_key_proxy.getNotifier();
const typename SecondKeyProxy::Notifier* notifierSecondKey =
Modified: hugo/trunk/lemon/min_cost_arborescence.h
==============================================================================
--- hugo/trunk/lemon/min_cost_arborescence.h (original)
+++ hugo/trunk/lemon/min_cost_arborescence.h Tue Oct 24 19:19:16 2006
@@ -45,7 +45,7 @@
/// \brief The type of the map that stores the edge costs.
///
/// The type of the map that stores the edge costs.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _CostMap CostMap;
/// \brief The value type of the costs.
@@ -57,7 +57,7 @@
/// in the arborescence.
///
/// The type of the map that stores which edges are in the arborescence.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
/// Initially it will be set to false on each edge. After it
/// will set all arborescence edges once.
typedef typename Graph::template EdgeMap<bool> ArborescenceMap;
@@ -110,7 +110,7 @@
/// edges. It is read once for each edge, so the map may involve in
/// relatively time consuming process to compute the edge cost if
/// it is necessary. The default map type is \ref
- /// concept::Graph::EdgeMap "Graph::EdgeMap<int>". The value
+ /// concepts::Graph::EdgeMap "Graph::EdgeMap<int>". The value
/// of _CostMap is not used directly by MinCostArborescence,
/// it is only passed to \ref MinCostArborescenceDefaultTraits.
/// \param _Traits Traits class to set various data types used
Modified: hugo/trunk/lemon/min_cut.h
==============================================================================
--- hugo/trunk/lemon/min_cut.h (original)
+++ hugo/trunk/lemon/min_cut.h Tue Oct 24 19:19:16 2006
@@ -67,7 +67,7 @@
/// \brief The type of the map that stores the edge capacities.
///
/// The type of the map that stores the edge capacities.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _CapacityMap CapacityMap;
/// \brief The type of the capacity of the edges.
@@ -113,7 +113,7 @@
/// \brief The type of the map that stores whether a nodes is processed.
///
/// The type of the map that stores whether a nodes is processed.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
/// By default it is a NullMap.
typedef NullMap<typename Graph::Node, bool> ProcessedMap;
@@ -134,7 +134,7 @@
/// \brief The type of the map that stores the cardinalties of the nodes.
///
/// The type of the map that stores the cardinalities of the nodes.
- /// It must meet the \ref concept::WriteMap "WriteMap" concept.
+ /// It must meet the \ref concepts::WriteMap "WriteMap" concept.
typedef typename Graph::template NodeMap<Value> CardinalityMap;
/// \brief Instantiates a CardinalityMap.
@@ -162,11 +162,11 @@
/// before the given node.
///
/// The edge capacities are passed to the algorithm using a
- /// \ref concept::ReadMap "ReadMap", so it is easy to change it to any
+ /// \ref concepts::ReadMap "ReadMap", so it is easy to change it to any
/// kind of capacity.
///
/// The type of the capacity is determined by the \ref
- /// concept::ReadMap::Value "Value" of the capacity map.
+ /// concepts::ReadMap::Value "Value" of the capacity map.
///
/// It is also possible to change the underlying priority heap.
///
@@ -179,7 +179,7 @@
/// the edges. It is read once for each edge, so the map may involve in
/// relatively time consuming process to compute the edge capacity if
/// it is necessary. The default map type is \ref
- /// concept::Graph::EdgeMap "Graph::EdgeMap<int>". The value
+ /// concepts::Graph::EdgeMap "Graph::EdgeMap<int>". The value
/// of CapacityMap is not used directly by search algorithm, it is only
/// passed to \ref MaxCardinalitySearchDefaultTraits.
/// \param _Traits Traits class to set various data types used by the
@@ -714,7 +714,7 @@
/// \brief The type of the map that stores the edge capacities.
///
/// The type of the map that stores the edge capacities.
- /// It must meet the \ref concept::ReadMap "ReadMap" concept.
+ /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef _CapacityMap CapacityMap;
/// \brief Instantiates a CapacityMap.
Modified: hugo/trunk/lemon/prim.h
==============================================================================
--- hugo/trunk/lemon/prim.h (original)
+++ hugo/trunk/lemon/prim.h Tue Oct 24 19:19:16 2006
@@ -30,7 +30,7 @@
#include <lemon/maps.h>
#include <lemon/bits/traits.h>
-#include <lemon/concept/ugraph.h>
+#include <lemon/concepts/ugraph.h>
namespace lemon {
@@ -46,7 +46,7 @@
///The type of the map that stores the edge costs.
///The type of the map that stores the edge costs.
- ///It must meet the \ref concept::ReadMap "ReadMap" concept.
+ ///It must meet the \ref concepts::ReadMap "ReadMap" concept.
typedef CM CostMap;
//The type of the cost of the edges.
typedef typename CM::Value Value;
@@ -82,7 +82,7 @@
///
///The type of the map that stores the last
///edges of the minimum spanning tree.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///
typedef typename UGraph::template NodeMap<typename GR::UEdge> PredMap;
///Instantiates a PredMap.
@@ -113,7 +113,7 @@
///The type of the map that stores whether a nodes is processed.
///The type of the map that stores whether a nodes is processed.
- ///It must meet the \ref concept::WriteMap "WriteMap" concept.
+ ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
///By default it is a NodeMap<bool>.
typedef NullMap<typename UGraph::Node,bool> ProcessedMap;
///Instantiates a ProcessedMap.
@@ -140,11 +140,11 @@
///n is the number of nodes in the graph.
///
///The edge costs are passed to the algorithm using a
- ///\ref concept::ReadMap "ReadMap",
+ ///\ref concepts::ReadMap "ReadMap",
///so it is easy to change it to any kind of cost.
///
///The type of the cost is determined by the
- ///\ref concept::ReadMap::Value "Value" of the cost map.
+ ///\ref concepts::ReadMap::Value "Value" of the cost map.
///
///It is also possible to change the underlying priority heap.
///
@@ -156,7 +156,7 @@
///edges. It is read once for each edge, so the map may involve in
///relatively time consuming process to compute the edge cost if
///it is necessary. The default map type is \ref
- ///concept::UGraph::UEdgeMap "UGraph::UEdgeMap<int>". The value
+ ///concepts::UGraph::UEdgeMap "UGraph::UEdgeMap<int>". The value
///of CM is not used directly by Prim, it is only passed to \ref
///PrimDefaultTraits.
///
@@ -412,7 +412,7 @@
_heap_cross_ref(NULL), local_heap_cross_ref(false),
_heap(NULL), local_heap(false)
{
- checkConcept<concept::UGraph, UGraph>();
+ checkConcept<concepts::UGraph, UGraph>();
}
///Destructor.
Modified: hugo/trunk/lemon/smart_graph.h
==============================================================================
--- hugo/trunk/lemon/smart_graph.h (original)
+++ hugo/trunk/lemon/smart_graph.h Tue Oct 24 19:19:16 2006
@@ -194,11 +194,11 @@
///that <b> it does support only limited (only stack-like)
///node and edge deletions</b>.
///It conforms to
- ///the \ref concept::Graph "Graph concept" with an
+ ///the \ref concepts::Graph "Graph concept" with an
///important extra feature that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
- ///\sa concept::Graph.
+ ///\sa concepts::Graph.
///
///\author Alpar Juttner
class SmartGraph : public ExtendedSmartGraphBase {
@@ -380,13 +380,13 @@
/// that <b> it does support only limited (only stack-like)
/// node and edge deletions</b>.
/// Except from this it conforms to
- /// the \ref concept::UGraph "UGraph concept".
+ /// the \ref concepts::UGraph "UGraph concept".
///
///It also has an
///important extra feature that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
- /// \sa concept::UGraph.
+ /// \sa concepts::UGraph.
///
/// \todo Snapshot hasn't been implemented yet.
///
@@ -762,13 +762,13 @@
/// It is also quite memory efficient, but at the price
/// that <b> it does not support node and edge deletions</b>.
/// Except from this it conforms to
- /// the \ref concept::BpUGraph "BpUGraph concept".
+ /// the \ref concepts::BpUGraph "BpUGraph concept".
///
///It also has an
///important extra feature that
- ///its maps are real \ref concept::ReferenceMap "reference map"s.
+ ///its maps are real \ref concepts::ReferenceMap "reference map"s.
///
- /// \sa concept::BpUGraph.
+ /// \sa concepts::BpUGraph.
///
class SmartBpUGraph : public ExtendedSmartBpUGraphBase {
private:
Modified: hugo/trunk/lemon/topology.h
==============================================================================
--- hugo/trunk/lemon/topology.h (original)
+++ hugo/trunk/lemon/topology.h Tue Oct 24 19:19:16 2006
@@ -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;
Modified: hugo/trunk/lemon/vmap.h
==============================================================================
--- hugo/trunk/lemon/vmap.h (original)
+++ hugo/trunk/lemon/vmap.h Tue Oct 24 19:19:16 2006
@@ -59,7 +59,7 @@
virtual void set(const Key &,const Value &) = 0;
};
- ///Makes a virtual map from a \ref concept::ReadMap "ReadMap"
+ ///Makes a virtual map from a \ref concepts::ReadMap "ReadMap"
template<class M, class K=typename M::Key,class V=typename M::Value>
class VReadMap : public VMapBase<K,V>
{
@@ -74,7 +74,7 @@
template<class M, class K=typename M::Key,class V=typename M::Value>
vReadMap(const M& m) {return VReadMap<M,K,V>(m);}
- ///Makes a virtual map from a \ref concept::WriteMap "WriteMap"
+ ///Makes a virtual map from a \ref concepts::WriteMap "WriteMap"
template<class M, class K=typename M::Key,class V=typename M::Value>
class VWriteMap :public VMapBase<K,V>
{
@@ -89,7 +89,7 @@
template<class M, class K=typename M::Key,class V=typename M::Value>
vWriteMap(const M& m) {return VReadMap<M,K,V>(m);}
- ///Makes a virtual map from a \ref concept::ReadWriteMap "ReadWriteMap"
+ ///Makes a virtual map from a \ref concepts::ReadWriteMap "ReadWriteMap"
template<class M, class K=typename M::Key,class V=typename M::Value>
class VReadWriteMap :public VMapBase<K,V>
{
Modified: hugo/trunk/test/bfs_test.cc
==============================================================================
--- hugo/trunk/test/bfs_test.cc (original)
+++ hugo/trunk/test/bfs_test.cc Tue Oct 24 19:19:16 2006
@@ -20,7 +20,7 @@
#include <lemon/smart_graph.h>
#include <lemon/bfs.h>
#include <lemon/path.h>
-#include<lemon/concept/graph.h>
+#include<lemon/concepts/graph.h>
using namespace lemon;
@@ -29,7 +29,7 @@
void check_Bfs_Compile()
{
- typedef concept::Graph Graph;
+ typedef concepts::Graph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
@@ -66,22 +66,22 @@
void check_Bfs_Function_Compile()
{
typedef int VType;
- typedef concept::Graph Graph;
+ typedef concepts::Graph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
typedef Graph::EdgeIt EdgeIt;
typedef Graph::NodeIt NodeIt;
- typedef concept::ReadMap<Edge,VType> LengthMap;
+ typedef concepts::ReadMap<Edge,VType> LengthMap;
Graph g;
bfs(g,Node()).run();
bfs(g).source(Node()).run();
bfs(g)
- .predMap(concept::WriteMap<Node,Edge>())
- .distMap(concept::WriteMap<Node,VType>())
- .reachedMap(concept::ReadWriteMap<Node,bool>())
- .processedMap(concept::WriteMap<Node,bool>())
+ .predMap(concepts::WriteMap<Node,Edge>())
+ .distMap(concepts::WriteMap<Node,VType>())
+ .reachedMap(concepts::ReadWriteMap<Node,bool>())
+ .processedMap(concepts::WriteMap<Node,bool>())
.run(Node());
}
Modified: hugo/trunk/test/bpugraph_test.cc
==============================================================================
--- hugo/trunk/test/bpugraph_test.cc (original)
+++ hugo/trunk/test/bpugraph_test.cc Tue Oct 24 19:19:16 2006
@@ -16,7 +16,7 @@
*
*/
-#include <lemon/concept/bpugraph.h>
+#include <lemon/concepts/bpugraph.h>
#include <lemon/list_graph.h>
#include <lemon/smart_graph.h>
#include <lemon/full_graph.h>
@@ -28,7 +28,7 @@
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
void check_concepts() {
Modified: hugo/trunk/test/dfs_test.cc
==============================================================================
--- hugo/trunk/test/dfs_test.cc (original)
+++ hugo/trunk/test/dfs_test.cc Tue Oct 24 19:19:16 2006
@@ -20,7 +20,7 @@
#include <lemon/smart_graph.h>
#include <lemon/dfs.h>
#include <lemon/path.h>
-#include <lemon/concept/graph.h>
+#include <lemon/concepts/graph.h>
using namespace lemon;
@@ -29,7 +29,7 @@
void check_Dfs_SmartGraph_Compile()
{
- typedef concept::Graph Graph;
+ typedef concepts::Graph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
@@ -67,22 +67,22 @@
void check_Dfs_Function_Compile()
{
typedef int VType;
- typedef concept::Graph Graph;
+ typedef concepts::Graph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
typedef Graph::EdgeIt EdgeIt;
typedef Graph::NodeIt NodeIt;
- typedef concept::ReadMap<Edge,VType> LengthMap;
+ typedef concepts::ReadMap<Edge,VType> LengthMap;
Graph g;
dfs(g,Node()).run();
dfs(g).source(Node()).run();
dfs(g)
- .predMap(concept::WriteMap<Node,Edge>())
- .distMap(concept::WriteMap<Node,VType>())
- .reachedMap(concept::ReadWriteMap<Node,bool>())
- .processedMap(concept::WriteMap<Node,bool>())
+ .predMap(concepts::WriteMap<Node,Edge>())
+ .distMap(concepts::WriteMap<Node,VType>())
+ .reachedMap(concepts::ReadWriteMap<Node,bool>())
+ .processedMap(concepts::WriteMap<Node,bool>())
.run(Node());
}
Modified: hugo/trunk/test/dijkstra_test.cc
==============================================================================
--- hugo/trunk/test/dijkstra_test.cc (original)
+++ hugo/trunk/test/dijkstra_test.cc Tue Oct 24 19:19:16 2006
@@ -21,8 +21,8 @@
#include <lemon/dijkstra.h>
#include <lemon/path.h>
#include <lemon/maps.h>
-#include <lemon/concept/graph.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/graph.h>
+#include <lemon/concepts/maps.h>
using namespace lemon;
const int PET_SIZE =5;
@@ -31,13 +31,13 @@
void check_Dijkstra_BinHeap_Compile()
{
typedef int VType;
- typedef concept::Graph Graph;
+ typedef concepts::Graph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
typedef Graph::EdgeIt EdgeIt;
typedef Graph::NodeIt NodeIt;
- typedef concept::ReadMap<Edge,VType> LengthMap;
+ typedef concepts::ReadMap<Edge,VType> LengthMap;
typedef Dijkstra<Graph, LengthMap> DType;
@@ -70,20 +70,20 @@
void check_Dijkstra_Function_Compile()
{
typedef int VType;
- typedef concept::Graph Graph;
+ typedef concepts::Graph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
typedef Graph::EdgeIt EdgeIt;
typedef Graph::NodeIt NodeIt;
- typedef concept::ReadMap<Edge,VType> LengthMap;
+ typedef concepts::ReadMap<Edge,VType> LengthMap;
Graph g;
dijkstra(g,LengthMap(),Node()).run();
dijkstra(g,LengthMap()).source(Node()).run();
dijkstra(g,LengthMap())
- .predMap(concept::WriteMap<Node,Edge>())
- .distMap(concept::WriteMap<Node,VType>())
+ .predMap(concepts::WriteMap<Node,Edge>())
+ .distMap(concepts::WriteMap<Node,VType>())
.run(Node());
}
Modified: hugo/trunk/test/edge_set_test.cc
==============================================================================
--- hugo/trunk/test/edge_set_test.cc (original)
+++ hugo/trunk/test/edge_set_test.cc Tue Oct 24 19:19:16 2006
@@ -3,8 +3,8 @@
#include <iostream>
#include <vector>
-#include <lemon/concept/graph.h>
-#include <lemon/concept/ugraph.h>
+#include <lemon/concepts/graph.h>
+#include <lemon/concepts/ugraph.h>
#include <lemon/smart_graph.h>
#include <lemon/edge_set.h>
@@ -15,7 +15,7 @@
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
typedef SmartGraph RGraph;
Modified: hugo/trunk/test/graph_adaptor_test.cc
==============================================================================
--- hugo/trunk/test/graph_adaptor_test.cc (original)
+++ hugo/trunk/test/graph_adaptor_test.cc Tue Oct 24 19:19:16 2006
@@ -20,9 +20,9 @@
#include<lemon/concept_check.h>
#include<lemon/smart_graph.h>
-#include<lemon/concept/graph.h>
-#include<lemon/concept/ugraph.h>
-#include<lemon/concept/bpugraph.h>
+#include<lemon/concepts/graph.h>
+#include<lemon/concepts/ugraph.h>
+#include<lemon/concepts/bpugraph.h>
#include<lemon/list_graph.h>
#include<lemon/full_graph.h>
@@ -41,7 +41,7 @@
*/
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
Modified: hugo/trunk/test/graph_factory_test.cc
==============================================================================
--- hugo/trunk/test/graph_factory_test.cc (original)
+++ hugo/trunk/test/graph_factory_test.cc Tue Oct 24 19:19:16 2006
@@ -18,8 +18,8 @@
#include<iostream>
#include<lemon/smart_graph.h>
-#include<lemon/concept/graph.h>
-#include<lemon/concept/maps.h>
+#include<lemon/concepts/graph.h>
+#include<lemon/concepts/maps.h>
#include<lemon/list_graph_base.h>
#include<lemon/full_graph.h>
@@ -70,22 +70,22 @@
}
//Compile Graph
-template void lemon::concept::checkCompileGraph<concept::Graph>
-(concept::Graph &);
+template void lemon::concepts::checkCompileGraph<concepts::Graph>
+(concepts::Graph &);
template
-void lemon::concept::checkCompileGraph<concept::Graph>
-(concept::Graph &);
+void lemon::concepts::checkCompileGraph<concepts::Graph>
+(concepts::Graph &);
template
-void lemon::concept::checkCompileGraph<concept::Graph>
-(concept::Graph &);
+void lemon::concepts::checkCompileGraph<concepts::Graph>
+(concepts::Graph &);
//Compile SmartGraph
template
-void lemon::concept::checkCompileGraph<SmartGraph>(SmartGraph &);
+void lemon::concepts::checkCompileGraph<SmartGraph>(SmartGraph &);
template
-void lemon::concept::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
+void lemon::concepts::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
//Compile SymSmartGraph
//template void hugo::checkCompileGraph<SymSmartGraph>(SymSmartGraph &);
@@ -93,11 +93,11 @@
//Compile ListGraph
template
-void lemon::concept::checkCompileGraph<ListGraph>(ListGraph &);
+void lemon::concepts::checkCompileGraph<ListGraph>(ListGraph &);
template
-void lemon::concept::checkCompileGraph<ListGraph>(ListGraph &);
+void lemon::concepts::checkCompileGraph<ListGraph>(ListGraph &);
template
-void lemon::concept::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
+void lemon::concepts::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
//Compile SymListGraph
@@ -106,9 +106,9 @@
//template void hugo::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
//Compile FullGraph
-template void lemon::concept::checkCompileGraph<FullGraph>(FullGraph &);
+template void lemon::concepts::checkCompileGraph<FullGraph>(FullGraph &);
template
-void lemon::concept::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
+void lemon::concepts::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
int main()
@@ -143,7 +143,7 @@
// Some map tests.
// FIXME: These shouldn't be here.
- using namespace concept;
+ using namespace concepts;
function_requires< ReadMapConcept< ReadMap<int,int> > >();
function_requires< WriteMapConcept< WriteMap<int,int> > >();
function_requires< ReadWriteMapConcept< ReadWriteMap<int,int> > >();
Modified: hugo/trunk/test/graph_test.cc
==============================================================================
--- hugo/trunk/test/graph_test.cc (original)
+++ hugo/trunk/test/graph_test.cc Tue Oct 24 19:19:16 2006
@@ -19,7 +19,7 @@
#include <iostream>
#include <vector>
-#include <lemon/concept/graph.h>
+#include <lemon/concepts/graph.h>
#include <lemon/list_graph.h>
#include <lemon/smart_graph.h>
#include <lemon/full_graph.h>
@@ -31,7 +31,7 @@
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
int main() {
Modified: hugo/trunk/test/heap_test.cc
==============================================================================
--- hugo/trunk/test/heap_test.cc (original)
+++ hugo/trunk/test/heap_test.cc Tue Oct 24 19:19:16 2006
@@ -22,7 +22,7 @@
#include <vector>
#include <lemon/concept_check.h>
-#include <lemon/concept/heap.h>
+#include <lemon/concepts/heap.h>
#include <lemon/smart_graph.h>
@@ -40,7 +40,7 @@
#include <lemon/time_measure.h>
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
int main() {
Modified: hugo/trunk/test/kruskal_test.cc
==============================================================================
--- hugo/trunk/test/kruskal_test.cc (original)
+++ hugo/trunk/test/kruskal_test.cc Tue Oct 24 19:19:16 2006
@@ -23,8 +23,8 @@
#include <lemon/maps.h>
#include <lemon/kruskal.h>
#include <lemon/list_graph.h>
-#include <lemon/concept/maps.h>
-#include <lemon/concept/graph.h>
+#include <lemon/concepts/maps.h>
+#include <lemon/concepts/graph.h>
using namespace std;
@@ -32,11 +32,11 @@
void checkCompileKruskal()
{
- concept::WriteMap<concept::Graph::Edge,bool> w;
+ concepts::WriteMap<concepts::Graph::Edge,bool> w;
- concept::Graph g;
+ concepts::Graph g;
kruskal(g,
- concept::ReadMap<concept::Graph::Edge,int>(),
+ concepts::ReadMap<concepts::Graph::Edge,int>(),
w);
}
Modified: hugo/trunk/test/maps_test.cc
==============================================================================
--- hugo/trunk/test/maps_test.cc (original)
+++ hugo/trunk/test/maps_test.cc Tue Oct 24 19:19:16 2006
@@ -20,13 +20,13 @@
#include <set>
#include <lemon/concept_check.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/maps.h>
#include <lemon/maps.h>
#include "test_tools.h"
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
struct A {};
inline bool operator<(A, A) { return true; }
Modified: hugo/trunk/test/matrix_maps_test.cc
==============================================================================
--- hugo/trunk/test/matrix_maps_test.cc (original)
+++ hugo/trunk/test/matrix_maps_test.cc Tue Oct 24 19:19:16 2006
@@ -21,9 +21,9 @@
#include <lemon/concept_check.h>
-#include <lemon/concept/matrix_maps.h>
-#include <lemon/concept/maps.h>
-#include <lemon/concept/graph.h>
+#include <lemon/concepts/matrix_maps.h>
+#include <lemon/concepts/maps.h>
+#include <lemon/concepts/graph.h>
#include <lemon/matrix_maps.h>
@@ -35,7 +35,7 @@
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
int main() {
typedef SmartGraph Graph;
Modified: hugo/trunk/test/path_test.cc
==============================================================================
--- hugo/trunk/test/path_test.cc (original)
+++ hugo/trunk/test/path_test.cc Tue Oct 24 19:19:16 2006
@@ -19,8 +19,8 @@
#include <string>
#include <iostream>
-#include <lemon/concept/path.h>
-#include <lemon/concept/graph.h>
+#include <lemon/concepts/path.h>
+#include <lemon/concepts/graph.h>
#include <lemon/path.h>
#include <lemon/list_graph.h>
@@ -31,11 +31,11 @@
using namespace lemon;
void check_concepts() {
- checkConcept<concept::Path<concept::Graph>,
- concept::Path<concept::Graph> >();
- checkConcept<concept::Path<concept::Graph>,
- Path<concept::Graph> >();
- checkConcept<concept::Path<ListGraph>, Path<ListGraph> >();
+ checkConcept<concepts::Path<concepts::Graph>,
+ concepts::Path<concepts::Graph> >();
+ checkConcept<concepts::Path<concepts::Graph>,
+ Path<concepts::Graph> >();
+ checkConcept<concepts::Path<ListGraph>, Path<ListGraph> >();
}
int main() {
Modified: hugo/trunk/test/preflow_test.cc
==============================================================================
--- hugo/trunk/test/preflow_test.cc (original)
+++ hugo/trunk/test/preflow_test.cc Tue Oct 24 19:19:16 2006
@@ -23,21 +23,21 @@
#include <lemon/smart_graph.h>
#include <lemon/dimacs.h>
#include <lemon/preflow.h>
-#include <lemon/concept/graph.h>
-#include <lemon/concept/maps.h>
+#include <lemon/concepts/graph.h>
+#include <lemon/concepts/maps.h>
using namespace lemon;
void check_Preflow()
{
typedef int VType;
- typedef concept::Graph Graph;
+ typedef concepts::Graph Graph;
typedef Graph::Node Node;
typedef Graph::Edge Edge;
- typedef concept::ReadMap<Edge,VType> CapMap;
- typedef concept::ReadWriteMap<Edge,VType> FlowMap;
- typedef concept::ReadWriteMap<Node,bool> CutMap;
+ typedef concepts::ReadMap<Edge,VType> CapMap;
+ typedef concepts::ReadWriteMap<Edge,VType> FlowMap;
+ typedef concepts::ReadWriteMap<Node,bool> CutMap;
typedef Preflow<Graph, int, CapMap, FlowMap> PType;
Modified: hugo/trunk/test/test_tools.h
==============================================================================
--- hugo/trunk/test/test_tools.h (original)
+++ hugo/trunk/test/test_tools.h Tue Oct 24 19:19:16 2006
@@ -26,7 +26,7 @@
#include <ctime>
#include <lemon/concept_check.h>
-#include <lemon/concept/graph.h>
+#include <lemon/concepts/graph.h>
#include <lemon/random.h>
Modified: hugo/trunk/test/ugraph_test.cc
==============================================================================
--- hugo/trunk/test/ugraph_test.cc (original)
+++ hugo/trunk/test/ugraph_test.cc Tue Oct 24 19:19:16 2006
@@ -17,7 +17,7 @@
*/
#include <lemon/bits/graph_extender.h>
-#include <lemon/concept/ugraph.h>
+#include <lemon/concepts/ugraph.h>
#include <lemon/list_graph.h>
#include <lemon/smart_graph.h>
#include <lemon/full_graph.h>
@@ -29,7 +29,7 @@
using namespace lemon;
-using namespace lemon::concept;
+using namespace lemon::concepts;
void check_concepts() {
More information about the Lemon-commits
mailing list