Changes in / [757:9fbbd802020f:753:48fe2a46bf91] in lemon-1.2

Files:

• doc/Doxyfile.in (modified) (3 diffs)
• doc/groups.dox (modified) (7 diffs)
• doc/mainpage.dox (modified) (2 diffs)
• doc/min_cost_flow.dox (modified) (1 diff)
• doc/references.bib (modified) (15 diffs)
• lemon/network_simplex.h (modified) (1 diff)
• lemon/preflow.h (modified) (1 diff)
• scripts/bib2dox.py (modified) (3 diffs)

doc/Doxyfile.in

@@ -1 @@
-# Doxyfile 1.5.9
+# Doxyfile 1.5.7.1
 
 #---------------------------------------------------------------------------
@@ -22 +22 @@
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = YES
 INHERIT_DOCS           = NO
 SEPARATE_MEMBER_PAGES  = NO
@@ -224 +225 @@
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Options related to the search engine   
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
 TAGFILES               = "@abs_top_srcdir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "

doc/groups.dox

@@ -317 +317 @@
 
 This group contains the common graph search algorithms, namely
-\e breadth-first \e search (BFS) and \e depth-first \e search (DFS)
-\ref clrs01algorithms.
+\e breadth-first \e search (BFS) and \e depth-first \e search (DFS).
 */
 
@@ -326 +325 @@
 \brief Algorithms for finding shortest paths.
 
-This group contains the algorithms for finding shortest paths in digraphs
-\ref clrs01algorithms.
+This group contains the algorithms for finding shortest paths in digraphs.
 
  - \ref Dijkstra algorithm for finding shortest paths from a source node
@@ -349 +347 @@
 
 This group contains the algorithms for finding minimum cost spanning
-trees and arborescences \ref clrs01algorithms.
+trees and arborescences.
 */
 
@@ -358 +356 @@
 
 This group contains the algorithms for finding maximum flows and
-feasible circulations \ref clrs01algorithms, \ref amo93networkflows.
+feasible circulations.
 
 The \e maximum \e flow \e problem is to find a flow of maximum value between
@@ -373 +371 @@
 
 LEMON contains several algorithms for solving maximum flow problems:
-- \ref EdmondsKarp Edmonds-Karp algorithm
-  \ref edmondskarp72theoretical.
-- \ref Preflow Goldberg-Tarjan's preflow push-relabel algorithm
-  \ref goldberg88newapproach.
-- \ref DinitzSleatorTarjan Dinitz's blocking flow algorithm with dynamic trees
-  \ref dinic70algorithm, \ref sleator83dynamic.
-- \ref GoldbergTarjan !Preflow push-relabel algorithm with dynamic trees
-  \ref goldberg88newapproach, \ref sleator83dynamic.
-
-In most cases the \ref Preflow algorithm provides the
+- \ref EdmondsKarp Edmonds-Karp algorithm.
+- \ref Preflow Goldberg-Tarjan's preflow push-relabel algorithm.
+- \ref DinitzSleatorTarjan Dinitz's blocking flow algorithm with dynamic trees.
+- \ref GoldbergTarjan Preflow push-relabel algorithm with dynamic trees.
+
+In most cases the \ref Preflow "Preflow" algorithm provides the
 fastest method for computing a maximum flow. All implementations
 also provide functions to query the minimum cut, which is the dual
@@ -400 +394 @@
 
 This group contains the algorithms for finding minimum cost flows and
-circulations \ref amo93networkflows. For more information about this
-problem and its dual solution, see \ref min_cost_flow
-"Minimum Cost Flow Problem".
+circulations. For more information about this problem and its dual
+solution see \ref min_cost_flow "Minimum Cost Flow Problem".
 
 LEMON contains several algorithms for this problem.
  - \ref NetworkSimplex Primal Network Simplex algorithm with various
-   pivot strategies \ref dantzig63linearprog, \ref kellyoneill91netsimplex.
+   pivot strategies.
  - \ref CostScaling Push-Relabel and Augment-Relabel algorithms based on
-   cost scaling \ref goldberg90approximation, \ref goldberg97efficient,
-   \ref bunnagel98efficient.
+   cost scaling.
  - \ref CapacityScaling Successive Shortest %Path algorithm with optional
-   capacity scaling \ref edmondskarp72theoretical.
- - \ref CancelAndTighten The Cancel and Tighten algorithm
-   \ref goldberg89cyclecanceling.
- - \ref CycleCanceling Cycle-Canceling algorithms
-   \ref klein67primal, \ref goldberg89cyclecanceling.
+   capacity scaling.
+ - \ref CancelAndTighten The Cancel and Tighten algorithm.
+ - \ref CycleCanceling Cycle-Canceling algorithms.
 
 In general NetworkSimplex is the most efficient implementation,
@@ -545 +535 @@
 
 /**
-@defgroup lp_group LP and MIP Solvers
+@defgroup lp_group Lp and Mip Solvers
 @ingroup gen_opt_group
-\brief LP and MIP solver interfaces for LEMON.
-
-This group contains LP and MIP solver interfaces for LEMON.
-Various LP solvers could be used in the same manner with this
-high-level interface.
-
-The currently supported solvers are \ref glpk, \ref clp, \ref cbc,
-\ref cplex, \ref soplex.
+\brief Lp and Mip solver interfaces for LEMON.
+
+This group contains Lp and Mip solver interfaces for LEMON. The
+various LP solvers could be used in the same manner with this
+interface.
 */
 

doc/mainpage.dox

@@ -22 +22 @@
 \section intro Introduction
 
-<b>LEMON</b> stands for <i><b>L</b>ibrary for <b>E</b>fficient <b>M</b>odeling
-and <b>O</b>ptimization in <b>N</b>etworks</i>.
-It is a C++ template library providing efficient implementation of common
-data structures and algorithms with focus on combinatorial optimization
-problems in graphs and networks.
+\subsection whatis What is LEMON
+
+LEMON stands for <b>L</b>ibrary for <b>E</b>fficient <b>M</b>odeling
+and <b>O</b>ptimization in <b>N</b>etworks.
+It is a C++ template
+library aimed at combinatorial optimization tasks which
+often involve in working
+with graphs.
 
 <b>
@@ -36 +39 @@
 </b>
 
-The project is maintained by the 
-<a href="http://www.cs.elte.hu/egres/">Egerv&aacute;ry Research Group on
-Combinatorial Optimization</a> \ref egres
-at the Operations Research Department of the
-<a href="http://www.elte.hu/">E&ouml;tv&ouml;s Lor&aacute;nd University,
-Budapest</a>, Hungary.
-LEMON is also a member of the <a href="http://www.coin-or.org/">COIN-OR</a>
-initiative \ref coinor.
-
-\section howtoread How to Read the Documentation
+\subsection howtoread How to read the documentation
 
 If you would like to get to know the library, see

doc/min_cost_flow.dox

@@ -27 +27 @@
 minimum total cost from a set of supply nodes to a set of demand nodes
 in a network with capacity constraints (lower and upper bounds)
-and arc costs \ref amo93networkflows.
+and arc costs.
 
 Formally, let \f$G=(V,A)\f$ be a digraph, \f$lower: A\rightarrow\mathbf{R}\f$,

doc/references.bib

@@ -13 +13 @@
   title =        {{EGRES} -- {E}gerv{\'a}ry {R}esearch {G}roup on
                   {C}ombinatorial {O}ptimization},
-  url =          {http://www.cs.elte.hu/egres/}
+  howpublished = {\url{http://www.cs.elte.hu/egres/}},
+  year =         2009
 }
 
@@ -20 +21 @@
   title =        {{COIN-OR} -- {C}omputational {I}nfrastructure for
                   {O}perations {R}esearch},
-  url =          {http://www.coin-or.org/}
+  howpublished = {\url{http://www.coin-or.org/}},
+  year =         2009
 }
 
@@ -29 +31 @@
   key =          {Boost},
   title =        {{B}oost {C++} {L}ibraries},
-  url =          {http://www.boost.org/}
+  howpublished = {\url{http://www.boost.org/}},
+  year =         2009
 }
 
@@ -45 +48 @@
   title =        {{LEDA} -- {L}ibrary of {E}fficient {D}ata {T}ypes and
                   {A}lgorithms},
-  url =          {http://www.algorithmic-solutions.com/}
+  howpublished = {\url{http://www.algorithmic-solutions.com/}},
+  year =         2009
 }
 
@@ -64 +68 @@
   key =          {CMake},
   title =        {{CMake} -- {C}ross {P}latform {M}ake},
-  url =          {http://www.cmake.org/}
+  howpublished = {\url{http://www.cmake.org/}},
+  year =         2009
 }
 
@@ -71 +76 @@
   title =        {{Doxygen} -- {S}ource code documentation generator
                   tool},
-  url =          {http://www.doxygen.org/}
+  howpublished = {\url{http://www.doxygen.org/}},
+  year =         2009
 }
 
@@ -80 +86 @@
   key =          {GLPK},
   title =        {{GLPK} -- {GNU} {L}inear {P}rogramming {K}it},
-  url =          {http://www.gnu.org/software/glpk/}
+  howpublished = {\url{http://www.gnu.org/software/glpk/}},
+  year =         2009
 }
 
@@ -86 +93 @@
   key =          {Clp},
   title =        {{Clp} -- {Coin-Or} {L}inear {P}rogramming},
-  url =          {http://projects.coin-or.org/Clp/}
+  howpublished = {\url{http://projects.coin-or.org/Clp/}},
+  year =         2009
 }
 
@@ -92 +100 @@
   key =          {Cbc},
   title =        {{Cbc} -- {Coin-Or} {B}ranch and {C}ut},
-  url =          {http://projects.coin-or.org/Cbc/}
+  howpublished = {\url{http://projects.coin-or.org/Cbc/}},
+  year =         2009
 }
 
@@ -98 +107 @@
   key =          {CPLEX},
   title =        {{ILOG} {CPLEX}},
-  url =          {http://www.ilog.com/}
+  howpublished = {\url{http://www.ilog.com/}},
+  year =         2009
 }
 
@@ -105 +115 @@
   title =        {{SoPlex} -- {T}he {S}equential {O}bject-{O}riented
                   {S}implex},
-  url =          {http://soplex.zib.de/}
+  howpublished = {\url{http://soplex.zib.de/}},
+  year =         2009
 }
 
@@ -151 +162 @@
 %%%%% Maximum flow algorithms %%%%%
 
-@article{edmondskarp72theoretical,
-  author =       {Jack Edmonds and Richard M. Karp},
-  title =        {Theoretical improvements in algorithmic efficiency
-                  for network flow problems},
-  journal =      {Journal of the ACM},
-  year =         1972,
-  volume =       19,
-  number =       2,
-  pages =        {248-264}
-}
-
-@article{goldberg88newapproach,
+@inproceedings{goldberg86newapproach,
   author =       {Andrew V. Goldberg and Robert E. Tarjan},
   title =        {A new approach to the maximum flow problem},
-  journal =      {Journal of the ACM},
-  year =         1988,
-  volume =       35,
-  number =       4,
-  pages =        {921-940}
+  booktitle =    {STOC '86: Proceedings of the Eighteenth Annual ACM
+                  Symposium on Theory of Computing},
+  year =         1986,
+  publisher =    {ACM Press},
+  address =      {New York, NY},
+  pages =        {136-146}
 }
 
@@ -240 +241 @@
 }
 
-@article{goldberg89cyclecanceling,
+@inproceedings{goldberg88cyclecanceling,
   author =       {Andrew V. Goldberg and Robert E. Tarjan},
   title =        {Finding minimum-cost circulations by canceling
                   negative cycles},
+  booktitle =    {STOC '88: Proceedings of the Twentieth Annual ACM
+                  Symposium on Theory of Computing},
+  year =         1988,
+  publisher =    {ACM Press},
+  address =      {New York, NY},
+  pages =        {388-397}
+}
+
+@article{edmondskarp72theoretical,
+  author =       {Jack Edmonds and Richard M. Karp},
+  title =        {Theoretical improvements in algorithmic efficiency
+                  for network flow problems},
   journal =      {Journal of the ACM},
-  year =         1989,
-  volume =       36,
-  number =       4,
-  pages =        {873-886}
-}
-
-@article{goldberg90approximation,
+  year =         1972,
+  volume =       19,
+  number =       2,
+  pages =        {248-264}
+}
+
+@inproceedings{goldberg87approximation,
+  author =       {Andrew V. Goldberg and Robert E. Tarjan},
+  title =        {Solving minimum-cost flow problems by successive
+                  approximation},
+  booktitle =    {STOC '87: Proceedings of the Nineteenth Annual ACM
+                  Symposium on Theory of Computing},
+  year =         1987,
+  publisher =    {ACM Press},
+  address =      {New York, NY},
+  pages =        {7-18}
+}
+
+@article{goldberg90finding,
   author =       {Andrew V. Goldberg and Robert E. Tarjan},
   title =        {Finding Minimum-Cost Circulations by Successive
@@ -284 +309 @@
 }
 
-@book{dantzig63linearprog,
-  author =       {George B. Dantzig},
-  title =        {Linear Programming and Extensions},
-  publisher =    {Princeton University Press},
-  year =         1963
-}
-
 @mastersthesis{kellyoneill91netsimplex,
   author =       {Damian J. Kelly and Garrett M. O'Neill},
@@ -300 +318 @@
   month =        sep,
 }
+
+@techreport{lobel96networksimplex,
+  author =       {Andreas L{\"o}bel},
+  title =        {Solving large-scale real-world minimum-cost flow
+                  problems by a network simplex method},
+  institution =  {Konrad-Zuse-Zentrum fur Informationstechnik Berlin
+                  ({ZIB})},
+  address =      {Berlin, Germany},
+  year =         1996,
+  number =       {SC 96-7}
+}
+
+@article{frangioni06computational,
+  author =       {Antonio Frangioni and Antonio Manca},
+  title =        {A Computational Study of Cost Reoptimization for
+                  Min-Cost Flow Problems},
+  journal =      {INFORMS Journal On Computing},
+  year =         2006,
+  volume =       18,
+  number =       1,
+  pages =        {61-70}
+}

lemon/network_simplex.h

@@ -41 +41 @@
   ///
   /// \ref NetworkSimplex implements the primal Network Simplex algorithm
-  /// for finding a \ref min_cost_flow "minimum cost flow"
-  /// \ref amo93networkflows, \ref dantzig63linearprog,
-  /// \ref kellyoneill91netsimplex.
+  /// for finding a \ref min_cost_flow "minimum cost flow".
   /// This algorithm is a specialized version of the linear programming
   /// simplex method directly for the minimum cost flow problem.

lemon/preflow.h

@@ -103 +103 @@
   /// This class provides an implementation of Goldberg-Tarjan's \e preflow
   /// \e push-relabel algorithm producing a \ref max_flow
-  /// "flow of maximum value" in a digraph \ref clrs01algorithms,
-  /// \ref amo93networkflows, \ref goldberg88newapproach.
+  /// "flow of maximum value" in a digraph.
   /// The preflow algorithms are the fastest known maximum
   /// flow algorithms. The current implementation uses a mixture of the

scripts/bib2dox.py

@@ -71 +71 @@
 author_rex = re.compile('\s+and\s+')
 rembraces_rex = re.compile('[{}]')
-capitalize_rex = re.compile('({[^}]*})')
+capitalize_rex = re.compile('({\w*})')
 
 # used by bibtexkeywords(data)
@@ -364 +364 @@
             if entrycont.has_key('note') and (entrycont['note'] != ''):
                 entry.append(entrycont['note'] + '.')
-            if entrycont.has_key('url') and (entrycont['url'] != ''):
-                entry.append(entrycont['url'] + '.')
 
             # generate keys for sorting and for the output
@@ -413 +411 @@
                 field = string.lower(field)
                 data =  data_rex.sub('\g<2>', line)
-
-            if field == 'url':
-                data = '\\url{' + data.strip() + '}'
             
             if field in ('author', 'editor'):