1.1 --- a/doc/groups.dox Fri Nov 13 12:33:33 2009 +0100
1.2 +++ b/doc/groups.dox Thu Dec 10 17:05:35 2009 +0100
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2008
1.8 + * Copyright (C) 2003-2009
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -16,9 +16,11 @@
1.13 *
1.14 */
1.15
1.16 +namespace lemon {
1.17 +
1.18 /**
1.19 @defgroup datas Data Structures
1.20 -This group describes the several data structures implemented in LEMON.
1.21 +This group contains the several data structures implemented in LEMON.
1.22 */
1.23
1.24 /**
1.25 @@ -60,13 +62,79 @@
1.26 */
1.27
1.28 /**
1.29 -@defgroup semi_adaptors Semi-Adaptor Classes for Graphs
1.30 +@defgroup graph_adaptors Adaptor Classes for Graphs
1.31 @ingroup graphs
1.32 -\brief Graph types between real graphs and graph adaptors.
1.33 +\brief Adaptor classes for digraphs and graphs
1.34
1.35 -This group describes some graph types between real graphs and graph adaptors.
1.36 -These classes wrap graphs to give new functionality as the adaptors do it.
1.37 -On the other hand they are not light-weight structures as the adaptors.
1.38 +This group contains several useful adaptor classes for digraphs and graphs.
1.39 +
1.40 +The main parts of LEMON are the different graph structures, generic
1.41 +graph algorithms, graph concepts, which couple them, and graph
1.42 +adaptors. While the previous notions are more or less clear, the
1.43 +latter one needs further explanation. Graph adaptors are graph classes
1.44 +which serve for considering graph structures in different ways.
1.45 +
1.46 +A short example makes this much clearer. Suppose that we have an
1.47 +instance \c g of a directed graph type, say ListDigraph and an algorithm
1.48 +\code
1.49 +template <typename Digraph>
1.50 +int algorithm(const Digraph&);
1.51 +\endcode
1.52 +is needed to run on the reverse oriented graph. It may be expensive
1.53 +(in time or in memory usage) to copy \c g with the reversed
1.54 +arcs. In this case, an adaptor class is used, which (according
1.55 +to LEMON \ref concepts::Digraph "digraph concepts") works as a digraph.
1.56 +The adaptor uses the original digraph structure and digraph operations when
1.57 +methods of the reversed oriented graph are called. This means that the adaptor
1.58 +have minor memory usage, and do not perform sophisticated algorithmic
1.59 +actions. The purpose of it is to give a tool for the cases when a
1.60 +graph have to be used in a specific alteration. If this alteration is
1.61 +obtained by a usual construction like filtering the node or the arc set or
1.62 +considering a new orientation, then an adaptor is worthwhile to use.
1.63 +To come back to the reverse oriented graph, in this situation
1.64 +\code
1.65 +template<typename Digraph> class ReverseDigraph;
1.66 +\endcode
1.67 +template class can be used. The code looks as follows
1.68 +\code
1.69 +ListDigraph g;
1.70 +ReverseDigraph<ListDigraph> rg(g);
1.71 +int result = algorithm(rg);
1.72 +\endcode
1.73 +During running the algorithm, the original digraph \c g is untouched.
1.74 +This techniques give rise to an elegant code, and based on stable
1.75 +graph adaptors, complex algorithms can be implemented easily.
1.76 +
1.77 +In flow, circulation and matching problems, the residual
1.78 +graph is of particular importance. Combining an adaptor implementing
1.79 +this with shortest path algorithms or minimum mean cycle algorithms,
1.80 +a range of weighted and cardinality optimization algorithms can be
1.81 +obtained. For other examples, the interested user is referred to the
1.82 +detailed documentation of particular adaptors.
1.83 +
1.84 +The behavior of graph adaptors can be very different. Some of them keep
1.85 +capabilities of the original graph while in other cases this would be
1.86 +meaningless. This means that the concepts that they meet depend
1.87 +on the graph adaptor, and the wrapped graph.
1.88 +For example, if an arc of a reversed digraph is deleted, this is carried
1.89 +out by deleting the corresponding arc of the original digraph, thus the
1.90 +adaptor modifies the original digraph.
1.91 +However in case of a residual digraph, this operation has no sense.
1.92 +
1.93 +Let us stand one more example here to simplify your work.
1.94 +ReverseDigraph has constructor
1.95 +\code
1.96 +ReverseDigraph(Digraph& digraph);
1.97 +\endcode
1.98 +This means that in a situation, when a <tt>const %ListDigraph&</tt>
1.99 +reference to a graph is given, then it have to be instantiated with
1.100 +<tt>Digraph=const %ListDigraph</tt>.
1.101 +\code
1.102 +int algorithm1(const ListDigraph& g) {
1.103 + ReverseDigraph<const ListDigraph> rg(g);
1.104 + return algorithm2(rg);
1.105 +}
1.106 +\endcode
1.107 */
1.108
1.109 /**
1.110 @@ -74,7 +142,7 @@
1.111 @ingroup datas
1.112 \brief Map structures implemented in LEMON.
1.113
1.114 -This group describes the map structures implemented in LEMON.
1.115 +This group contains the map structures implemented in LEMON.
1.116
1.117 LEMON provides several special purpose maps and map adaptors that e.g. combine
1.118 new maps from existing ones.
1.119 @@ -87,8 +155,11 @@
1.120 @ingroup maps
1.121 \brief Special graph-related maps.
1.122
1.123 -This group describes maps that are specifically designed to assign
1.124 -values to the nodes and arcs of graphs.
1.125 +This group contains maps that are specifically designed to assign
1.126 +values to the nodes and arcs/edges of graphs.
1.127 +
1.128 +If you are looking for the standard graph maps (\c NodeMap, \c ArcMap,
1.129 +\c EdgeMap), see the \ref graph_concepts "Graph Structure Concepts".
1.130 */
1.131
1.132 /**
1.133 @@ -96,10 +167,10 @@
1.134 \ingroup maps
1.135 \brief Tools to create new maps from existing ones
1.136
1.137 -This group describes map adaptors that are used to create "implicit"
1.138 +This group contains map adaptors that are used to create "implicit"
1.139 maps from other maps.
1.140
1.141 -Most of them are \ref lemon::concepts::ReadMap "read-only maps".
1.142 +Most of them are \ref concepts::ReadMap "read-only maps".
1.143 They can make arithmetic and logical operations between one or two maps
1.144 (negation, shifting, addition, multiplication, logical 'and', 'or',
1.145 'not' etc.) or e.g. convert a map to another one of different Value type.
1.146 @@ -159,7 +230,7 @@
1.147 @ingroup datas
1.148 \brief Two dimensional data storages implemented in LEMON.
1.149
1.150 -This group describes two dimensional data storages implemented in LEMON.
1.151 +This group contains two dimensional data storages implemented in LEMON.
1.152 */
1.153
1.154 /**
1.155 @@ -167,7 +238,7 @@
1.156 @ingroup datas
1.157 \brief %Path structures implemented in LEMON.
1.158
1.159 -This group describes the path structures implemented in LEMON.
1.160 +This group contains the path structures implemented in LEMON.
1.161
1.162 LEMON provides flexible data structures to work with paths.
1.163 All of them have similar interfaces and they can be copied easily with
1.164 @@ -183,16 +254,16 @@
1.165 @ingroup datas
1.166 \brief Auxiliary data structures implemented in LEMON.
1.167
1.168 -This group describes some data structures implemented in LEMON in
1.169 +This group contains some data structures implemented in LEMON in
1.170 order to make it easier to implement combinatorial algorithms.
1.171 */
1.172
1.173 /**
1.174 @defgroup algs Algorithms
1.175 -\brief This group describes the several algorithms
1.176 +\brief This group contains the several algorithms
1.177 implemented in LEMON.
1.178
1.179 -This group describes the several algorithms
1.180 +This group contains the several algorithms
1.181 implemented in LEMON.
1.182 */
1.183
1.184 @@ -201,8 +272,8 @@
1.185 @ingroup algs
1.186 \brief Common graph search algorithms.
1.187
1.188 -This group describes the common graph search algorithms like
1.189 -Breadth-First Search (BFS) and Depth-First Search (DFS).
1.190 +This group contains the common graph search algorithms, namely
1.191 +\e breadth-first \e search (BFS) and \e depth-first \e search (DFS).
1.192 */
1.193
1.194 /**
1.195 @@ -210,7 +281,20 @@
1.196 @ingroup algs
1.197 \brief Algorithms for finding shortest paths.
1.198
1.199 -This group describes the algorithms for finding shortest paths in graphs.
1.200 +This group contains the algorithms for finding shortest paths in digraphs.
1.201 +
1.202 + - \ref Dijkstra algorithm for finding shortest paths from a source node
1.203 + when all arc lengths are non-negative.
1.204 + - \ref BellmanFord "Bellman-Ford" algorithm for finding shortest paths
1.205 + from a source node when arc lenghts can be either positive or negative,
1.206 + but the digraph should not contain directed cycles with negative total
1.207 + length.
1.208 + - \ref FloydWarshall "Floyd-Warshall" and \ref Johnson "Johnson" algorithms
1.209 + for solving the \e all-pairs \e shortest \e paths \e problem when arc
1.210 + lenghts can be either positive or negative, but the digraph should
1.211 + not contain directed cycles with negative total length.
1.212 + - \ref Suurballe A successive shortest path algorithm for finding
1.213 + arc-disjoint paths between two nodes having minimum total length.
1.214 */
1.215
1.216 /**
1.217 @@ -218,40 +302,62 @@
1.218 @ingroup algs
1.219 \brief Algorithms for finding maximum flows.
1.220
1.221 -This group describes the algorithms for finding maximum flows and
1.222 +This group contains the algorithms for finding maximum flows and
1.223 feasible circulations.
1.224
1.225 -The maximum flow problem is to find a flow between a single source and
1.226 -a single target that is maximum. Formally, there is a \f$G=(V,A)\f$
1.227 -directed graph, an \f$c_a:A\rightarrow\mathbf{R}^+_0\f$ capacity
1.228 -function and given \f$s, t \in V\f$ source and target node. The
1.229 -maximum flow is the \f$f_a\f$ solution of the next optimization problem:
1.230 +The \e maximum \e flow \e problem is to find a flow of maximum value between
1.231 +a single source and a single target. Formally, there is a \f$G=(V,A)\f$
1.232 +digraph, a \f$cap: A\rightarrow\mathbf{R}^+_0\f$ capacity function and
1.233 +\f$s, t \in V\f$ source and target nodes.
1.234 +A maximum flow is an \f$f: A\rightarrow\mathbf{R}^+_0\f$ solution of the
1.235 +following optimization problem.
1.236
1.237 -\f[ 0 \le f_a \le c_a \f]
1.238 -\f[ \sum_{v\in\delta^{-}(u)}f_{vu}=\sum_{v\in\delta^{+}(u)}f_{uv}
1.239 -\qquad \forall u \in V \setminus \{s,t\}\f]
1.240 -\f[ \max \sum_{v\in\delta^{+}(s)}f_{uv} - \sum_{v\in\delta^{-}(s)}f_{vu}\f]
1.241 +\f[ \max\sum_{sv\in A} f(sv) - \sum_{vs\in A} f(vs) \f]
1.242 +\f[ \sum_{uv\in A} f(uv) = \sum_{vu\in A} f(vu)
1.243 + \quad \forall u\in V\setminus\{s,t\} \f]
1.244 +\f[ 0 \leq f(uv) \leq cap(uv) \quad \forall uv\in A \f]
1.245
1.246 LEMON contains several algorithms for solving maximum flow problems:
1.247 -- \ref lemon::EdmondsKarp "Edmonds-Karp"
1.248 -- \ref lemon::Preflow "Goldberg's Preflow algorithm"
1.249 -- \ref lemon::DinitzSleatorTarjan "Dinitz's blocking flow algorithm with dynamic trees"
1.250 -- \ref lemon::GoldbergTarjan "Preflow algorithm with dynamic trees"
1.251 +- \ref EdmondsKarp Edmonds-Karp algorithm.
1.252 +- \ref Preflow Goldberg-Tarjan's preflow push-relabel algorithm.
1.253 +- \ref DinitzSleatorTarjan Dinitz's blocking flow algorithm with dynamic trees.
1.254 +- \ref GoldbergTarjan Preflow push-relabel algorithm with dynamic trees.
1.255
1.256 -In most cases the \ref lemon::Preflow "Preflow" algorithm provides the
1.257 -fastest method to compute the maximum flow. All impelementations
1.258 -provides functions to query the minimum cut, which is the dual linear
1.259 -programming problem of the maximum flow.
1.260 +In most cases the \ref Preflow "Preflow" algorithm provides the
1.261 +fastest method for computing a maximum flow. All implementations
1.262 +also provide functions to query the minimum cut, which is the dual
1.263 +problem of maximum flow.
1.264 +
1.265 +\ref Circulation is a preflow push-relabel algorithm implemented directly
1.266 +for finding feasible circulations, which is a somewhat different problem,
1.267 +but it is strongly related to maximum flow.
1.268 +For more information, see \ref Circulation.
1.269 */
1.270
1.271 /**
1.272 -@defgroup min_cost_flow Minimum Cost Flow Algorithms
1.273 +@defgroup min_cost_flow_algs Minimum Cost Flow Algorithms
1.274 @ingroup algs
1.275
1.276 \brief Algorithms for finding minimum cost flows and circulations.
1.277
1.278 -This group describes the algorithms for finding minimum cost flows and
1.279 -circulations.
1.280 +This group contains the algorithms for finding minimum cost flows and
1.281 +circulations. For more information about this problem and its dual
1.282 +solution see \ref min_cost_flow "Minimum Cost Flow Problem".
1.283 +
1.284 +LEMON contains several algorithms for this problem.
1.285 + - \ref NetworkSimplex Primal Network Simplex algorithm with various
1.286 + pivot strategies.
1.287 + - \ref CostScaling Push-Relabel and Augment-Relabel algorithms based on
1.288 + cost scaling.
1.289 + - \ref CapacityScaling Successive Shortest %Path algorithm with optional
1.290 + capacity scaling.
1.291 + - \ref CancelAndTighten The Cancel and Tighten algorithm.
1.292 + - \ref CycleCanceling Cycle-Canceling algorithms.
1.293 +
1.294 +In general NetworkSimplex is the most efficient implementation,
1.295 +but in special cases other algorithms could be faster.
1.296 +For example, if the total supply and/or capacities are rather small,
1.297 +CapacityScaling is usually the fastest algorithm (without effective scaling).
1.298 */
1.299
1.300 /**
1.301 @@ -260,36 +366,36 @@
1.302
1.303 \brief Algorithms for finding minimum cut in graphs.
1.304
1.305 -This group describes the algorithms for finding minimum cut in graphs.
1.306 +This group contains the algorithms for finding minimum cut in graphs.
1.307
1.308 -The minimum cut problem is to find a non-empty and non-complete
1.309 -\f$X\f$ subset of the vertices with minimum overall capacity on
1.310 -outgoing arcs. Formally, there is \f$G=(V,A)\f$ directed graph, an
1.311 -\f$c_a:A\rightarrow\mathbf{R}^+_0\f$ capacity function. The minimum
1.312 +The \e minimum \e cut \e problem is to find a non-empty and non-complete
1.313 +\f$X\f$ subset of the nodes with minimum overall capacity on
1.314 +outgoing arcs. Formally, there is a \f$G=(V,A)\f$ digraph, a
1.315 +\f$cap: A\rightarrow\mathbf{R}^+_0\f$ capacity function. The minimum
1.316 cut is the \f$X\f$ solution of the next optimization problem:
1.317
1.318 \f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}
1.319 -\sum_{uv\in A, u\in X, v\not\in X}c_{uv}\f]
1.320 + \sum_{uv\in A, u\in X, v\not\in X}cap(uv) \f]
1.321
1.322 LEMON contains several algorithms related to minimum cut problems:
1.323
1.324 -- \ref lemon::HaoOrlin "Hao-Orlin algorithm" to calculate minimum cut
1.325 - in directed graphs
1.326 -- \ref lemon::NagamochiIbaraki "Nagamochi-Ibaraki algorithm" to
1.327 - calculate minimum cut in undirected graphs
1.328 -- \ref lemon::GomoryHuTree "Gomory-Hu tree computation" to calculate all
1.329 - pairs minimum cut in undirected graphs
1.330 +- \ref HaoOrlin "Hao-Orlin algorithm" for calculating minimum cut
1.331 + in directed graphs.
1.332 +- \ref NagamochiIbaraki "Nagamochi-Ibaraki algorithm" for
1.333 + calculating minimum cut in undirected graphs.
1.334 +- \ref GomoryHu "Gomory-Hu tree computation" for calculating
1.335 + all-pairs minimum cut in undirected graphs.
1.336
1.337 If you want to find minimum cut just between two distinict nodes,
1.338 -please see the \ref max_flow "Maximum Flow page".
1.339 +see the \ref max_flow "maximum flow problem".
1.340 */
1.341
1.342 /**
1.343 -@defgroup graph_prop Connectivity and Other Graph Properties
1.344 +@defgroup graph_properties Connectivity and Other Graph Properties
1.345 @ingroup algs
1.346 \brief Algorithms for discovering the graph properties
1.347
1.348 -This group describes the algorithms for discovering the graph properties
1.349 +This group contains the algorithms for discovering the graph properties
1.350 like connectivity, bipartiteness, euler property, simplicity etc.
1.351
1.352 \image html edge_biconnected_components.png
1.353 @@ -301,7 +407,7 @@
1.354 @ingroup algs
1.355 \brief Algorithms for planarity checking, embedding and drawing
1.356
1.357 -This group describes the algorithms for planarity checking,
1.358 +This group contains the algorithms for planarity checking,
1.359 embedding and drawing.
1.360
1.361 \image html planar.png
1.362 @@ -313,37 +419,36 @@
1.363 @ingroup algs
1.364 \brief Algorithms for finding matchings in graphs and bipartite graphs.
1.365
1.366 -This group contains algorithm objects and functions to calculate
1.367 +This group contains the algorithms for calculating
1.368 matchings in graphs and bipartite graphs. The general matching problem is
1.369 -finding a subset of the arcs which does not shares common endpoints.
1.370 +finding a subset of the edges for which each node has at most one incident
1.371 +edge.
1.372
1.373 There are several different algorithms for calculate matchings in
1.374 graphs. The matching problems in bipartite graphs are generally
1.375 easier than in general graphs. The goal of the matching optimization
1.376 -can be the finding maximum cardinality, maximum weight or minimum cost
1.377 +can be finding maximum cardinality, maximum weight or minimum cost
1.378 matching. The search can be constrained to find perfect or
1.379 maximum cardinality matching.
1.380
1.381 -LEMON contains the next algorithms:
1.382 -- \ref lemon::MaxBipartiteMatching "MaxBipartiteMatching" Hopcroft-Karp
1.383 - augmenting path algorithm for calculate maximum cardinality matching in
1.384 - bipartite graphs
1.385 -- \ref lemon::PrBipartiteMatching "PrBipartiteMatching" Push-Relabel
1.386 - algorithm for calculate maximum cardinality matching in bipartite graphs
1.387 -- \ref lemon::MaxWeightedBipartiteMatching "MaxWeightedBipartiteMatching"
1.388 - Successive shortest path algorithm for calculate maximum weighted matching
1.389 - and maximum weighted bipartite matching in bipartite graph
1.390 -- \ref lemon::MinCostMaxBipartiteMatching "MinCostMaxBipartiteMatching"
1.391 - Successive shortest path algorithm for calculate minimum cost maximum
1.392 - matching in bipartite graph
1.393 -- \ref lemon::MaxMatching "MaxMatching" Edmond's blossom shrinking algorithm
1.394 - for calculate maximum cardinality matching in general graph
1.395 -- \ref lemon::MaxWeightedMatching "MaxWeightedMatching" Edmond's blossom
1.396 - shrinking algorithm for calculate maximum weighted matching in general
1.397 - graph
1.398 -- \ref lemon::MaxWeightedPerfectMatching "MaxWeightedPerfectMatching"
1.399 - Edmond's blossom shrinking algorithm for calculate maximum weighted
1.400 - perfect matching in general graph
1.401 +The matching algorithms implemented in LEMON:
1.402 +- \ref MaxBipartiteMatching Hopcroft-Karp augmenting path algorithm
1.403 + for calculating maximum cardinality matching in bipartite graphs.
1.404 +- \ref PrBipartiteMatching Push-relabel algorithm
1.405 + for calculating maximum cardinality matching in bipartite graphs.
1.406 +- \ref MaxWeightedBipartiteMatching
1.407 + Successive shortest path algorithm for calculating maximum weighted
1.408 + matching and maximum weighted bipartite matching in bipartite graphs.
1.409 +- \ref MinCostMaxBipartiteMatching
1.410 + Successive shortest path algorithm for calculating minimum cost maximum
1.411 + matching in bipartite graphs.
1.412 +- \ref MaxMatching Edmond's blossom shrinking algorithm for calculating
1.413 + maximum cardinality matching in general graphs.
1.414 +- \ref MaxWeightedMatching Edmond's blossom shrinking algorithm for calculating
1.415 + maximum weighted matching in general graphs.
1.416 +- \ref MaxWeightedPerfectMatching
1.417 + Edmond's blossom shrinking algorithm for calculating maximum weighted
1.418 + perfect matching in general graphs.
1.419
1.420 \image html bipartite_matching.png
1.421 \image latex bipartite_matching.eps "Bipartite Matching" width=\textwidth
1.422 @@ -352,10 +457,10 @@
1.423 /**
1.424 @defgroup spantree Minimum Spanning Tree Algorithms
1.425 @ingroup algs
1.426 -\brief Algorithms for finding a minimum cost spanning tree in a graph.
1.427 +\brief Algorithms for finding minimum cost spanning trees and arborescences.
1.428
1.429 -This group describes the algorithms for finding a minimum cost spanning
1.430 -tree in a graph
1.431 +This group contains the algorithms for finding minimum cost spanning
1.432 +trees and arborescences.
1.433 */
1.434
1.435 /**
1.436 @@ -363,7 +468,7 @@
1.437 @ingroup algs
1.438 \brief Auxiliary algorithms implemented in LEMON.
1.439
1.440 -This group describes some algorithms implemented in LEMON
1.441 +This group contains some algorithms implemented in LEMON
1.442 in order to make it easier to implement complex algorithms.
1.443 */
1.444
1.445 @@ -372,16 +477,16 @@
1.446 @ingroup algs
1.447 \brief Approximation algorithms.
1.448
1.449 -This group describes the approximation and heuristic algorithms
1.450 +This group contains the approximation and heuristic algorithms
1.451 implemented in LEMON.
1.452 */
1.453
1.454 /**
1.455 @defgroup gen_opt_group General Optimization Tools
1.456 -\brief This group describes some general optimization frameworks
1.457 +\brief This group contains some general optimization frameworks
1.458 implemented in LEMON.
1.459
1.460 -This group describes some general optimization frameworks
1.461 +This group contains some general optimization frameworks
1.462 implemented in LEMON.
1.463 */
1.464
1.465 @@ -390,7 +495,7 @@
1.466 @ingroup gen_opt_group
1.467 \brief Lp and Mip solver interfaces for LEMON.
1.468
1.469 -This group describes Lp and Mip solver interfaces for LEMON. The
1.470 +This group contains Lp and Mip solver interfaces for LEMON. The
1.471 various LP solvers could be used in the same manner with this
1.472 interface.
1.473 */
1.474 @@ -409,7 +514,7 @@
1.475 @ingroup gen_opt_group
1.476 \brief Metaheuristics for LEMON library.
1.477
1.478 -This group describes some metaheuristic optimization tools.
1.479 +This group contains some metaheuristic optimization tools.
1.480 */
1.481
1.482 /**
1.483 @@ -424,7 +529,7 @@
1.484 @ingroup utils
1.485 \brief Simple basic graph utilities.
1.486
1.487 -This group describes some simple basic graph utilities.
1.488 +This group contains some simple basic graph utilities.
1.489 */
1.490
1.491 /**
1.492 @@ -432,7 +537,7 @@
1.493 @ingroup utils
1.494 \brief Tools for development, debugging and testing.
1.495
1.496 -This group describes several useful tools for development,
1.497 +This group contains several useful tools for development,
1.498 debugging and testing.
1.499 */
1.500
1.501 @@ -441,7 +546,7 @@
1.502 @ingroup misc
1.503 \brief Simple tools for measuring the performance of algorithms.
1.504
1.505 -This group describes simple tools for measuring the performance
1.506 +This group contains simple tools for measuring the performance
1.507 of algorithms.
1.508 */
1.509
1.510 @@ -450,25 +555,25 @@
1.511 @ingroup utils
1.512 \brief Exceptions defined in LEMON.
1.513
1.514 -This group describes the exceptions defined in LEMON.
1.515 +This group contains the exceptions defined in LEMON.
1.516 */
1.517
1.518 /**
1.519 @defgroup io_group Input-Output
1.520 \brief Graph Input-Output methods
1.521
1.522 -This group describes the tools for importing and exporting graphs
1.523 +This group contains the tools for importing and exporting graphs
1.524 and graph related data. Now it supports the \ref lgf-format
1.525 "LEMON Graph Format", the \c DIMACS format and the encapsulated
1.526 postscript (EPS) format.
1.527 */
1.528
1.529 /**
1.530 -@defgroup lemon_io LEMON Input-Output
1.531 +@defgroup lemon_io LEMON Graph Format
1.532 @ingroup io_group
1.533 \brief Reading and writing LEMON Graph Format.
1.534
1.535 -This group describes methods for reading and writing
1.536 +This group contains methods for reading and writing
1.537 \ref lgf-format "LEMON Graph Format".
1.538 */
1.539
1.540 @@ -477,15 +582,31 @@
1.541 @ingroup io_group
1.542 \brief General \c EPS drawer and graph exporter
1.543
1.544 -This group describes general \c EPS drawing methods and special
1.545 +This group contains general \c EPS drawing methods and special
1.546 graph exporting tools.
1.547 */
1.548
1.549 /**
1.550 +@defgroup dimacs_group DIMACS format
1.551 +@ingroup io_group
1.552 +\brief Read and write files in DIMACS format
1.553 +
1.554 +Tools to read a digraph from or write it to a file in DIMACS format data.
1.555 +*/
1.556 +
1.557 +/**
1.558 +@defgroup nauty_group NAUTY Format
1.559 +@ingroup io_group
1.560 +\brief Read \e Nauty format
1.561 +
1.562 +Tool to read graphs from \e Nauty format data.
1.563 +*/
1.564 +
1.565 +/**
1.566 @defgroup concept Concepts
1.567 \brief Skeleton classes and concept checking classes
1.568
1.569 -This group describes the data/algorithm skeletons and concept checking
1.570 +This group contains the data/algorithm skeletons and concept checking
1.571 classes implemented in LEMON.
1.572
1.573 The purpose of the classes in this group is fourfold.
1.574 @@ -515,7 +636,7 @@
1.575 @ingroup concept
1.576 \brief Skeleton and concept checking classes for graph structures
1.577
1.578 -This group describes the skeletons and concept checking classes of LEMON's
1.579 +This group contains the skeletons and concept checking classes of LEMON's
1.580 graph structures and helper classes used to implement these.
1.581 */
1.582
1.583 @@ -524,23 +645,23 @@
1.584 @ingroup concept
1.585 \brief Skeleton and concept checking classes for maps
1.586
1.587 -This group describes the skeletons and concept checking classes of maps.
1.588 +This group contains the skeletons and concept checking classes of maps.
1.589 */
1.590
1.591 /**
1.592 \anchor demoprograms
1.593
1.594 -@defgroup demos Demo programs
1.595 +@defgroup demos Demo Programs
1.596
1.597 Some demo programs are listed here. Their full source codes can be found in
1.598 the \c demo subdirectory of the source tree.
1.599
1.600 -It order to compile them, use <tt>--enable-demo</tt> configure option when
1.601 -build the library.
1.602 +In order to compile them, use the <tt>make demo</tt> or the
1.603 +<tt>make check</tt> commands.
1.604 */
1.605
1.606 /**
1.607 -@defgroup tools Standalone utility applications
1.608 +@defgroup tools Standalone Utility Applications
1.609
1.610 Some utility applications are listed here.
1.611
1.612 @@ -548,3 +669,4 @@
1.613 them, as well.
1.614 */
1.615
1.616 +}