LEMON/LEMON-official Changeset - r212:1ae84dea7d09

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r212:1ae84dea7d09

« 210:81cfc0

213:56579d »

r212:1ae84dea7d09

Mon, 14 Jul 2008 09:15:23

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Fix the incorrect tab replacements of unify-sources.sh

0 11 0

default

11 files changed with 106 insertions and 116 deletions:

doc/Doxyfile.in

doc/lgf.dox

lemon/assert.h

lemon/concepts/path.h

lemon/error.h

lemon/graph_to_eps.h

lemon/graph_utils.h

lemon/lgf_reader.h

lemon/lgf_writer.h

lemon/list_graph.h

test/heap_test.cc

↑ Collapse diff ↑

0 comments (0 inline)

@@ -103,5 +103,5 @@
 		EXAMPLE_RECURSIVE      = NO
 		IMAGE_PATH             = @abs_top_srcdir@/doc/images \
-				       	 @abs_top_builddir@/doc/gen-images
+		                         @abs_top_builddir@/doc/gen-images
 		INPUT_FILTER           =
 		FILTER_PATTERNS        =

@@ -58,8 +58,8 @@
 		\code
 		 @nodes
 		 label   coordinates size    title
 (10,20)     10      "First node"
 (80,80)     8       "Second node"
 (40,10)     10      "Third node"
 		 label  coordinates  size    title
 (10,20)      10      "First node"
 (80,80)      8       "Second node"
 (40,10)      10      "Third node"
 		\endcode
@@ -73,5 +73,5 @@
 		\code
 		 @arcs
-		               capacity
 		         capacity
 2   16
 3   12

@@ -67,15 +67,15 @@
 		#undef LEMON_DEBUG
 		#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
 		  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
 		#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +               \
 		  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +               \
 		  (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1
 		#error "LEMON assertion system is not set properly"
 		#endif
 		#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
 		     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
 		     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||        \
 		     defined(LEMON_ENABLE_ASSERTS)) &&                        \
-		  (defined(LEMON_DISABLE_ASSERTS) ||                        \
+		#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +              \
 		     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +            \
 		     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||     \
 		     defined(LEMON_ENABLE_ASSERTS)) &&                  \
 		  (defined(LEMON_DISABLE_ASSERTS) ||                    \
 		   defined(NDEBUG))
 		#error "LEMON assertion system is not set properly"
@@ -169,7 +169,7 @@
 		/// behaviour is changed appropiately to the new settings.
 		#  define LEMON_ASSERT(exp, msg)                                        \
 		  (static_cast<void> (!!(exp) ? 0 : (                                        \
 		    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                                \
-		                         LEMON_FUNCTION_NAME,                                \
+		  (static_cast<void> (!!(exp) ? 0 : (                                   \
 		    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                            \
 		                         LEMON_FUNCTION_NAME,                           \
 		                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
@@ -185,7 +185,7 @@
 		///
 		/// \see LEMON_ASSERT
-		#  define LEMON_FIXME(msg)                                                \
 		#  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)))
@@ -213,8 +213,8 @@
 		///
 		/// \see LEMON_ASSERT
 		#  define LEMON_DEBUG(exp, msg)                                                \
 		  (static_cast<void> (!!(exp) ? 0 : (                                        \
 		#  define LEMON_DEBUG(exp, msg)                                         \
 		  (static_cast<void> (!!(exp) ? 0 : (                                   \
 		    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                            \
-		                         LEMON_FUNCTION_NAME,                                \
 		                         LEMON_FUNCTION_NAME,                           \
 		                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
@@ -226,21 +226,21 @@
 		#    define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
 		#  else
 		#    define LEMON_ASSERT(exp, msg)                                        \
 		       (static_cast<void> (!!(exp) ? 0 : (                                \
 		#    define LEMON_ASSERT(exp, msg)                                      \
 		       (static_cast<void> (!!(exp) ? 0 : (                              \
 		        LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                        \
 		                             LEMON_FUNCTION_NAME,                        \
 		                             ::lemon::_assert_bits::cstringify(msg),        \
 		                             LEMON_FUNCTION_NAME,                       \
 		                             ::lemon::_assert_bits::cstringify(msg),    \
 		                             #exp), 0)))
 		#    define LEMON_FIXME(msg)                                                \
 		       (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
-		                             ::lemon::_assert_bits::cstringify(msg),        \
+		#    define LEMON_FIXME(msg)                                            \
 		       (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,   \
 		                             ::lemon::_assert_bits::cstringify(msg),    \
 		                             static_cast<const char*>(0)))
 		#    if LEMON_ENABLE_DEBUG
 		#      define LEMON_DEBUG(exp, msg)
 		         (static_cast<void> (!!(exp) ? 0 : (         \
 		           LEMON_ASSERT_HANDLER(__FILE__, __LINE__,  \
 		                                LEMON_FUNCTION_NAME, \
 		                                ::lemon::_assert_bits::cstringify(msg),     \
 		         (static_cast<void> (!!(exp) ? 0 : (                            \
 		           LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                     \
 		                                LEMON_FUNCTION_NAME,                    \
 		                                ::lemon::_assert_bits::cstringify(msg), \
 		                                #exp), 0)))
 		#    else
@@ -250,12 +250,2 @@
 		#endif
 		#ifdef DOXYGEN
 		#else
 		#endif

@@ -101,6 +101,6 @@
 		        /// Comparison operator
 		        bool operator!=(const ArcIt&) const {return true;}
 		         /// Comparison operator
 		         bool operator<(const ArcIt&) const {return false;}
 		        /// Comparison operator
 		        bool operator<(const ArcIt&) const {return false;}
 		      };
@@ -256,6 +256,6 @@
 		        /// Comparison operator
 		        bool operator!=(const ArcIt&) const {return true;}
 		         /// Comparison operator
 		         bool operator<(const ArcIt&) const {return false;}
 		        /// Comparison operator
 		        bool operator<(const ArcIt&) const {return false;}
 		      };
@@ -284,6 +284,6 @@
 		        /// Comparison operator
 		        bool operator!=(const RevArcIt&) const {return true;}
 		         /// Comparison operator
 		         bool operator<(const RevArcIt&) const {return false;}
 		        /// Comparison operator
 		        bool operator<(const RevArcIt&) const {return false;}
 		      };

@@ -71,5 +71,5 @@
 		      try {
 		        if (!copy.valid()) return;
-		         *ptr = copy.get();
 		        *ptr = copy.get();
 		      } catch (...) {}
+		    }

RhodeCode

Login to your account

@@ -909,5 +909,5 @@
 		          //\todo better 'epsilon' would be nice here.
 		          dim2::Point<double> d(dvec/std::max(l,EPSILON));
-		           dim2::Point<double> m;
 		          dim2::Point<double> m;
 		//           m=dim2::Point<double>(mycoords[g.target(*i)]+
 		//                                 mycoords[g.source(*i)])/2.0;
@@ -917,5 +917,5 @@
 		//                (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
-		           m=dim2::Point<double>(mycoords[g.source(*i)])+
 		          m=dim2::Point<double>(mycoords[g.source(*i)])+
 		            d*(l+_nodeSizes[g.source(*i)]-_nodeSizes[g.target(*i)])/2.0;

@@ -53,16 +53,16 @@
 		  ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
 		  ///macro.
 		#define DIGRAPH_TYPEDEFS(Digraph)                                        \
 		  typedef Digraph::Node Node;                                                \
 		  typedef Digraph::NodeIt NodeIt;                                        \
 		  typedef Digraph::Arc Arc;                                                \
 		  typedef Digraph::ArcIt ArcIt;                                                \
 		  typedef Digraph::InArcIt InArcIt;                                        \
 		  typedef Digraph::OutArcIt OutArcIt;                                        \
 		  typedef Digraph::NodeMap<bool> BoolNodeMap;                                \
 		  typedef Digraph::NodeMap<int> IntNodeMap;                                \
 		  typedef Digraph::NodeMap<double> DoubleNodeMap;                        \
 		  typedef Digraph::ArcMap<bool> BoolArcMap;                                \
 		  typedef Digraph::ArcMap<int> IntArcMap;                                \
 		#define DIGRAPH_TYPEDEFS(Digraph)                                       \
 		  typedef Digraph::Node Node;                                           \
 		  typedef Digraph::NodeIt NodeIt;                                       \
 		  typedef Digraph::Arc Arc;                                             \
 		  typedef Digraph::ArcIt ArcIt;                                         \
 		  typedef Digraph::InArcIt InArcIt;                                     \
 		  typedef Digraph::OutArcIt OutArcIt;                                   \
 		  typedef Digraph::NodeMap<bool> BoolNodeMap;                           \
 		  typedef Digraph::NodeMap<int> IntNodeMap;                             \
 		  typedef Digraph::NodeMap<double> DoubleNodeMap;                       \
 		  typedef Digraph::ArcMap<bool> BoolArcMap;                             \
 		  typedef Digraph::ArcMap<int> IntArcMap;                               \
 		  typedef Digraph::ArcMap<double> DoubleArcMap
@@ -73,16 +73,16 @@
 		  ///\note Use this macro, if the graph type is a dependent type,
 		  ///ie. the graph type depend on a template parameter.
 		#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph)                                \
 		  typedef typename Digraph::Node Node;                                        \
 		  typedef typename Digraph::NodeIt NodeIt;                                \
 		  typedef typename Digraph::Arc Arc;                                        \
 		#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph)                              \
 		  typedef typename Digraph::Node Node;                                  \
 		  typedef typename Digraph::NodeIt NodeIt;                              \
 		  typedef typename Digraph::Arc Arc;                                    \
 		  typedef typename Digraph::ArcIt ArcIt;                                \
 		  typedef typename Digraph::InArcIt InArcIt;                                \
 		  typedef typename Digraph::OutArcIt OutArcIt;                                \
 		  typedef typename Digraph::template NodeMap<bool> BoolNodeMap;                \
 		  typedef typename Digraph::template NodeMap<int> IntNodeMap;                \
 		  typedef typename Digraph::template NodeMap<double> DoubleNodeMap;        \
 		  typedef typename Digraph::template ArcMap<bool> BoolArcMap;                \
-		  typedef typename Digraph::template ArcMap<int> IntArcMap;                \
+		  typedef typename Digraph::InArcIt InArcIt;                            \
 		  typedef typename Digraph::OutArcIt OutArcIt;                          \
 		  typedef typename Digraph::template NodeMap<bool> BoolNodeMap;         \
 		  typedef typename Digraph::template NodeMap<int> IntNodeMap;           \
 		  typedef typename Digraph::template NodeMap<double> DoubleNodeMap;     \
 		  typedef typename Digraph::template ArcMap<bool> BoolArcMap;           \
 		  typedef typename Digraph::template ArcMap<int> IntArcMap;             \
 		  typedef typename Digraph::template ArcMap<double> DoubleArcMap
@@ -97,11 +97,11 @@
 		  ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
 		  ///macro.
 		#define GRAPH_TYPEDEFS(Graph)                                                \
 		  DIGRAPH_TYPEDEFS(Graph);                                                \
 		  typedef Graph::Edge Edge;                                                \
 		  typedef Graph::EdgeIt EdgeIt;                                                \
 		  typedef Graph::IncEdgeIt IncEdgeIt;                                        \
 		  typedef Graph::EdgeMap<bool> BoolEdgeMap;                                \
-		  typedef Graph::EdgeMap<int> IntEdgeMap;                                \
+		#define GRAPH_TYPEDEFS(Graph)                                           \
 		  DIGRAPH_TYPEDEFS(Graph);                                              \
 		  typedef Graph::Edge Edge;                                             \
 		  typedef Graph::EdgeIt EdgeIt;                                         \
 		  typedef Graph::IncEdgeIt IncEdgeIt;                                   \
 		  typedef Graph::EdgeMap<bool> BoolEdgeMap;                             \
 		  typedef Graph::EdgeMap<int> IntEdgeMap;                               \
 		  typedef Graph::EdgeMap<double> DoubleEdgeMap
@@ -112,11 +112,11 @@
 		  ///\note Use this macro, if the graph type is a dependent type,
 		  ///ie. the graph type depend on a template parameter.
 		#define TEMPLATE_GRAPH_TYPEDEFS(Graph)                                        \
 		  TEMPLATE_DIGRAPH_TYPEDEFS(Graph);                                        \
-		  typedef typename Graph::Edge Edge;                                        \
+		#define TEMPLATE_GRAPH_TYPEDEFS(Graph)                                  \
 		  TEMPLATE_DIGRAPH_TYPEDEFS(Graph);                                     \
 		  typedef typename Graph::Edge Edge;                                    \
 		  typedef typename Graph::EdgeIt EdgeIt;                                \
 		  typedef typename Graph::IncEdgeIt IncEdgeIt;                                \
 		  typedef typename Graph::template EdgeMap<bool> BoolEdgeMap;                \
-		  typedef typename Graph::template EdgeMap<int> IntEdgeMap;                \
+		  typedef typename Graph::IncEdgeIt IncEdgeIt;                          \
 		  typedef typename Graph::template EdgeMap<bool> BoolEdgeMap;           \
 		  typedef typename Graph::template EdgeMap<int> IntEdgeMap;             \
 		  typedef typename Graph::template EdgeMap<double> DoubleEdgeMap

@@ -147,5 +147,5 @@
 		    public:
 		      ValueStorage(Value& value, const Converter& converter = Converter())
-		         : _value(value), _converter(converter) {}
 		        : _value(value), _converter(converter) {}
 		      virtual void set(const std::string& value) {
@@ -511,5 +511,5 @@
 		    DigraphReader(const std::string& fn, Digraph& digraph)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
-		            _use_nodes(false), _use_arcs(false),
 		        _use_nodes(false), _use_arcs(false),
 		        _skip_nodes(false), _skip_arcs(false) {}
@@ -520,5 +520,5 @@
 		    DigraphReader(const char* fn, Digraph& digraph)
 		      : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
-		            _use_nodes(false), _use_arcs(false),
 		        _use_nodes(false), _use_arcs(false),
 		        _skip_nodes(false), _skip_arcs(false) {}
@@ -1295,5 +1295,5 @@
 		    GraphReader(const std::string& fn, Graph& graph)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
-		            _use_nodes(false), _use_edges(false),
 		        _use_nodes(false), _use_edges(false),
 		        _skip_nodes(false), _skip_edges(false) {}
@@ -1304,5 +1304,5 @@
 		    GraphReader(const char* fn, Graph& graph)
 		      : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
-		            _use_nodes(false), _use_edges(false),
 		        _use_nodes(false), _use_edges(false),
 		        _skip_nodes(false), _skip_edges(false) {}

@@ -182,5 +182,5 @@
 		    public:
 		      ValueStorage(const Value& value, const Converter& converter = Converter())
-		         : _value(value), _converter(converter) {}
 		        : _value(value), _converter(converter) {}
 		      virtual std::string get() {

@@ -495,5 +495,5 @@
 		      Node b = addNode();
 		      for(OutArcIt e(*this,n);e!=INVALID;) {
-		         OutArcIt f=e;
 		        OutArcIt f=e;
 		        ++f;
 		        changeSource(e,b);

@@ -55,25 +55,25 @@
 		  "9\n"
 		  "@arcs\n"
 		  "                label        capacity\n"
 		  "0        5        0        94\n"
 		  "3        9        1        11\n"
 		  "8        7        2        83\n"
 		  "1        2        3        94\n"
 		  "5        7        4        35\n"
 		  "7        4        5        84\n"
 		  "9        5        6        38\n"
 		  "0        4        7        96\n"
 		  "6        7        8        6\n"
 		  "3        1        9        27\n"
 		  "5        2        10        77\n"
 		  "5        6        11        69\n"
 		  "6        5        12        41\n"
 		  "4        6        13        70\n"
 		  "3        2        14        45\n"
 		  "7        9        15        93\n"
 		  "5        9        16        50\n"
 		  "9        0        17        94\n"
 		  "9        6        18        67\n"
-		  "0        9        19        86\n"
+		  "                label   capacity\n"
 		  "0       5       0       94\n"
 		  "3       9       1       11\n"
 		  "8       7       2       83\n"
 		  "1       2       3       94\n"
 		  "5       7       4       35\n"
 		  "7       4       5       84\n"
 		  "9       5       6       38\n"
 		  "0       4       7       96\n"
 		  "6       7       8       6\n"
 		  "3       1       9       27\n"
 		  "5       2       10      77\n"
 		  "5       6       11      69\n"
 		  "6       5       12      41\n"
 		  "4       6       13      70\n"
 		  "3       2       14      45\n"
 		  "7       9       15      93\n"
 		  "5       9       16      50\n"
 		  "9       0       17      94\n"
 		  "9       6       18      67\n"
 		  "0       9       19      86\n"
 		  "@attributes\n"
 		  "source 3\n";
@@ -142,5 +142,5 @@
 		    if (dijkstra.reached(s)) {
 		      check( dijkstra.dist(t) - dijkstra.dist(s) <= length[a],
-		                   "Error in a shortest path tree!");
 		             "Error in a shortest path tree!");
+		    }
+		  }