1.1 --- a/doc/coding_style.dox Sun Jul 13 19:51:02 2008 +0100
1.2 +++ b/doc/coding_style.dox Sun Jul 13 20:09:47 2008 +0100
1.3 @@ -89,7 +89,8 @@
1.4
1.5 \subsection cs-loc-var Class and instance member variables, auto variables
1.6
1.7 -The names of class and instance member variables and auto variables (=variables used locally in methods) should look like the following.
1.8 +The names of class and instance member variables and auto variables
1.9 +(=variables used locally in methods) should look like the following.
1.10
1.11 \code
1.12 all_lower_case_with_underscores
2.1 --- a/doc/groups.dox Sun Jul 13 19:51:02 2008 +0100
2.2 +++ b/doc/groups.dox Sun Jul 13 20:09:47 2008 +0100
2.3 @@ -227,7 +227,8 @@
2.4 maximum flow is the \f$f_a\f$ solution of the next optimization problem:
2.5
2.6 \f[ 0 \le f_a \le c_a \f]
2.7 -\f[ \sum_{v\in\delta^{-}(u)}f_{vu}=\sum_{v\in\delta^{+}(u)}f_{uv} \qquad \forall u \in V \setminus \{s,t\}\f]
2.8 +\f[ \sum_{v\in\delta^{-}(u)}f_{vu}=\sum_{v\in\delta^{+}(u)}f_{uv}
2.9 +\qquad \forall u \in V \setminus \{s,t\}\f]
2.10 \f[ \max \sum_{v\in\delta^{+}(s)}f_{uv} - \sum_{v\in\delta^{-}(s)}f_{vu}\f]
2.11
2.12 LEMON contains several algorithms for solving maximum flow problems:
2.13 @@ -267,7 +268,8 @@
2.14 \f$c_a:A\rightarrow\mathbf{R}^+_0\f$ capacity function. The minimum
2.15 cut is the \f$X\f$ solution of the next optimization problem:
2.16
2.17 -\f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}\sum_{uv\in A, u\in X, v\not\in X}c_{uv}\f]
2.18 +\f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}
2.19 +\sum_{uv\in A, u\in X, v\not\in X}c_{uv}\f]
2.20
2.21 LEMON contains several algorithms related to minimum cut problems:
2.22
2.23 @@ -300,7 +302,8 @@
2.24 @ingroup algs
2.25 \brief Algorithms for planarity checking, embedding and drawing
2.26
2.27 -This group describes the algorithms for planarity checking, embedding and drawing.
2.28 +This group describes the algorithms for planarity checking,
2.29 +embedding and drawing.
2.30
2.31 \image html planar.png
2.32 \image latex planar.eps "Plane graph" width=\textwidth
2.33 @@ -477,7 +480,8 @@
2.34 @ingroup io_group
2.35 \brief Reading and writing \ref lgf-format "Lemon Graph Format".
2.36
2.37 -This group describes methods for reading and writing \ref lgf-format "Lemon Graph Format".
2.38 +This group describes methods for reading and writing
2.39 +\ref lgf-format "Lemon Graph Format".
2.40 */
2.41
2.42 /**
3.1 --- a/lemon/arg_parser.cc Sun Jul 13 19:51:02 2008 +0100
3.2 +++ b/lemon/arg_parser.cc Sun Jul 13 20:09:47 2008 +0100
3.3 @@ -395,16 +395,16 @@
3.4 o!=i->second.opts.end();++o)
3.5 if(_opts.find(*o)->second.set) ++set;
3.6 if(i->second.mandatory&&!set) {
3.7 - std::cerr << _command_name
3.8 - << ": At least one of the following arguments is mandatory.\n";
3.9 + std::cerr << _command_name <<
3.10 + ": At least one of the following arguments is mandatory.\n";
3.11 ok=false;
3.12 for(GroupData::Opts::iterator o=i->second.opts.begin();
3.13 o!=i->second.opts.end();++o)
3.14 showHelp(_opts.find(*o));
3.15 }
3.16 if(i->second.only_one&&set>1) {
3.17 - std::cerr << _command_name
3.18 - << ": At most one of the following arguments can be given.\n";
3.19 + std::cerr << _command_name <<
3.20 + ": At most one of the following arguments can be given.\n";
3.21 ok=false;
3.22 for(GroupData::Opts::iterator o=i->second.opts.begin();
3.23 o!=i->second.opts.end();++o)
4.1 --- a/lemon/assert.h Sun Jul 13 19:51:02 2008 +0100
4.2 +++ b/lemon/assert.h Sun Jul 13 20:09:47 2008 +0100
4.3 @@ -151,8 +151,9 @@
4.4 /// - \c LEMON_ASSERT_CUSTOM The user can define own assertion handler
4.5 /// function.
4.6 /// \code
4.7 -/// void custom_assert_handler(const char* file, int line, const char* function,
4.8 -/// const char* message, const char* assertion);
4.9 +/// void custom_assert_handler(const char* file, int line,
4.10 +/// const char* function, const char* message,
4.11 +/// const char* assertion);
4.12 /// \endcode
4.13 /// The name of the function should be defined as the \c
4.14 /// LEMON_CUSTOM_ASSERT_HANDLER macro name.
4.15 @@ -185,7 +186,7 @@
4.16 /// \see LEMON_ASSERT
4.17 # define LEMON_FIXME(msg) \
4.18 (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME, \
4.19 - ::lemon::_assert_bits::cstringify(msg), \
4.20 + ::lemon::_assert_bits::cstringify(msg), \
4.21 static_cast<const char*>(0)))
4.22
4.23 /// \ingroup exceptions
4.24 @@ -240,7 +241,7 @@
4.25 (static_cast<void> (!!(exp) ? 0 : ( \
4.26 LEMON_ASSERT_HANDLER(__FILE__, __LINE__, \
4.27 LEMON_FUNCTION_NAME, \
4.28 - ::lemon::_assert_bits::cstringify(msg), \
4.29 + ::lemon::_assert_bits::cstringify(msg), \
4.30 #exp), 0)))
4.31 # else
4.32 # define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
5.1 --- a/lemon/bfs.h Sun Jul 13 19:51:02 2008 +0100
5.2 +++ b/lemon/bfs.h Sun Jul 13 20:09:47 2008 +0100
5.3 @@ -103,7 +103,8 @@
5.4 ///Instantiates a DistMap.
5.5
5.6 ///This function instantiates a \ref DistMap.
5.7 - ///\param G is the digraph, to which we would like to define the \ref DistMap
5.8 + ///\param G is the digraph, to which we would like to define
5.9 + ///the \ref DistMap
5.10 static DistMap *createDistMap(const GR &G)
5.11 {
5.12 return new DistMap(G);
5.13 @@ -825,7 +826,8 @@
5.14 ///Instantiates a DistMap.
5.15
5.16 ///This function instantiates a \ref DistMap.
5.17 - ///\param g is the digraph, to which we would like to define the \ref DistMap
5.18 + ///\param g is the digraph, to which we would like to define
5.19 + ///the \ref DistMap
5.20 #ifdef DOXYGEN
5.21 static DistMap *createDistMap(const GR &g)
5.22 #else
5.23 @@ -1199,7 +1201,8 @@
5.24 /// class. It works with callback mechanism, the BfsVisit object calls
5.25 /// on every bfs event the \c Visitor class member functions.
5.26 ///
5.27 - /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
5.28 + /// \tparam _Digraph The digraph type the algorithm runs on.
5.29 + /// The default value is
5.30 /// \ref ListDigraph. The value of _Digraph is not used directly by Bfs, it
5.31 /// is only passed to \ref BfsDefaultTraits.
5.32 /// \tparam _Visitor The Visitor object for the algorithm. The
6.1 --- a/lemon/concepts/maps.h Sun Jul 13 19:51:02 2008 +0100
6.2 +++ b/lemon/concepts/maps.h Sun Jul 13 20:09:47 2008 +0100
6.3 @@ -43,7 +43,8 @@
6.4 public:
6.5 /// The key type of the map.
6.6 typedef K Key;
6.7 - /// The value type of the map. (The type of objects associated with the keys).
6.8 + /// \brief The value type of the map.
6.9 + /// (The type of objects associated with the keys).
6.10 typedef T Value;
6.11
6.12 /// Returns the value associated with the given key.
6.13 @@ -82,7 +83,8 @@
6.14 public:
6.15 /// The key type of the map.
6.16 typedef K Key;
6.17 - /// The value type of the map. (The type of objects associated with the keys).
6.18 + /// \brief The value type of the map.
6.19 + /// (The type of objects associated with the keys).
6.20 typedef T Value;
6.21
6.22 /// Sets the value associated with the given key.
6.23 @@ -121,7 +123,8 @@
6.24 public:
6.25 /// The key type of the map.
6.26 typedef K Key;
6.27 - /// The value type of the map. (The type of objects associated with the keys).
6.28 + /// \brief The value type of the map.
6.29 + /// (The type of objects associated with the keys).
6.30 typedef T Value;
6.31
6.32 /// Returns the value associated with the given key.
6.33 @@ -154,7 +157,8 @@
6.34 typedef True ReferenceMapTag;
6.35 /// The key type of the map.
6.36 typedef K Key;
6.37 - /// The value type of the map. (The type of objects associated with the keys).
6.38 + /// \brief The value type of the map.
6.39 + /// (The type of objects associated with the keys).
6.40 typedef T Value;
6.41 /// The reference type of the map.
6.42 typedef R Reference;
7.1 --- a/lemon/dfs.h Sun Jul 13 19:51:02 2008 +0100
7.2 +++ b/lemon/dfs.h Sun Jul 13 20:09:47 2008 +0100
7.3 @@ -105,7 +105,8 @@
7.4 ///Instantiates a DistMap.
7.5
7.6 ///This function instantiates a \ref DistMap.
7.7 - ///\param G is the digraph, to which we would like to define the \ref DistMap
7.8 + ///\param G is the digraph, to which we would like to define
7.9 + ///the \ref DistMap
7.10 static DistMap *createDistMap(const GR &G)
7.11 {
7.12 return new DistMap(G);
7.13 @@ -808,7 +809,8 @@
7.14 ///Instantiates a DistMap.
7.15
7.16 ///This function instantiates a \ref DistMap.
7.17 - ///\param g is the digraph, to which we would like to define the \ref DistMap
7.18 + ///\param g is the digraph, to which we would like to define
7.19 + ///the \ref DistMap
7.20 #ifdef DOXYGEN
7.21 static DistMap *createDistMap(const GR &g)
7.22 #else
7.23 @@ -1193,7 +1195,8 @@
7.24 /// class. It works with callback mechanism, the DfsVisit object calls
7.25 /// on every dfs event the \c Visitor class member functions.
7.26 ///
7.27 - /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
7.28 + /// \tparam _Digraph The digraph type the algorithm runs on.
7.29 + /// The default value is
7.30 /// \ref ListDigraph. The value of _Digraph is not used directly by Dfs, it
7.31 /// is only passed to \ref DfsDefaultTraits.
7.32 /// \tparam _Visitor The Visitor object for the algorithm. The
8.1 --- a/lemon/dijkstra.h Sun Jul 13 19:51:02 2008 +0100
8.2 +++ b/lemon/dijkstra.h Sun Jul 13 20:09:47 2008 +0100
8.3 @@ -173,7 +173,8 @@
8.4 ///Instantiates a DistMap.
8.5
8.6 ///This function instantiates a \ref DistMap.
8.7 - ///\param G is the digraph, to which we would like to define the \ref DistMap
8.8 + ///\param G is the digraph, to which we would like to define
8.9 + ///the \ref DistMap
8.10 static DistMap *createDistMap(const GR &G)
8.11 {
8.12 return new DistMap(G);
8.13 @@ -336,8 +337,8 @@
8.14 ///
8.15 template <class T>
8.16 struct DefPredMap
8.17 - : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
8.18 - typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
8.19 + : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
8.20 + typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
8.21 };
8.22
8.23 template <class T>
8.24 @@ -372,8 +373,8 @@
8.25 ///
8.26 template <class T>
8.27 struct DefProcessedMap
8.28 - : public Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > {
8.29 - typedef Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > Create;
8.30 + : public Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > {
8.31 + typedef Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > Create;
8.32 };
8.33
8.34 struct DefDigraphProcessedMapTraits : public Traits {
8.35 @@ -392,7 +393,8 @@
8.36 template <class T>
8.37 struct DefProcessedMapToBeDefaultMap
8.38 : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
8.39 - typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> Create;
8.40 + typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits>
8.41 + Create;
8.42 };
8.43
8.44 template <class H, class CR>
8.45 @@ -415,8 +417,8 @@
8.46 ///
8.47 template <class H, class CR = typename Digraph::template NodeMap<int> >
8.48 struct DefHeap
8.49 - : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
8.50 - typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
8.51 + : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
8.52 + typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
8.53 };
8.54
8.55 template <class H, class CR>
8.56 @@ -440,8 +442,8 @@
8.57 ///parameter and the heap's constructor waits for the cross reference.
8.58 template <class H, class CR = typename Digraph::template NodeMap<int> >
8.59 struct DefStandardHeap
8.60 - : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
8.61 - typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
8.62 + : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
8.63 + typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
8.64 Create;
8.65 };
8.66
8.67 @@ -976,7 +978,8 @@
8.68 ///Instantiates a DistMap.
8.69
8.70 ///This function instantiates a \ref DistMap.
8.71 - ///\param g is the digraph, to which we would like to define the \ref DistMap
8.72 + ///\param g is the digraph, to which we would like to define
8.73 + ///the \ref DistMap
8.74 #ifdef DOXYGEN
8.75 static DistMap *createDistMap(const GR &g)
8.76 #else
9.1 --- a/lemon/graph_to_eps.h Sun Jul 13 19:51:02 2008 +0100
9.2 +++ b/lemon/graph_to_eps.h Sun Jul 13 20:09:47 2008 +0100
9.3 @@ -142,7 +142,8 @@
9.4 ///Constructor
9.5 ///\param _g Reference to the graph to be printed.
9.6 ///\param _os Reference to the output stream.
9.7 - ///\param _os Reference to the output stream. By default it is <tt>std::cout</tt>.
9.8 + ///\param _os Reference to the output stream.
9.9 + ///By default it is <tt>std::cout</tt>.
9.10 ///\param _pros If it is \c true, then the \c ostream referenced by \c _os
9.11 ///will be explicitly deallocated by the destructor.
9.12 DefaultGraphToEpsTraits(const G &_g,std::ostream& _os=std::cout,
9.13 @@ -781,9 +782,11 @@
9.14 //x1 y1 x2 y2 x3 y3 cr cg cb w
9.15 os << "/lb { setlinewidth setrgbcolor newpath moveto\n"
9.16 << " 4 2 roll 1 index 1 index curveto stroke } bind def\n";
9.17 - os << "/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def\n";
9.18 + os << "/l { setlinewidth setrgbcolor newpath moveto lineto stroke }"
9.19 + << " bind def\n";
9.20 //x y r
9.21 - os << "/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def\n";
9.22 + os << "/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath }"
9.23 + << " bind def\n";
9.24 //x y r
9.25 os << "/sq { newpath 2 index 1 index add 2 index 2 index add moveto\n"
9.26 << " 2 index 1 index sub 2 index 2 index add lineto\n"
9.27 @@ -811,8 +814,10 @@
9.28 << " 1.5 mul mul setlinewidth\n"
9.29 << " newpath 5 index 5 index moveto "
9.30 << "5 index 5 index 5 index 3.01 mul sub\n"
9.31 - << " lineto 5 index 4 index .7 mul sub 5 index 5 index 2.2 mul sub moveto\n"
9.32 - << " 5 index 4 index .7 mul add 5 index 5 index 2.2 mul sub lineto stroke\n"
9.33 + << " lineto 5 index 4 index .7 mul sub 5 index 5 index 2.2 mul sub"
9.34 + << " moveto\n"
9.35 + << " 5 index 4 index .7 mul add 5 index 5 index 2.2 mul sub lineto "
9.36 + << "stroke\n"
9.37 << " 5 index 5 index 5 index c fill\n"
9.38 << " setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
9.39 << " } bind def\n";
9.40 @@ -826,7 +831,8 @@
9.41 << " 1 index 1 index lineto\n"
9.42 << " 1 index 1 index 7 index sub moveto\n"
9.43 << " 1 index 1 index lineto\n"
9.44 - << " exch 5 index 3 sqrt .5 mul mul sub exch 5 index .5 mul sub lineto\n"
9.45 + << " exch 5 index 3 sqrt .5 mul mul sub exch 5 index .5 mul sub"
9.46 + << " lineto\n"
9.47 << " stroke\n"
9.48 << " 5 index 5 index 5 index c fill\n"
9.49 << " setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
9.50 @@ -838,9 +844,10 @@
9.51 // l dx_norm dy_norm
9.52 os << "/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def\n";
9.53 //len w dx_norm dy_norm x1 y1 cr cg cb
9.54 - os << "/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def\n"
9.55 + os << "/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx "
9.56 + << "exch def\n"
9.57 << " /w exch def /len exch def\n"
9.58 - // << " 0.1 setlinewidth x1 y1 moveto dx len mul dy len mul rlineto stroke"
9.59 + //<< "0.1 setlinewidth x1 y1 moveto dx len mul dy len mul rlineto stroke"
9.60 << " newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto\n"
9.61 << " len w sub arrl sub dx dy lrl\n"
9.62 << " arrw dy dx neg lrl\n"
9.63 @@ -902,7 +909,8 @@
9.64 //\todo better 'epsilon' would be nice here.
9.65 dim2::Point<double> d(dvec/std::max(l,EPSILON));
9.66 dim2::Point<double> m;
9.67 -// m=dim2::Point<double>(mycoords[g.target(*i)]+mycoords[g.source(*i)])/2.0;
9.68 +// m=dim2::Point<double>(mycoords[g.target(*i)]+
9.69 +// mycoords[g.source(*i)])/2.0;
9.70
9.71 // m=dim2::Point<double>(mycoords[g.source(*i)])+
9.72 // dvec*(double(_nodeSizes[g.source(*i)])/
9.73 @@ -938,7 +946,8 @@
9.74 // node_shape=_nodeShapes[g.source(*e)];
9.75 // t1=0;t2=1;
9.76 // for(int i=0;i<INTERPOL_PREC;++i)
9.77 -// if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t1=(t1+t2)/2;
9.78 +// if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape))
9.79 +// t1=(t1+t2)/2;
9.80 // else t2=(t1+t2)/2;
9.81 // bez=bez.after((t1+t2)/2);
9.82 os << _arcWidths[*e]*_arcWidthScale << " setlinewidth "
10.1 --- a/lemon/lgf_reader.h Sun Jul 13 19:51:02 2008 +0100
10.2 +++ b/lemon/lgf_reader.h Sun Jul 13 20:09:47 2008 +0100
10.3 @@ -444,7 +444,8 @@
10.4 /// set into an \e ArcSet class (\c SmartArcSet or \c ListArcSet).
10.5 /// The previously read label node map should be passed to the \c
10.6 /// useNodes() functions. Another application of multipass reading when
10.7 - /// paths are given as a node map or an arc map. It is impossible to read this in
10.8 + /// paths are given as a node map or an arc map.
10.9 + /// It is impossible to read this in
10.10 /// a single pass, because the arcs are not constructed when the node
10.11 /// maps are read.
10.12 template <typename _Digraph>
11.1 --- a/lemon/time_measure.h Sun Jul 13 19:51:02 2008 +0100
11.2 +++ b/lemon/time_measure.h Sun Jul 13 20:09:47 2008 +0100
11.3 @@ -314,7 +314,8 @@
11.4 ///but it provides a bit finer control on the execution.
11.5 ///The \ref Timer also counts the number of \ref start()
11.6 ///executions, and is stops only after the same amount (or more)
11.7 - ///\ref stop() "stop()"s. This can be useful e.g. to compute the running time
11.8 + ///\ref stop() "stop()"s. This can be useful e.g. to compute
11.9 + ///the running time
11.10 ///of recursive functions.
11.11 ///
11.12
12.1 --- a/test/dijkstra_test.cc Sun Jul 13 19:51:02 2008 +0100
12.2 +++ b/test/dijkstra_test.cc Sun Jul 13 20:09:47 2008 +0100
12.3 @@ -110,8 +110,10 @@
12.4 for(ArcIt e(G); e!=INVALID; ++e) {
12.5 Node u=G.source(e);
12.6 Node v=G.target(e);
12.7 - check( !dijkstra_test.reached(u) || (dijkstra_test.dist(v) - dijkstra_test.dist(u) <= length[e]),
12.8 - "dist(target)-dist(source)-arc_length= " << dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]);
12.9 + check( !dijkstra_test.reached(u) ||
12.10 + (dijkstra_test.dist(v) - dijkstra_test.dist(u) <= length[e]),
12.11 + "dist(target)-dist(source)-arc_length= " <<
12.12 + dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]);
12.13 }
12.14
12.15 for(NodeIt v(G); v!=INVALID; ++v){
12.16 @@ -121,7 +123,8 @@
12.17 Node u=G.source(e);
12.18 check(u==dijkstra_test.predNode(v),"Wrong tree.");
12.19 check(dijkstra_test.dist(v) - dijkstra_test.dist(u) == length[e],
12.20 - "Wrong distance! Difference: " << std::abs(dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]));
12.21 + "Wrong distance! Difference: " <<
12.22 + std::abs(dijkstra_test.dist(v)-dijkstra_test.dist(u)-length[e]));
12.23 }
12.24 }
12.25
13.1 --- a/test/graph_utils_test.cc Sun Jul 13 19:51:02 2008 +0100
13.2 +++ b/test/graph_utils_test.cc Sun Jul 13 20:09:47 2008 +0100
13.3 @@ -92,12 +92,15 @@
13.4 Arc con2 = al2(src, trg);
13.5 Arc con3 = al3(src, trg);
13.6 Arc con4 = findArc(fg, src, trg);
13.7 - check(con1 == con2 && con2 == con3 && con3 == con4, "Different results.")
13.8 + check(con1 == con2 && con2 == con3 && con3 == con4,
13.9 + "Different results.")
13.10 check(con1 != INVALID, "There is no connecting arc.");
13.11 check(fg.source(con1) == src, "Wrong source.");
13.12 check(fg.target(con1) == trg, "Wrong target.");
13.13 - check(al3(src, trg, con3) == INVALID, "There is more connecting arc.");
13.14 - check(findArc(fg, src, trg, con4) == INVALID, "There is more connecting arc.");
13.15 + check(al3(src, trg, con3) == INVALID,
13.16 + "There is more connecting arc.");
13.17 + check(findArc(fg, src, trg, con4) == INVALID,
13.18 + "There is more connecting arc.");
13.19 }
13.20 }
13.21 }
13.22 @@ -123,7 +126,8 @@
13.23 for (NodeIt trg(graph); trg != INVALID; ++trg) {
13.24 for (ConEdgeIt<Graph> con(graph, src, trg); con != INVALID; ++con) {
13.25 check( (graph.u(con) == src && graph.v(con) == trg) ||
13.26 - (graph.v(con) == src && graph.u(con) == trg), "Wrong end nodes.");
13.27 + (graph.v(con) == src && graph.u(con) == trg),
13.28 + "Wrong end nodes.");
13.29 ++found[con];
13.30 check(found[con] <= 2, "The edge found more than twice.");
13.31 }
14.1 --- a/test/maps_test.cc Sun Jul 13 19:51:02 2008 +0100
14.2 +++ b/test/maps_test.cc Sun Jul 13 20:09:47 2008 +0100
14.3 @@ -103,7 +103,8 @@
14.4 ConstMap<A,Const<int,10> > map7 = map6;
14.5 map6 = constMap<A,int,10>();
14.6 map7 = constMap<A,Const<int,10> >();
14.7 - check(map6[A()] == 10 && map7[A()] == 10, "Something is wrong with ConstMap");
14.8 + check(map6[A()] == 10 && map7[A()] == 10,
14.9 + "Something is wrong with ConstMap");
14.10 }
14.11
14.12 // IdentityMap
14.13 @@ -114,7 +115,8 @@
14.14 map1 = identityMap<A>();
14.15
14.16 checkConcept<ReadMap<double,double>, IdentityMap<double> >();
14.17 - check(identityMap<double>()[1.0] == 1.0 && identityMap<double>()[3.14] == 3.14,
14.18 + check(identityMap<double>()[1.0] == 1.0 &&
14.19 + identityMap<double>()[3.14] == 3.14,
14.20 "Something is wrong with IdentityMap");
14.21 }
14.22
14.23 @@ -155,10 +157,12 @@
14.24 SparseMap<double, int> map7 = sparseMap(m);
14.25 SparseMap<double, int> map8 = sparseMap(m,10);
14.26
14.27 - check(map5[1.0] == 0 && map5[3.14] == 0 && map6[1.0] == 10 && map6[3.14] == 10,
14.28 + check(map5[1.0] == 0 && map5[3.14] == 0 &&
14.29 + map6[1.0] == 10 && map6[3.14] == 10,
14.30 "Something is wrong with SparseMap");
14.31 map5[1.0] = map6[3.14] = 100;
14.32 - check(map5[1.0] == 100 && map5[3.14] == 0 && map6[1.0] == 10 && map6[3.14] == 100,
14.33 + check(map5[1.0] == 100 && map5[3.14] == 0 &&
14.34 + map6[1.0] == 10 && map6[3.14] == 100,
14.35 "Something is wrong with SparseMap");
14.36 }
14.37
14.38 @@ -171,7 +175,8 @@
14.39
14.40 SparseMap<double, bool> m1(false); m1[3.14] = true;
14.41 RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
14.42 - check(!composeMap(m1,m2)[0] && composeMap(m1,m2)[1], "Something is wrong with ComposeMap")
14.43 + check(!composeMap(m1,m2)[0] && composeMap(m1,m2)[1],
14.44 + "Something is wrong with ComposeMap")
14.45 }
14.46
14.47 // CombineMap
14.48 @@ -196,9 +201,12 @@
14.49 checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
14.50 MapToFunctor<ReadMap<A,B> > map(ReadMap<A,B>());
14.51
14.52 - check(functorToMap(&func)[A()] == 3, "Something is wrong with FunctorToMap");
14.53 - check(mapToFunctor(constMap<A,int>(2))(A()) == 2, "Something is wrong with MapToFunctor");
14.54 - check(mapToFunctor(functorToMap(&func))(A()) == 3 && mapToFunctor(functorToMap(&func))[A()] == 3,
14.55 + check(functorToMap(&func)[A()] == 3,
14.56 + "Something is wrong with FunctorToMap");
14.57 + check(mapToFunctor(constMap<A,int>(2))(A()) == 2,
14.58 + "Something is wrong with MapToFunctor");
14.59 + check(mapToFunctor(functorToMap(&func))(A()) == 3 &&
14.60 + mapToFunctor(functorToMap(&func))[A()] == 3,
14.61 "Something is wrong with FunctorToMap or MapToFunctor");
14.62 check(functorToMap(mapToFunctor(constMap<A,int>(2)))[A()] == 2,
14.63 "Something is wrong with FunctorToMap or MapToFunctor");
14.64 @@ -206,7 +214,8 @@
14.65
14.66 // ConvertMap
14.67 {
14.68 - checkConcept<ReadMap<double,double>, ConvertMap<ReadMap<double, int>, double> >();
14.69 + checkConcept<ReadMap<double,double>,
14.70 + ConvertMap<ReadMap<double, int>, double> >();
14.71 ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
14.72 ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
14.73 }
14.74 @@ -224,7 +233,8 @@
14.75 ForkMap<RM, SM> map1(m1,m2);
14.76 ForkMap<SM, RM> map2 = forkMap(m2,m1);
14.77 map2.set(5, 10);
14.78 - check(m1[1] == -1 && m1[5] == 10 && m2[1] == -1 && m2[5] == 10 && map2[1] == -1 && map2[5] == 10,
14.79 + check(m1[1] == -1 && m1[5] == 10 && m2[1] == -1 &&
14.80 + m2[5] == 10 && map2[1] == -1 && map2[5] == 10,
14.81 "Something is wrong with ForkMap");
14.82 }
14.83
14.84 @@ -241,10 +251,14 @@
14.85 ConstMap<int, double> c1(1.0), c2(3.14);
14.86 IdentityMap<int> im;
14.87 ConvertMap<IdentityMap<int>, double> id(im);
14.88 - check(addMap(c1,id)[0] == 1.0 && addMap(c1,id)[10] == 11.0, "Something is wrong with AddMap");
14.89 - check(subMap(id,c1)[0] == -1.0 && subMap(id,c1)[10] == 9.0, "Something is wrong with SubMap");
14.90 - check(mulMap(id,c2)[0] == 0 && mulMap(id,c2)[2] == 6.28, "Something is wrong with MulMap");
14.91 - check(divMap(c2,id)[1] == 3.14 && divMap(c2,id)[2] == 1.57, "Something is wrong with DivMap");
14.92 + check(addMap(c1,id)[0] == 1.0 && addMap(c1,id)[10] == 11.0,
14.93 + "Something is wrong with AddMap");
14.94 + check(subMap(id,c1)[0] == -1.0 && subMap(id,c1)[10] == 9.0,
14.95 + "Something is wrong with SubMap");
14.96 + check(mulMap(id,c2)[0] == 0 && mulMap(id,c2)[2] == 6.28,
14.97 + "Something is wrong with MulMap");
14.98 + check(divMap(c2,id)[1] == 3.14 && divMap(c2,id)[2] == 1.57,
14.99 + "Something is wrong with DivMap");
14.100
14.101 checkConcept<DoubleMap, ShiftMap<DoubleMap> >();
14.102 checkConcept<DoubleWriteMap, ShiftWriteMap<DoubleWriteMap> >();
14.103 @@ -256,11 +270,13 @@
14.104
14.105 check(shiftMap(id, 2.0)[1] == 3.0 && shiftMap(id, 2.0)[10] == 12.0,
14.106 "Something is wrong with ShiftMap");
14.107 - check(shiftWriteMap(id, 2.0)[1] == 3.0 && shiftWriteMap(id, 2.0)[10] == 12.0,
14.108 + check(shiftWriteMap(id, 2.0)[1] == 3.0 &&
14.109 + shiftWriteMap(id, 2.0)[10] == 12.0,
14.110 "Something is wrong with ShiftWriteMap");
14.111 check(scaleMap(id, 2.0)[1] == 2.0 && scaleMap(id, 2.0)[10] == 20.0,
14.112 "Something is wrong with ScaleMap");
14.113 - check(scaleWriteMap(id, 2.0)[1] == 2.0 && scaleWriteMap(id, 2.0)[10] == 20.0,
14.114 + check(scaleWriteMap(id, 2.0)[1] == 2.0 &&
14.115 + scaleWriteMap(id, 2.0)[10] == 20.0,
14.116 "Something is wrong with ScaleWriteMap");
14.117 check(negMap(id)[1] == -1.0 && negMap(id)[-10] == 10.0,
14.118 "Something is wrong with NegMap");
14.119 @@ -289,12 +305,16 @@
14.120 FalseMap<int> fm;
14.121 RangeMap<bool> rm(2);
14.122 rm[0] = true; rm[1] = false;
14.123 - check(andMap(tm,rm)[0] && !andMap(tm,rm)[1] && !andMap(fm,rm)[0] && !andMap(fm,rm)[1],
14.124 + check(andMap(tm,rm)[0] && !andMap(tm,rm)[1] &&
14.125 + !andMap(fm,rm)[0] && !andMap(fm,rm)[1],
14.126 "Something is wrong with AndMap");
14.127 - check(orMap(tm,rm)[0] && orMap(tm,rm)[1] && orMap(fm,rm)[0] && !orMap(fm,rm)[1],
14.128 + check(orMap(tm,rm)[0] && orMap(tm,rm)[1] &&
14.129 + orMap(fm,rm)[0] && !orMap(fm,rm)[1],
14.130 "Something is wrong with OrMap");
14.131 - check(!notMap(rm)[0] && notMap(rm)[1], "Something is wrong with NotMap");
14.132 - check(!notWriteMap(rm)[0] && notWriteMap(rm)[1], "Something is wrong with NotWriteMap");
14.133 + check(!notMap(rm)[0] && notMap(rm)[1],
14.134 + "Something is wrong with NotMap");
14.135 + check(!notWriteMap(rm)[0] && notWriteMap(rm)[1],
14.136 + "Something is wrong with NotWriteMap");
14.137
14.138 ConstMap<int, double> cm(2.0);
14.139 IdentityMap<int> im;
14.140 @@ -310,7 +330,8 @@
14.141 typedef std::vector<int> vec;
14.142 vec v1;
14.143 vec v2(10);
14.144 - LoggerBoolMap<std::back_insert_iterator<vec> > map1(std::back_inserter(v1));
14.145 + LoggerBoolMap<std::back_insert_iterator<vec> >
14.146 + map1(std::back_inserter(v1));
14.147 LoggerBoolMap<vec::iterator> map2(v2.begin());
14.148 map1.set(10, false);
14.149 map1.set(20, true); map2.set(20, true);
14.150 @@ -318,7 +339,8 @@
14.151 map1.set(50, true); map2.set(50, true);
14.152 map1.set(60, true); map2.set(60, true);
14.153 check(v1.size() == 3 && v2.size() == 10 &&
14.154 - v1[0]==20 && v1[1]==50 && v1[2]==60 && v2[0]==20 && v2[1]==50 && v2[2]==60,
14.155 + v1[0]==20 && v1[1]==50 && v1[2]==60 &&
14.156 + v2[0]==20 && v2[1]==50 && v2[2]==60,
14.157 "Something is wrong with LoggerBoolMap");
14.158
14.159 int i = 0;