gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Remove long lines (from all but one file)
0 14 0
default
14 files changed with 134 insertions and 75 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -80,25 +80,26 @@
80 80
\endcode
81 81

	
82 82
\subsection cs-funcs Constants, Macros
83 83

	
84 84
The names of constants and macros should look like the following.
85 85

	
86 86
\code
87 87
ALL_UPPER_CASE_WITH_UNDERSCORES
88 88
\endcode
89 89

	
90 90
\subsection cs-loc-var Class and instance member variables, auto variables
91 91

	
92
The names of class and instance member variables and auto variables (=variables used locally in methods) should look like the following.
92
The names of class and instance member variables and auto variables
93
(=variables used locally in methods) should look like the following.
93 94

	
94 95
\code
95 96
all_lower_case_with_underscores
96 97
\endcode
97 98

	
98 99
\subsection pri-loc-var Private member variables
99 100

	
100 101
Private member variables should start with underscore
101 102

	
102 103
\code
103 104
_start_with_underscores
104 105
\endcode
Ignore white space 6 line context
... ...
@@ -218,25 +218,26 @@
218 218
\brief Algorithms for finding maximum flows.
219 219

	
220 220
This group describes the algorithms for finding maximum flows and
221 221
feasible circulations.
222 222

	
223 223
The maximum flow problem is to find a flow between a single source and
224 224
a single target that is maximum. Formally, there is a \f$G=(V,A)\f$
225 225
directed graph, an \f$c_a:A\rightarrow\mathbf{R}^+_0\f$ capacity
226 226
function and given \f$s, t \in V\f$ source and target node. The
227 227
maximum flow is the \f$f_a\f$ solution of the next optimization problem:
228 228

	
229 229
\f[ 0 \le f_a \le c_a \f]
230
\f[ \sum_{v\in\delta^{-}(u)}f_{vu}=\sum_{v\in\delta^{+}(u)}f_{uv} \qquad \forall u \in V \setminus \{s,t\}\f]
230
\f[ \sum_{v\in\delta^{-}(u)}f_{vu}=\sum_{v\in\delta^{+}(u)}f_{uv}
231
\qquad \forall u \in V \setminus \{s,t\}\f]
231 232
\f[ \max \sum_{v\in\delta^{+}(s)}f_{uv} - \sum_{v\in\delta^{-}(s)}f_{vu}\f]
232 233

	
233 234
LEMON contains several algorithms for solving maximum flow problems:
234 235
- \ref lemon::EdmondsKarp "Edmonds-Karp"
235 236
- \ref lemon::Preflow "Goldberg's Preflow algorithm"
236 237
- \ref lemon::DinitzSleatorTarjan "Dinitz's blocking flow algorithm with dynamic trees"
237 238
- \ref lemon::GoldbergTarjan "Preflow algorithm with dynamic trees"
238 239

	
239 240
In most cases the \ref lemon::Preflow "Preflow" algorithm provides the
240 241
fastest method to compute the maximum flow. All impelementations
241 242
provides functions to query the minimum cut, which is the dual linear
242 243
programming problem of the maximum flow.
... ...
@@ -258,25 +259,26 @@
258 259
@ingroup algs
259 260

	
260 261
\brief Algorithms for finding minimum cut in graphs.
261 262

	
262 263
This group describes the algorithms for finding minimum cut in graphs.
263 264

	
264 265
The minimum cut problem is to find a non-empty and non-complete
265 266
\f$X\f$ subset of the vertices with minimum overall capacity on
266 267
outgoing arcs. Formally, there is \f$G=(V,A)\f$ directed graph, an
267 268
\f$c_a:A\rightarrow\mathbf{R}^+_0\f$ capacity function. The minimum
268 269
cut is the \f$X\f$ solution of the next optimization problem:
269 270

	
270
\f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}\sum_{uv\in A, u\in X, v\not\in X}c_{uv}\f]
271
\f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}
272
\sum_{uv\in A, u\in X, v\not\in X}c_{uv}\f]
271 273

	
272 274
LEMON contains several algorithms related to minimum cut problems:
273 275

	
274 276
- \ref lemon::HaoOrlin "Hao-Orlin algorithm" to calculate minimum cut
275 277
  in directed graphs
276 278
- \ref lemon::NagamochiIbaraki "Nagamochi-Ibaraki algorithm" to
277 279
  calculate minimum cut in undirected graphs
278 280
- \ref lemon::GomoryHuTree "Gomory-Hu tree computation" to calculate all
279 281
  pairs minimum cut in undirected graphs
280 282

	
281 283
If you want to find minimum cut just between two distinict nodes,
282 284
please see the \ref max_flow "Maximum Flow page".
... ...
@@ -291,25 +293,26 @@
291 293
This group describes the algorithms for discovering the graph properties
292 294
like connectivity, bipartiteness, euler property, simplicity etc.
293 295

	
294 296
\image html edge_biconnected_components.png
295 297
\image latex edge_biconnected_components.eps "bi-edge-connected components" width=\textwidth
296 298
*/
297 299

	
298 300
/**
299 301
@defgroup planar Planarity embedding and drawing
300 302
@ingroup algs
301 303
\brief Algorithms for planarity checking, embedding and drawing
302 304

	
303
This group describes the algorithms for planarity checking, embedding and drawing.
305
This group describes the algorithms for planarity checking,
306
embedding and drawing.
304 307

	
305 308
\image html planar.png
306 309
\image latex planar.eps "Plane graph" width=\textwidth
307 310
*/
308 311

	
309 312
/**
310 313
@defgroup matching Matching algorithms
311 314
@ingroup algs
312 315
\brief Algorithms for finding matchings in graphs and bipartite graphs.
313 316

	
314 317
This group contains algorithm objects and functions to calculate
315 318
matchings in graphs and bipartite graphs. The general matching problem is
... ...
@@ -468,25 +471,26 @@
468 471
\brief Graph Input-Output methods
469 472

	
470 473
This group describes the tools for importing and exporting graphs
471 474
and graph related data. Now it supports the LEMON format, the
472 475
\c DIMACS format and the encapsulated postscript (EPS) format.
473 476
*/
474 477

	
475 478
/**
476 479
@defgroup lemon_io Lemon Input-Output
477 480
@ingroup io_group
478 481
\brief Reading and writing \ref lgf-format "Lemon Graph Format".
479 482

	
480
This group describes methods for reading and writing \ref lgf-format "Lemon Graph Format".
483
This group describes methods for reading and writing
484
\ref lgf-format "Lemon Graph Format".
481 485
*/
482 486

	
483 487
/**
484 488
@defgroup eps_io Postscript exporting
485 489
@ingroup io_group
486 490
\brief General \c EPS drawer and graph exporter
487 491

	
488 492
This group describes general \c EPS drawing methods and special
489 493
graph exporting tools.
490 494
*/
491 495

	
492 496

	
Ignore white space 6 line context
... ...
@@ -386,34 +386,34 @@
386 386
                      << ": The following mandatory arguments are missing.\n";
387 387
          ok=false;
388 388
          showHelp(i);
389 389
        }
390 390
    for(Groups::iterator i=_groups.begin();i!=_groups.end();++i)
391 391
      if(i->second.mandatory||i->second.only_one)
392 392
        {
393 393
          int set=0;
394 394
          for(GroupData::Opts::iterator o=i->second.opts.begin();
395 395
              o!=i->second.opts.end();++o)
396 396
            if(_opts.find(*o)->second.set) ++set;
397 397
          if(i->second.mandatory&&!set) {
398
            std::cerr << _command_name
399
                      << ": At least one of the following arguments is mandatory.\n";
398
            std::cerr << _command_name <<
399
              ": At least one of the following arguments is mandatory.\n";
400 400
            ok=false;
401 401
            for(GroupData::Opts::iterator o=i->second.opts.begin();
402 402
                o!=i->second.opts.end();++o)
403 403
              showHelp(_opts.find(*o));
404 404
          }
405 405
          if(i->second.only_one&&set>1) {
406
            std::cerr << _command_name
407
                      << ": At most one of the following arguments can be given.\n";
406
            std::cerr << _command_name <<
407
              ": At most one of the following arguments can be given.\n";
408 408
            ok=false;
409 409
            for(GroupData::Opts::iterator o=i->second.opts.begin();
410 410
                o!=i->second.opts.end();++o)
411 411
              showHelp(_opts.find(*o));
412 412
          }
413 413
        }
414 414
    if(!ok) {
415 415
      std::cerr << "\nType '" << _command_name <<
416 416
        " --help' to obtain a short summary on the usage.\n\n";
417 417
      exit(1);
418 418
    }
419 419
  }
Ignore white space 6 line context
... ...
@@ -142,26 +142,27 @@
142 142
/// short log message to the standard error and aborts the execution.
143 143
///
144 144
/// The following modes can be used in the assertion system:
145 145
///
146 146
/// - \c LEMON_ASSERT_LOG The failed assertion prints a short log
147 147
///   message to the standard error and continues the execution.
148 148
/// - \c LEMON_ASSERT_ABORT This mode is similar to the \c
149 149
///   LEMON_ASSERT_LOG, but it aborts the program. It is the default
150 150
///   behaviour.
151 151
/// - \c LEMON_ASSERT_CUSTOM The user can define own assertion handler
152 152
///   function.
153 153
///   \code
154
///     void custom_assert_handler(const char* file, int line, const char* function,
155
///                                const char* message, const char* assertion);
154
///     void custom_assert_handler(const char* file, int line,
155
///                                const char* function, const char* message,
156
///                                const char* assertion);
156 157
///   \endcode
157 158
///   The name of the function should be defined as the \c
158 159
///   LEMON_CUSTOM_ASSERT_HANDLER macro name.
159 160
///   \code
160 161
///     #define LEMON_CUSTOM_ASSERT_HANDLER custom_assert_handler
161 162
///   \endcode
162 163
///   Whenever an assertion is occured, the custom assertion
163 164
///   handler is called with appropiate parameters.
164 165
///
165 166
/// The assertion mode can also be changed within one compilation unit.
166 167
/// If the macros are redefined with other settings and the
167 168
/// \ref lemon/assert.h "assert.h" file is reincluded, then the
... ...
@@ -176,25 +177,25 @@
176 177
///
177 178
/// \brief Macro for mark not yet implemented features.
178 179
///
179 180
/// Macro for mark not yet implemented features and outstanding bugs.
180 181
/// It is close to be the shortcut of the following code:
181 182
/// \code
182 183
///   LEMON_ASSERT(false, msg);
183 184
/// \endcode
184 185
///
185 186
/// \see LEMON_ASSERT
186 187
#  define LEMON_FIXME(msg)                                                \
187 188
  (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
188
                        ::lemon::_assert_bits::cstringify(msg),                \
189
                        ::lemon::_assert_bits::cstringify(msg),          \
189 190
                        static_cast<const char*>(0)))
190 191

	
191 192
/// \ingroup exceptions
192 193
///
193 194
/// \brief Macro for internal assertions
194 195
///
195 196
/// Macro for internal assertions, it is used in the library to check
196 197
/// the consistency of results of algorithms, several pre- and
197 198
/// postconditions and invariants. The checking is disabled by
198 199
/// default, but it can be turned on with the macro \c
199 200
/// LEMON_ENABLE_DEBUG.
200 201
/// \code
... ...
@@ -231,25 +232,25 @@
231 232
                             ::lemon::_assert_bits::cstringify(msg),        \
232 233
                             #exp), 0)))
233 234
#    define LEMON_FIXME(msg)                                                \
234 235
       (LEMON_ASSERT_HANDLER(__FILE__, __LINE__, LEMON_FUNCTION_NAME,        \
235 236
                             ::lemon::_assert_bits::cstringify(msg),        \
236 237
                             static_cast<const char*>(0)))
237 238

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

	
250 251
#endif
251 252

	
252 253
#ifdef DOXYGEN
253 254

	
254 255

	
255 256
#else
Ignore white space 6 line context
... ...
@@ -94,25 +94,26 @@
94 94
    {
95 95
      return new ReachedMap(G);
96 96
    }
97 97
    ///The type of the map that stores the dists of the nodes.
98 98

	
99 99
    ///The type of the map that stores the dists of the nodes.
100 100
    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
101 101
    ///
102 102
    typedef typename Digraph::template NodeMap<int> DistMap;
103 103
    ///Instantiates a DistMap.
104 104

	
105 105
    ///This function instantiates a \ref DistMap.
106
    ///\param G is the digraph, to which we would like to define the \ref DistMap
106
    ///\param G is the digraph, to which we would like to define
107
    ///the \ref DistMap
107 108
    static DistMap *createDistMap(const GR &G)
108 109
    {
109 110
      return new DistMap(G);
110 111
    }
111 112
  };
112 113

	
113 114
  ///%BFS algorithm class.
114 115

	
115 116
  ///\ingroup search
116 117
  ///This class provides an efficient implementation of the %BFS algorithm.
117 118
  ///
118 119
  ///\tparam GR The digraph type the algorithm runs on. The default value is
... ...
@@ -816,25 +817,26 @@
816 817
    {
817 818
      return new ReachedMap(G);
818 819
    }
819 820
    ///The type of the map that stores the dists of the nodes.
820 821

	
821 822
    ///The type of the map that stores the dists of the nodes.
822 823
    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
823 824
    ///
824 825
    typedef NullMap<typename Digraph::Node,int> DistMap;
825 826
    ///Instantiates a DistMap.
826 827

	
827 828
    ///This function instantiates a \ref DistMap.
828
    ///\param g is the digraph, to which we would like to define the \ref DistMap
829
    ///\param g is the digraph, to which we would like to define
830
    ///the \ref DistMap
829 831
#ifdef DOXYGEN
830 832
    static DistMap *createDistMap(const GR &g)
831 833
#else
832 834
    static DistMap *createDistMap(const GR &)
833 835
#endif
834 836
    {
835 837
      return new DistMap();
836 838
    }
837 839
  };
838 840

	
839 841
  /// Default traits used by \ref BfsWizard
840 842

	
... ...
@@ -1190,25 +1192,26 @@
1190 1192

	
1191 1193
  /// \ingroup search
1192 1194
  ///
1193 1195
  /// \brief %BFS Visit algorithm class.
1194 1196
  ///
1195 1197
  /// This class provides an efficient implementation of the %BFS algorithm
1196 1198
  /// with visitor interface.
1197 1199
  ///
1198 1200
  /// The %BfsVisit class provides an alternative interface to the Bfs
1199 1201
  /// class. It works with callback mechanism, the BfsVisit object calls
1200 1202
  /// on every bfs event the \c Visitor class member functions.
1201 1203
  ///
1202
  /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
1204
  /// \tparam _Digraph The digraph type the algorithm runs on.
1205
  /// The default value is
1203 1206
  /// \ref ListDigraph. The value of _Digraph is not used directly by Bfs, it
1204 1207
  /// is only passed to \ref BfsDefaultTraits.
1205 1208
  /// \tparam _Visitor The Visitor object for the algorithm. The
1206 1209
  /// \ref BfsVisitor "BfsVisitor<_Digraph>" is an empty Visitor which
1207 1210
  /// does not observe the Bfs events. If you want to observe the bfs
1208 1211
  /// events you should implement your own Visitor class.
1209 1212
  /// \tparam _Traits Traits class to set various data types used by the
1210 1213
  /// algorithm. The default traits class is
1211 1214
  /// \ref BfsVisitDefaultTraits "BfsVisitDefaultTraits<_Digraph>".
1212 1215
  /// See \ref BfsVisitDefaultTraits for the documentation of
1213 1216
  /// a Bfs visit traits class.
1214 1217
#ifdef DOXYGEN
Ignore white space 6 line context
... ...
@@ -34,25 +34,26 @@
34 34
    /// @{
35 35

	
36 36
    /// Readable map concept
37 37

	
38 38
    /// Readable map concept.
39 39
    ///
40 40
    template<typename K, typename T>
41 41
    class ReadMap
42 42
    {
43 43
    public:
44 44
      /// The key type of the map.
45 45
      typedef K Key;
46
      /// The value type of the map. (The type of objects associated with the keys).
46
      /// \brief The value type of the map.
47
      /// (The type of objects associated with the keys).
47 48
      typedef T Value;
48 49

	
49 50
      /// Returns the value associated with the given key.
50 51
      Value operator[](const Key &) const {
51 52
        return *static_cast<Value *>(0);
52 53
      }
53 54

	
54 55
      template<typename _ReadMap>
55 56
      struct Constraints {
56 57
        void constraints() {
57 58
          Value val = m[key];
58 59
          val = m[key];
... ...
@@ -73,25 +74,26 @@
73 74

	
74 75

	
75 76
    /// Writable map concept
76 77

	
77 78
    /// Writable map concept.
78 79
    ///
79 80
    template<typename K, typename T>
80 81
    class WriteMap
81 82
    {
82 83
    public:
83 84
      /// The key type of the map.
84 85
      typedef K Key;
85
      /// The value type of the map. (The type of objects associated with the keys).
86
      /// \brief The value type of the map.
87
      /// (The type of objects associated with the keys).
86 88
      typedef T Value;
87 89

	
88 90
      /// Sets the value associated with the given key.
89 91
      void set(const Key &, const Value &) {}
90 92

	
91 93
      /// Default constructor.
92 94
      WriteMap() {}
93 95

	
94 96
      template <typename _WriteMap>
95 97
      struct Constraints {
96 98
        void constraints() {
97 99
          m.set(key, val);
... ...
@@ -112,25 +114,26 @@
112 114

	
113 115
    /// Read/writable map concept
114 116

	
115 117
    /// Read/writable map concept.
116 118
    ///
117 119
    template<typename K, typename T>
118 120
    class ReadWriteMap : public ReadMap<K,T>,
119 121
                         public WriteMap<K,T>
120 122
    {
121 123
    public:
122 124
      /// The key type of the map.
123 125
      typedef K Key;
124
      /// The value type of the map. (The type of objects associated with the keys).
126
      /// \brief The value type of the map.
127
      /// (The type of objects associated with the keys).
125 128
      typedef T Value;
126 129

	
127 130
      /// Returns the value associated with the given key.
128 131
      Value operator[](const Key &) const {
129 132
        return *static_cast<Value *>(0);
130 133
      }
131 134

	
132 135
      /// Sets the value associated with the given key.
133 136
      void set(const Key &, const Value &) {}
134 137

	
135 138
      template<typename _ReadWriteMap>
136 139
      struct Constraints {
... ...
@@ -145,25 +148,26 @@
145 148
    /// Dereferable map concept
146 149

	
147 150
    /// Dereferable map concept.
148 151
    ///
149 152
    template<typename K, typename T, typename R, typename CR>
150 153
    class ReferenceMap : public ReadWriteMap<K,T>
151 154
    {
152 155
    public:
153 156
      /// Tag for reference maps.
154 157
      typedef True ReferenceMapTag;
155 158
      /// The key type of the map.
156 159
      typedef K Key;
157
      /// The value type of the map. (The type of objects associated with the keys).
160
      /// \brief The value type of the map.
161
      /// (The type of objects associated with the keys).
158 162
      typedef T Value;
159 163
      /// The reference type of the map.
160 164
      typedef R Reference;
161 165
      /// The const reference type of the map.
162 166
      typedef CR ConstReference;
163 167

	
164 168
    public:
165 169

	
166 170
      /// Returns a reference to the value associated with the given key.
167 171
      Reference operator[](const Key &) {
168 172
        return *static_cast<Value *>(0);
169 173
      }
Ignore white space 6 line context
... ...
@@ -96,25 +96,26 @@
96 96
    {
97 97
      return new ReachedMap(G);
98 98
    }
99 99
    ///The type of the map that stores the dists of the nodes.
100 100

	
101 101
    ///The type of the map that stores the dists of the nodes.
102 102
    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
103 103
    ///
104 104
    typedef typename Digraph::template NodeMap<int> DistMap;
105 105
    ///Instantiates a DistMap.
106 106

	
107 107
    ///This function instantiates a \ref DistMap.
108
    ///\param G is the digraph, to which we would like to define the \ref DistMap
108
    ///\param G is the digraph, to which we would like to define
109
    ///the \ref DistMap
109 110
    static DistMap *createDistMap(const GR &G)
110 111
    {
111 112
      return new DistMap(G);
112 113
    }
113 114
  };
114 115

	
115 116
  ///%DFS algorithm class.
116 117

	
117 118
  ///\ingroup search
118 119
  ///This class provides an efficient implementation of the %DFS algorithm.
119 120
  ///
120 121
  ///\tparam GR The digraph type the algorithm runs on. The default value is
... ...
@@ -799,25 +800,26 @@
799 800
    {
800 801
      return new ReachedMap(G);
801 802
    }
802 803
    ///The type of the map that stores the dists of the nodes.
803 804

	
804 805
    ///The type of the map that stores the dists of the nodes.
805 806
    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
806 807
    ///
807 808
    typedef NullMap<typename Digraph::Node,int> DistMap;
808 809
    ///Instantiates a DistMap.
809 810

	
810 811
    ///This function instantiates a \ref DistMap.
811
    ///\param g is the digraph, to which we would like to define the \ref DistMap
812
    ///\param g is the digraph, to which we would like to define
813
    ///the \ref DistMap
812 814
#ifdef DOXYGEN
813 815
    static DistMap *createDistMap(const GR &g)
814 816
#else
815 817
    static DistMap *createDistMap(const GR &)
816 818
#endif
817 819
    {
818 820
      return new DistMap();
819 821
    }
820 822
  };
821 823

	
822 824
  /// Default traits used by \ref DfsWizard
823 825

	
... ...
@@ -1184,25 +1186,26 @@
1184 1186
  };
1185 1187

	
1186 1188
  /// %DFS Visit algorithm class.
1187 1189

	
1188 1190
  /// \ingroup search
1189 1191
  /// This class provides an efficient implementation of the %DFS algorithm
1190 1192
  /// with visitor interface.
1191 1193
  ///
1192 1194
  /// The %DfsVisit class provides an alternative interface to the Dfs
1193 1195
  /// class. It works with callback mechanism, the DfsVisit object calls
1194 1196
  /// on every dfs event the \c Visitor class member functions.
1195 1197
  ///
1196
  /// \tparam _Digraph The digraph type the algorithm runs on. The default value is
1198
  /// \tparam _Digraph The digraph type the algorithm runs on.
1199
  /// The default value is
1197 1200
  /// \ref ListDigraph. The value of _Digraph is not used directly by Dfs, it
1198 1201
  /// is only passed to \ref DfsDefaultTraits.
1199 1202
  /// \tparam _Visitor The Visitor object for the algorithm. The
1200 1203
  /// \ref DfsVisitor "DfsVisitor<_Digraph>" is an empty Visitor which
1201 1204
  /// does not observe the Dfs events. If you want to observe the dfs
1202 1205
  /// events you should implement your own Visitor class.
1203 1206
  /// \tparam _Traits Traits class to set various data types used by the
1204 1207
  /// algorithm. The default traits class is
1205 1208
  /// \ref DfsVisitDefaultTraits "DfsVisitDefaultTraits<_Digraph>".
1206 1209
  /// See \ref DfsVisitDefaultTraits for the documentation of
1207 1210
  /// a Dfs visit traits class.
1208 1211
  ///
Ignore white space 24 line context
... ...
@@ -164,25 +164,26 @@
164 164
    {
165 165
      return new ProcessedMap();
166 166
    }
167 167
    ///The type of the map that stores the dists of the nodes.
168 168

	
169 169
    ///The type of the map that stores the dists of the nodes.
170 170
    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
171 171
    ///
172 172
    typedef typename Digraph::template NodeMap<typename LM::Value> DistMap;
173 173
    ///Instantiates a DistMap.
174 174

	
175 175
    ///This function instantiates a \ref DistMap.
176
    ///\param G is the digraph, to which we would like to define the \ref DistMap
176
    ///\param G is the digraph, to which we would like to define
177
    ///the \ref DistMap
177 178
    static DistMap *createDistMap(const GR &G)
178 179
    {
179 180
      return new DistMap(G);
180 181
    }
181 182
  };
182 183

	
183 184
  ///%Dijkstra algorithm class.
184 185

	
185 186
  /// \ingroup shortest_path
186 187
  ///This class provides an efficient implementation of %Dijkstra algorithm.
187 188
  ///The arc lengths are passed to the algorithm using a
188 189
  ///\ref concepts::ReadMap "ReadMap",
... ...
@@ -327,26 +328,26 @@
327 328
      typedef T PredMap;
328 329
      static PredMap *createPredMap(const Digraph &)
329 330
      {
330 331
        throw UninitializedParameter();
331 332
      }
332 333
    };
333 334
    ///\ref named-templ-param "Named parameter" for setting PredMap type
334 335

	
335 336
    ///\ref named-templ-param "Named parameter" for setting PredMap type
336 337
    ///
337 338
    template <class T>
338 339
    struct DefPredMap
339
      : public Dijkstra< Digraph,        LengthMap, DefPredMapTraits<T> > {
340
      typedef Dijkstra< Digraph,        LengthMap, DefPredMapTraits<T> > Create;
340
      : public Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > {
341
      typedef Dijkstra< Digraph, LengthMap, DefPredMapTraits<T> > Create;
341 342
    };
342 343

	
343 344
    template <class T>
344 345
    struct DefDistMapTraits : public Traits {
345 346
      typedef T DistMap;
346 347
      static DistMap *createDistMap(const Digraph &)
347 348
      {
348 349
        throw UninitializedParameter();
349 350
      }
350 351
    };
351 352
    ///\ref named-templ-param "Named parameter" for setting DistMap type
352 353

	
... ...
@@ -363,94 +364,95 @@
363 364
      typedef T ProcessedMap;
364 365
      static ProcessedMap *createProcessedMap(const Digraph &G)
365 366
      {
366 367
        throw UninitializedParameter();
367 368
      }
368 369
    };
369 370
    ///\ref named-templ-param "Named parameter" for setting ProcessedMap type
370 371

	
371 372
    ///\ref named-templ-param "Named parameter" for setting ProcessedMap type
372 373
    ///
373 374
    template <class T>
374 375
    struct DefProcessedMap
375
      : public Dijkstra< Digraph,        LengthMap, DefProcessedMapTraits<T> > {
376
      typedef Dijkstra< Digraph,        LengthMap, DefProcessedMapTraits<T> > Create;
376
      : public Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > {
377
      typedef Dijkstra< Digraph, LengthMap, DefProcessedMapTraits<T> > Create;
377 378
    };
378 379

	
379 380
    struct DefDigraphProcessedMapTraits : public Traits {
380 381
      typedef typename Digraph::template NodeMap<bool> ProcessedMap;
381 382
      static ProcessedMap *createProcessedMap(const Digraph &G)
382 383
      {
383 384
        return new ProcessedMap(G);
384 385
      }
385 386
    };
386 387
    ///\brief \ref named-templ-param "Named parameter"
387 388
    ///for setting the ProcessedMap type to be Digraph::NodeMap<bool>.
388 389
    ///
389 390
    ///\ref named-templ-param "Named parameter"
390 391
    ///for setting the ProcessedMap type to be Digraph::NodeMap<bool>.
391 392
    ///If you don't set it explicitely, it will be automatically allocated.
392 393
    template <class T>
393 394
    struct DefProcessedMapToBeDefaultMap
394 395
      : public Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> {
395
      typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits> Create;
396
      typedef Dijkstra< Digraph, LengthMap, DefDigraphProcessedMapTraits>
397
      Create;
396 398
    };
397 399

	
398 400
    template <class H, class CR>
399 401
    struct DefHeapTraits : public Traits {
400 402
      typedef CR HeapCrossRef;
401 403
      typedef H Heap;
402 404
      static HeapCrossRef *createHeapCrossRef(const Digraph &) {
403 405
        throw UninitializedParameter();
404 406
      }
405 407
      static Heap *createHeap(HeapCrossRef &)
406 408
      {
407 409
        throw UninitializedParameter();
408 410
      }
409 411
    };
410 412
    ///\brief \ref named-templ-param "Named parameter" for setting
411 413
    ///heap and cross reference type
412 414
    ///
413 415
    ///\ref named-templ-param "Named parameter" for setting heap and cross
414 416
    ///reference type
415 417
    ///
416 418
    template <class H, class CR = typename Digraph::template NodeMap<int> >
417 419
    struct DefHeap
418
      : public Dijkstra< Digraph,        LengthMap, DefHeapTraits<H, CR> > {
419
      typedef Dijkstra< Digraph,        LengthMap, DefHeapTraits<H, CR> > Create;
420
      : public Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > {
421
      typedef Dijkstra< Digraph, LengthMap, DefHeapTraits<H, CR> > Create;
420 422
    };
421 423

	
422 424
    template <class H, class CR>
423 425
    struct DefStandardHeapTraits : public Traits {
424 426
      typedef CR HeapCrossRef;
425 427
      typedef H Heap;
426 428
      static HeapCrossRef *createHeapCrossRef(const Digraph &G) {
427 429
        return new HeapCrossRef(G);
428 430
      }
429 431
      static Heap *createHeap(HeapCrossRef &R)
430 432
      {
431 433
        return new Heap(R);
432 434
      }
433 435
    };
434 436
    ///\brief \ref named-templ-param "Named parameter" for setting
435 437
    ///heap and cross reference type with automatic allocation
436 438
    ///
437 439
    ///\ref named-templ-param "Named parameter" for setting heap and cross
438 440
    ///reference type. It can allocate the heap and the cross reference
439 441
    ///object if the cross reference's constructor waits for the digraph as
440 442
    ///parameter and the heap's constructor waits for the cross reference.
441 443
    template <class H, class CR = typename Digraph::template NodeMap<int> >
442 444
    struct DefStandardHeap
443
      : public Dijkstra< Digraph,        LengthMap, DefStandardHeapTraits<H, CR> > {
444
      typedef Dijkstra< Digraph,        LengthMap, DefStandardHeapTraits<H, CR> >
445
      : public Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> > {
446
      typedef Dijkstra< Digraph, LengthMap, DefStandardHeapTraits<H, CR> >
445 447
      Create;
446 448
    };
447 449

	
448 450
    template <class T>
449 451
    struct DefOperationTraitsTraits : public Traits {
450 452
      typedef T OperationTraits;
451 453
    };
452 454

	
453 455
    /// \brief \ref named-templ-param "Named parameter" for setting
454 456
    /// OperationTraits type
455 457
    ///
456 458
    /// \ref named-templ-param "Named parameter" for setting OperationTraits
... ...
@@ -967,25 +969,26 @@
967 969
    {
968 970
      return new ProcessedMap();
969 971
    }
970 972
    ///The type of the map that stores the dists of the nodes.
971 973

	
972 974
    ///The type of the map that stores the dists of the nodes.
973 975
    ///It must meet the \ref concepts::WriteMap "WriteMap" concept.
974 976
    ///
975 977
    typedef NullMap<typename Digraph::Node,typename LM::Value> DistMap;
976 978
    ///Instantiates a DistMap.
977 979

	
978 980
    ///This function instantiates a \ref DistMap.
979
    ///\param g is the digraph, to which we would like to define the \ref DistMap
981
    ///\param g is the digraph, to which we would like to define
982
    ///the \ref DistMap
980 983
#ifdef DOXYGEN
981 984
    static DistMap *createDistMap(const GR &g)
982 985
#else
983 986
    static DistMap *createDistMap(const GR &)
984 987
#endif
985 988
    {
986 989
      return new DistMap();
987 990
    }
988 991
  };
989 992

	
990 993
  /// Default traits used by \ref DijkstraWizard
991 994

	
Ignore white space 6 line context
... ...
@@ -133,25 +133,26 @@
133 133

	
134 134
  bool _absoluteNodeSizes;
135 135
  bool _absoluteArcWidths;
136 136

	
137 137
  bool _negY;
138 138

	
139 139
  bool _preScale;
140 140
  ///Constructor
141 141

	
142 142
  ///Constructor
143 143
  ///\param _g  Reference to the graph to be printed.
144 144
  ///\param _os Reference to the output stream.
145
  ///\param _os Reference to the output stream. By default it is <tt>std::cout</tt>.
145
  ///\param _os Reference to the output stream.
146
  ///By default it is <tt>std::cout</tt>.
146 147
  ///\param _pros If it is \c true, then the \c ostream referenced by \c _os
147 148
  ///will be explicitly deallocated by the destructor.
148 149
  DefaultGraphToEpsTraits(const G &_g,std::ostream& _os=std::cout,
149 150
                          bool _pros=false) :
150 151
    g(_g), os(_os),
151 152
    _coords(dim2::Point<double>(1,1)), _nodeSizes(1), _nodeShapes(0),
152 153
    _nodeColors(WHITE), _arcColors(BLACK),
153 154
    _arcWidths(1.0), _arcWidthScale(0.003),
154 155
    _nodeScale(.01), _xBorder(10), _yBorder(10), _scale(1.0),
155 156
    _nodeBorderQuotient(.1),
156 157
    _drawArrows(false), _arrowLength(1), _arrowWidth(0.3),
157 158
    _showNodes(true), _showArcs(true),
... ...
@@ -772,27 +773,29 @@
772 773
      os << "%%BoundingBox: "
773 774
         << int(floor(bb.left()   * _scale - _xBorder)) << ' '
774 775
         << int(floor(bb.bottom() * _scale - _yBorder)) << ' '
775 776
         << int(ceil(bb.right()  * _scale + _xBorder)) << ' '
776 777
         << int(ceil(bb.top()    * _scale + _yBorder)) << '\n';
777 778
    }
778 779

	
779 780
    os << "%%EndComments\n";
780 781

	
781 782
    //x1 y1 x2 y2 x3 y3 cr cg cb w
782 783
    os << "/lb { setlinewidth setrgbcolor newpath moveto\n"
783 784
       << "      4 2 roll 1 index 1 index curveto stroke } bind def\n";
784
    os << "/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def\n";
785
    os << "/l { setlinewidth setrgbcolor newpath moveto lineto stroke }"
786
       << " bind def\n";
785 787
    //x y r
786
    os << "/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def\n";
788
    os << "/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath }"
789
       << " bind def\n";
787 790
    //x y r
788 791
    os << "/sq { newpath 2 index 1 index add 2 index 2 index add moveto\n"
789 792
       << "      2 index 1 index sub 2 index 2 index add lineto\n"
790 793
       << "      2 index 1 index sub 2 index 2 index sub lineto\n"
791 794
       << "      2 index 1 index add 2 index 2 index sub lineto\n"
792 795
       << "      closepath pop pop pop} bind def\n";
793 796
    //x y r
794 797
    os << "/di { newpath 2 index 1 index add 2 index moveto\n"
795 798
       << "      2 index             2 index 2 index add lineto\n"
796 799
       << "      2 index 1 index sub 2 index             lineto\n"
797 800
       << "      2 index             2 index 2 index sub lineto\n"
798 801
       << "      closepath pop pop pop} bind def\n";
... ...
@@ -802,54 +805,58 @@
802 805
       << "   } bind def\n";
803 806
    os << "/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill\n"
804 807
       << "     setrgbcolor " << 1+_nodeBorderQuotient << " div sq fill\n"
805 808
       << "   } bind def\n";
806 809
    os << "/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill\n"
807 810
       << "     setrgbcolor " << 1+_nodeBorderQuotient << " div di fill\n"
808 811
       << "   } bind def\n";
809 812
    os << "/nfemale { 0 0 0 setrgbcolor 3 index "
810 813
       << _nodeBorderQuotient/(1+_nodeBorderQuotient)
811 814
       << " 1.5 mul mul setlinewidth\n"
812 815
       << "  newpath 5 index 5 index moveto "
813 816
       << "5 index 5 index 5 index 3.01 mul sub\n"
814
       << "  lineto 5 index 4 index .7 mul sub 5 index 5 index 2.2 mul sub moveto\n"
815
       << "  5 index 4 index .7 mul add 5 index 5 index 2.2 mul sub lineto stroke\n"
817
       << "  lineto 5 index 4 index .7 mul sub 5 index 5 index 2.2 mul sub"
818
       << " moveto\n"
819
       << "  5 index 4 index .7 mul add 5 index 5 index 2.2 mul sub lineto "
820
       << "stroke\n"
816 821
       << "  5 index 5 index 5 index c fill\n"
817 822
       << "  setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
818 823
       << "  } bind def\n";
819 824
    os << "/nmale {\n"
820 825
       << "  0 0 0 setrgbcolor 3 index "
821 826
       << _nodeBorderQuotient/(1+_nodeBorderQuotient)
822 827
       <<" 1.5 mul mul setlinewidth\n"
823 828
       << "  newpath 5 index 5 index moveto\n"
824 829
       << "  5 index 4 index 1 mul 1.5 mul add\n"
825 830
       << "  5 index 5 index 3 sqrt 1.5 mul mul add\n"
826 831
       << "  1 index 1 index lineto\n"
827 832
       << "  1 index 1 index 7 index sub moveto\n"
828 833
       << "  1 index 1 index lineto\n"
829
       << "  exch 5 index 3 sqrt .5 mul mul sub exch 5 index .5 mul sub lineto\n"
834
       << "  exch 5 index 3 sqrt .5 mul mul sub exch 5 index .5 mul sub"
835
       << " lineto\n"
830 836
       << "  stroke\n"
831 837
       << "  5 index 5 index 5 index c fill\n"
832 838
       << "  setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
833 839
       << "  } bind def\n";
834 840

	
835 841

	
836 842
    os << "/arrl " << _arrowLength << " def\n";
837 843
    os << "/arrw " << _arrowWidth << " def\n";
838 844
    // l dx_norm dy_norm
839 845
    os << "/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def\n";
840 846
    //len w dx_norm dy_norm x1 y1 cr cg cb
841
    os << "/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def\n"
847
    os << "/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx "
848
       << "exch def\n"
842 849
       << "       /w exch def /len exch def\n"
843
      //         << "       0.1 setlinewidth x1 y1 moveto dx len mul dy len mul rlineto stroke"
850
      //<< "0.1 setlinewidth x1 y1 moveto dx len mul dy len mul rlineto stroke"
844 851
       << "       newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto\n"
845 852
       << "       len w sub arrl sub dx dy lrl\n"
846 853
       << "       arrw dy dx neg lrl\n"
847 854
       << "       dx arrl w add mul dy w 2 div arrw add mul sub\n"
848 855
       << "       dy arrl w add mul dx w 2 div arrw add mul add rlineto\n"
849 856
       << "       dx arrl w add mul neg dy w 2 div arrw add mul sub\n"
850 857
       << "       dy arrl w add mul neg dx w 2 div arrw add mul add rlineto\n"
851 858
       << "       arrw dy dx neg lrl\n"
852 859
       << "       len w sub arrl sub neg dx dy lrl\n"
853 860
       << "       closepath fill } bind def\n";
854 861
    os << "/cshow { 2 index 2 index moveto dup stringwidth pop\n"
855 862
       << "         neg 2 div fosi .35 mul neg rmoveto show pop pop} def\n";
... ...
@@ -893,25 +900,26 @@
893 900

	
894 901
          double sw=0;
895 902
          for(typename std::vector<Arc>::iterator e=i;e!=j;++e)
896 903
            sw+=_arcWidths[*e]*_arcWidthScale+_parArcDist;
897 904
          sw-=_parArcDist;
898 905
          sw/=-2.0;
899 906
          dim2::Point<double>
900 907
            dvec(mycoords[g.target(*i)]-mycoords[g.source(*i)]);
901 908
          double l=std::sqrt(dvec.normSquare());
902 909
          //\todo better 'epsilon' would be nice here.
903 910
          dim2::Point<double> d(dvec/std::max(l,EPSILON));
904 911
           dim2::Point<double> m;
905
//           m=dim2::Point<double>(mycoords[g.target(*i)]+mycoords[g.source(*i)])/2.0;
912
//           m=dim2::Point<double>(mycoords[g.target(*i)]+
913
//                                 mycoords[g.source(*i)])/2.0;
906 914

	
907 915
//            m=dim2::Point<double>(mycoords[g.source(*i)])+
908 916
//             dvec*(double(_nodeSizes[g.source(*i)])/
909 917
//                (_nodeSizes[g.source(*i)]+_nodeSizes[g.target(*i)]));
910 918

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

	
914 922
          for(typename std::vector<Arc>::iterator e=i;e!=j;++e) {
915 923
            sw+=_arcWidths[*e]*_arcWidthScale/2.0;
916 924
            dim2::Point<double> mm=m+rot90(d)*sw/.75;
917 925
            if(_drawArrows) {
... ...
@@ -929,25 +937,26 @@
929 937
              rn = _arrowLength+_arcWidths[*e]*_arcWidthScale;
930 938
              rn*=rn;
931 939
              t2=(t1+t2)/2;t1=0;
932 940
              for(int ii=0;ii<INTERPOL_PREC;++ii)
933 941
                if((bez((t1+t2)/2)-apoint).normSquare()>rn) t1=(t1+t2)/2;
934 942
                else t2=(t1+t2)/2;
935 943
              dim2::Point<double> linend=bez((t1+t2)/2);
936 944
              bez=bez.before((t1+t2)/2);
937 945
//               rn=_nodeSizes[g.source(*e)]*_nodeScale;
938 946
//               node_shape=_nodeShapes[g.source(*e)];
939 947
//               t1=0;t2=1;
940 948
//               for(int i=0;i<INTERPOL_PREC;++i)
941
//                 if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t1=(t1+t2)/2;
949
//                 if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape))
950
//                   t1=(t1+t2)/2;
942 951
//                 else t2=(t1+t2)/2;
943 952
//               bez=bez.after((t1+t2)/2);
944 953
              os << _arcWidths[*e]*_arcWidthScale << " setlinewidth "
945 954
                 << _arcColors[*e].red() << ' '
946 955
                 << _arcColors[*e].green() << ' '
947 956
                 << _arcColors[*e].blue() << " setrgbcolor newpath\n"
948 957
                 << bez.p1.x << ' ' <<  bez.p1.y << " moveto\n"
949 958
                 << bez.p2.x << ' ' << bez.p2.y << ' '
950 959
                 << bez.p3.x << ' ' << bez.p3.y << ' '
951 960
                 << bez.p4.x << ' ' << bez.p4.y << " curveto stroke\n";
952 961
              dim2::Point<double> dd(rot90(linend-apoint));
953 962
              dd*=(.5*_arcWidths[*e]*_arcWidthScale+_arrowWidth)/
Ignore white space 6 line context
... ...
@@ -435,25 +435,26 @@
435 435
  ///
436 436
  /// The \c useNodes() and \c useArcs() functions are used to tell the reader
437 437
  /// that the nodes or arcs should not be constructed (added to the
438 438
  /// graph) during the reading, but instead the label map of the items
439 439
  /// are given as a parameter of these functions. An
440 440
  /// application of these functions is multipass reading, which is
441 441
  /// important if two \c \@arcs sections must be read from the
442 442
  /// file. In this case the first phase would read the node set and one
443 443
  /// of the arc sets, while the second phase would read the second arc
444 444
  /// set into an \e ArcSet class (\c SmartArcSet or \c ListArcSet).
445 445
  /// The previously read label node map should be passed to the \c
446 446
  /// useNodes() functions. Another application of multipass reading when
447
  /// paths are given as a node map or an arc map. It is impossible to read this in
447
  /// paths are given as a node map or an arc map.
448
  /// It is impossible to read this in
448 449
  /// a single pass, because the arcs are not constructed when the node
449 450
  /// maps are read.
450 451
  template <typename _Digraph>
451 452
  class DigraphReader {
452 453
  public:
453 454

	
454 455
    typedef _Digraph Digraph;
455 456
    TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
456 457

	
457 458
  private:
458 459

	
459 460

	
Ignore white space 6 line context
... ...
@@ -305,25 +305,26 @@
305 305
  public:
306 306
    ///Constructor.
307 307

	
308 308
    ///\param run indicates whether or not the timer starts immediately.
309 309
    ///
310 310
    Timer(bool run=true) :_running(run) {_reset();}
311 311

	
312 312
    ///\name Control the state of the timer
313 313
    ///Basically a Timer can be either running or stopped,
314 314
    ///but it provides a bit finer control on the execution.
315 315
    ///The \ref Timer also counts the number of \ref start()
316 316
    ///executions, and is stops only after the same amount (or more)
317
    ///\ref stop() "stop()"s. This can be useful e.g. to compute the running time
317
    ///\ref stop() "stop()"s. This can be useful e.g. to compute
318
    ///the running time
318 319
    ///of recursive functions.
319 320
    ///
320 321

	
321 322
    ///@{
322 323

	
323 324
    ///Reset and stop the time counters
324 325

	
325 326
    ///This function resets and stops the time counters
326 327
    ///\sa restart()
327 328
    void reset()
328 329
    {
329 330
      _running=0;
Ignore white space 6 line context
... ...
@@ -101,36 +101,39 @@
101 101

	
102 102
  check(dijkstra_test.dist(t)==13,"Dijkstra found a wrong path.");
103 103

	
104 104
  Path<Digraph> p = dijkstra_test.path(t);
105 105
  check(p.length()==4,"getPath() found a wrong path.");
106 106
  check(checkPath(G, p),"path() found a wrong path.");
107 107
  check(pathSource(G, p) == s,"path() found a wrong path.");
108 108
  check(pathTarget(G, p) == t,"path() found a wrong path.");
109 109

	
110 110
  for(ArcIt e(G); e!=INVALID; ++e) {
111 111
    Node u=G.source(e);
112 112
    Node v=G.target(e);
113
    check( !dijkstra_test.reached(u) || (dijkstra_test.dist(v) - dijkstra_test.dist(u) <= length[e]),
114
           "dist(target)-dist(source)-arc_length= " << dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]);
113
    check( !dijkstra_test.reached(u) ||
114
           (dijkstra_test.dist(v) - dijkstra_test.dist(u) <= length[e]),
115
           "dist(target)-dist(source)-arc_length= " <<
116
           dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]);
115 117
  }
116 118

	
117 119
  for(NodeIt v(G); v!=INVALID; ++v){
118 120
    check(dijkstra_test.reached(v),"Each node should be reached.");
119 121
    if ( dijkstra_test.predArc(v)!=INVALID ) {
120 122
      Arc e=dijkstra_test.predArc(v);
121 123
      Node u=G.source(e);
122 124
      check(u==dijkstra_test.predNode(v),"Wrong tree.");
123 125
      check(dijkstra_test.dist(v) - dijkstra_test.dist(u) == length[e],
124
            "Wrong distance! Difference: " << std::abs(dijkstra_test.dist(v) - dijkstra_test.dist(u) - length[e]));
126
            "Wrong distance! Difference: " <<
127
            std::abs(dijkstra_test.dist(v)-dijkstra_test.dist(u)-length[e]));
125 128
    }
126 129
  }
127 130

	
128 131
  {
129 132
    NullMap<Node,Arc> myPredMap;
130 133
    dijkstra(G,length).predMap(myPredMap).run(s);
131 134
  }
132 135
}
133 136

	
134 137
int main() {
135 138
  checkDijkstra<ListDigraph>();
136 139
  checkDijkstra<SmartDigraph>();
Ignore white space 6 line context
... ...
@@ -83,30 +83,33 @@
83 83
        check(++con == INVALID, "There is more connecting arc.");
84 84
      }
85 85
    }
86 86
    ArcLookUp<Digraph> al1(fg);
87 87
    DynArcLookUp<Digraph> al2(fg);
88 88
    AllArcLookUp<Digraph> al3(fg);
89 89
    for (NodeIt src(fg); src != INVALID; ++src) {
90 90
      for (NodeIt trg(fg); trg != INVALID; ++trg) {
91 91
        Arc con1 = al1(src, trg);
92 92
        Arc con2 = al2(src, trg);
93 93
        Arc con3 = al3(src, trg);
94 94
        Arc con4 = findArc(fg, src, trg);
95
        check(con1 == con2 && con2 == con3 && con3 == con4, "Different results.")
95
        check(con1 == con2 && con2 == con3 && con3 == con4,
96
              "Different results.")
96 97
        check(con1 != INVALID, "There is no connecting arc.");
97 98
        check(fg.source(con1) == src, "Wrong source.");
98 99
        check(fg.target(con1) == trg, "Wrong target.");
99
        check(al3(src, trg, con3) == INVALID, "There is more connecting arc.");
100
        check(findArc(fg, src, trg, con4) == INVALID, "There is more connecting arc.");
100
        check(al3(src, trg, con3) == INVALID,
101
              "There is more connecting arc.");
102
        check(findArc(fg, src, trg, con4) == INVALID,
103
              "There is more connecting arc.");
101 104
      }
102 105
    }
103 106
  }
104 107
}
105 108

	
106 109
template <typename Graph>
107 110
void checkFindEdges() {
108 111
  TEMPLATE_GRAPH_TYPEDEFS(Graph);
109 112
  Graph graph;
110 113
  for (int i = 0; i < 10; ++i) {
111 114
    graph.addNode();
112 115
  }
... ...
@@ -114,25 +117,26 @@
114 117
  typename DescriptorMap<Graph, Node>::InverseMap invNodes(nodes);
115 118
  for (int i = 0; i < 100; ++i) {
116 119
    int src = rnd[invNodes.size()];
117 120
    int trg = rnd[invNodes.size()];
118 121
    graph.addEdge(invNodes[src], invNodes[trg]);
119 122
  }
120 123
  typename Graph::template EdgeMap<int> found(graph, 0);
121 124
  DescriptorMap<Graph, Edge> edges(graph);
122 125
  for (NodeIt src(graph); src != INVALID; ++src) {
123 126
    for (NodeIt trg(graph); trg != INVALID; ++trg) {
124 127
      for (ConEdgeIt<Graph> con(graph, src, trg); con != INVALID; ++con) {
125 128
        check( (graph.u(con) == src && graph.v(con) == trg) ||
126
               (graph.v(con) == src && graph.u(con) == trg), "Wrong end nodes.");
129
               (graph.v(con) == src && graph.u(con) == trg),
130
               "Wrong end nodes.");
127 131
        ++found[con];
128 132
        check(found[con] <= 2, "The edge found more than twice.");
129 133
      }
130 134
    }
131 135
  }
132 136
  for (EdgeIt it(graph); it != INVALID; ++it) {
133 137
    check( (graph.u(it) != graph.v(it) && found[it] == 2) ||
134 138
           (graph.u(it) == graph.v(it) && found[it] == 1),
135 139
           "The edge is not found correctly.");
136 140
  }
137 141
}
138 142

	
Ignore white space 6 line context
... ...
@@ -94,36 +94,38 @@
94 94
    ConstMap<A,C> map5 = map4;
95 95
    map4 = constMap<A>(C(2));
96 96
    map4.setAll(C(3));
97 97

	
98 98
    checkConcept<ReadWriteMap<A,int>, ConstMap<A,int> >();
99 99
    check(constMap<A>(10)[A()] == 10, "Something is wrong with ConstMap");
100 100

	
101 101
    checkConcept<ReadWriteMap<A,int>, ConstMap<A,Const<int,10> > >();
102 102
    ConstMap<A,Const<int,10> > map6;
103 103
    ConstMap<A,Const<int,10> > map7 = map6;
104 104
    map6 = constMap<A,int,10>();
105 105
    map7 = constMap<A,Const<int,10> >();
106
    check(map6[A()] == 10 && map7[A()] == 10, "Something is wrong with ConstMap");
106
    check(map6[A()] == 10 && map7[A()] == 10,
107
          "Something is wrong with ConstMap");
107 108
  }
108 109

	
109 110
  // IdentityMap
110 111
  {
111 112
    checkConcept<ReadMap<A,A>, IdentityMap<A> >();
112 113
    IdentityMap<A> map1;
113 114
    IdentityMap<A> map2 = map1;
114 115
    map1 = identityMap<A>();
115 116

	
116 117
    checkConcept<ReadMap<double,double>, IdentityMap<double> >();
117
    check(identityMap<double>()[1.0] == 1.0 && identityMap<double>()[3.14] == 3.14,
118
    check(identityMap<double>()[1.0] == 1.0 &&
119
          identityMap<double>()[3.14] == 3.14,
118 120
          "Something is wrong with IdentityMap");
119 121
  }
120 122

	
121 123
  // RangeMap
122 124
  {
123 125
    checkConcept<ReferenceMap<int,B,B&,const B&>, RangeMap<B> >();
124 126
    RangeMap<B> map1;
125 127
    RangeMap<B> map2(10);
126 128
    RangeMap<B> map3(10,B());
127 129
    RangeMap<B> map4 = map1;
128 130
    RangeMap<B> map5 = rangeMap<B>();
129 131
    RangeMap<B> map6 = rangeMap<B>(10);
... ...
@@ -146,130 +148,144 @@
146 148
    SparseMap<A,B> map2 = B();
147 149
    SparseMap<A,B> map3 = sparseMap<A,B>();
148 150
    SparseMap<A,B> map4 = sparseMap<A>(B());
149 151

	
150 152
    checkConcept< ReferenceMap<double, int, int&, const int&>,
151 153
                  SparseMap<double, int> >();
152 154
    std::map<double, int> m;
153 155
    SparseMap<double, int> map5(m);
154 156
    SparseMap<double, int> map6(m,10);
155 157
    SparseMap<double, int> map7 = sparseMap(m);
156 158
    SparseMap<double, int> map8 = sparseMap(m,10);
157 159

	
158
    check(map5[1.0] == 0 && map5[3.14] == 0 && map6[1.0] == 10 && map6[3.14] == 10,
160
    check(map5[1.0] == 0 && map5[3.14] == 0 &&
161
          map6[1.0] == 10 && map6[3.14] == 10,
159 162
          "Something is wrong with SparseMap");
160 163
    map5[1.0] = map6[3.14] = 100;
161
    check(map5[1.0] == 100 && map5[3.14] == 0 && map6[1.0] == 10 && map6[3.14] == 100,
164
    check(map5[1.0] == 100 && map5[3.14] == 0 &&
165
          map6[1.0] == 10 && map6[3.14] == 100,
162 166
          "Something is wrong with SparseMap");
163 167
  }
164 168

	
165 169
  // ComposeMap
166 170
  {
167 171
    typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
168 172
    checkConcept<ReadMap<B,double>, CompMap>();
169 173
    CompMap map1(DoubleMap(),ReadMap<B,A>());
170 174
    CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
171 175

	
172 176
    SparseMap<double, bool> m1(false); m1[3.14] = true;
173 177
    RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
174
    check(!composeMap(m1,m2)[0] && composeMap(m1,m2)[1], "Something is wrong with ComposeMap")
178
    check(!composeMap(m1,m2)[0] && composeMap(m1,m2)[1],
179
          "Something is wrong with ComposeMap")
175 180
  }
176 181

	
177 182
  // CombineMap
178 183
  {
179 184
    typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
180 185
    checkConcept<ReadMap<A,double>, CombMap>();
181 186
    CombMap map1(DoubleMap(), DoubleMap());
182 187
    CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
183 188

	
184 189
    check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
185 190
          "Something is wrong with CombineMap");
186 191
  }
187 192

	
188 193
  // FunctorToMap, MapToFunctor
189 194
  {
190 195
    checkConcept<ReadMap<A,B>, FunctorToMap<F,A,B> >();
191 196
    checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
192 197
    FunctorToMap<F> map1;
193 198
    FunctorToMap<F> map2(F());
194 199
    B b = functorToMap(F())[A()];
195 200

	
196 201
    checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
197 202
    MapToFunctor<ReadMap<A,B> > map(ReadMap<A,B>());
198 203

	
199
    check(functorToMap(&func)[A()] == 3, "Something is wrong with FunctorToMap");
200
    check(mapToFunctor(constMap<A,int>(2))(A()) == 2, "Something is wrong with MapToFunctor");
201
    check(mapToFunctor(functorToMap(&func))(A()) == 3 && mapToFunctor(functorToMap(&func))[A()] == 3,
204
    check(functorToMap(&func)[A()] == 3,
205
          "Something is wrong with FunctorToMap");
206
    check(mapToFunctor(constMap<A,int>(2))(A()) == 2,
207
          "Something is wrong with MapToFunctor");
208
    check(mapToFunctor(functorToMap(&func))(A()) == 3 &&
209
          mapToFunctor(functorToMap(&func))[A()] == 3,
202 210
          "Something is wrong with FunctorToMap or MapToFunctor");
203 211
    check(functorToMap(mapToFunctor(constMap<A,int>(2)))[A()] == 2,
204 212
          "Something is wrong with FunctorToMap or MapToFunctor");
205 213
  }
206 214

	
207 215
  // ConvertMap
208 216
  {
209
    checkConcept<ReadMap<double,double>, ConvertMap<ReadMap<double, int>, double> >();
217
    checkConcept<ReadMap<double,double>,
218
      ConvertMap<ReadMap<double, int>, double> >();
210 219
    ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
211 220
    ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
212 221
  }
213 222

	
214 223
  // ForkMap
215 224
  {
216 225
    checkConcept<DoubleWriteMap, ForkMap<DoubleWriteMap, DoubleWriteMap> >();
217 226

	
218 227
    typedef RangeMap<double> RM;
219 228
    typedef SparseMap<int, double> SM;
220 229
    RM m1(10, -1);
221 230
    SM m2(-1);
222 231
    checkConcept<ReadWriteMap<int, double>, ForkMap<RM, SM> >();
223 232
    checkConcept<ReadWriteMap<int, double>, ForkMap<SM, RM> >();
224 233
    ForkMap<RM, SM> map1(m1,m2);
225 234
    ForkMap<SM, RM> map2 = forkMap(m2,m1);
226 235
    map2.set(5, 10);
227
    check(m1[1] == -1 && m1[5] == 10 && m2[1] == -1 && m2[5] == 10 && map2[1] == -1 && map2[5] == 10,
236
    check(m1[1] == -1 && m1[5] == 10 && m2[1] == -1 &&
237
          m2[5] == 10 && map2[1] == -1 && map2[5] == 10,
228 238
          "Something is wrong with ForkMap");
229 239
  }
230 240

	
231 241
  // Arithmetic maps:
232 242
  // - AddMap, SubMap, MulMap, DivMap
233 243
  // - ShiftMap, ShiftWriteMap, ScaleMap, ScaleWriteMap
234 244
  // - NegMap, NegWriteMap, AbsMap
235 245
  {
236 246
    checkConcept<DoubleMap, AddMap<DoubleMap,DoubleMap> >();
237 247
    checkConcept<DoubleMap, SubMap<DoubleMap,DoubleMap> >();
238 248
    checkConcept<DoubleMap, MulMap<DoubleMap,DoubleMap> >();
239 249
    checkConcept<DoubleMap, DivMap<DoubleMap,DoubleMap> >();
240 250

	
241 251
    ConstMap<int, double> c1(1.0), c2(3.14);
242 252
    IdentityMap<int> im;
243 253
    ConvertMap<IdentityMap<int>, double> id(im);
244
    check(addMap(c1,id)[0] == 1.0  && addMap(c1,id)[10] == 11.0, "Something is wrong with AddMap");
245
    check(subMap(id,c1)[0] == -1.0 && subMap(id,c1)[10] == 9.0,  "Something is wrong with SubMap");
246
    check(mulMap(id,c2)[0] == 0    && mulMap(id,c2)[2]  == 6.28, "Something is wrong with MulMap");
247
    check(divMap(c2,id)[1] == 3.14 && divMap(c2,id)[2]  == 1.57, "Something is wrong with DivMap");
254
    check(addMap(c1,id)[0] == 1.0  && addMap(c1,id)[10] == 11.0,
255
          "Something is wrong with AddMap");
256
    check(subMap(id,c1)[0] == -1.0 && subMap(id,c1)[10] == 9.0,
257
          "Something is wrong with SubMap");
258
    check(mulMap(id,c2)[0] == 0    && mulMap(id,c2)[2]  == 6.28,
259
          "Something is wrong with MulMap");
260
    check(divMap(c2,id)[1] == 3.14 && divMap(c2,id)[2]  == 1.57,
261
          "Something is wrong with DivMap");
248 262

	
249 263
    checkConcept<DoubleMap, ShiftMap<DoubleMap> >();
250 264
    checkConcept<DoubleWriteMap, ShiftWriteMap<DoubleWriteMap> >();
251 265
    checkConcept<DoubleMap, ScaleMap<DoubleMap> >();
252 266
    checkConcept<DoubleWriteMap, ScaleWriteMap<DoubleWriteMap> >();
253 267
    checkConcept<DoubleMap, NegMap<DoubleMap> >();
254 268
    checkConcept<DoubleWriteMap, NegWriteMap<DoubleWriteMap> >();
255 269
    checkConcept<DoubleMap, AbsMap<DoubleMap> >();
256 270

	
257 271
    check(shiftMap(id, 2.0)[1] == 3.0 && shiftMap(id, 2.0)[10] == 12.0,
258 272
          "Something is wrong with ShiftMap");
259
    check(shiftWriteMap(id, 2.0)[1] == 3.0 && shiftWriteMap(id, 2.0)[10] == 12.0,
273
    check(shiftWriteMap(id, 2.0)[1] == 3.0 &&
274
          shiftWriteMap(id, 2.0)[10] == 12.0,
260 275
          "Something is wrong with ShiftWriteMap");
261 276
    check(scaleMap(id, 2.0)[1] == 2.0 && scaleMap(id, 2.0)[10] == 20.0,
262 277
          "Something is wrong with ScaleMap");
263
    check(scaleWriteMap(id, 2.0)[1] == 2.0 && scaleWriteMap(id, 2.0)[10] == 20.0,
278
    check(scaleWriteMap(id, 2.0)[1] == 2.0 &&
279
          scaleWriteMap(id, 2.0)[10] == 20.0,
264 280
          "Something is wrong with ScaleWriteMap");
265 281
    check(negMap(id)[1] == -1.0 && negMap(id)[-10] == 10.0,
266 282
          "Something is wrong with NegMap");
267 283
    check(negWriteMap(id)[1] == -1.0 && negWriteMap(id)[-10] == 10.0,
268 284
          "Something is wrong with NegWriteMap");
269 285
    check(absMap(id)[1] == 1.0 && absMap(id)[-10] == 10.0,
270 286
          "Something is wrong with AbsMap");
271 287
  }
272 288

	
273 289
  // Logical maps:
274 290
  // - TrueMap, FalseMap
275 291
  // - AndMap, OrMap
... ...
@@ -280,52 +296,58 @@
280 296
    checkConcept<BoolMap, FalseMap<A> >();
281 297
    checkConcept<BoolMap, AndMap<BoolMap,BoolMap> >();
282 298
    checkConcept<BoolMap, OrMap<BoolMap,BoolMap> >();
283 299
    checkConcept<BoolMap, NotMap<BoolMap> >();
284 300
    checkConcept<BoolWriteMap, NotWriteMap<BoolWriteMap> >();
285 301
    checkConcept<BoolMap, EqualMap<DoubleMap,DoubleMap> >();
286 302
    checkConcept<BoolMap, LessMap<DoubleMap,DoubleMap> >();
287 303

	
288 304
    TrueMap<int> tm;
289 305
    FalseMap<int> fm;
290 306
    RangeMap<bool> rm(2);
291 307
    rm[0] = true; rm[1] = false;
292
    check(andMap(tm,rm)[0] && !andMap(tm,rm)[1] && !andMap(fm,rm)[0] && !andMap(fm,rm)[1],
308
    check(andMap(tm,rm)[0] && !andMap(tm,rm)[1] &&
309
          !andMap(fm,rm)[0] && !andMap(fm,rm)[1],
293 310
          "Something is wrong with AndMap");
294
    check(orMap(tm,rm)[0] && orMap(tm,rm)[1] && orMap(fm,rm)[0] && !orMap(fm,rm)[1],
311
    check(orMap(tm,rm)[0] && orMap(tm,rm)[1] &&
312
          orMap(fm,rm)[0] && !orMap(fm,rm)[1],
295 313
          "Something is wrong with OrMap");
296
    check(!notMap(rm)[0] && notMap(rm)[1], "Something is wrong with NotMap");
297
    check(!notWriteMap(rm)[0] && notWriteMap(rm)[1], "Something is wrong with NotWriteMap");
314
    check(!notMap(rm)[0] && notMap(rm)[1],
315
          "Something is wrong with NotMap");
316
    check(!notWriteMap(rm)[0] && notWriteMap(rm)[1],
317
          "Something is wrong with NotWriteMap");
298 318

	
299 319
    ConstMap<int, double> cm(2.0);
300 320
    IdentityMap<int> im;
301 321
    ConvertMap<IdentityMap<int>, double> id(im);
302 322
    check(lessMap(id,cm)[1] && !lessMap(id,cm)[2] && !lessMap(id,cm)[3],
303 323
          "Something is wrong with LessMap");
304 324
    check(!equalMap(id,cm)[1] && equalMap(id,cm)[2] && !equalMap(id,cm)[3],
305 325
          "Something is wrong with EqualMap");
306 326
  }
307 327

	
308 328
  // LoggerBoolMap
309 329
  {
310 330
    typedef std::vector<int> vec;
311 331
    vec v1;
312 332
    vec v2(10);
313
    LoggerBoolMap<std::back_insert_iterator<vec> > map1(std::back_inserter(v1));
333
    LoggerBoolMap<std::back_insert_iterator<vec> >
334
      map1(std::back_inserter(v1));
314 335
    LoggerBoolMap<vec::iterator> map2(v2.begin());
315 336
    map1.set(10, false);
316 337
    map1.set(20, true);   map2.set(20, true);
317 338
    map1.set(30, false);  map2.set(40, false);
318 339
    map1.set(50, true);   map2.set(50, true);
319 340
    map1.set(60, true);   map2.set(60, true);
320 341
    check(v1.size() == 3 && v2.size() == 10 &&
321
          v1[0]==20 && v1[1]==50 && v1[2]==60 && v2[0]==20 && v2[1]==50 && v2[2]==60,
342
          v1[0]==20 && v1[1]==50 && v1[2]==60 &&
343
          v2[0]==20 && v2[1]==50 && v2[2]==60,
322 344
          "Something is wrong with LoggerBoolMap");
323 345

	
324 346
    int i = 0;
325 347
    for ( LoggerBoolMap<vec::iterator>::Iterator it = map2.begin();
326 348
          it != map2.end(); ++it )
327 349
      check(v1[i++] == *it, "Something is wrong with LoggerBoolMap");
328 350
  }
329 351

	
330 352
  return 0;
331 353
}
0 comments (0 inline)