[Lemon-commits] Alpar Juttner: Remove long lines (from all but o...
Lemon HG
hg at lemon.cs.elte.hu
Sun Jul 13 21:14:18 CEST 2008
details: http://lemon.cs.elte.hu/hg/lemon/rev/81cfc04531e8
changeset: 210:81cfc04531e8
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Sun Jul 13 20:09:47 2008 +0100
description:
Remove long lines (from all but one file)
diffstat:
14 files changed, 134 insertions(+), 75 deletions(-)
doc/coding_style.dox | 3 +-
doc/groups.dox | 12 +++++---
lemon/arg_parser.cc | 8 ++---
lemon/assert.h | 9 +++---
lemon/bfs.h | 9 ++++--
lemon/concepts/maps.h | 12 +++++---
lemon/dfs.h | 9 ++++--
lemon/dijkstra.h | 25 +++++++++--------
lemon/graph_to_eps.h | 29 +++++++++++++-------
lemon/lgf_reader.h | 3 +-
lemon/time_measure.h | 3 +-
test/dijkstra_test.cc | 9 ++++--
test/graph_utils_test.cc | 12 +++++---
test/maps_test.cc | 66 ++++++++++++++++++++++++++++++----------------
diffs (truncated from 626 to 300 lines):
diff -r 765619b7cbb2 -r 81cfc04531e8 doc/coding_style.dox
--- a/doc/coding_style.dox Sun Jul 13 19:51:02 2008 +0100
+++ b/doc/coding_style.dox Sun Jul 13 20:09:47 2008 +0100
@@ -89,7 +89,8 @@
\subsection cs-loc-var Class and instance member variables, auto variables
-The names of class and instance member variables and auto variables (=variables used locally in methods) should look like the following.
+The names of class and instance member variables and auto variables
+(=variables used locally in methods) should look like the following.
\code
all_lower_case_with_underscores
diff -r 765619b7cbb2 -r 81cfc04531e8 doc/groups.dox
--- a/doc/groups.dox Sun Jul 13 19:51:02 2008 +0100
+++ b/doc/groups.dox Sun Jul 13 20:09:47 2008 +0100
@@ -227,7 +227,8 @@
maximum flow is the \f$f_a\f$ solution of the next optimization problem:
\f[ 0 \le f_a \le c_a \f]
-\f[ \sum_{v\in\delta^{-}(u)}f_{vu}=\sum_{v\in\delta^{+}(u)}f_{uv} \qquad \forall u \in V \setminus \{s,t\}\f]
+\f[ \sum_{v\in\delta^{-}(u)}f_{vu}=\sum_{v\in\delta^{+}(u)}f_{uv}
+\qquad \forall u \in V \setminus \{s,t\}\f]
\f[ \max \sum_{v\in\delta^{+}(s)}f_{uv} - \sum_{v\in\delta^{-}(s)}f_{vu}\f]
LEMON contains several algorithms for solving maximum flow problems:
@@ -267,7 +268,8 @@
\f$c_a:A\rightarrow\mathbf{R}^+_0\f$ capacity function. The minimum
cut is the \f$X\f$ solution of the next optimization problem:
-\f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}\sum_{uv\in A, u\in X, v\not\in X}c_{uv}\f]
+\f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}
+\sum_{uv\in A, u\in X, v\not\in X}c_{uv}\f]
LEMON contains several algorithms related to minimum cut problems:
@@ -300,7 +302,8 @@
@ingroup algs
\brief Algorithms for planarity checking, embedding and drawing
-This group describes the algorithms for planarity checking, embedding and drawing.
+This group describes the algorithms for planarity checking,
+embedding and drawing.
\image html planar.png
\image latex planar.eps "Plane graph" width=\textwidth
@@ -477,7 +480,8 @@
@ingroup io_group
\brief Reading and writing \ref lgf-format "Lemon Graph Format".
-This group describes methods for reading and writing \ref lgf-format "Lemon Graph Format".
+This group describes methods for reading and writing
+\ref lgf-format "Lemon Graph Format".
*/
/**
diff -r 765619b7cbb2 -r 81cfc04531e8 lemon/arg_parser.cc
--- a/lemon/arg_parser.cc Sun Jul 13 19:51:02 2008 +0100
+++ b/lemon/arg_parser.cc Sun Jul 13 20:09:47 2008 +0100
@@ -395,16 +395,16 @@
o!=i->second.opts.end();++o)
if(_opts.find(*o)->second.set) ++set;
if(i->second.mandatory&&!set) {
- std::cerr << _command_name
- << ": At least one of the following arguments is mandatory.\n";
+ std::cerr << _command_name <<
+ ": At least one of the following arguments is mandatory.\n";
ok=false;
for(GroupData::Opts::iterator o=i->second.opts.begin();
o!=i->second.opts.end();++o)
showHelp(_opts.find(*o));
}
if(i->second.only_one&&set>1) {
- std::cerr << _command_name
- << ": At most one of the following arguments can be given.\n";
+ std::cerr << _command_name <<
+ ": At most one of the following arguments can be given.\n";
ok=false;
for(GroupData::Opts::iterator o=i->second.opts.begin();
o!=i->second.opts.end();++o)
diff -r 765619b7cbb2 -r 81cfc04531e8 lemon/assert.h
--- a/lemon/assert.h Sun Jul 13 19:51:02 2008 +0100
+++ b/lemon/assert.h Sun Jul 13 20:09:47 2008 +0100
@@ -151,8 +151,9 @@
/// - \c LEMON_ASSERT_CUSTOM The user can define own assertion handler
/// function.
/// \code
-/// void custom_assert_handler(const char* file, int line, const char* function,
-/// const char* message, const char* assertion);
+/// void custom_assert_handler(const char* file, int line,
+/// const char* function, const char* message,
+/// const char* assertion);
/// \endcode
/// The name of the function should be defined as the \c
/// LEMON_CUSTOM_ASSERT_HANDLER macro name.
@@ -185,7 +186,7 @@
/// \see LEMON_ASSERT
# define LEMON_FIXME(msg) \
(LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
- ::lemon::_assert_bits::cstringify(msg), \
+ ::lemon::_assert_bits::cstringify(msg), \
static_cast<const char*>(0)))
/// \ingroup exceptions
@@ -240,7 +241,7 @@
(static_cast<void> (!!(exp) ? 0 : ( \
LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
LEMON_FUNCTION_NAME, \
- ::lemon::_assert_bits::cstringify(msg), \
+ ::lemon::_assert_bits::cstringify(msg), \
#exp), 0)))
# else
# define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
diff -r 765619b7cbb2 -r 81cfc04531e8 lemon/bfs.h
--- a/lemon/bfs.h Sun Jul 13 19:51:02 2008 +0100
+++ b/lemon/bfs.h Sun Jul 13 20:09:47 2008 +0100
@@ -103,7 +103,8 @@
///Instantiates a DistMap.
///This function instantiates a \ref DistMap.
- ///\param G is the digraph, to which we would like to define the \ref DistMap
+ ///\param G is the digraph, to which we would like to define
+ ///the \ref DistMap
static DistMap *createDistMap(const GR &G)
{
return new DistMap(G);
@@ -825,7 +826,8 @@
///Instantiates a DistMap.
///This function instantiates a \ref DistMap.
- ///\param g is the digraph, to which we would like to define the \ref DistMap
+ ///\param g is the digraph, to which we would like to define
+ ///the \ref DistMap
#ifdef DOXYGEN
static DistMap *createDistMap(const GR &g)
#else
@@ -1199,7 +1201,8 @@
/// class. It works with callback mechanism, the BfsVisit object calls
/// on every bfs event the \c Visitor class member functions.
///
- /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
+ /// \tparam _Digraph The digraph type the algorithm runs on.
+ /// The default value is
/// \ref ListDigraph. The value of _Digraph is not used directly by Bfs, it
/// is only passed to \ref BfsDefaultTraits.
/// \tparam _Visitor The Visitor object for the algorithm. The
diff -r 765619b7cbb2 -r 81cfc04531e8 lemon/concepts/maps.h
--- a/lemon/concepts/maps.h Sun Jul 13 19:51:02 2008 +0100
+++ b/lemon/concepts/maps.h Sun Jul 13 20:09:47 2008 +0100
@@ -43,7 +43,8 @@
public:
/// The key type of the map.
typedef K Key;
- /// The value type of the map. (The type of objects associated with the keys).
+ /// \brief The value type of the map.
+ /// (The type of objects associated with the keys).
typedef T Value;
/// Returns the value associated with the given key.
@@ -82,7 +83,8 @@
public:
/// The key type of the map.
typedef K Key;
- /// The value type of the map. (The type of objects associated with the keys).
+ /// \brief The value type of the map.
+ /// (The type of objects associated with the keys).
typedef T Value;
/// Sets the value associated with the given key.
@@ -121,7 +123,8 @@
public:
/// The key type of the map.
typedef K Key;
- /// The value type of the map. (The type of objects associated with the keys).
+ /// \brief The value type of the map.
+ /// (The type of objects associated with the keys).
typedef T Value;
/// Returns the value associated with the given key.
@@ -154,7 +157,8 @@
typedef True ReferenceMapTag;
/// The key type of the map.
typedef K Key;
- /// The value type of the map. (The type of objects associated with the keys).
+ /// \brief The value type of the map.
+ /// (The type of objects associated with the keys).
typedef T Value;
/// The reference type of the map.
typedef R Reference;
diff -r 765619b7cbb2 -r 81cfc04531e8 lemon/dfs.h
--- a/lemon/dfs.h Sun Jul 13 19:51:02 2008 +0100
+++ b/lemon/dfs.h Sun Jul 13 20:09:47 2008 +0100
@@ -105,7 +105,8 @@
///Instantiates a DistMap.
///This function instantiates a \ref DistMap.
- ///\param G is the digraph, to which we would like to define the \ref DistMap
+ ///\param G is the digraph, to which we would like to define
+ ///the \ref DistMap
static DistMap *createDistMap(const GR &G)
{
return new DistMap(G);
@@ -808,7 +809,8 @@
///Instantiates a DistMap.
///This function instantiates a \ref DistMap.
- ///\param g is the digraph, to which we would like to define the \ref DistMap
+ ///\param g is the digraph, to which we would like to define
+ ///the \ref DistMap
#ifdef DOXYGEN
static DistMap *createDistMap(const GR &g)
#else
@@ -1193,7 +1195,8 @@
/// class. It works with callback mechanism, the DfsVisit object calls
/// on every dfs event the \c Visitor class member functions.
///
- /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
+ /// \tparam _Digraph The digraph type the algorithm runs on.
+ /// The default value is
/// \ref ListDigraph. The value of _Digraph is not used directly by Dfs, it
/// is only passed to \ref DfsDefaultTraits.
/// \tparam _Visitor The Visitor object for the algorithm. The
diff -r 765619b7cbb2 -r 81cfc04531e8 lemon/dijkstra.h
--- a/lemon/dijkstra.h Sun Jul 13 19:51:02 2008 +0100
+++ b/lemon/dijkstra.h Sun Jul 13 20:09:47 2008 +0100
@@ -173,7 +173,8 @@
///Instantiates a DistMap.
///This function instantiates a \ref DistMap.
- ///\param G is the digraph, to which we would like to define the \ref DistMap
+ ///\param G is the digraph, to which we would like to define
+ ///the \ref DistMap
static DistMap *createDistMap(const GR &G)
{
return new DistMap(G);
@@ -336,8 +337,8 @@
///
template <class T>
struct DefPredMap
- : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
- typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
+ : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
+ typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
};
template <class T>
@@ -372,8 +373,8 @@
///
template <class T>
struct DefProcessedMap
- : public Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > {
- typedef Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > Create;
+ : public Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > {
+ typedef Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > Create;
};
struct DefDigraphProcessedMapTraits : public Traits {
@@ -392,7 +393,8 @@
template <class T>
struct DefProcessedMapToBeDefaultMap
: public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
- typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> Create;
+ typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits>
+ Create;
};
template <class H, class CR>
@@ -415,8 +417,8 @@
///
template <class H, class CR = typename Digraph::template NodeMap<int> >
struct DefHeap
- : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
- typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
+ : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
+ typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
};
template <class H, class CR>
@@ -440,8 +442,8 @@
///parameter and the heap's constructor waits for the cross reference.
template <class H, class CR = typename Digraph::template NodeMap<int> >
struct DefStandardHeap
- : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
- typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
+ : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
+ typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
Create;
};
@@ -976,7 +978,8 @@
///Instantiates a DistMap.
///This function instantiates a \ref DistMap.
- ///\param g is the digraph, to which we would like to define the \ref DistMap
+ ///\param g is the digraph, to which we would like to define
+ ///the \ref DistMap
#ifdef DOXYGEN
static DistMap *createDistMap(const GR &g)
#else
diff -r 765619b7cbb2 -r 81cfc04531e8 lemon/graph_to_eps.h
More information about the Lemon-commits
mailing list