1.1 --- a/doc/Doxyfile.in Sun Jul 13 20:09:47 2008 +0100
1.2 +++ b/doc/Doxyfile.in Mon Jul 14 09:15:23 2008 +0200
1.3 @@ -102,7 +102,7 @@
1.4 EXAMPLE_PATTERNS =
1.5 EXAMPLE_RECURSIVE = NO
1.6 IMAGE_PATH = @abs_top_srcdir@/doc/images \
1.7 - @abs_top_builddir@/doc/gen-images
1.8 + @abs_top_builddir@/doc/gen-images
1.9 INPUT_FILTER =
1.10 FILTER_PATTERNS =
1.11 FILTER_SOURCE_FILES = NO
2.1 --- a/doc/lgf.dox Sun Jul 13 20:09:47 2008 +0100
2.2 +++ b/doc/lgf.dox Mon Jul 14 09:15:23 2008 +0200
2.3 @@ -57,10 +57,10 @@
2.4
2.5 \code
2.6 @nodes
2.7 - label coordinates size title
2.8 - 1 (10,20) 10 "First node"
2.9 - 2 (80,80) 8 "Second node"
2.10 - 3 (40,10) 10 "Third node"
2.11 + label coordinates size title
2.12 + 1 (10,20) 10 "First node"
2.13 + 2 (80,80) 8 "Second node"
2.14 + 3 (40,10) 10 "Third node"
2.15 \endcode
2.16
2.17 The \c \@arcs section is very similar to the \c \@nodes section,
2.18 @@ -72,7 +72,7 @@
2.19
2.20 \code
2.21 @arcs
2.22 - capacity
2.23 + capacity
2.24 1 2 16
2.25 1 3 12
2.26 2 3 18
3.1 --- a/lemon/assert.h Sun Jul 13 20:09:47 2008 +0100
3.2 +++ b/lemon/assert.h Mon Jul 14 09:15:23 2008 +0200
3.3 @@ -66,17 +66,17 @@
3.4 #undef LEMON_FIXME
3.5 #undef LEMON_DEBUG
3.6
3.7 -#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
3.8 - (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
3.9 +#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
3.10 + (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
3.11 (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1
3.12 #error "LEMON assertion system is not set properly"
3.13 #endif
3.14
3.15 -#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
3.16 - (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
3.17 - (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 || \
3.18 - defined(LEMON_ENABLE_ASSERTS)) && \
3.19 - (defined(LEMON_DISABLE_ASSERTS) || \
3.20 +#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) + \
3.21 + (defined(LEMON_ASSERT_ABORT) ? 1 : 0) + \
3.22 + (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 || \
3.23 + defined(LEMON_ENABLE_ASSERTS)) && \
3.24 + (defined(LEMON_DISABLE_ASSERTS) || \
3.25 defined(NDEBUG))
3.26 #error "LEMON assertion system is not set properly"
3.27 #endif
3.28 @@ -168,9 +168,9 @@
3.29 /// \ref lemon/assert.h "assert.h" file is reincluded, then the
3.30 /// behaviour is changed appropiately to the new settings.
3.31 # define LEMON_ASSERT(exp, msg) \
3.32 - (static_cast<void> (!!(exp) ? 0 : ( \
3.33 - LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
3.34 - LEMON_FUNCTION_NAME, \
3.35 + (static_cast<void> (!!(exp) ? 0 : ( \
3.36 + LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
3.37 + LEMON_FUNCTION_NAME, \
3.38 ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
3.39
3.40 /// \ingroup exceptions
3.41 @@ -184,9 +184,9 @@
3.42 /// \endcode
3.43 ///
3.44 /// \see LEMON_ASSERT
3.45 -# define LEMON_FIXME(msg) \
3.46 +# define LEMON_FIXME(msg) \
3.47 (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
3.48 - ::lemon::_assert_bits::cstringify(msg), \
3.49 + ::lemon::_assert_bits::cstringify(msg), \
3.50 static_cast<const char*>(0)))
3.51
3.52 /// \ingroup exceptions
3.53 @@ -212,10 +212,10 @@
3.54 /// macro.
3.55 ///
3.56 /// \see LEMON_ASSERT
3.57 -# define LEMON_DEBUG(exp, msg) \
3.58 - (static_cast<void> (!!(exp) ? 0 : ( \
3.59 +# define LEMON_DEBUG(exp, msg) \
3.60 + (static_cast<void> (!!(exp) ? 0 : ( \
3.61 LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
3.62 - LEMON_FUNCTION_NAME, \
3.63 + LEMON_FUNCTION_NAME, \
3.64 ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
3.65
3.66 #else
3.67 @@ -225,23 +225,23 @@
3.68 # define LEMON_FIXME(msg) (static_cast<void>(0))
3.69 # define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
3.70 # else
3.71 -# define LEMON_ASSERT(exp, msg) \
3.72 - (static_cast<void> (!!(exp) ? 0 : ( \
3.73 +# define LEMON_ASSERT(exp, msg) \
3.74 + (static_cast<void> (!!(exp) ? 0 : ( \
3.75 LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
3.76 - LEMON_FUNCTION_NAME, \
3.77 - ::lemon::_assert_bits::cstringify(msg), \
3.78 + LEMON_FUNCTION_NAME, \
3.79 + ::lemon::_assert_bits::cstringify(msg), \
3.80 #exp), 0)))
3.81 -# define LEMON_FIXME(msg) \
3.82 - (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
3.83 - ::lemon::_assert_bits::cstringify(msg), \
3.84 +# define LEMON_FIXME(msg) \
3.85 + (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
3.86 + ::lemon::_assert_bits::cstringify(msg), \
3.87 static_cast<const char*>(0)))
3.88
3.89 # if LEMON_ENABLE_DEBUG
3.90 # define LEMON_DEBUG(exp, msg)
3.91 - (static_cast<void> (!!(exp) ? 0 : ( \
3.92 - LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
3.93 - LEMON_FUNCTION_NAME, \
3.94 - ::lemon::_assert_bits::cstringify(msg), \
3.95 + (static_cast<void> (!!(exp) ? 0 : ( \
3.96 + LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
3.97 + LEMON_FUNCTION_NAME, \
3.98 + ::lemon::_assert_bits::cstringify(msg), \
3.99 #exp), 0)))
3.100 # else
3.101 # define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
3.102 @@ -249,13 +249,3 @@
3.103 # endif
3.104
3.105 #endif
3.106 -
3.107 -#ifdef DOXYGEN
3.108 -
3.109 -
3.110 -#else
3.111 -
3.112 -
3.113 -#endif
3.114 -
3.115 -
4.1 --- a/lemon/concepts/path.h Sun Jul 13 20:09:47 2008 +0100
4.2 +++ b/lemon/concepts/path.h Mon Jul 14 09:15:23 2008 +0200
4.3 @@ -100,8 +100,8 @@
4.4 bool operator==(const ArcIt&) const {return true;}
4.5 /// Comparison operator
4.6 bool operator!=(const ArcIt&) const {return true;}
4.7 - /// Comparison operator
4.8 - bool operator<(const ArcIt&) const {return false;}
4.9 + /// Comparison operator
4.10 + bool operator<(const ArcIt&) const {return false;}
4.11
4.12 };
4.13
4.14 @@ -255,8 +255,8 @@
4.15 bool operator==(const ArcIt&) const {return true;}
4.16 /// Comparison operator
4.17 bool operator!=(const ArcIt&) const {return true;}
4.18 - /// Comparison operator
4.19 - bool operator<(const ArcIt&) const {return false;}
4.20 + /// Comparison operator
4.21 + bool operator<(const ArcIt&) const {return false;}
4.22
4.23 };
4.24
4.25 @@ -283,8 +283,8 @@
4.26 bool operator==(const RevArcIt&) const {return true;}
4.27 /// Comparison operator
4.28 bool operator!=(const RevArcIt&) const {return true;}
4.29 - /// Comparison operator
4.30 - bool operator<(const RevArcIt&) const {return false;}
4.31 + /// Comparison operator
4.32 + bool operator<(const RevArcIt&) const {return false;}
4.33
4.34 };
4.35
5.1 --- a/lemon/error.h Sun Jul 13 20:09:47 2008 +0100
5.2 +++ b/lemon/error.h Mon Jul 14 09:15:23 2008 +0200
5.3 @@ -70,7 +70,7 @@
5.4 if (ptr.get() == 0) return;
5.5 try {
5.6 if (!copy.valid()) return;
5.7 - *ptr = copy.get();
5.8 + *ptr = copy.get();
5.9 } catch (...) {}
5.10 }
5.11
6.1 --- a/lemon/graph_to_eps.h Sun Jul 13 20:09:47 2008 +0100
6.2 +++ b/lemon/graph_to_eps.h Mon Jul 14 09:15:23 2008 +0200
6.3 @@ -908,7 +908,7 @@
6.4 double l=std::sqrt(dvec.normSquare());
6.5 //\todo better 'epsilon' would be nice here.
6.6 dim2::Point<double> d(dvec/std::max(l,EPSILON));
6.7 - dim2::Point<double> m;
6.8 + dim2::Point<double> m;
6.9 // m=dim2::Point<double>(mycoords[g.target(*i)]+
6.10 // mycoords[g.source(*i)])/2.0;
6.11
6.12 @@ -916,7 +916,7 @@
6.13 // dvec*(double(_nodeSizes[g.source(*i)])/
6.14 // (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
6.15
6.16 - m=dim2::Point<double>(mycoords[g.source(*i)])+
6.17 + m=dim2::Point<double>(mycoords[g.source(*i)])+
6.18 d*(l+_nodeSizes[g.source(*i)]-_nodeSizes[g.target(*i)])/2.0;
6.19
6.20 for(typename std::vector<Arc>::iterator e=i;e!=j;++e) {
7.1 --- a/lemon/graph_utils.h Sun Jul 13 20:09:47 2008 +0100
7.2 +++ b/lemon/graph_utils.h Mon Jul 14 09:15:23 2008 +0200
7.3 @@ -52,18 +52,18 @@
7.4 ///\note If the graph type is a dependent type, ie. the graph type depend
7.5 ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
7.6 ///macro.
7.7 -#define DIGRAPH_TYPEDEFS(Digraph) \
7.8 - typedef Digraph::Node Node; \
7.9 - typedef Digraph::NodeIt NodeIt; \
7.10 - typedef Digraph::Arc Arc; \
7.11 - typedef Digraph::ArcIt ArcIt; \
7.12 - typedef Digraph::InArcIt InArcIt; \
7.13 - typedef Digraph::OutArcIt OutArcIt; \
7.14 - typedef Digraph::NodeMap<bool> BoolNodeMap; \
7.15 - typedef Digraph::NodeMap<int> IntNodeMap; \
7.16 - typedef Digraph::NodeMap<double> DoubleNodeMap; \
7.17 - typedef Digraph::ArcMap<bool> BoolArcMap; \
7.18 - typedef Digraph::ArcMap<int> IntArcMap; \
7.19 +#define DIGRAPH_TYPEDEFS(Digraph) \
7.20 + typedef Digraph::Node Node; \
7.21 + typedef Digraph::NodeIt NodeIt; \
7.22 + typedef Digraph::Arc Arc; \
7.23 + typedef Digraph::ArcIt ArcIt; \
7.24 + typedef Digraph::InArcIt InArcIt; \
7.25 + typedef Digraph::OutArcIt OutArcIt; \
7.26 + typedef Digraph::NodeMap<bool> BoolNodeMap; \
7.27 + typedef Digraph::NodeMap<int> IntNodeMap; \
7.28 + typedef Digraph::NodeMap<double> DoubleNodeMap; \
7.29 + typedef Digraph::ArcMap<bool> BoolArcMap; \
7.30 + typedef Digraph::ArcMap<int> IntArcMap; \
7.31 typedef Digraph::ArcMap<double> DoubleArcMap
7.32
7.33 ///Creates convenience typedefs for the digraph types and iterators
7.34 @@ -72,18 +72,18 @@
7.35 ///
7.36 ///\note Use this macro, if the graph type is a dependent type,
7.37 ///ie. the graph type depend on a template parameter.
7.38 -#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph) \
7.39 - typedef typename Digraph::Node Node; \
7.40 - typedef typename Digraph::NodeIt NodeIt; \
7.41 - typedef typename Digraph::Arc Arc; \
7.42 +#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph) \
7.43 + typedef typename Digraph::Node Node; \
7.44 + typedef typename Digraph::NodeIt NodeIt; \
7.45 + typedef typename Digraph::Arc Arc; \
7.46 typedef typename Digraph::ArcIt ArcIt; \
7.47 - typedef typename Digraph::InArcIt InArcIt; \
7.48 - typedef typename Digraph::OutArcIt OutArcIt; \
7.49 - typedef typename Digraph::template NodeMap<bool> BoolNodeMap; \
7.50 - typedef typename Digraph::template NodeMap<int> IntNodeMap; \
7.51 - typedef typename Digraph::template NodeMap<double> DoubleNodeMap; \
7.52 - typedef typename Digraph::template ArcMap<bool> BoolArcMap; \
7.53 - typedef typename Digraph::template ArcMap<int> IntArcMap; \
7.54 + typedef typename Digraph::InArcIt InArcIt; \
7.55 + typedef typename Digraph::OutArcIt OutArcIt; \
7.56 + typedef typename Digraph::template NodeMap<bool> BoolNodeMap; \
7.57 + typedef typename Digraph::template NodeMap<int> IntNodeMap; \
7.58 + typedef typename Digraph::template NodeMap<double> DoubleNodeMap; \
7.59 + typedef typename Digraph::template ArcMap<bool> BoolArcMap; \
7.60 + typedef typename Digraph::template ArcMap<int> IntArcMap; \
7.61 typedef typename Digraph::template ArcMap<double> DoubleArcMap
7.62
7.63 ///Creates convenience typedefs for the graph types and iterators
7.64 @@ -96,13 +96,13 @@
7.65 ///\note If the graph type is a dependent type, ie. the graph type depend
7.66 ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
7.67 ///macro.
7.68 -#define GRAPH_TYPEDEFS(Graph) \
7.69 - DIGRAPH_TYPEDEFS(Graph); \
7.70 - typedef Graph::Edge Edge; \
7.71 - typedef Graph::EdgeIt EdgeIt; \
7.72 - typedef Graph::IncEdgeIt IncEdgeIt; \
7.73 - typedef Graph::EdgeMap<bool> BoolEdgeMap; \
7.74 - typedef Graph::EdgeMap<int> IntEdgeMap; \
7.75 +#define GRAPH_TYPEDEFS(Graph) \
7.76 + DIGRAPH_TYPEDEFS(Graph); \
7.77 + typedef Graph::Edge Edge; \
7.78 + typedef Graph::EdgeIt EdgeIt; \
7.79 + typedef Graph::IncEdgeIt IncEdgeIt; \
7.80 + typedef Graph::EdgeMap<bool> BoolEdgeMap; \
7.81 + typedef Graph::EdgeMap<int> IntEdgeMap; \
7.82 typedef Graph::EdgeMap<double> DoubleEdgeMap
7.83
7.84 ///Creates convenience typedefs for the graph types and iterators
7.85 @@ -111,13 +111,13 @@
7.86 ///
7.87 ///\note Use this macro, if the graph type is a dependent type,
7.88 ///ie. the graph type depend on a template parameter.
7.89 -#define TEMPLATE_GRAPH_TYPEDEFS(Graph) \
7.90 - TEMPLATE_DIGRAPH_TYPEDEFS(Graph); \
7.91 - typedef typename Graph::Edge Edge; \
7.92 +#define TEMPLATE_GRAPH_TYPEDEFS(Graph) \
7.93 + TEMPLATE_DIGRAPH_TYPEDEFS(Graph); \
7.94 + typedef typename Graph::Edge Edge; \
7.95 typedef typename Graph::EdgeIt EdgeIt; \
7.96 - typedef typename Graph::IncEdgeIt IncEdgeIt; \
7.97 - typedef typename Graph::template EdgeMap<bool> BoolEdgeMap; \
7.98 - typedef typename Graph::template EdgeMap<int> IntEdgeMap; \
7.99 + typedef typename Graph::IncEdgeIt IncEdgeIt; \
7.100 + typedef typename Graph::template EdgeMap<bool> BoolEdgeMap; \
7.101 + typedef typename Graph::template EdgeMap<int> IntEdgeMap; \
7.102 typedef typename Graph::template EdgeMap<double> DoubleEdgeMap
7.103
7.104 /// \brief Function to count the items in the graph.
8.1 --- a/lemon/lgf_reader.h Sun Jul 13 20:09:47 2008 +0100
8.2 +++ b/lemon/lgf_reader.h Mon Jul 14 09:15:23 2008 +0200
8.3 @@ -146,7 +146,7 @@
8.4
8.5 public:
8.6 ValueStorage(Value& value, const Converter& converter = Converter())
8.7 - : _value(value), _converter(converter) {}
8.8 + : _value(value), _converter(converter) {}
8.9
8.10 virtual void set(const std::string& value) {
8.11 _value = _converter(value);
8.12 @@ -510,7 +510,7 @@
8.13 /// file.
8.14 DigraphReader(const std::string& fn, Digraph& digraph)
8.15 : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
8.16 - _use_nodes(false), _use_arcs(false),
8.17 + _use_nodes(false), _use_arcs(false),
8.18 _skip_nodes(false), _skip_arcs(false) {}
8.19
8.20 /// \brief Constructor
8.21 @@ -519,7 +519,7 @@
8.22 /// file.
8.23 DigraphReader(const char* fn, Digraph& digraph)
8.24 : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
8.25 - _use_nodes(false), _use_arcs(false),
8.26 + _use_nodes(false), _use_arcs(false),
8.27 _skip_nodes(false), _skip_arcs(false) {}
8.28
8.29 /// \brief Destructor
8.30 @@ -1294,7 +1294,7 @@
8.31 /// file.
8.32 GraphReader(const std::string& fn, Graph& graph)
8.33 : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
8.34 - _use_nodes(false), _use_edges(false),
8.35 + _use_nodes(false), _use_edges(false),
8.36 _skip_nodes(false), _skip_edges(false) {}
8.37
8.38 /// \brief Constructor
8.39 @@ -1303,7 +1303,7 @@
8.40 /// file.
8.41 GraphReader(const char* fn, Graph& graph)
8.42 : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
8.43 - _use_nodes(false), _use_edges(false),
8.44 + _use_nodes(false), _use_edges(false),
8.45 _skip_nodes(false), _skip_edges(false) {}
8.46
8.47 /// \brief Destructor
9.1 --- a/lemon/lgf_writer.h Sun Jul 13 20:09:47 2008 +0100
9.2 +++ b/lemon/lgf_writer.h Mon Jul 14 09:15:23 2008 +0200
9.3 @@ -181,7 +181,7 @@
9.4
9.5 public:
9.6 ValueStorage(const Value& value, const Converter& converter = Converter())
9.7 - : _value(value), _converter(converter) {}
9.8 + : _value(value), _converter(converter) {}
9.9
9.10 virtual std::string get() {
9.11 return _converter(_value);
10.1 --- a/lemon/list_graph.h Sun Jul 13 20:09:47 2008 +0100
10.2 +++ b/lemon/list_graph.h Mon Jul 14 09:15:23 2008 +0200
10.3 @@ -494,7 +494,7 @@
10.4 Node split(Node n, bool connect = true) {
10.5 Node b = addNode();
10.6 for(OutArcIt e(*this,n);e!=INVALID;) {
10.7 - OutArcIt f=e;
10.8 + OutArcIt f=e;
10.9 ++f;
10.10 changeSource(e,b);
10.11 e=f;
11.1 --- a/test/heap_test.cc Sun Jul 13 20:09:47 2008 +0100
11.2 +++ b/test/heap_test.cc Mon Jul 14 09:15:23 2008 +0200
11.3 @@ -54,27 +54,27 @@
11.4 "8\n"
11.5 "9\n"
11.6 "@arcs\n"
11.7 - " label capacity\n"
11.8 - "0 5 0 94\n"
11.9 - "3 9 1 11\n"
11.10 - "8 7 2 83\n"
11.11 - "1 2 3 94\n"
11.12 - "5 7 4 35\n"
11.13 - "7 4 5 84\n"
11.14 - "9 5 6 38\n"
11.15 - "0 4 7 96\n"
11.16 - "6 7 8 6\n"
11.17 - "3 1 9 27\n"
11.18 - "5 2 10 77\n"
11.19 - "5 6 11 69\n"
11.20 - "6 5 12 41\n"
11.21 - "4 6 13 70\n"
11.22 - "3 2 14 45\n"
11.23 - "7 9 15 93\n"
11.24 - "5 9 16 50\n"
11.25 - "9 0 17 94\n"
11.26 - "9 6 18 67\n"
11.27 - "0 9 19 86\n"
11.28 + " label capacity\n"
11.29 + "0 5 0 94\n"
11.30 + "3 9 1 11\n"
11.31 + "8 7 2 83\n"
11.32 + "1 2 3 94\n"
11.33 + "5 7 4 35\n"
11.34 + "7 4 5 84\n"
11.35 + "9 5 6 38\n"
11.36 + "0 4 7 96\n"
11.37 + "6 7 8 6\n"
11.38 + "3 1 9 27\n"
11.39 + "5 2 10 77\n"
11.40 + "5 6 11 69\n"
11.41 + "6 5 12 41\n"
11.42 + "4 6 13 70\n"
11.43 + "3 2 14 45\n"
11.44 + "7 9 15 93\n"
11.45 + "5 9 16 50\n"
11.46 + "9 0 17 94\n"
11.47 + "9 6 18 67\n"
11.48 + "0 9 19 86\n"
11.49 "@attributes\n"
11.50 "source 3\n";
11.51
11.52 @@ -141,7 +141,7 @@
11.53 Node t = digraph.target(a);
11.54 if (dijkstra.reached(s)) {
11.55 check( dijkstra.dist(t) - dijkstra.dist(s) <= length[a],
11.56 - "Error in a shortest path tree!");
11.57 + "Error in a shortest path tree!");
11.58 }
11.59 }
11.60