[Lemon-commits] [lemon_svn] klao: r1342 - in hugo/trunk: doc src/lemon src/lemon/concept src/lemon/skeletons src/test src/work src/work/alpar src/work/marci src/work/peter/path
Lemon SVN
svn at lemon.cs.elte.hu
Mon Nov 6 20:44:44 CET 2006
Author: klao
Date: Thu Nov 4 21:24:59 2004
New Revision: 1342
Added:
hugo/trunk/src/lemon/concept/
- copied from r1337, /hugo/trunk/src/lemon/skeletons/
Removed:
hugo/trunk/src/lemon/skeletons/
Modified:
hugo/trunk/doc/Doxyfile
hugo/trunk/doc/graphs.dox
hugo/trunk/doc/groups.dox
hugo/trunk/doc/namespaces.dox
hugo/trunk/src/lemon/Makefile.am
hugo/trunk/src/lemon/concept/graph.h
hugo/trunk/src/lemon/concept/graph_component.h
hugo/trunk/src/lemon/concept/maps.h
hugo/trunk/src/lemon/concept/path.h
hugo/trunk/src/lemon/concept/sym_graph.h
hugo/trunk/src/lemon/dijkstra.h
hugo/trunk/src/lemon/full_graph.h
hugo/trunk/src/lemon/list_graph.h
hugo/trunk/src/lemon/maps.h
hugo/trunk/src/lemon/path.h
hugo/trunk/src/lemon/smart_graph.h
hugo/trunk/src/test/bfs_test.cc
hugo/trunk/src/test/dfs_test.cc
hugo/trunk/src/test/dijkstra_test.cc
hugo/trunk/src/test/graph_factory_test.cc
hugo/trunk/src/test/graph_test.cc
hugo/trunk/src/test/graph_wrapper_test.cc
hugo/trunk/src/test/kruskal_test.cc
hugo/trunk/src/test/new_graph_test.cc
hugo/trunk/src/test/path_test.cc
hugo/trunk/src/test/preflow_test.cc
hugo/trunk/src/test/sym_graph_test.cc
hugo/trunk/src/test/sym_graph_test.h
hugo/trunk/src/work/Doxyfile
hugo/trunk/src/work/alpar/dijkstra.h
hugo/trunk/src/work/alpar/list_graph_demo.cc
hugo/trunk/src/work/marci/bfs_mm_test.cc
hugo/trunk/src/work/peter/path/path.h
hugo/trunk/src/work/peter/path/path_skeleton.h
hugo/trunk/src/work/peter/path/path_test.cc
Log:
skeleton(s) -> concept renaming
Modified: hugo/trunk/doc/Doxyfile
==============================================================================
--- hugo/trunk/doc/Doxyfile (original)
+++ hugo/trunk/doc/Doxyfile Thu Nov 4 21:24:59 2004
@@ -431,7 +431,7 @@
groups.dox \
namespaces.dox \
../src/lemon \
- ../src/lemon/skeletons \
+ ../src/lemon/concept \
../src/test/test_tools.h
# If the value of the INPUT tag contains directories, you can use the
Modified: hugo/trunk/doc/graphs.dox
==============================================================================
--- hugo/trunk/doc/graphs.dox (original)
+++ hugo/trunk/doc/graphs.dox Thu Nov 4 21:24:59 2004
@@ -9,31 +9,31 @@
Each graph should meet the
-\ref lemon::skeleton::StaticGraph "StaticGraph" concept.
+\ref lemon::concept::StaticGraph "StaticGraph" concept.
This concept does not
makes 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.
The graphs meeting the
-\ref lemon::skeleton::ExtendableGraph "ExtendableGraph"
+\ref lemon::concept::ExtendableGraph "ExtendableGraph"
concept allow node and
edge addition. You can also "clear" (i.e. erase all edges and nodes)
such a graph.
In case of graphs meeting the full feature
-\ref lemon::skeleton::ErasableGraph "ErasableGraph"
+\ref lemon::concept::ErasableGraph "ErasableGraph"
concept
you can also erase individual edges and node 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::skeleton::ErasableGraph "ErasableGraph" concept
+the \ref lemon::concept::ErasableGraph "ErasableGraph" concept
and it also have some convenience features.
\li \ref lemon::SmartGraph "SmartGraph" is a more memory
efficient version of \ref lemon::ListGraph "ListGraph". The
price of it is that it only meets the
-\ref lemon::skeleton::ExtendableGraph "ExtendableGraph" concept,
+\ref lemon::concept::ExtendableGraph "ExtendableGraph" concept,
so you cannot delete individual edges or nodes.
\li \ref lemon::SymListGraph "SymListGraph" and
\ref lemon::SymSmartGraph "SymSmartGraph" classes are very similar to
@@ -45,7 +45,7 @@
attach data to the edges in such a way that the stored data
are shared by the edge pairs.
\li \ref lemon::FullGraph "FullGraph"
-implements a full graph. It is a \ref lemon::skeleton::StaticGraph, so you cannot
+implements a full graph. It is a \ref lemon::concept::StaticGraph, 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 "NodeMap"'s and
Modified: hugo/trunk/doc/groups.dox
==============================================================================
--- hugo/trunk/doc/groups.dox (original)
+++ hugo/trunk/doc/groups.dox Thu Nov 4 21:24:59 2004
@@ -80,12 +80,13 @@
*/
/**
- at defgroup skeletons Skeletons
-\brief Skeletons (a.k.a. concept checking classes)
+ at defgroup concept Concept
+\brief Skeleton classes and concept checking classes
-This group describes the data/algorithm skeletons implemented in LEMON in
-order to make it easier to check if a certain template class or
-template function is correctly implemented.
+This group describes the data/algorithm skeletons and concept checking
+classes implemented in LEMON. These classes exist in order to make it
+easier to check if a certain template class or template function is
+correctly implemented.
*/
Modified: hugo/trunk/doc/namespaces.dox
==============================================================================
--- hugo/trunk/doc/namespaces.dox (original)
+++ hugo/trunk/doc/namespaces.dox Thu Nov 4 21:24:59 2004
@@ -8,5 +8,5 @@
/// \todo Some more detailed description would be nice here.
///
- namespace skeleton {}
+ namespace concept {}
}
Modified: hugo/trunk/src/lemon/Makefile.am
==============================================================================
--- hugo/trunk/src/lemon/Makefile.am (original)
+++ hugo/trunk/src/lemon/Makefile.am Thu Nov 4 21:24:59 2004
@@ -36,8 +36,8 @@
erasable_graph_extender.h
noinst_HEADERS = \
- skeletons/graph.h \
- skeletons/graph_component.h \
- skeletons/sym_graph.h \
- skeletons/maps.h \
- skeletons/path.h
+ concept/graph.h \
+ concept/graph_component.h \
+ concept/sym_graph.h \
+ concept/maps.h \
+ concept/path.h
Modified: hugo/trunk/src/lemon/concept/graph.h
==============================================================================
--- /hugo/trunk/src/lemon/skeletons/graph.h (original)
+++ hugo/trunk/src/lemon/concept/graph.h Thu Nov 4 21:24:59 2004
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- * src/lemon/skeletons/graph.h - Part of LEMON, a generic C++ optimization library
+ * src/lemon/concept/graph.h - Part of LEMON, a generic C++ optimization library
*
* Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Combinatorial Optimization Research Group, EGRES).
@@ -14,22 +14,22 @@
*
*/
-#ifndef LEMON_SKELETON_GRAPH_H
-#define LEMON_SKELETON_GRAPH_H
+#ifndef LEMON_CONCEPT_GRAPH_H
+#define LEMON_CONCEPT_GRAPH_H
-///\ingroup skeletons
+///\ingroup concept
///\file
///\brief Declaration of Graph.
#include <lemon/invalid.h>
-#include <lemon/skeletons/maps.h>
+#include <lemon/concept/maps.h>
#include <lemon/concept_check.h>
-#include <lemon/skeletons/graph_component.h>
+#include <lemon/concept/graph_component.h>
namespace lemon {
- namespace skeleton {
+ namespace concept {
- /// \addtogroup skeletons
+ /// \addtogroup concept
/// @{
// /// An empty static graph class.
@@ -401,7 +401,7 @@
// ///Reference map of the nodes to type \c T.
-// /// \ingroup skeletons
+// /// \ingroup concept
// ///Reference map of the nodes to type \c T.
// /// \sa Reference
// /// \warning Making maps that can handle bool type (NodeMap<bool>)
@@ -424,7 +424,7 @@
// ///Reference map of the edges to type \c T.
-// /// \ingroup skeletons
+// /// \ingroup concept
// ///Reference map of the edges to type \c T.
// /// \sa Reference
// /// \warning Making maps that can handle bool type (EdgeMap<bool>)
@@ -455,7 +455,7 @@
// };
// ///\brief Checks whether \c G meets the
-// ///\ref lemon::skeleton::StaticGraph "StaticGraph" concept
+// ///\ref lemon::concept::StaticGraph "StaticGraph" concept
// template<class Graph> void checkCompileStaticGraph(Graph &G)
// {
// typedef typename Graph::Node Node;
@@ -680,7 +680,7 @@
// ///\brief Checks whether \c G meets the
-// ///\ref lemon::skeleton::ExtendableGraph "ExtendableGraph" concept
+// ///\ref lemon::concept::ExtendableGraph "ExtendableGraph" concept
// template<class Graph> void checkCompileExtendableGraph(Graph &G)
// {
// checkCompileStaticGraph(G);
@@ -739,7 +739,7 @@
// }
// ///\brief Checks whether \c G meets the
-// ///\ref lemon::skeleton::EresableGraph "EresableGraph" concept
+// ///\ref lemon::concept::EresableGraph "EresableGraph" concept
// template<class Graph> void checkCompileErasableGraph(Graph &G)
// {
// checkCompileExtendableGraph(G);
@@ -910,9 +910,9 @@
};
// @}
- } //namespace skeleton
+ } //namespace concept
} //namespace lemon
-#endif // LEMON_SKELETON_GRAPH_H
+#endif // LEMON_CONCEPT_GRAPH_H
Modified: hugo/trunk/src/lemon/concept/graph_component.h
==============================================================================
--- /hugo/trunk/src/lemon/skeletons/graph_component.h (original)
+++ hugo/trunk/src/lemon/concept/graph_component.h Thu Nov 4 21:24:59 2004
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- * src/lemon/skeletons/graph_component.h - Part of LEMON, a generic C++ optimization library
+ * src/lemon/concept/graph_component.h - Part of LEMON, a generic C++ optimization library
*
* Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Combinatorial Optimization Research Group, EGRES).
@@ -14,19 +14,19 @@
*
*/
-///\ingroup skeletons
+///\ingroup concept
///\file
///\brief The graph components.
-#ifndef LEMON_SKELETON_GRAPH_COMPONENT_H
-#define LEMON_SKELETON_GRAPH_COMPONENT_H
+#ifndef LEMON_CONCEPT_GRAPH_COMPONENT_H
+#define LEMON_CONCEPT_GRAPH_COMPONENT_H
#include <lemon/invalid.h>
-#include <lemon/skeletons/maps.h>
+#include <lemon/concept/maps.h>
namespace lemon {
- namespace skeleton {
+ namespace concept {
/// An empty base graph class.
Modified: hugo/trunk/src/lemon/concept/maps.h
==============================================================================
--- /hugo/trunk/src/lemon/skeletons/maps.h (original)
+++ hugo/trunk/src/lemon/concept/maps.h Thu Nov 4 21:24:59 2004
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- * src/lemon/skeletons/maps.h - Part of LEMON, a generic C++ optimization library
+ * src/lemon/concept/maps.h - Part of LEMON, a generic C++ optimization library
*
* Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Combinatorial Optimization Research Group, EGRES).
@@ -14,20 +14,20 @@
*
*/
-#ifndef LEMON_MAPSKELETON_H
-#define LEMON_MAPSKELETON_H
+#ifndef LEMON_CONCEPT_MAPS_H
+#define LEMON_CONCEPT_MAPS_H
#include <lemon/concept_check.h>
-///\ingroup skeletons
+///\ingroup concept
///\file
///\brief Map concepts checking classes for testing and documenting.
namespace lemon {
- namespace skeleton {
+ namespace concept {
- /// \addtogroup skeletons
+ /// \addtogroup concept
/// @{
/// Readable map concept
@@ -241,6 +241,6 @@
// @}
- } //namespace skeleton
+ } //namespace concept
} //namespace lemon
-#endif // LEMON_MAPSKELETON_H
+#endif // LEMON_CONCEPT_MAPS_H
Modified: hugo/trunk/src/lemon/concept/path.h
==============================================================================
--- /hugo/trunk/src/lemon/skeletons/path.h (original)
+++ hugo/trunk/src/lemon/concept/path.h Thu Nov 4 21:24:59 2004
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- * src/lemon/skeletons/path.h - Part of LEMON, a generic C++ optimization library
+ * src/lemon/concept/path.h - Part of LEMON, a generic C++ optimization library
*
* Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Combinatorial Optimization Research Group, EGRES).
@@ -14,18 +14,18 @@
*
*/
-///\ingroup skeletons
+///\ingroup concept
///\file
///\brief Classes for representing paths in graphs.
-#ifndef LEMON_SKELETON_PATH_H
-#define LEMON_SKELETON_PATH_H
+#ifndef LEMON_CONCEPT_PATH_H
+#define LEMON_CONCEPT_PATH_H
#include <lemon/invalid.h>
namespace lemon {
- namespace skeleton {
- /// \addtogroup skeletons
+ namespace concept {
+ /// \addtogroup concept
/// @{
@@ -98,7 +98,7 @@
/**
* \brief Iterator class to iterate on the edges of the paths
*
- * \ingroup skeletons
+ * \ingroup concept
* This class is used to iterate on the edges of the paths
*
* Of course it converts to Graph::Edge
@@ -131,7 +131,7 @@
/**
* \brief Iterator class to iterate on the nodes of the paths
*
- * \ingroup skeletons
+ * \ingroup concept
* This class is used to iterate on the nodes of the paths
*
* Of course it converts to Graph::Node.
@@ -166,7 +166,7 @@
/**
* \brief Class to build paths
*
- * \ingroup skeletons
+ * \ingroup concept
* This class is used to fill a path with edges.
*
* You can push new edges to the front and to the back of the path in
@@ -233,4 +233,4 @@
} // namespace lemon
-#endif // LEMON_SKELETON_PATH_H
+#endif // LEMON_CONCEPT_PATH_H
Modified: hugo/trunk/src/lemon/concept/sym_graph.h
==============================================================================
--- /hugo/trunk/src/lemon/skeletons/sym_graph.h (original)
+++ hugo/trunk/src/lemon/concept/sym_graph.h Thu Nov 4 21:24:59 2004
@@ -1,5 +1,5 @@
/* -*- C++ -*-
- * src/lemon/skeletons/graph.h - Part of LEMON, a generic C++ optimization library
+ * src/lemon/concept/graph.h - Part of LEMON, a generic C++ optimization library
*
* Copyright (C) 2004 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
* (Egervary Combinatorial Optimization Research Group, EGRES).
@@ -14,21 +14,21 @@
*
*/
-#ifndef LEMON_SKELETON_SYM_GRAPH_H
-#define LEMON_SKELETON_SYM_GRAPH_H
+#ifndef LEMON_CONCEPT_SYM_GRAPH_H
+#define LEMON_CONCEPT_SYM_GRAPH_H
-///\ingroup skeletons
+///\ingroup concept
///\file
///\brief Declaration of SymGraph.
#include <lemon/invalid.h>
-#include <lemon/skeletons/graph.h>
-#include <lemon/skeletons/maps.h>
+#include <lemon/concept/graph.h>
+#include <lemon/concept/maps.h>
namespace lemon {
- namespace skeleton {
+ namespace concept {
- /// \addtogroup skeletons
+ /// \addtogroup concept
/// @{
/// An empty static graph class.
@@ -515,7 +515,7 @@
Edge opposite(Edge) const {return INVALID;}
///Reference map of the nodes to type \c T.
- /// \ingroup skeletons
+ /// \ingroup concept
///Reference map of the nodes to type \c T.
/// \sa Reference
/// \warning Making maps that can handle bool type (NodeMap<bool>)
@@ -538,7 +538,7 @@
///Reference map of the edges to type \c T.
- /// \ingroup skeletons
+ /// \ingroup concept
///Reference map of the edges to type \c T.
/// \sa Reference
/// \warning Making maps that can handle bool type (EdgeMap<bool>)
@@ -562,7 +562,7 @@
///Reference map of the edges to type \c T.
- /// \ingroup skeletons
+ /// \ingroup concept
///Reference map of the symmetric edges to type \c T.
/// \sa Reference
/// \warning Making maps that can handle bool type (EdgeMap<bool>)
@@ -645,9 +645,9 @@
};
// @}
- } //namespace skeleton
+ } //namespace concept
} //namespace lemon
-#endif // LEMON_SKELETON_GRAPH_H
+#endif // LEMON_CONCEPT_GRAPH_H
Modified: hugo/trunk/src/lemon/dijkstra.h
==============================================================================
--- hugo/trunk/src/lemon/dijkstra.h (original)
+++ hugo/trunk/src/lemon/dijkstra.h Thu Nov 4 21:24:59 2004
@@ -33,11 +33,11 @@
///This class provides an efficient implementation of %Dijkstra algorithm.
///The edge lengths are passed to the algorithm using a
- ///\ref skeleton::ReadMap "ReadMap",
+ ///\ref concept::ReadMap "ReadMap",
///so it is easy to change it to any kind of length.
///
///The type of the length is determined by the
- ///\ref skeleton::ReadMap::ValueType "ValueType" of the length map.
+ ///\ref concept::ReadMap::ValueType "ValueType" of the length map.
///
///It is also possible to change the underlying priority heap.
///
@@ -48,7 +48,7 @@
///lengths of the 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 skeleton::StaticGraph::EdgeMap "Graph::EdgeMap<int>"
+ ///\ref concept::StaticGraph::EdgeMap "Graph::EdgeMap<int>"
///\param Heap The heap type used by the %Dijkstra
///algorithm. The default
///is using \ref BinHeap "binary heap".
Modified: hugo/trunk/src/lemon/full_graph.h
==============================================================================
--- hugo/trunk/src/lemon/full_graph.h (original)
+++ hugo/trunk/src/lemon/full_graph.h Thu Nov 4 21:24:59 2004
@@ -194,8 +194,8 @@
///It is completely static, so you can neither add nor delete either
///edges or nodes.
///Thus it conforms to
- ///the \ref skeleton::StaticGraph "StaticGraph" concept
- ///\sa skeleton::StaticGraph.
+ ///the \ref concept::StaticGraph "StaticGraph" concept
+ ///\sa concept::StaticGraph.
///\todo What about loops?
///\todo Don't we need SymEdgeMap?
///
Modified: hugo/trunk/src/lemon/list_graph.h
==============================================================================
--- hugo/trunk/src/lemon/list_graph.h (original)
+++ hugo/trunk/src/lemon/list_graph.h Thu Nov 4 21:24:59 2004
@@ -317,8 +317,8 @@
///This is a simple and fast erasable graph implementation.
///
///It conforms to the
- ///\ref skeleton::ErasableGraph "ErasableGraph" concept.
- ///\sa skeleton::ErasableGraph.
+ ///\ref concept::ErasableGraph "ErasableGraph" concept.
+ ///\sa concept::ErasableGraph.
class ListGraph : public ErasableListGraphBase
{
Modified: hugo/trunk/src/lemon/maps.h
==============================================================================
--- hugo/trunk/src/lemon/maps.h (original)
+++ hugo/trunk/src/lemon/maps.h Thu Nov 4 21:24:59 2004
@@ -20,7 +20,7 @@
///\file
///\brief Miscellaneous property maps
///
-///\todo This file has the same name as the concept file in skeletons,
+///\todo This file has the same name as the concept file in concept/,
/// and this is not easily detectable in docs...
#include <map>
Modified: hugo/trunk/src/lemon/path.h
==============================================================================
--- hugo/trunk/src/lemon/path.h (original)
+++ hugo/trunk/src/lemon/path.h Thu Nov 4 21:24:59 2004
@@ -26,7 +26,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::skeleton::Path
+\sa lemon::concept::Path
*/
Modified: hugo/trunk/src/lemon/smart_graph.h
==============================================================================
--- hugo/trunk/src/lemon/smart_graph.h (original)
+++ hugo/trunk/src/lemon/smart_graph.h Thu Nov 4 21:24:59 2004
@@ -229,8 +229,8 @@
///It is also quite memory efficient, but at the price
///that <b> it does not support node and edge deletion</b>.
///It conforms to
- ///the \ref skeleton::ExtendableGraph "ExtendableGraph" concept.
- ///\sa skeleton::ExtendableGraph.
+ ///the \ref concept::ExtendableGraph "ExtendableGraph" concept.
+ ///\sa concept::ExtendableGraph.
///
///\todo Some member functions could be \c static.
///
Modified: hugo/trunk/src/test/bfs_test.cc
==============================================================================
--- hugo/trunk/src/test/bfs_test.cc (original)
+++ hugo/trunk/src/test/bfs_test.cc Thu Nov 4 21:24:59 2004
@@ -17,7 +17,7 @@
#include "test_tools.h"
#include <lemon/smart_graph.h>
#include <lemon/bfs.h>
-#include<lemon/skeletons/graph.h>
+#include<lemon/concept/graph.h>
using namespace lemon;
@@ -26,7 +26,7 @@
void check_Bfs_Compile()
{
- typedef skeleton::StaticGraph Graph;
+ typedef concept::StaticGraph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
Modified: hugo/trunk/src/test/dfs_test.cc
==============================================================================
--- hugo/trunk/src/test/dfs_test.cc (original)
+++ hugo/trunk/src/test/dfs_test.cc Thu Nov 4 21:24:59 2004
@@ -17,7 +17,7 @@
#include "test_tools.h"
#include <lemon/smart_graph.h>
#include <lemon/dfs.h>
-#include<lemon/skeletons/graph.h>
+#include <lemon/concept/graph.h>
using namespace lemon;
@@ -26,7 +26,7 @@
void check_Dfs_SmartGraph_Compile()
{
- typedef skeleton::StaticGraph Graph;
+ typedef concept::StaticGraph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
Modified: hugo/trunk/src/test/dijkstra_test.cc
==============================================================================
--- hugo/trunk/src/test/dijkstra_test.cc (original)
+++ hugo/trunk/src/test/dijkstra_test.cc Thu Nov 4 21:24:59 2004
@@ -17,8 +17,8 @@
#include "test_tools.h"
#include <lemon/smart_graph.h>
#include <lemon/dijkstra.h>
-#include<lemon/skeletons/graph.h>
-#include<lemon/skeletons/maps.h>
+#include <lemon/concept/graph.h>
+#include <lemon/concept/maps.h>
using namespace lemon;
const int PET_SIZE =5;
@@ -27,13 +27,13 @@
void check_Dijkstra_BinHeap_Compile()
{
typedef int VType;
- typedef skeleton::StaticGraph Graph;
+ typedef concept::StaticGraph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
typedef Graph::EdgeIt EdgeIt;
typedef Graph::NodeIt NodeIt;
- typedef skeleton::ReadMap<Edge,VType> LengthMap;
+ typedef concept::ReadMap<Edge,VType> LengthMap;
typedef Dijkstra<Graph, LengthMap> DType;
Modified: hugo/trunk/src/test/graph_factory_test.cc
==============================================================================
--- hugo/trunk/src/test/graph_factory_test.cc (original)
+++ hugo/trunk/src/test/graph_factory_test.cc Thu Nov 4 21:24:59 2004
@@ -16,8 +16,8 @@
#include<iostream>
#include<lemon/smart_graph.h>
-#include<lemon/skeletons/graph.h>
-#include<lemon/skeletons/maps.h>
+#include<lemon/concept/graph.h>
+#include<lemon/concept/maps.h>
#include<lemon/list_graph_base.h>
#include<lemon/full_graph.h>
@@ -68,22 +68,22 @@
}
//Compile Graph
-template void lemon::skeleton::checkCompileStaticGraph<skeleton::StaticGraph>
-(skeleton::StaticGraph &);
+template void lemon::concept::checkCompileStaticGraph<concept::StaticGraph>
+(concept::StaticGraph &);
template
-void lemon::skeleton::checkCompileExtendableGraph<skeleton::ExtendableGraph>
-(skeleton::ExtendableGraph &);
+void lemon::concept::checkCompileExtendableGraph<concept::ExtendableGraph>
+(concept::ExtendableGraph &);
template
-void lemon::skeleton::checkCompileErasableGraph<skeleton::ErasableGraph>
-(skeleton::ErasableGraph &);
+void lemon::concept::checkCompileErasableGraph<concept::ErasableGraph>
+(concept::ErasableGraph &);
//Compile SmartGraph
template
-void lemon::skeleton::checkCompileExtendableGraph<SmartGraph>(SmartGraph &);
+void lemon::concept::checkCompileExtendableGraph<SmartGraph>(SmartGraph &);
template
-void lemon::skeleton::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
+void lemon::concept::checkCompileGraphFindEdge<SmartGraph>(SmartGraph &);
//Compile SymSmartGraph
//template void hugo::checkCompileGraph<SymSmartGraph>(SymSmartGraph &);
@@ -91,11 +91,11 @@
//Compile ListGraph
template
-void lemon::skeleton::checkCompileExtendableGraph<ListGraph>(ListGraph &);
+void lemon::concept::checkCompileExtendableGraph<ListGraph>(ListGraph &);
template
-void lemon::skeleton::checkCompileErasableGraph<ListGraph>(ListGraph &);
+void lemon::concept::checkCompileErasableGraph<ListGraph>(ListGraph &);
template
-void lemon::skeleton::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
+void lemon::concept::checkCompileGraphFindEdge<ListGraph>(ListGraph &);
//Compile SymListGraph
@@ -104,9 +104,9 @@
//template void hugo::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
//Compile FullGraph
-template void lemon::skeleton::checkCompileStaticGraph<FullGraph>(FullGraph &);
+template void lemon::concept::checkCompileStaticGraph<FullGraph>(FullGraph &);
template
-void lemon::skeleton::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
+void lemon::concept::checkCompileGraphFindEdge<FullGraph>(FullGraph &);
int main()
@@ -141,7 +141,7 @@
// Some map tests.
// FIXME: These shouldn't be here.
- using namespace skeleton;
+ using namespace concept;
function_requires< ReadMapConcept< ReadMap<int,int> > >();
function_requires< WriteMapConcept< WriteMap<int,int> > >();
function_requires< ReadWriteMapConcept< ReadWriteMap<int,int> > >();
Modified: hugo/trunk/src/test/graph_test.cc
==============================================================================
--- hugo/trunk/src/test/graph_test.cc (original)
+++ hugo/trunk/src/test/graph_test.cc Thu Nov 4 21:24:59 2004
@@ -3,7 +3,7 @@
#include <iostream>
#include <vector>
-#include <lemon/skeletons/graph.h>
+#include <lemon/concept/graph.h>
#include <lemon/list_graph.h>
#include <lemon/smart_graph.h>
#include <lemon/full_graph.h>
@@ -14,7 +14,7 @@
using namespace lemon;
-using namespace lemon::skeleton;
+using namespace lemon::concept;
int main() {
Modified: hugo/trunk/src/test/graph_wrapper_test.cc
==============================================================================
--- hugo/trunk/src/test/graph_wrapper_test.cc (original)
+++ hugo/trunk/src/test/graph_wrapper_test.cc Thu Nov 4 21:24:59 2004
@@ -18,7 +18,7 @@
#include<lemon/concept_check.h>
#include<lemon/smart_graph.h>
-#include<lemon/skeletons/graph.h>
+#include<lemon/concept/graph.h>
#include<lemon/list_graph.h>
#include<lemon/full_graph.h>
@@ -35,7 +35,7 @@
*/
using namespace lemon;
-using namespace lemon::skeleton;
+using namespace lemon::concept;
typedef SmartGraph Graph;
Modified: hugo/trunk/src/test/kruskal_test.cc
==============================================================================
--- hugo/trunk/src/test/kruskal_test.cc (original)
+++ hugo/trunk/src/test/kruskal_test.cc Thu Nov 4 21:24:59 2004
@@ -21,8 +21,8 @@
#include <lemon/maps.h>
#include <lemon/kruskal.h>
#include <lemon/list_graph.h>
-#include <lemon/skeletons/maps.h>
-#include <lemon/skeletons/graph.h>
+#include <lemon/concept/maps.h>
+#include <lemon/concept/graph.h>
using namespace std;
@@ -30,10 +30,10 @@
void checkCompileKruskal()
{
- skeleton::WriteMap<skeleton::StaticGraph::Edge,bool> w;
+ concept::WriteMap<concept::StaticGraph::Edge,bool> w;
- kruskalEdgeMap(skeleton::StaticGraph(),
- skeleton::ReadMap<skeleton::StaticGraph::Edge,int>(),
+ kruskalEdgeMap(concept::StaticGraph(),
+ concept::ReadMap<concept::StaticGraph::Edge,int>(),
w);
}
Modified: hugo/trunk/src/test/new_graph_test.cc
==============================================================================
--- hugo/trunk/src/test/new_graph_test.cc (original)
+++ hugo/trunk/src/test/new_graph_test.cc Thu Nov 4 21:24:59 2004
@@ -14,10 +14,10 @@
*
*/
-#include <lemon/skeletons/graph.h>
+#include <lemon/concept/graph.h>
// #include <boost/concept_check.hpp>
-using namespace lemon::skeleton;
+using namespace lemon::concept;
// Borrowed from boost:
template <class T> inline void ignore_unused_variable_warning(const T&) { }
Modified: hugo/trunk/src/test/path_test.cc
==============================================================================
--- hugo/trunk/src/test/path_test.cc (original)
+++ hugo/trunk/src/test/path_test.cc Thu Nov 4 21:24:59 2004
@@ -16,13 +16,13 @@
#include <string>
#include <iostream>
-#include <lemon/skeletons/path.h>
+#include <lemon/concept/path.h>
#include <lemon/path.h>
#include <lemon/list_graph.h>
using namespace std;
using namespace lemon;
-using namespace skeleton;
+using namespace lemon::concept;
template<class Path> void checkCompilePath(Path &P)
{
@@ -86,7 +86,7 @@
}
-template void checkCompilePath< skeleton::Path<ListGraph> >(skeleton::Path<ListGraph> &);
+template void checkCompilePath< concept::Path<ListGraph> >(concept::Path<ListGraph> &);
template void checkCompilePath< DirPath<ListGraph> >(DirPath<ListGraph> &);
template void checkCompilePath< UndirPath<ListGraph> >(UndirPath<ListGraph> &);
Modified: hugo/trunk/src/test/preflow_test.cc
==============================================================================
--- hugo/trunk/src/test/preflow_test.cc (original)
+++ hugo/trunk/src/test/preflow_test.cc Thu Nov 4 21:24:59 2004
@@ -21,21 +21,21 @@
#include <lemon/smart_graph.h>
#include <lemon/dimacs.h>
#include <lemon/preflow.h>
-#include <lemon/skeletons/graph.h>
-#include <lemon/skeletons/maps.h>
+#include <lemon/concept/graph.h>
+#include <lemon/concept/maps.h>
using namespace lemon;
void check_Preflow()
{
typedef int VType;
- typedef skeleton::StaticGraph Graph;
+ typedef concept::StaticGraph Graph;
typedef Graph::Node Node;
typedef Graph::Edge Edge;
- typedef skeleton::ReadMap<Edge,VType> CapMap;
- typedef skeleton::ReadWriteMap<Edge,VType> FlowMap;
- typedef skeleton::ReadWriteMap<Node,bool> CutMap;
+ typedef concept::ReadMap<Edge,VType> CapMap;
+ typedef concept::ReadWriteMap<Edge,VType> FlowMap;
+ typedef concept::ReadWriteMap<Node,bool> CutMap;
typedef Preflow<Graph, int, CapMap, FlowMap> PType;
Modified: hugo/trunk/src/test/sym_graph_test.cc
==============================================================================
--- hugo/trunk/src/test/sym_graph_test.cc (original)
+++ hugo/trunk/src/test/sym_graph_test.cc Thu Nov 4 21:24:59 2004
@@ -16,7 +16,7 @@
#include<iostream>
-#include<lemon/skeletons/sym_graph.h>
+#include<lemon/concept/sym_graph.h>
#include<lemon/list_graph.h>
#include<lemon/smart_graph.h>
@@ -54,26 +54,26 @@
}
//Compile Graph
-template void lemon::checkCompileStaticSymGraph<skeleton::StaticSymGraph>
-(skeleton::StaticSymGraph &);
+template void lemon::checkCompileStaticSymGraph<concept::StaticSymGraph>
+(concept::StaticSymGraph &);
-template void lemon::checkCompileSymGraph<skeleton::ExtendableSymGraph>
-(skeleton::ExtendableSymGraph &);
+template void lemon::checkCompileSymGraph<concept::ExtendableSymGraph>
+(concept::ExtendableSymGraph &);
-template void lemon::checkCompileErasableSymGraph<skeleton::ErasableSymGraph>
-(skeleton::ErasableSymGraph &);
+template void lemon::checkCompileErasableSymGraph<concept::ErasableSymGraph>
+(concept::ErasableSymGraph &);
//Compile SymSmartGraph
template void lemon::checkCompileSymGraph<SymSmartGraph>(SymSmartGraph &);
template
-void lemon::skeleton::checkCompileGraphFindEdge<SymSmartGraph>(SymSmartGraph &);
+void lemon::concept::checkCompileGraphFindEdge<SymSmartGraph>(SymSmartGraph &);
//Compile SymListGraph
template void lemon::checkCompileSymGraph<SymListGraph>(SymListGraph &);
template void lemon::checkCompileErasableSymGraph<SymListGraph>(SymListGraph &);
template
-void lemon::skeleton::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
+void lemon::concept::checkCompileGraphFindEdge<SymListGraph>(SymListGraph &);
int main()
{
Modified: hugo/trunk/src/test/sym_graph_test.h
==============================================================================
--- hugo/trunk/src/test/sym_graph_test.h (original)
+++ hugo/trunk/src/test/sym_graph_test.h Thu Nov 4 21:24:59 2004
@@ -27,7 +27,7 @@
/// \e
- /// \todo This should go to lemon/skeleton/symgraph.h
+ /// \todo This should go to lemon/concept/symgraph.h
///
template<class Graph> void checkCompileStaticSymGraph(Graph &G)
{
@@ -40,7 +40,7 @@
typedef typename Graph::InEdgeIt InEdgeIt;
typedef typename Graph::OutEdgeIt OutEdgeIt;
- lemon::skeleton::checkCompileStaticGraph(G);
+ lemon::concept::checkCompileStaticGraph(G);
{
SymEdge i; SymEdge j(i); SymEdge k(INVALID);
@@ -157,7 +157,7 @@
template<class Graph> void checkCompileErasableSymGraph(Graph &G)
{
checkCompileSymGraph(G);
- lemon::skeleton::checkCompileGraphEraseNode(G);
+ lemon::concept::checkCompileGraphEraseNode(G);
checkCompileSymGraphEraseSymEdge(G);
}
Modified: hugo/trunk/src/work/Doxyfile
==============================================================================
--- hugo/trunk/src/work/Doxyfile (original)
+++ hugo/trunk/src/work/Doxyfile Thu Nov 4 21:24:59 2004
@@ -396,7 +396,7 @@
../../doc/maps.dox ../../doc/coding_style.dox \
../../doc/groups.dox \
../lemon \
- ../lemon/skeletons \
+ ../lemon/concept \
../test/test_tools.h \
klao/path.h \
klao/debug.h \
Modified: hugo/trunk/src/work/alpar/dijkstra.h
==============================================================================
--- hugo/trunk/src/work/alpar/dijkstra.h (original)
+++ hugo/trunk/src/work/alpar/dijkstra.h Thu Nov 4 21:24:59 2004
@@ -100,11 +100,11 @@
///This class provides an efficient implementation of %Dijkstra algorithm.
///The edge lengths are passed to the algorithm using a
- ///\ref skeleton::ReadMap "ReadMap",
+ ///\ref concept::ReadMap "ReadMap",
///so it is easy to change it to any kind of length.
///
///The type of the length is determined by the
- ///\ref skeleton::ReadMap::ValueType "ValueType" of the length map.
+ ///\ref concept::ReadMap::ValueType "ValueType" of the length map.
///
///It is also possible to change the underlying priority heap.
///
@@ -117,7 +117,7 @@
///lengths of the 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 skeleton::StaticGraph::EdgeMap "Graph::EdgeMap<int>".
+ ///\ref concept::StaticGraph::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.
Modified: hugo/trunk/src/work/alpar/list_graph_demo.cc
==============================================================================
--- hugo/trunk/src/work/alpar/list_graph_demo.cc (original)
+++ hugo/trunk/src/work/alpar/list_graph_demo.cc Thu Nov 4 21:24:59 2004
@@ -1,5 +1,5 @@
#include<list_graph.h>
-#include<skeletons/graph.h>
+#include<concept/graph.h>
#include <iostream>
#include <vector>
Modified: hugo/trunk/src/work/marci/bfs_mm_test.cc
==============================================================================
--- hugo/trunk/src/work/marci/bfs_mm_test.cc (original)
+++ hugo/trunk/src/work/marci/bfs_mm_test.cc Thu Nov 4 21:24:59 2004
@@ -17,7 +17,7 @@
#include <test/test_tools.h>
#include <lemon/smart_graph.h>
#include <bfs_mm.h>
-#include <lemon/skeletons/graph.h>
+#include <lemon/concept/graph.h>
using namespace lemon;
@@ -26,7 +26,7 @@
void check_Bfs_Compile()
{
- typedef skeleton::StaticGraph Graph;
+ typedef concept::StaticGraph Graph;
typedef Graph::Edge Edge;
typedef Graph::Node Node;
Modified: hugo/trunk/src/work/peter/path/path.h
==============================================================================
--- hugo/trunk/src/work/peter/path/path.h (original)
+++ hugo/trunk/src/work/peter/path/path.h Thu Nov 4 21:24:59 2004
@@ -12,7 +12,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::skeleton::Path
+\sa lemon::concept::Path
*/
Modified: hugo/trunk/src/work/peter/path/path_skeleton.h
==============================================================================
--- hugo/trunk/src/work/peter/path/path_skeleton.h (original)
+++ hugo/trunk/src/work/peter/path/path_skeleton.h Thu Nov 4 21:24:59 2004
@@ -1,7 +1,7 @@
#define SKELETON
// -*- c++ -*- //
-///\ingroup skeletons
+///\ingroup concept
///\file
///\brief Classes for representing paths in graphs.
@@ -11,12 +11,12 @@
#include <lemon/invalid.h>
namespace lemon {
- namespace skeleton {
- /// \addtogroup skeletons
+ namespace concept {
+ /// \addtogroup concept
/// @{
- //! \brief A skeletom structure for representing directed paths in a graph.
+ //! \brief A skeleton structure for representing directed paths in a graph.
//!
//! A skeleton structure for representing directed paths in a graph.
//! \param GR The graph type in which the path is.
@@ -85,7 +85,7 @@
/**
* \brief Iterator class to iterate on the edges of the paths
*
- * \ingroup skeletons
+ * \ingroup concept
* This class is used to iterate on the edges of the paths
*
* Of course it converts to Graph::Edge
@@ -118,7 +118,7 @@
/**
* \brief Iterator class to iterate on the nodes of the paths
*
- * \ingroup skeletons
+ * \ingroup concept
* This class is used to iterate on the nodes of the paths
*
* Of course it converts to Graph::Node.
@@ -153,7 +153,7 @@
/**
* \brief Class to build paths
*
- * \ingroup skeletons
+ * \ingroup concept
* This class is used to fill a path with edges.
*
* You can push new edges to the front and to the back of the path in
Modified: hugo/trunk/src/work/peter/path/path_test.cc
==============================================================================
--- hugo/trunk/src/work/peter/path/path_test.cc (original)
+++ hugo/trunk/src/work/peter/path/path_test.cc Thu Nov 4 21:24:59 2004
@@ -6,7 +6,7 @@
using namespace std;
using namespace lemon;
-using namespace skeleton;
+using namespace concept;
bool passed = true;
More information about the Lemon-commits
mailing list