gravatar
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:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -102,7 +102,7 @@
102 102
EXAMPLE_PATTERNS       = 
103 103
EXAMPLE_RECURSIVE      = NO
104 104
IMAGE_PATH             = @abs_top_srcdir@/doc/images \
105
		       	 @abs_top_builddir@/doc/gen-images
105
                         @abs_top_builddir@/doc/gen-images
106 106
INPUT_FILTER           = 
107 107
FILTER_PATTERNS        = 
108 108
FILTER_SOURCE_FILES    = NO
Ignore white space 6 line context
... ...
@@ -57,10 +57,10 @@
57 57

	
58 58
\code
59 59
 @nodes
60
 label   coordinates size    title
61
 1       (10,20)     10      "First node"
62
 2       (80,80)     8       "Second node"
63
 3       (40,10)     10      "Third node"
60
 label  coordinates  size    title
61
 1      (10,20)      10      "First node"
62
 2      (80,80)      8       "Second node"
63
 3      (40,10)      10      "Third node"
64 64
\endcode
65 65

	
66 66
The \c \@arcs section is very similar to the \c \@nodes section,
... ...
@@ -72,7 +72,7 @@
72 72

	
73 73
\code
74 74
 @arcs
75
               capacity
75
         capacity
76 76
 1   2   16
77 77
 1   3   12
78 78
 2   3   18
Ignore white space 6 line context
... ...
@@ -66,17 +66,17 @@
66 66
#undef LEMON_FIXME
67 67
#undef LEMON_DEBUG
68 68

	
69
#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
70
  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
69
#if (defined(LEMON_ASSERT_LOG) ? 1 : 0) +               \
70
  (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +               \
71 71
  (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) > 1
72 72
#error "LEMON assertion system is not set properly"
73 73
#endif
74 74

	
75
#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +                \
76
     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +                \
77
     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||        \
78
     defined(LEMON_ENABLE_ASSERTS)) &&                        \
79
  (defined(LEMON_DISABLE_ASSERTS) ||                        \
75
#if ((defined(LEMON_ASSERT_LOG) ? 1 : 0) +              \
76
     (defined(LEMON_ASSERT_ABORT) ? 1 : 0) +            \
77
     (defined(LEMON_ASSERT_CUSTOM) ? 1 : 0) == 1 ||     \
78
     defined(LEMON_ENABLE_ASSERTS)) &&                  \
79
  (defined(LEMON_DISABLE_ASSERTS) ||                    \
80 80
   defined(NDEBUG))
81 81
#error "LEMON assertion system is not set properly"
82 82
#endif
... ...
@@ -168,9 +168,9 @@
168 168
/// \ref lemon/assert.h "assert.h" file is reincluded, then the
169 169
/// behaviour is changed appropiately to the new settings.
170 170
#  define LEMON_ASSERT(exp, msg)                                        \
171
  (static_cast<void> (!!(exp) ? 0 : (                                        \
172
    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                                \
173
                         LEMON_FUNCTION_NAME,                                \
171
  (static_cast<void> (!!(exp) ? 0 : (                                   \
172
    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                            \
173
                         LEMON_FUNCTION_NAME,                           \
174 174
                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
175 175

	
176 176
/// \ingroup exceptions
... ...
@@ -184,9 +184,9 @@
184 184
/// \endcode
185 185
///
186 186
/// \see LEMON_ASSERT
187
#  define LEMON_FIXME(msg)                                                \
187
#  define LEMON_FIXME(msg)                                              \
188 188
  (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
189
                        ::lemon::_assert_bits::cstringify(msg),          \
189
                        ::lemon::_assert_bits::cstringify(msg),         \
190 190
                        static_cast<const char*>(0)))
191 191

	
192 192
/// \ingroup exceptions
... ...
@@ -212,10 +212,10 @@
212 212
/// macro.
213 213
///
214 214
/// \see LEMON_ASSERT
215
#  define LEMON_DEBUG(exp, msg)                                                \
216
  (static_cast<void> (!!(exp) ? 0 : (                                        \
215
#  define LEMON_DEBUG(exp, msg)                                         \
216
  (static_cast<void> (!!(exp) ? 0 : (                                   \
217 217
    LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                            \
218
                         LEMON_FUNCTION_NAME,                                \
218
                         LEMON_FUNCTION_NAME,                           \
219 219
                         ::lemon::_assert_bits::cstringify(msg), #exp), 0)))
220 220

	
221 221
#else
... ...
@@ -225,23 +225,23 @@
225 225
#    define LEMON_FIXME(msg) (static_cast<void>(0))
226 226
#    define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
227 227
#  else
228
#    define LEMON_ASSERT(exp, msg)                                        \
229
       (static_cast<void> (!!(exp) ? 0 : (                                \
228
#    define LEMON_ASSERT(exp, msg)                                      \
229
       (static_cast<void> (!!(exp) ? 0 : (                              \
230 230
        LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                        \
231
                             LEMON_FUNCTION_NAME,                        \
232
                             ::lemon::_assert_bits::cstringify(msg),        \
231
                             LEMON_FUNCTION_NAME,                       \
232
                             ::lemon::_assert_bits::cstringify(msg),    \
233 233
                             #exp), 0)))
234
#    define LEMON_FIXME(msg)                                                \
235
       (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
236
                             ::lemon::_assert_bits::cstringify(msg),        \
234
#    define LEMON_FIXME(msg)                                            \
235
       (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,   \
236
                             ::lemon::_assert_bits::cstringify(msg),    \
237 237
                             static_cast<const char*>(0)))
238 238

	
239 239
#    if LEMON_ENABLE_DEBUG
240 240
#      define LEMON_DEBUG(exp, msg)
241
         (static_cast<void> (!!(exp) ? 0 : (         \
242
           LEMON_ASSERT_HANDLER(__FILE__, __LINE__,  \
243
                                LEMON_FUNCTION_NAME, \
244
                                ::lemon::_assert_bits::cstringify(msg),     \
241
         (static_cast<void> (!!(exp) ? 0 : (                            \
242
           LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                     \
243
                                LEMON_FUNCTION_NAME,                    \
244
                                ::lemon::_assert_bits::cstringify(msg), \
245 245
                                #exp), 0)))
246 246
#    else
247 247
#      define LEMON_DEBUG(exp, msg) (static_cast<void>(0))
... ...
@@ -249,13 +249,3 @@
249 249
#  endif
250 250

	
251 251
#endif
252

	
253
#ifdef DOXYGEN
254

	
255

	
256
#else
257

	
258

	
259
#endif
260

	
261

	
Ignore white space 6 line context
... ...
@@ -100,8 +100,8 @@
100 100
        bool operator==(const ArcIt&) const {return true;}
101 101
        /// Comparison operator
102 102
        bool operator!=(const ArcIt&) const {return true;}
103
         /// Comparison operator
104
         bool operator<(const ArcIt&) const {return false;}
103
        /// Comparison operator
104
        bool operator<(const ArcIt&) const {return false;}
105 105

	
106 106
      };
107 107

	
... ...
@@ -255,8 +255,8 @@
255 255
        bool operator==(const ArcIt&) const {return true;}
256 256
        /// Comparison operator
257 257
        bool operator!=(const ArcIt&) const {return true;}
258
         /// Comparison operator
259
         bool operator<(const ArcIt&) const {return false;}
258
        /// Comparison operator
259
        bool operator<(const ArcIt&) const {return false;}
260 260

	
261 261
      };
262 262

	
... ...
@@ -283,8 +283,8 @@
283 283
        bool operator==(const RevArcIt&) const {return true;}
284 284
        /// Comparison operator
285 285
        bool operator!=(const RevArcIt&) const {return true;}
286
         /// Comparison operator
287
         bool operator<(const RevArcIt&) const {return false;}
286
        /// Comparison operator
287
        bool operator<(const RevArcIt&) const {return false;}
288 288

	
289 289
      };
290 290

	
Ignore white space 6 line context
... ...
@@ -70,7 +70,7 @@
70 70
      if (ptr.get() == 0) return;
71 71
      try {
72 72
        if (!copy.valid()) return;
73
         *ptr = copy.get();
73
        *ptr = copy.get();
74 74
      } catch (...) {}
75 75
    }
76 76

	
Ignore white space 6 line context
... ...
@@ -908,7 +908,7 @@
908 908
          double l=std::sqrt(dvec.normSquare());
909 909
          //\todo better 'epsilon' would be nice here.
910 910
          dim2::Point<double> d(dvec/std::max(l,EPSILON));
911
           dim2::Point<double> m;
911
          dim2::Point<double> m;
912 912
//           m=dim2::Point<double>(mycoords[g.target(*i)]+
913 913
//                                 mycoords[g.source(*i)])/2.0;
914 914

	
... ...
@@ -916,7 +916,7 @@
916 916
//             dvec*(double(_nodeSizes[g.source(*i)])/
917 917
//                (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
918 918

	
919
           m=dim2::Point<double>(mycoords[g.source(*i)])+
919
          m=dim2::Point<double>(mycoords[g.source(*i)])+
920 920
            d*(l+_nodeSizes[g.source(*i)]-_nodeSizes[g.target(*i)])/2.0;
921 921

	
922 922
          for(typename std::vector<Arc>::iterator e=i;e!=j;++e) {
Ignore white space 6 line context
... ...
@@ -52,18 +52,18 @@
52 52
  ///\note If the graph type is a dependent type, ie. the graph type depend
53 53
  ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
54 54
  ///macro.
55
#define DIGRAPH_TYPEDEFS(Digraph)                                        \
56
  typedef Digraph::Node Node;                                                \
57
  typedef Digraph::NodeIt NodeIt;                                        \
58
  typedef Digraph::Arc Arc;                                                \
59
  typedef Digraph::ArcIt ArcIt;                                                \
60
  typedef Digraph::InArcIt InArcIt;                                        \
61
  typedef Digraph::OutArcIt OutArcIt;                                        \
62
  typedef Digraph::NodeMap<bool> BoolNodeMap;                                \
63
  typedef Digraph::NodeMap<int> IntNodeMap;                                \
64
  typedef Digraph::NodeMap<double> DoubleNodeMap;                        \
65
  typedef Digraph::ArcMap<bool> BoolArcMap;                                \
66
  typedef Digraph::ArcMap<int> IntArcMap;                                \
55
#define DIGRAPH_TYPEDEFS(Digraph)                                       \
56
  typedef Digraph::Node Node;                                           \
57
  typedef Digraph::NodeIt NodeIt;                                       \
58
  typedef Digraph::Arc Arc;                                             \
59
  typedef Digraph::ArcIt ArcIt;                                         \
60
  typedef Digraph::InArcIt InArcIt;                                     \
61
  typedef Digraph::OutArcIt OutArcIt;                                   \
62
  typedef Digraph::NodeMap<bool> BoolNodeMap;                           \
63
  typedef Digraph::NodeMap<int> IntNodeMap;                             \
64
  typedef Digraph::NodeMap<double> DoubleNodeMap;                       \
65
  typedef Digraph::ArcMap<bool> BoolArcMap;                             \
66
  typedef Digraph::ArcMap<int> IntArcMap;                               \
67 67
  typedef Digraph::ArcMap<double> DoubleArcMap
68 68

	
69 69
  ///Creates convenience typedefs for the digraph types and iterators
... ...
@@ -72,18 +72,18 @@
72 72
  ///
73 73
  ///\note Use this macro, if the graph type is a dependent type,
74 74
  ///ie. the graph type depend on a template parameter.
75
#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph)                                \
76
  typedef typename Digraph::Node Node;                                        \
77
  typedef typename Digraph::NodeIt NodeIt;                                \
78
  typedef typename Digraph::Arc Arc;                                        \
75
#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph)                              \
76
  typedef typename Digraph::Node Node;                                  \
77
  typedef typename Digraph::NodeIt NodeIt;                              \
78
  typedef typename Digraph::Arc Arc;                                    \
79 79
  typedef typename Digraph::ArcIt ArcIt;                                \
80
  typedef typename Digraph::InArcIt InArcIt;                                \
81
  typedef typename Digraph::OutArcIt OutArcIt;                                \
82
  typedef typename Digraph::template NodeMap<bool> BoolNodeMap;                \
83
  typedef typename Digraph::template NodeMap<int> IntNodeMap;                \
84
  typedef typename Digraph::template NodeMap<double> DoubleNodeMap;        \
85
  typedef typename Digraph::template ArcMap<bool> BoolArcMap;                \
86
  typedef typename Digraph::template ArcMap<int> IntArcMap;                \
80
  typedef typename Digraph::InArcIt InArcIt;                            \
81
  typedef typename Digraph::OutArcIt OutArcIt;                          \
82
  typedef typename Digraph::template NodeMap<bool> BoolNodeMap;         \
83
  typedef typename Digraph::template NodeMap<int> IntNodeMap;           \
84
  typedef typename Digraph::template NodeMap<double> DoubleNodeMap;     \
85
  typedef typename Digraph::template ArcMap<bool> BoolArcMap;           \
86
  typedef typename Digraph::template ArcMap<int> IntArcMap;             \
87 87
  typedef typename Digraph::template ArcMap<double> DoubleArcMap
88 88

	
89 89
  ///Creates convenience typedefs for the graph types and iterators
... ...
@@ -96,13 +96,13 @@
96 96
  ///\note If the graph type is a dependent type, ie. the graph type depend
97 97
  ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
98 98
  ///macro.
99
#define GRAPH_TYPEDEFS(Graph)                                                \
100
  DIGRAPH_TYPEDEFS(Graph);                                                \
101
  typedef Graph::Edge Edge;                                                \
102
  typedef Graph::EdgeIt EdgeIt;                                                \
103
  typedef Graph::IncEdgeIt IncEdgeIt;                                        \
104
  typedef Graph::EdgeMap<bool> BoolEdgeMap;                                \
105
  typedef Graph::EdgeMap<int> IntEdgeMap;                                \
99
#define GRAPH_TYPEDEFS(Graph)                                           \
100
  DIGRAPH_TYPEDEFS(Graph);                                              \
101
  typedef Graph::Edge Edge;                                             \
102
  typedef Graph::EdgeIt EdgeIt;                                         \
103
  typedef Graph::IncEdgeIt IncEdgeIt;                                   \
104
  typedef Graph::EdgeMap<bool> BoolEdgeMap;                             \
105
  typedef Graph::EdgeMap<int> IntEdgeMap;                               \
106 106
  typedef Graph::EdgeMap<double> DoubleEdgeMap
107 107

	
108 108
  ///Creates convenience typedefs for the graph types and iterators
... ...
@@ -111,13 +111,13 @@
111 111
  ///
112 112
  ///\note Use this macro, if the graph type is a dependent type,
113 113
  ///ie. the graph type depend on a template parameter.
114
#define TEMPLATE_GRAPH_TYPEDEFS(Graph)                                        \
115
  TEMPLATE_DIGRAPH_TYPEDEFS(Graph);                                        \
116
  typedef typename Graph::Edge Edge;                                        \
114
#define TEMPLATE_GRAPH_TYPEDEFS(Graph)                                  \
115
  TEMPLATE_DIGRAPH_TYPEDEFS(Graph);                                     \
116
  typedef typename Graph::Edge Edge;                                    \
117 117
  typedef typename Graph::EdgeIt EdgeIt;                                \
118
  typedef typename Graph::IncEdgeIt IncEdgeIt;                                \
119
  typedef typename Graph::template EdgeMap<bool> BoolEdgeMap;                \
120
  typedef typename Graph::template EdgeMap<int> IntEdgeMap;                \
118
  typedef typename Graph::IncEdgeIt IncEdgeIt;                          \
119
  typedef typename Graph::template EdgeMap<bool> BoolEdgeMap;           \
120
  typedef typename Graph::template EdgeMap<int> IntEdgeMap;             \
121 121
  typedef typename Graph::template EdgeMap<double> DoubleEdgeMap
122 122

	
123 123
  /// \brief Function to count the items in the graph.
Ignore white space 6 line context
... ...
@@ -146,7 +146,7 @@
146 146

	
147 147
    public:
148 148
      ValueStorage(Value& value, const Converter& converter = Converter())
149
         : _value(value), _converter(converter) {}
149
        : _value(value), _converter(converter) {}
150 150

	
151 151
      virtual void set(const std::string& value) {
152 152
        _value = _converter(value);
... ...
@@ -510,7 +510,7 @@
510 510
    /// file.
511 511
    DigraphReader(const std::string& fn, Digraph& digraph)
512 512
      : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
513
            _use_nodes(false), _use_arcs(false),
513
        _use_nodes(false), _use_arcs(false),
514 514
        _skip_nodes(false), _skip_arcs(false) {}
515 515

	
516 516
    /// \brief Constructor
... ...
@@ -519,7 +519,7 @@
519 519
    /// file.
520 520
    DigraphReader(const char* fn, Digraph& digraph)
521 521
      : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
522
            _use_nodes(false), _use_arcs(false),
522
        _use_nodes(false), _use_arcs(false),
523 523
        _skip_nodes(false), _skip_arcs(false) {}
524 524

	
525 525
    /// \brief Destructor
... ...
@@ -1294,7 +1294,7 @@
1294 1294
    /// file.
1295 1295
    GraphReader(const std::string& fn, Graph& graph)
1296 1296
      : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
1297
            _use_nodes(false), _use_edges(false),
1297
        _use_nodes(false), _use_edges(false),
1298 1298
        _skip_nodes(false), _skip_edges(false) {}
1299 1299

	
1300 1300
    /// \brief Constructor
... ...
@@ -1303,7 +1303,7 @@
1303 1303
    /// file.
1304 1304
    GraphReader(const char* fn, Graph& graph)
1305 1305
      : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
1306
            _use_nodes(false), _use_edges(false),
1306
        _use_nodes(false), _use_edges(false),
1307 1307
        _skip_nodes(false), _skip_edges(false) {}
1308 1308

	
1309 1309
    /// \brief Destructor
Ignore white space 6 line context
... ...
@@ -181,7 +181,7 @@
181 181

	
182 182
    public:
183 183
      ValueStorage(const Value& value, const Converter& converter = Converter())
184
         : _value(value), _converter(converter) {}
184
        : _value(value), _converter(converter) {}
185 185

	
186 186
      virtual std::string get() {
187 187
        return _converter(_value);
Ignore white space 6 line context
... ...
@@ -494,7 +494,7 @@
494 494
    Node split(Node n, bool connect = true) {
495 495
      Node b = addNode();
496 496
      for(OutArcIt e(*this,n);e!=INVALID;) {
497
         OutArcIt f=e;
497
        OutArcIt f=e;
498 498
        ++f;
499 499
        changeSource(e,b);
500 500
        e=f;
Ignore white space 6 line context
... ...
@@ -54,27 +54,27 @@
54 54
  "8\n"
55 55
  "9\n"
56 56
  "@arcs\n"
57
  "                label        capacity\n"
58
  "0        5        0        94\n"
59
  "3        9        1        11\n"
60
  "8        7        2        83\n"
61
  "1        2        3        94\n"
62
  "5        7        4        35\n"
63
  "7        4        5        84\n"
64
  "9        5        6        38\n"
65
  "0        4        7        96\n"
66
  "6        7        8        6\n"
67
  "3        1        9        27\n"
68
  "5        2        10        77\n"
69
  "5        6        11        69\n"
70
  "6        5        12        41\n"
71
  "4        6        13        70\n"
72
  "3        2        14        45\n"
73
  "7        9        15        93\n"
74
  "5        9        16        50\n"
75
  "9        0        17        94\n"
76
  "9        6        18        67\n"
77
  "0        9        19        86\n"
57
  "                label   capacity\n"
58
  "0       5       0       94\n"
59
  "3       9       1       11\n"
60
  "8       7       2       83\n"
61
  "1       2       3       94\n"
62
  "5       7       4       35\n"
63
  "7       4       5       84\n"
64
  "9       5       6       38\n"
65
  "0       4       7       96\n"
66
  "6       7       8       6\n"
67
  "3       1       9       27\n"
68
  "5       2       10      77\n"
69
  "5       6       11      69\n"
70
  "6       5       12      41\n"
71
  "4       6       13      70\n"
72
  "3       2       14      45\n"
73
  "7       9       15      93\n"
74
  "5       9       16      50\n"
75
  "9       0       17      94\n"
76
  "9       6       18      67\n"
77
  "0       9       19      86\n"
78 78
  "@attributes\n"
79 79
  "source 3\n";
80 80

	
... ...
@@ -141,7 +141,7 @@
141 141
    Node t = digraph.target(a);
142 142
    if (dijkstra.reached(s)) {
143 143
      check( dijkstra.dist(t) - dijkstra.dist(s) <= length[a],
144
                   "Error in a shortest path tree!");
144
             "Error in a shortest path tree!");
145 145
    }
146 146
  }
147 147

	
0 comments (0 inline)