LEMON/LEMON-official Changeset - r830:ef88c0a30f85

Repositories » LEMON » LEMON-official

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

Changeset - r830:ef88c0a30f85

« 829:ceb275
« 550:c35afa

831:1a7fe3 »

r830:ef88c0a30f85

Thu, 05 Nov 2009 15:48:01

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge #293

4 113 50

merge default

4 files changed:

cmake/FindCOIN.cmake

cmake/FindCPLEX.cmake

cmake/FindGLPK.cmake

cmake/LEMONConfig.cmake.in

cmake/version.cmake.in

doc/images/bipartite_matching.eps

586

doc/images/bipartite_partitions.eps

114

doc/images/connected_components.eps

159

doc/images/edge_biconnected_components.eps

159

doc/images/node_biconnected_components.eps

159

doc/images/strongly_connected_components.eps

180

doc/min_cost_flow.dox

153

doc/references.bib

301

lemon/bellman_ford.h

1101

.hgignore

CMakeLists.txt

INSTALL

LICENSE

Makefile.am

NEWS

README

cmake/FindGhostscript.cmake

cmake/nsis/lemon.ico

bin

configure.ac

demo/CMakeLists.txt

demo/Makefile.am

demo/graph_to_eps_demo.cc

doc/CMakeLists.txt

doc/Doxyfile.in

doc/Makefile.am

doc/groups.dox

219

141

doc/mainpage.dox

lemon/CMakeLists.txt

lemon/Makefile.am

lemon/adaptors.h

770

761

lemon/base.cc

Changeset was too big and was cut off... Show full diff

↑ Collapse diff ↑

cmake/FindCOIN.cmake

Show inline comments

 		SET(COIN_ROOT_DIR "" CACHE PATH "COIN root directory")
 		FIND_PATH(COIN_INCLUDE_DIR coin/CoinUtilsConfig.h
 		  HINTS ${COIN_ROOT_DIR}/include
+		)
 		FIND_LIBRARY(COIN_CBC_LIBRARY
 		  NAMES Cbc libCbc
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
 		  NAMES CbcSolver libCbcSolver
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_CGL_LIBRARY
 		  NAMES Cgl libCgl
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_CLP_LIBRARY
 		  NAMES Clp libClp
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY
 		  NAMES CoinUtils libCoinUtils
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_LIBRARY
 		  NAMES Osi libOsi
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
 		  NAMES OsiCbc libOsiCbc
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
 		  NAMES OsiClp libOsiClp
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_OSI_VOL_LIBRARY
 		  NAMES OsiVol libOsiVol
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		FIND_LIBRARY(COIN_VOL_LIBRARY
 		  NAMES Vol libVol
 		  HINTS ${COIN_ROOT_DIR}/lib
+		)
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG
 		  COIN_INCLUDE_DIR
 		  COIN_CBC_LIBRARY
 		  COIN_CBC_SOLVER_LIBRARY
 		  COIN_CGL_LIBRARY
 		  COIN_CLP_LIBRARY
 		  COIN_COIN_UTILS_LIBRARY
 		  COIN_OSI_LIBRARY
 		  COIN_OSI_CBC_LIBRARY
 		  COIN_OSI_CLP_LIBRARY
 		  COIN_OSI_VOL_LIBRARY
 		  COIN_VOL_LIBRARY
+		)
 		IF(COIN_FOUND)
 		  SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
 		  SET(COIN_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_OSI_VOL_LIBRARY};${COIN_VOL_LIBRARY}")
 		  SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
 		  SET(COIN_CBC_LIBRARIES ${COIN_LIBRARIES})
 		ENDIF(COIN_FOUND)
 		MARK_AS_ADVANCED(
 		  COIN_INCLUDE_DIR
 		  COIN_CBC_LIBRARY
 		  COIN_CBC_SOLVER_LIBRARY
 		  COIN_CGL_LIBRARY
 		  COIN_CLP_LIBRARY
 		  COIN_COIN_UTILS_LIBRARY
 		  COIN_OSI_LIBRARY
 		  COIN_OSI_CBC_LIBRARY
 		  COIN_OSI_CLP_LIBRARY
 		  COIN_OSI_VOL_LIBRARY
 		  COIN_VOL_LIBRARY
+		)
 		IF(COIN_FOUND)
 		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CLP TRUE)
 		  SET(LEMON_HAVE_CBC TRUE)
 		ENDIF(COIN_FOUND)

cmake/FindCPLEX.cmake

Show inline comments

 		SET(CPLEX_ROOT_DIR "" CACHE PATH "CPLEX root directory")
 		FIND_PATH(CPLEX_INCLUDE_DIR
 		  ilcplex/cplex.h
 		  PATHS "C:/ILOG/CPLEX91/include"
 		  PATHS "/opt/ilog/cplex91/include"
 		  HINTS ${CPLEX_ROOT_DIR}/include
+		)
 		FIND_LIBRARY(CPLEX_LIBRARY
 		  cplex91
 		  PATHS "C:/ILOG/CPLEX91/lib/msvc7/stat_mda"
 		  PATHS "/opt/ilog/cplex91/bin"
 		  HINTS ${CPLEX_ROOT_DIR}/bin
+		)
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPLEX DEFAULT_MSG CPLEX_LIBRARY CPLEX_INCLUDE_DIR)
 		FIND_PATH(CPLEX_BIN_DIR
 		  cplex91.dll
 		  PATHS "C:/ILOG/CPLEX91/bin/x86_win32"
+		)
 		IF(CPLEX_FOUND)
 		  SET(CPLEX_INCLUDE_DIRS ${CPLEX_INCLUDE_DIR})
 		  SET(CPLEX_LIBRARIES ${CPLEX_LIBRARY})
 		  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		    SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread")
 		  ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		ENDIF(CPLEX_FOUND)
 		MARK_AS_ADVANCED(CPLEX_LIBRARY CPLEX_INCLUDE_DIR CPLEX_BIN_DIR)
 		IF(CPLEX_FOUND)
 		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_CPLEX TRUE)
 		ENDIF(CPLEX_FOUND)

cmake/FindGLPK.cmake

Show inline comments

 		SET(GLPK_ROOT_DIR "" CACHE PATH "GLPK root directory")
 		SET(GLPK_REGKEY "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Glpk;InstallPath]")
 		GET_FILENAME_COMPONENT(GLPK_ROOT_PATH ${GLPK_REGKEY} ABSOLUTE)
 		FIND_PATH(GLPK_INCLUDE_DIR
 		  glpk.h
 		  PATHS ${GLPK_REGKEY}/include
 		  HINTS ${GLPK_ROOT_DIR}/include
+		)
 		FIND_LIBRARY(GLPK_LIBRARY
 		  glpk
 		  PATHS ${GLPK_REGKEY}/lib
 		  HINTS ${GLPK_ROOT_DIR}/lib
+		)
 		IF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
 		  FILE(READ ${GLPK_INCLUDE_DIR}/glpk.h GLPK_GLPK_H)
 		  STRING(REGEX MATCH "define[ ]+GLP_MAJOR_VERSION[ ]+[0-9]+" GLPK_MAJOR_VERSION_LINE "${GLPK_GLPK_H}")
 		  STRING(REGEX REPLACE "define[ ]+GLP_MAJOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MAJOR "${GLPK_MAJOR_VERSION_LINE}")
 		  STRING(REGEX MATCH "define[ ]+GLP_MINOR_VERSION[ ]+[0-9]+" GLPK_MINOR_VERSION_LINE "${GLPK_GLPK_H}")
 		  STRING(REGEX REPLACE "define[ ]+GLP_MINOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MINOR "${GLPK_MINOR_VERSION_LINE}")
 		  SET(GLPK_VERSION_STRING "${GLPK_VERSION_MAJOR}.${GLPK_VERSION_MINOR}")
 		  IF(GLPK_FIND_VERSION)
 		    IF(GLPK_FIND_VERSION_COUNT GREATER 2)
 		      MESSAGE(SEND_ERROR "unexpected version string")
 		    ENDIF(GLPK_FIND_VERSION_COUNT GREATER 2)
 		    MATH(EXPR GLPK_REQUESTED_VERSION "${GLPK_FIND_VERSION_MAJOR}*100 + ${GLPK_FIND_VERSION_MINOR}")
 		    MATH(EXPR GLPK_FOUND_VERSION "${GLPK_VERSION_MAJOR}*100 + ${GLPK_VERSION_MINOR}")
 		    IF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
 		      SET(GLPK_PROPER_VERSION_FOUND FALSE)
 		    ELSE(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
 		      SET(GLPK_PROPER_VERSION_FOUND TRUE)
 		    ENDIF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
 		  ELSE(GLPK_FIND_VERSION)
 		    SET(GLPK_PROPER_VERSION_FOUND TRUE)
 		  ENDIF(GLPK_FIND_VERSION)
 		ENDIF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
 		INCLUDE(FindPackageHandleStandardArgs)
 		FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_PROPER_VERSION_FOUND)
 		IF(GLPK_FOUND)
 		  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})
 		  SET(GLPK_LIBRARIES ${GLPK_LIBRARY})
 		  SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)
 		ENDIF(GLPK_FOUND)
 		MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)
 		IF(GLPK_FOUND)
 		  SET(LEMON_HAVE_LP TRUE)
 		  SET(LEMON_HAVE_MIP TRUE)
 		  SET(LEMON_HAVE_GLPK TRUE)
 		ENDIF(GLPK_FOUND)

cmake/LEMONConfig.cmake.in

Show inline comments

 		SET(LEMON_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" CACHE PATH "LEMON include directory")
 		SET(LEMON_INCLUDE_DIRS "${LEMON_INCLUDE_DIR}")
 		IF(UNIX)
 		  SET(LEMON_LIB_NAME "libemon.a")
 		ELSEIF(WIN32)
 		  SET(LEMON_LIB_NAME "lemon.lib")
 		ENDIF(UNIX)
 		SET(LEMON_LIBRARY "@CMAKE_INSTALL_PREFIX@/lib/${LEMON_LIB_NAME}" CACHE FILEPATH "LEMON library")
 		SET(LEMON_LIBRARIES "${LEMON_LIBRARY}")
 		MARK_AS_ADVANCED(LEMON_LIBRARY LEMON_INCLUDE_DIR)

cmake/version.cmake.in

Show inline comments

SET(LEMON_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.")

doc/images/bipartite_matching.eps

Show inline comments

 		%!PS-Adobe-3.0 EPSF-3.0
 		%%BoundingBox: 15 18 829 570
 		%%HiResBoundingBox: 15.1913 18.4493 828.078 569.438
 		%%Creator: Karbon14 EPS Exportfilter 0.5
 		%%CreationDate: (04/15/06 15:20:26)
 		%%For: (Balazs Dezso) ()
 		%%Title: ()
 		/N {newpath} def
 		/C {closepath} def
 		/m {moveto} def
 		/c {curveto} def
 		/l {lineto} def
 		/s {stroke} def
 		/f {fill} def
 		/w {setlinewidth} def
 		/d {setdash} def
 		/r {setrgbcolor} def
 		/S {gsave} def
 		/R {grestore} def
+		N
 .402 32.047 m
 .945 293.946 814.484 555.844 814.484 555.844 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .012 32.047 m
 .465 293.946 735.918 555.844 735.918 555.844 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .492 32.047 m
 .703 293.946 735.918 555.844 735.918 555.844 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .832 32.047 m
 .375 293.946 735.918 555.844 735.918 555.844 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .355 32.047 m
 .637 293.946 735.918 555.844 735.918 555.844 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .25 555.844 m
 .633 293.946 749.012 32.047 749.012 32.047 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .016 555.844 m
 .516 293.946 749.012 32.047 749.012 32.047 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .535 32.047 m
 .894 293.946 644.25 555.844 644.25 555.844 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .453 555.844 m
 .992 293.946 683.535 32.047 683.535 32.047 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .7853 555.844 m
 .16 293.946 683.535 32.047 683.535 32.047 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .492 32.047 m
 .039 293.946 552.586 555.844 552.586 555.844 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .875 32.047 m
 .613 293.946 382.351 555.844 382.351 555.844 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .355 32.047 m
 .855 293.946 382.351 555.844 382.351 555.844 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .687 555.844 m
 .805 293.946 460.922 32.047 460.922 32.047 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .453 555.844 m
 .687 293.946 460.922 32.047 460.922 32.047 c
 		[] 0 d 0 0 0 r 1.96407 w s
+		N
 .832 32.047 m
 .64 293.946 120.453 555.844 120.453 555.844 c
 		[] 0 d 1 0 0 r 3.92814 w s
+		N
 .6913 555.844 m
 .6913 555.844 l
 .6913 548.614 21.5553 542.75 28.7853 542.75 c
 .0163 542.75 41.8833 548.614 41.8833 555.844 c
 .8833 563.075 36.0163 568.938 28.7853 568.938 c
 .5553 568.938 15.6913 563.075 15.6913 555.844 c
 .6913 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .8833 555.844 m
 .8833 555.844 l
 .8833 549.27 22.2113 543.942 28.7853 543.942 c
 .3593 543.942 40.6913 549.27 40.6913 555.844 c
 .6913 562.418 35.3593 567.747 28.7853 567.747 c
 .2113 567.747 16.8833 562.418 16.8833 555.844 c
 .8833 555.844 l
+		C
 		S 1 0.5 1 r f R
+		N
 .355 555.844 m
 .355 555.844 l
 .355 548.614 113.223 542.75 120.453 542.75 c
 .683 542.75 133.547 548.614 133.547 555.844 c
 .547 563.075 127.683 568.938 120.453 568.938 c
 .223 568.938 107.355 563.075 107.355 555.844 c
 .355 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .547 555.844 m
 .547 555.844 l
 .547 549.27 113.879 543.942 120.453 543.942 c
 .027 543.942 132.355 549.27 132.355 555.844 c
 .355 562.418 127.027 567.747 120.453 567.747 c
 .879 567.747 108.547 562.418 108.547 555.844 c
 .547 555.844 l
+		C
 		S 1 0 1 r f R
+		N
 .019 555.844 m
 .019 555.844 l
 .019 548.614 204.887 542.75 212.117 542.75 c
 .348 542.75 225.211 548.614 225.211 555.844 c
 .211 563.075 219.348 568.938 212.117 568.938 c
 .887 568.938 199.019 563.075 199.019 555.844 c
 .019 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .211 555.844 m
 .211 555.844 l
 .211 549.27 205.543 543.942 212.117 543.942 c
 .691 543.942 224.019 549.27 224.019 555.844 c
 .019 562.418 218.691 567.747 212.117 567.747 c
 .543 567.747 200.211 562.418 200.211 555.844 c
 .211 555.844 l
+		C
 		S 1 0.5 1 r f R
+		N
 .59 555.844 m
 .59 555.844 l
 .59 548.614 283.457 542.75 290.687 542.75 c
 .918 542.75 303.781 548.614 303.781 555.844 c
 .781 563.075 297.918 568.938 290.687 568.938 c
 .457 568.938 277.59 563.075 277.59 555.844 c
 .59 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .781 555.844 m
 .781 555.844 l
 .781 549.27 284.113 543.942 290.687 543.942 c
 .262 543.942 302.59 549.27 302.59 555.844 c
 .59 562.418 297.262 567.747 290.687 567.747 c
 .113 567.747 278.781 562.418 278.781 555.844 c
 .781 555.844 l
+		C
 		S 1 0 1 r f R
+		N
 .258 555.844 m
 .258 555.844 l
 .258 548.614 375.121 542.75 382.351 542.75 c
 .582 542.75 395.445 548.614 395.445 555.844 c
 .445 563.075 389.582 568.938 382.351 568.938 c
 .121 568.938 369.258 563.075 369.258 555.844 c
 .258 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .445 555.844 m
 .445 555.844 l
 .445 549.27 375.777 543.942 382.351 543.942 c
 .926 543.942 394.258 549.27 394.258 555.844 c
 .258 562.418 388.926 567.747 382.351 567.747 c
 .777 567.747 370.445 562.418 370.445 555.844 c
 .445 555.844 l
+		C
 		S 1 0 1 r f R
+		N
 .922 555.844 m
 .922 555.844 l
 .922 548.614 466.785 542.75 474.016 542.75 c
 .246 542.75 487.109 548.614 487.109 555.844 c
 .109 563.075 481.246 568.938 474.016 568.938 c
 .785 568.938 460.922 563.075 460.922 555.844 c
 .922 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .113 555.844 m
 .113 555.844 l
 .113 549.27 467.441 543.942 474.016 543.942 c
 .59 543.942 485.922 549.27 485.922 555.844 c
 .922 562.418 480.59 567.747 474.016 567.747 c
 .441 567.747 462.113 562.418 462.113 555.844 c
 .113 555.844 l
+		C
 		S 1 0.5 1 r f R
+		N
 .492 555.844 m
 .492 555.844 l
 .492 548.614 545.355 542.75 552.586 542.75 c
 .816 542.75 565.68 548.614 565.68 555.844 c
 .68 563.075 559.816 568.938 552.586 568.938 c
 .355 568.938 539.492 563.075 539.492 555.844 c
 .492 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .683 555.844 m
 .683 555.844 l
 .683 549.27 546.012 543.942 552.586 543.942 c
 .16 543.942 564.492 549.27 564.492 555.844 c
 .492 562.418 559.16 567.747 552.586 567.747 c
 .012 567.747 540.683 562.418 540.683 555.844 c
 .683 555.844 l
+		C
 		S 1 0 1 r f R
+		N
 .156 555.844 m
 .156 555.844 l
 .156 548.614 637.019 542.75 644.25 542.75 c
 .48 542.75 657.348 548.614 657.348 555.844 c
 .348 563.075 651.48 568.938 644.25 568.938 c
 .019 568.938 631.156 563.075 631.156 555.844 c
 .156 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .348 555.844 m
 .348 555.844 l
 .348 549.27 637.676 543.942 644.25 543.942 c
 .824 543.942 656.156 549.27 656.156 555.844 c
 .156 562.418 650.824 567.747 644.25 567.747 c
 .676 567.747 632.348 562.418 632.348 555.844 c
 .348 555.844 l
+		C
 		S 1 0.5 1 r f R
+		N
 .82 555.844 m
 .82 555.844 l
 .82 548.614 728.687 542.75 735.918 542.75 c
 .149 542.75 749.012 548.614 749.012 555.844 c
 .012 563.075 743.149 568.938 735.918 568.938 c
 .687 568.938 722.82 563.075 722.82 555.844 c
 .82 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .012 555.844 m
 .012 555.844 l
 .012 549.27 729.344 543.942 735.918 543.942 c
 .492 543.942 747.82 549.27 747.82 555.844 c
 .82 562.418 742.492 567.747 735.918 567.747 c
 .344 567.747 724.012 562.418 724.012 555.844 c
 .012 555.844 l
+		C
 		S 1 0 1 r f R
+		N
 .391 555.844 m
 .391 555.844 l
 .391 548.614 807.254 542.75 814.484 542.75 c
 .715 542.75 827.578 548.614 827.578 555.844 c
 .578 563.075 821.715 568.938 814.484 568.938 c
 .254 568.938 801.391 563.075 801.391 555.844 c
 .391 555.844 l
+		C
 		S 0 0 0 r f R
+		N
 .582 555.844 m
 .582 555.844 l
 .582 549.27 807.91 543.942 814.484 543.942 c
 .059 543.942 826.387 549.27 826.387 555.844 c
 .387 562.418 821.059 567.747 814.484 567.747 c
 .91 567.747 802.582 562.418 802.582 555.844 c
 .582 555.844 l
+		C
 		S 1 0 1 r f R
+		N
 .6913 32.047 m
 .6913 32.047 l
 .6913 24.8165 21.5553 18.9493 28.7853 18.9493 c
 .0163 18.9493 41.8833 24.8165 41.8833 32.047 c
 .8833 39.2775 36.0163 45.1407 28.7853 45.1407 c
 .5553 45.1407 15.6913 39.2775 15.6913 32.047 c
 .6913 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .8833 32.047 m
 .8833 32.047 l
 .8833 25.4728 22.2113 20.1407 28.7853 20.1407 c
 .3593 20.1407 40.6913 25.4728 40.6913 32.047 c
 .6913 38.6212 35.3593 43.9493 28.7853 43.9493 c
 .2113 43.9493 16.8833 38.6212 16.8833 32.047 c
 .8833 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .2623 32.047 m
 .2623 32.047 l
 .2623 24.8165 100.125 18.9493 107.355 18.9493 c
 .586 18.9493 120.453 24.8165 120.453 32.047 c
 .453 39.2775 114.586 45.1407 107.355 45.1407 c
 .125 45.1407 94.2623 39.2775 94.2623 32.047 c
 .2623 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .4533 32.047 m
 .4533 32.047 l
 .4533 25.4728 100.781 20.1407 107.355 20.1407 c
 .93 20.1407 119.262 25.4728 119.262 32.047 c
 .262 38.6212 113.93 43.9493 107.355 43.9493 c
 .781 43.9493 95.4533 38.6212 95.4533 32.047 c
 .4533 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .734 32.047 m
 .734 32.047 l
 .734 24.8165 165.601 18.9493 172.832 18.9493 c
 .062 18.9493 185.926 24.8165 185.926 32.047 c
 .926 39.2775 180.062 45.1407 172.832 45.1407 c
 .601 45.1407 159.734 39.2775 159.734 32.047 c
 .734 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .926 32.047 m
 .926 32.047 l
 .926 25.4728 166.258 20.1407 172.832 20.1407 c
 .406 20.1407 184.734 25.4728 184.734 32.047 c
 .734 38.6212 179.406 43.9493 172.832 43.9493 c
 .258 43.9493 160.926 38.6212 160.926 32.047 c
 .926 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .305 32.047 m
 .305 32.047 l
 .305 24.8165 244.172 18.9493 251.402 18.9493 c
 .633 18.9493 264.496 24.8165 264.496 32.047 c
 .496 39.2775 258.633 45.1407 251.402 45.1407 c
 .172 45.1407 238.305 39.2775 238.305 32.047 c
 .305 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .496 32.047 m
 .496 32.047 l
 .496 25.4728 244.828 20.1407 251.402 20.1407 c
 .976 20.1407 263.305 25.4728 263.305 32.047 c
 .305 38.6212 257.976 43.9493 251.402 43.9493 c
 .828 43.9493 239.496 38.6212 239.496 32.047 c
 .496 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .781 32.047 m
 .781 32.047 l
 .781 24.8165 309.644 18.9493 316.875 18.9493 c
 .105 18.9493 329.973 24.8165 329.973 32.047 c
 .973 39.2775 324.105 45.1407 316.875 45.1407 c
 .644 45.1407 303.781 39.2775 303.781 32.047 c
 .781 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .973 32.047 m
 .973 32.047 l
 .973 25.4728 310.301 20.1407 316.875 20.1407 c
 .449 20.1407 328.781 25.4728 328.781 32.047 c
 .781 38.6212 323.449 43.9493 316.875 43.9493 c
 .301 43.9493 304.973 38.6212 304.973 32.047 c
 .973 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .351 32.047 m
 .351 32.047 l
 .351 24.8165 388.215 18.9493 395.445 18.9493 c
 .676 18.9493 408.543 24.8165 408.543 32.047 c
 .543 39.2775 402.676 45.1407 395.445 45.1407 c
 .215 45.1407 382.351 39.2775 382.351 32.047 c
 .351 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .543 32.047 m
 .543 32.047 l
 .543 25.4728 388.871 20.1407 395.445 20.1407 c
 .019 20.1407 407.351 25.4728 407.351 32.047 c
 .351 38.6212 402.019 43.9493 395.445 43.9493 c
 .871 43.9493 383.543 38.6212 383.543 32.047 c
 .543 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .828 32.047 m
 .828 32.047 l
 .828 24.8165 453.691 18.9493 460.922 18.9493 c
 .152 18.9493 474.016 24.8165 474.016 32.047 c
 .016 39.2775 468.152 45.1407 460.922 45.1407 c
 .691 45.1407 447.828 39.2775 447.828 32.047 c
 .828 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .016 32.047 m
 .016 32.047 l
 .016 25.4728 454.348 20.1407 460.922 20.1407 c
 .496 20.1407 472.824 25.4728 472.824 32.047 c
 .824 38.6212 467.496 43.9493 460.922 43.9493 c
 .348 43.9493 449.016 38.6212 449.016 32.047 c
 .016 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .394 32.047 m
 .394 32.047 l
 .394 24.8165 532.262 18.9493 539.492 18.9493 c
 .723 18.9493 552.586 24.8165 552.586 32.047 c
 .586 39.2775 546.723 45.1407 539.492 45.1407 c
 .262 45.1407 526.394 39.2775 526.394 32.047 c
 .394 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .586 32.047 m
 .586 32.047 l
 .586 25.4728 532.918 20.1407 539.492 20.1407 c
 .066 20.1407 551.394 25.4728 551.394 32.047 c
 .394 38.6212 546.066 43.9493 539.492 43.9493 c
 .918 43.9493 527.586 38.6212 527.586 32.047 c
 .586 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .871 32.047 m
 .871 32.047 l
 .871 24.8165 597.734 18.9493 604.965 18.9493 c
 .195 18.9493 618.062 24.8165 618.062 32.047 c
 .062 39.2775 612.195 45.1407 604.965 45.1407 c
 .734 45.1407 591.871 39.2775 591.871 32.047 c
 .871 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .062 32.047 m
 .062 32.047 l
 .062 25.4728 598.39 20.1407 604.965 20.1407 c
 .539 20.1407 616.871 25.4728 616.871 32.047 c
 .871 38.6212 611.539 43.9493 604.965 43.9493 c
 .39 43.9493 593.062 38.6212 593.062 32.047 c
 .062 32.047 l
+		C
 		S 0.5 0.5 1 r f R
+		N
 .441 32.047 m
 .441 32.047 l
 .441 24.8165 676.305 18.9493 683.535 18.9493 c
 .766 18.9493 696.633 24.8165 696.633 32.047 c
 .633 39.2775 690.766 45.1407 683.535 45.1407 c
 .305 45.1407 670.441 39.2775 670.441 32.047 c
 .441 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .633 32.047 m
 .633 32.047 l
 .633 25.4728 676.961 20.1407 683.535 20.1407 c
 .109 20.1407 695.441 25.4728 695.441 32.047 c
 .441 38.6212 690.109 43.9493 683.535 43.9493 c
 .961 43.9493 671.633 38.6212 671.633 32.047 c
 .633 32.047 l
+		C
 		S 0 0 1 r f R
+		N
 .918 32.047 m
 .918 32.047 l
 .918 24.8165 741.781 18.9493 749.012 18.9493 c
 .242 18.9493 762.106 24.8165 762.106 32.047 c
 .106 39.2775 756.242 45.1407 749.012 45.1407 c
 .781 45.1407 735.918 39.2775 735.918 32.047 c
 .918 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .105 32.047 m
 .105 32.047 l
 .105 25.4728 742.437 20.1407 749.012 20.1407 c
 .586 20.1407 760.914 25.4728 760.914 32.047 c
 .914 38.6212 755.586 43.9493 749.012 43.9493 c
 .437 43.9493 737.105 38.6212 737.105 32.047 c
 .105 32.047 l
+		C
 		S 0 0 1 r f R
+		N
 .391 32.047 m
 .391 32.047 l
 .391 24.8165 807.254 18.9493 814.484 18.9493 c
 .715 18.9493 827.578 24.8165 827.578 32.047 c
 .578 39.2775 821.715 45.1407 814.484 45.1407 c
 .254 45.1407 801.391 39.2775 801.391 32.047 c
 .391 32.047 l
+		C
 		S 0 0 0 r f R
+		N
 .582 32.047 m
 .582 32.047 l
 .582 25.4728 807.91 20.1407 814.484 20.1407 c
 .059 20.1407 826.387 25.4728 826.387 32.047 c
 .387 38.6212 821.059 43.9493 814.484 43.9493 c
 .91 43.9493 802.582 38.6212 802.582 32.047 c
 .582 32.047 l
+		C
 		S 0.5 0.5 1 r f R
 		%%EOF

doc/images/bipartite_partitions.eps

Show inline comments

 		%!PS-Adobe-2.0 EPSF-2.0
 		%%Creator: LEMON, graphToEps()
 		%%CreationDate: Tue Nov 15 16:51:43 2005
 		%%BoundingBox: 0 0 842 596
 		%%EndComments
 		/lb { setlinewidth setrgbcolor newpath moveto
 2 roll 1 index 1 index curveto stroke } bind def
 		/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def
 		/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def
 		/sq { newpath 2 index 1 index add 2 index 2 index add moveto
 index 1 index sub 2 index 2 index add lineto
 index 1 index sub 2 index 2 index sub lineto
 index 1 index add 2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/di { newpath 2 index 1 index add 2 index moveto
 index             2 index 2 index add lineto
 index 1 index sub 2 index             lineto
 index             2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill
 		     setrgbcolor 1.1 div c fill
 		   } bind def
 		/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill
 		     setrgbcolor 1.1 div sq fill
 		   } bind def
 		/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill
 		     setrgbcolor 1.1 div di fill
 		   } bind def
 		/arrl 1 def
 		/arrw 0.3 def
 		/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def
 		/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def
 		       /w exch def /len exch def
 		       newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto
 		       len w sub arrl sub dx dy lrl
 		       arrw dy dx neg lrl
 		       dx arrl w add mul dy w 2 div arrw add mul sub
 		       dy arrl w add mul dx w 2 div arrw add mul add rlineto
 		       dx arrl w add mul neg dy w 2 div arrw add mul sub
 		       dy arrl w add mul neg dx w 2 div arrw add mul add rlineto
 		       arrw dy dx neg lrl
 		       len w sub arrl sub neg dx dy lrl
 		       closepath fill } bind def
 		/cshow { 2 index 2 index moveto dup stringwidth pop
 		         neg 2 div fosi .35 mul neg rmoveto show pop pop} def
 		gsave
 rotate
 -842 translate
 .6378 15 translate
 .389093 dup scale
 rotate
 .47 -613.138 translate
 		%Edges:
 		gsave
 .857 -446.322 296.569 -487.43 79.2808 -528.539 0 0 0 2 lb
 .857 -446.322 575.52 -315.655 637.183 -184.989 0 0 0 2 lb
 .468 566.711 494.771 434.577 596.074 302.442 0 0 0 2 lb
 .468 566.711 155.625 579.925 -82.2171 593.138 0 0 0 2 lb
 .468 566.711 251.056 450.726 108.644 334.741 0 0 0 2 lb
 .153 52.8539 732.613 177.648 596.074 302.442 0 0 0 2 lb
 .153 52.8539 753.168 -66.0676 637.183 -184.989 0 0 0 2 lb
 		-82.2171 593.138 -91.0261 346.487 -99.8351 99.8351 0 0 0 2 lb
 		-663.61 546.157 -753.168 394.936 -842.726 243.715 0 0 0 2 lb
 		-663.61 546.157 -574.052 437.513 -484.494 328.869 0 0 0 2 lb
 		-1077.63 161.498 -960.178 202.606 -842.726 243.715 0 0 0 2 lb
 		-1077.63 161.498 -968.987 66.0674 -860.344 -29.3633 0 0 0 2 lb
 		-1177.47 -234.906 -1029.18 -381.722 -880.898 -528.539 0 0 0 2 lb
 		-1177.47 -234.906 -1018.91 -132.135 -860.344 -29.3633 0 0 0 2 lb
 		-880.898 -528.539 -744.359 -387.595 -607.82 -246.651 0 0 0 2 lb
 		-499.175 -499.175 -355.295 -475.685 -211.415 -452.194 0 0 0 2 lb
 		-499.175 -499.175 -553.498 -372.913 -607.82 -246.651 0 0 0 2 lb
 		-499.175 -499.175 -386.587 -315.087 -274 -131 0 0 0 2 lb
 .2808 -528.539 -66.0671 -490.366 -211.415 -452.194 0 0 0 2 lb
 .183 -184.989 421.363 -253.993 205.543 -322.996 0 0 0 2 lb
 .543 -322.996 162.966 -226.097 120.389 -129.198 0 0 0 2 lb
 .34 88.0898 259.865 -20.5541 120.389 -129.198 0 0 0 2 lb
 .34 88.0898 253.992 211.415 108.644 334.741 0 0 0 2 lb
 		-842.726 243.715 -471.281 171.775 -99.8351 99.8351 0 0 0 2 lb
 		-842.726 243.715 -558.363 56.3575 -274 -131 0 0 0 2 lb
 		-860.344 -29.3633 -734.082 -138.007 -607.82 -246.651 0 0 0 2 lb
 		-211.415 -452.194 -45.513 -290.696 120.389 -129.198 0 0 0 2 lb
 		-99.8351 99.8351 4.40445 217.288 108.644 334.741 0 0 0 2 lb
 		-99.8351 99.8351 -292.165 214.352 -484.494 328.869 0 0 0 2 lb
 .389 -129.198 -76.8055 -130.099 -274 -131 0 0 0 2 lb
 		grestore
 		%Nodes:
 		gsave
 		-274 -131 20 1 0 0 nc
 		-607.82 -246.651 20 1 0 0 nc
 		-484.494 328.869 20 0 0 1 nc
 .644 334.741 20 0 0 1 nc
 .389 -129.198 20 0 0 1 nc
 		-99.8351 99.8351 20 1 0 0 nc
 		-211.415 -452.194 20 1 0 0 nc
 		-860.344 -29.3633 20 0 0 1 nc
 		-842.726 243.715 20 0 0 1 nc
 .34 88.0898 20 1 0 0 nc
 .543 -322.996 20 1 0 0 nc
 .183 -184.989 20 0 0 1 nc
 .2808 -528.539 20 0 0 1 nc
 		-499.175 -499.175 20 0 0 1 nc
 		-880.898 -528.539 20 0 0 1 nc
 		-1177.47 -234.906 20 1 0 0 nc
 		-1077.63 161.498 20 1 0 0 nc
 		-663.61 546.157 20 1 0 0 nc
 		-82.2171 593.138 20 0 0 1 nc
 .074 302.442 20 0 0 1 nc
 .153 52.8539 20 1 0 0 nc
 .468 566.711 20 1 0 0 nc
 .857 -446.322 20 1 0 0 nc
 		grestore
 		grestore
 		showpage

doc/images/connected_components.eps

Show inline comments

 		%!PS-Adobe-2.0 EPSF-2.0
 		%%Creator: LEMON, graphToEps()
 		%%CreationDate: Fri Nov  4 13:47:12 2005
 		%%BoundingBox: 0 0 842 596
 		%%EndComments
 		/lb { setlinewidth setrgbcolor newpath moveto
 2 roll 1 index 1 index curveto stroke } bind def
 		/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def
 		/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def
 		/sq { newpath 2 index 1 index add 2 index 2 index add moveto
 index 1 index sub 2 index 2 index add lineto
 index 1 index sub 2 index 2 index sub lineto
 index 1 index add 2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/di { newpath 2 index 1 index add 2 index moveto
 index             2 index 2 index add lineto
 index 1 index sub 2 index             lineto
 index             2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill
 		     setrgbcolor 1.1 div c fill
 		   } bind def
 		/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill
 		     setrgbcolor 1.1 div sq fill
 		   } bind def
 		/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill
 		     setrgbcolor 1.1 div di fill
 		   } bind def
 		/arrl 1 def
 		/arrw 0.3 def
 		/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def
 		/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def
 		       /w exch def /len exch def
 		       newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto
 		       len w sub arrl sub dx dy lrl
 		       arrw dy dx neg lrl
 		       dx arrl w add mul dy w 2 div arrw add mul sub
 		       dy arrl w add mul dx w 2 div arrw add mul add rlineto
 		       dx arrl w add mul neg dy w 2 div arrw add mul sub
 		       dy arrl w add mul neg dx w 2 div arrw add mul add rlineto
 		       arrw dy dx neg lrl
 		       len w sub arrl sub neg dx dy lrl
 		       closepath fill } bind def
 		/cshow { 2 index 2 index moveto dup stringwidth pop
 		         neg 2 div fosi .35 mul neg rmoveto show pop pop} def
 		gsave
 rotate
 -842 translate
 .0944 15 translate
 .434694 dup scale
 rotate
 .856 -588.349 translate
 		%Edges:
 		gsave
 .035 177.301 622.149 225.748 670.264 274.195 0 0 0 2 lb
 .579 115.483 682.421 194.839 670.264 274.195 0 0 0 2 lb
 .402 10.3938 246.402 -6.60595 212.403 -23.6057 0 0 0 2 lb
 .402 10.3938 283.493 -18.9695 286.584 -48.3327 0 0 0 2 lb
 .403 -23.6057 249.493 -35.9692 286.584 -48.3327 0 0 0 2 lb
 .584 -48.3327 326.765 -79.2414 366.947 -110.15 0 0 0 2 lb
 .584 -48.3327 278.857 -111.695 271.13 -175.058 0 0 0 2 lb
 .037 -88.514 417.946 -142.604 397.855 -196.694 0 0 0 2 lb
 .037 -88.514 402.492 -99.332 366.947 -110.15 0 0 0 2 lb
 .855 -196.694 382.401 -153.422 366.947 -110.15 0 0 0 2 lb
 .947 -110.15 319.038 -142.604 271.13 -175.058 0 0 0 2 lb
 .13 -175.058 274.221 -213.694 277.311 -252.33 0 0 0 2 lb
 .13 -175.058 238.675 -190.512 206.221 -205.967 0 0 0 2 lb
 .311 -252.33 241.766 -229.149 206.221 -205.967 0 0 0 2 lb
 		-840.856 -246.718 -804.351 -66.7145 -767.847 113.289 0 0 0 2 lb
 		-579.033 445.603 -673.44 279.446 -767.847 113.289 0 0 0 2 lb
 		-579.033 445.603 -524.906 302.104 -470.779 158.605 0 0 0 2 lb
 		-767.847 113.289 -619.313 135.947 -470.779 158.605 0 0 0 2 lb
 .312 201.403 946.592 42.798 986.873 -115.807 0 0 0 2 lb
 .312 201.403 834.562 91.8901 762.812 -17.6227 0 0 0 2 lb
 .873 -115.807 874.842 -66.7148 762.812 -17.6227 0 0 0 2 lb
 		-470.779 158.605 -390.218 50.3508 -309.657 -57.9033 0 0 0 2 lb
 .945 521.129 208.955 541.269 -5.03507 561.41 0 0 0 2 lb
 .945 521.129 376.371 417.911 329.797 314.692 0 0 0 2 lb
 .945 521.129 474.554 276.928 526.164 32.7279 0 0 0 2 lb
 		-5.03507 561.41 -36.5042 440.568 -67.9734 319.727 0 0 0 2 lb
 .797 314.692 130.912 317.209 -67.9734 319.727 0 0 0 2 lb
 		-67.9734 319.727 229.095 176.227 526.164 32.7279 0 0 0 2 lb
 .812 -17.6227 644.488 7.5526 526.164 32.7279 0 0 0 2 lb
 .812 -17.6227 746.448 -162.381 730.084 -307.139 0 0 0 2 lb
 .164 32.7279 470.779 -128.394 415.393 -289.516 0 0 0 2 lb
 .084 -307.139 572.738 -298.327 415.393 -289.516 0 0 0 2 lb
 .393 -289.516 173.71 -318.468 -67.9734 -347.42 0 0 0 2 lb
 		-67.9734 -347.42 -188.815 -202.662 -309.657 -57.9033 0 0 0 2 lb
 		-67.9734 -347.42 -195.758 -390.692 -323.543 -433.964 0 0 0 2 lb
 		-309.657 -57.9033 -424.775 -160.272 -539.894 -262.64 0 0 0 2 lb
 		-323.543 -433.964 -431.719 -348.302 -539.894 -262.64 0 0 0 2 lb
 		-26.6953 -19.9585 44.8558 -96.8093 116.407 -173.66 0 0 0 2 lb
 		-26.6953 -19.9585 87.2563 9.19185 201.208 38.3422 0 0 0 2 lb
 		-26.6953 -19.9585 -144.622 43.6422 -262.548 107.243 0 0 0 2 lb
 		-26.6953 -19.9585 -20.0703 56.8923 -13.4452 133.743 0 0 0 2 lb
 .407 -173.66 158.808 -67.6589 201.208 38.3422 0 0 0 2 lb
 		-262.548 107.243 -137.997 120.493 -13.4452 133.743 0 0 0 2 lb
 		-262.548 107.243 -221.472 176.144 -180.397 245.045 0 0 0 2 lb
 		-13.4452 133.743 -96.9211 189.394 -180.397 245.045 0 0 0 2 lb
 		-180.397 245.045 -142.256 345.099 -132.697 451.748 0 0 0 2 lb
 		-180.397 245.045 -170.838 351.694 -132.697 451.748 0 0 0 2 lb
 		-416.25 345.746 -274.474 398.747 -132.697 451.748 0 0 0 2 lb
 		-416.25 345.746 -393.725 457.048 -371.2 568.349 0 0 0 2 lb
 		-132.697 451.748 -251.948 510.048 -371.2 568.349 0 0 0 2 lb
 .264 274.195 629.188 409.347 588.113 544.499 0 0 0 2 lb
 .264 274.195 797.466 341.771 924.667 409.347 0 0 0 2 lb
 .113 544.499 756.39 476.923 924.667 409.347 0 0 0 2 lb
 		-689.204 -237.261 -614.799 -102.648 -567.302 43.6423 0 0 0 2 lb
 		-689.204 -237.261 -641.707 -90.9706 -567.302 43.6423 0 0 0 2 lb
 		grestore
 		%Nodes:
 		gsave
 		-567.302 43.6423 20 0 0 0 nc
 		-689.204 -237.261 20 0 0 0 nc
 .667 409.347 20 1 0 0 nc
 .113 544.499 20 1 0 0 nc
 .264 274.195 20 1 0 0 nc
 		-371.2 568.349 20 0 1 0 nc
 		-132.697 451.748 20 0 1 0 nc
 		-416.25 345.746 20 0 1 0 nc
 		-180.397 245.045 20 0 1 0 nc
 		-13.4452 133.743 20 0 1 0 nc
 		-262.548 107.243 20 0 1 0 nc
 .208 38.3422 20 0 1 0 nc
 .407 -173.66 20 0 1 0 nc
 		-26.6953 -19.9585 20 0 1 0 nc
 		-539.894 -262.64 20 0 0 1 nc
 		-323.543 -433.964 20 0 0 1 nc
 		-309.657 -57.9033 20 0 0 1 nc
 		-67.9734 -347.42 20 0 0 1 nc
 .393 -289.516 20 0 0 1 nc
 .084 -307.139 20 0 0 1 nc
 .164 32.7279 20 0 0 1 nc
 .812 -17.6227 20 0 0 1 nc
 		-67.9734 319.727 20 0 0 1 nc
 .797 314.692 20 0 0 1 nc
 		-5.03507 561.41 20 0 0 1 nc
 .945 521.129 20 0 0 1 nc
 		-470.779 158.605 20 0 0 1 nc
 .873 -115.807 20 0 0 1 nc
 .312 201.403 20 0 0 1 nc
 		-767.847 113.289 20 0 0 1 nc
 		-579.033 445.603 20 0 0 1 nc
 		-840.856 -246.718 20 0 0 1 nc
 .221 -205.967 20 1 1 0 nc
 .311 -252.33 20 1 1 0 nc
 .13 -175.058 20 1 1 0 nc
 .947 -110.15 20 1 1 0 nc
 .855 -196.694 20 1 1 0 nc
 .037 -88.514 20 1 1 0 nc
 .584 -48.3327 20 1 1 0 nc
 .403 -23.6057 20 1 1 0 nc
 .402 10.3938 20 1 1 0 nc
 .579 115.483 20 1 0 0 nc
 .035 177.301 20 1 0 0 nc
 		grestore
 		grestore
 		showpage

doc/images/edge_biconnected_components.eps

Show inline comments

 		%!PS-Adobe-2.0 EPSF-2.0
 		%%Creator: LEMON, graphToEps()
 		%%CreationDate: Fri Nov  4 13:47:12 2005
 		%%BoundingBox: 0 0 842 596
 		%%EndComments
 		/lb { setlinewidth setrgbcolor newpath moveto
 2 roll 1 index 1 index curveto stroke } bind def
 		/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def
 		/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def
 		/sq { newpath 2 index 1 index add 2 index 2 index add moveto
 index 1 index sub 2 index 2 index add lineto
 index 1 index sub 2 index 2 index sub lineto
 index 1 index add 2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/di { newpath 2 index 1 index add 2 index moveto
 index             2 index 2 index add lineto
 index 1 index sub 2 index             lineto
 index             2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill
 		     setrgbcolor 1.1 div c fill
 		   } bind def
 		/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill
 		     setrgbcolor 1.1 div sq fill
 		   } bind def
 		/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill
 		     setrgbcolor 1.1 div di fill
 		   } bind def
 		/arrl 1 def
 		/arrw 0.3 def
 		/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def
 		/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def
 		       /w exch def /len exch def
 		       newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto
 		       len w sub arrl sub dx dy lrl
 		       arrw dy dx neg lrl
 		       dx arrl w add mul dy w 2 div arrw add mul sub
 		       dy arrl w add mul dx w 2 div arrw add mul add rlineto
 		       dx arrl w add mul neg dy w 2 div arrw add mul sub
 		       dy arrl w add mul neg dx w 2 div arrw add mul add rlineto
 		       arrw dy dx neg lrl
 		       len w sub arrl sub neg dx dy lrl
 		       closepath fill } bind def
 		/cshow { 2 index 2 index moveto dup stringwidth pop
 		         neg 2 div fosi .35 mul neg rmoveto show pop pop} def
 		gsave
 rotate
 -842 translate
 .0944 15 translate
 .434694 dup scale
 rotate
 .856 -588.349 translate
 		%Edges:
 		gsave
 .035 177.301 622.149 225.748 670.264 274.195 1 0 0 2 lb
 .579 115.483 682.421 194.839 670.264 274.195 1 0 0 2 lb
 .402 10.3938 246.402 -6.60595 212.403 -23.6057 0 0 1 2 lb
 .402 10.3938 283.493 -18.9695 286.584 -48.3327 0 0 1 2 lb
 .403 -23.6057 249.493 -35.9692 286.584 -48.3327 0 0 1 2 lb
 .584 -48.3327 326.765 -79.2414 366.947 -110.15 0 0 1 2 lb
 .584 -48.3327 278.857 -111.695 271.13 -175.058 0 0 1 2 lb
 .037 -88.514 417.946 -142.604 397.855 -196.694 0 0 1 2 lb
 .037 -88.514 402.492 -99.332 366.947 -110.15 0 0 1 2 lb
 .855 -196.694 382.401 -153.422 366.947 -110.15 0 0 1 2 lb
 .947 -110.15 319.038 -142.604 271.13 -175.058 0 0 1 2 lb
 .13 -175.058 274.221 -213.694 277.311 -252.33 0 0 1 2 lb
 .13 -175.058 238.675 -190.512 206.221 -205.967 0 0 1 2 lb
 .311 -252.33 241.766 -229.149 206.221 -205.967 0 0 1 2 lb
 		-840.856 -246.718 -804.351 -66.7145 -767.847 113.289 1 0 0 2 lb
 		-579.033 445.603 -673.44 279.446 -767.847 113.289 0 0 1 2 lb
 		-579.033 445.603 -524.906 302.104 -470.779 158.605 0 0 1 2 lb
 		-767.847 113.289 -619.313 135.947 -470.779 158.605 0 0 1 2 lb
 .312 201.403 946.592 42.798 986.873 -115.807 0 0 1 2 lb
 .312 201.403 834.562 91.8901 762.812 -17.6227 0 0 1 2 lb
 .873 -115.807 874.842 -66.7148 762.812 -17.6227 0 0 1 2 lb
 		-470.779 158.605 -390.218 50.3508 -309.657 -57.9033 1 0 0 2 lb
 .945 521.129 208.955 541.269 -5.03507 561.41 0 0 1 2 lb
 .945 521.129 376.371 417.911 329.797 314.692 0 0 1 2 lb
 .945 521.129 474.554 276.928 526.164 32.7279 0 0 1 2 lb
 		-5.03507 561.41 -36.5042 440.568 -67.9734 319.727 0 0 1 2 lb
 .797 314.692 130.912 317.209 -67.9734 319.727 0 0 1 2 lb
 		-67.9734 319.727 229.095 176.227 526.164 32.7279 0 0 1 2 lb
 .812 -17.6227 644.488 7.5526 526.164 32.7279 0 0 1 2 lb
 .812 -17.6227 746.448 -162.381 730.084 -307.139 0 0 1 2 lb
 .164 32.7279 470.779 -128.394 415.393 -289.516 0 0 1 2 lb
 .084 -307.139 572.738 -298.327 415.393 -289.516 0 0 1 2 lb
 .393 -289.516 173.71 -318.468 -67.9734 -347.42 1 0 0 2 lb
 		-67.9734 -347.42 -188.815 -202.662 -309.657 -57.9033 0 0 1 2 lb
 		-67.9734 -347.42 -195.758 -390.692 -323.543 -433.964 0 0 1 2 lb
 		-309.657 -57.9033 -424.775 -160.272 -539.894 -262.64 0 0 1 2 lb
 		-323.543 -433.964 -431.719 -348.302 -539.894 -262.64 0 0 1 2 lb
 		-26.6953 -19.9585 44.8558 -96.8093 116.407 -173.66 0 0 1 2 lb
 		-26.6953 -19.9585 87.2563 9.19185 201.208 38.3422 0 0 1 2 lb
 		-26.6953 -19.9585 -144.622 43.6422 -262.548 107.243 0 0 1 2 lb
 		-26.6953 -19.9585 -20.0703 56.8923 -13.4452 133.743 0 0 1 2 lb
 .407 -173.66 158.808 -67.6589 201.208 38.3422 0 0 1 2 lb
 		-262.548 107.243 -137.997 120.493 -13.4452 133.743 0 0 1 2 lb
 		-262.548 107.243 -221.472 176.144 -180.397 245.045 0 0 1 2 lb
 		-13.4452 133.743 -96.9211 189.394 -180.397 245.045 0 0 1 2 lb
 		-180.397 245.045 -142.256 345.099 -132.697 451.748 0 0 1 2 lb
 		-180.397 245.045 -170.838 351.694 -132.697 451.748 0 0 1 2 lb
 		-416.25 345.746 -274.474 398.747 -132.697 451.748 0 0 1 2 lb
 		-416.25 345.746 -393.725 457.048 -371.2 568.349 0 0 1 2 lb
 		-132.697 451.748 -251.948 510.048 -371.2 568.349 0 0 1 2 lb
 .264 274.195 629.188 409.347 588.113 544.499 0 0 1 2 lb
 .264 274.195 797.466 341.771 924.667 409.347 0 0 1 2 lb
 .113 544.499 756.39 476.923 924.667 409.347 0 0 1 2 lb
 		-689.204 -237.261 -614.799 -102.648 -567.302 43.6423 0 0 1 2 lb
 		-689.204 -237.261 -641.707 -90.9706 -567.302 43.6423 0 0 1 2 lb
 		grestore
 		%Nodes:
 		gsave
 		-567.302 43.6423 20 0 0 0 nc
 		-689.204 -237.261 20 0 0 0 nc
 .667 409.347 20 0 0 1 nc
 .113 544.499 20 0 0 1 nc
 .264 274.195 20 0 0 1 nc
 		-371.2 568.349 20 1 1 0 nc
 		-132.697 451.748 20 1 1 0 nc
 		-416.25 345.746 20 1 1 0 nc
 		-180.397 245.045 20 1 1 0 nc
 		-13.4452 133.743 20 1 1 0 nc
 		-262.548 107.243 20 1 1 0 nc
 .208 38.3422 20 1 1 0 nc
 .407 -173.66 20 1 1 0 nc
 		-26.6953 -19.9585 20 1 1 0 nc
 		-539.894 -262.64 20 0 0.5 0 nc
 		-323.543 -433.964 20 0 0.5 0 nc
 		-309.657 -57.9033 20 0 0.5 0 nc
 		-67.9734 -347.42 20 0 0.5 0 nc
 .393 -289.516 20 0.5 0 0 nc
 .084 -307.139 20 0.5 0 0 nc
 .164 32.7279 20 0.5 0 0 nc
 .812 -17.6227 20 0.5 0 0 nc
 		-67.9734 319.727 20 0.5 0 0 nc
 .797 314.692 20 0.5 0 0 nc
 		-5.03507 561.41 20 0.5 0 0 nc
 .945 521.129 20 0.5 0 0 nc
 		-470.779 158.605 20 0 1 1 nc
 .873 -115.807 20 0.5 0 0 nc
 .312 201.403 20 0.5 0 0 nc
 		-767.847 113.289 20 0 1 1 nc
 		-579.033 445.603 20 0 1 1 nc
 		-840.856 -246.718 20 1 0 1 nc
 .221 -205.967 20 0 0 0.5 nc
 .311 -252.33 20 0 0 0.5 nc
 .13 -175.058 20 0 0 0.5 nc
 .947 -110.15 20 0 0 0.5 nc
 .855 -196.694 20 0 0 0.5 nc
 .037 -88.514 20 0 0 0.5 nc
 .584 -48.3327 20 0 0 0.5 nc
 .403 -23.6057 20 0 0 0.5 nc
 .402 10.3938 20 0 0 0.5 nc
 .579 115.483 20 1 0 0 nc
 .035 177.301 20 0 1 0 nc
 		grestore
 		grestore
 		showpage

doc/images/node_biconnected_components.eps

Show inline comments

 		%!PS-Adobe-2.0 EPSF-2.0
 		%%Creator: LEMON, graphToEps()
 		%%CreationDate: Fri Nov  4 13:47:12 2005
 		%%BoundingBox: 0 0 842 596
 		%%EndComments
 		/lb { setlinewidth setrgbcolor newpath moveto
 2 roll 1 index 1 index curveto stroke } bind def
 		/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def
 		/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def
 		/sq { newpath 2 index 1 index add 2 index 2 index add moveto
 index 1 index sub 2 index 2 index add lineto
 index 1 index sub 2 index 2 index sub lineto
 index 1 index add 2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/di { newpath 2 index 1 index add 2 index moveto
 index             2 index 2 index add lineto
 index 1 index sub 2 index             lineto
 index             2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill
 		     setrgbcolor 1.1 div c fill
 		   } bind def
 		/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill
 		     setrgbcolor 1.1 div sq fill
 		   } bind def
 		/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill
 		     setrgbcolor 1.1 div di fill
 		   } bind def
 		/arrl 1 def
 		/arrw 0.3 def
 		/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def
 		/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def
 		       /w exch def /len exch def
 		       newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto
 		       len w sub arrl sub dx dy lrl
 		       arrw dy dx neg lrl
 		       dx arrl w add mul dy w 2 div arrw add mul sub
 		       dy arrl w add mul dx w 2 div arrw add mul add rlineto
 		       dx arrl w add mul neg dy w 2 div arrw add mul sub
 		       dy arrl w add mul neg dx w 2 div arrw add mul add rlineto
 		       arrw dy dx neg lrl
 		       len w sub arrl sub neg dx dy lrl
 		       closepath fill } bind def
 		/cshow { 2 index 2 index moveto dup stringwidth pop
 		         neg 2 div fosi .35 mul neg rmoveto show pop pop} def
 		gsave
 rotate
 -842 translate
 .0944 15 translate
 .434694 dup scale
 rotate
 .856 -588.349 translate
 		%Edges:
 		gsave
 .035 177.301 622.149 225.748 670.264 274.195 0 1 0 5 lb
 .579 115.483 682.421 194.839 670.264 274.195 1 0 0 5 lb
 .402 10.3938 246.402 -6.60595 212.403 -23.6057 1 1 0.5 5 lb
 .402 10.3938 283.493 -18.9695 286.584 -48.3327 1 1 0.5 5 lb
 .403 -23.6057 249.493 -35.9692 286.584 -48.3327 1 1 0.5 5 lb
 .584 -48.3327 326.765 -79.2414 366.947 -110.15 1 0.5 1 5 lb
 .584 -48.3327 278.857 -111.695 271.13 -175.058 1 0.5 1 5 lb
 .037 -88.514 417.946 -142.604 397.855 -196.694 0.5 0.5 1 5 lb
 .037 -88.514 402.492 -99.332 366.947 -110.15 0.5 0.5 1 5 lb
 .855 -196.694 382.401 -153.422 366.947 -110.15 0.5 0.5 1 5 lb
 .947 -110.15 319.038 -142.604 271.13 -175.058 1 0.5 1 5 lb
 .13 -175.058 274.221 -213.694 277.311 -252.33 0.5 1 1 5 lb
 .13 -175.058 238.675 -190.512 206.221 -205.967 0.5 1 1 5 lb
 .311 -252.33 241.766 -229.149 206.221 -205.967 0.5 1 1 5 lb
 		-840.856 -246.718 -804.351 -66.7145 -767.847 113.289 0 0.5 0 5 lb
 		-579.033 445.603 -673.44 279.446 -767.847 113.289 0 0 0.5 5 lb
 		-579.033 445.603 -524.906 302.104 -470.779 158.605 0 0 0.5 5 lb
 		-767.847 113.289 -619.313 135.947 -470.779 158.605 0 0 0.5 5 lb
 .312 201.403 946.592 42.798 986.873 -115.807 0 0.5 0.5 5 lb
 .312 201.403 834.562 91.8901 762.812 -17.6227 0 0.5 0.5 5 lb
 .873 -115.807 874.842 -66.7148 762.812 -17.6227 0 0.5 0.5 5 lb
 		-470.779 158.605 -390.218 50.3508 -309.657 -57.9033 0.5 0.5 0 5 lb
 .945 521.129 208.955 541.269 -5.03507 561.41 0.5 0 0.5 5 lb
 .945 521.129 376.371 417.911 329.797 314.692 0.5 0 0.5 5 lb
 .945 521.129 474.554 276.928 526.164 32.7279 0.5 0 0.5 5 lb
 		-5.03507 561.41 -36.5042 440.568 -67.9734 319.727 0.5 0 0.5 5 lb
 .797 314.692 130.912 317.209 -67.9734 319.727 0.5 0 0.5 5 lb
 		-67.9734 319.727 229.095 176.227 526.164 32.7279 0.5 0 0.5 5 lb
 .812 -17.6227 644.488 7.5526 526.164 32.7279 0.5 0.5 0.5 5 lb
 .812 -17.6227 746.448 -162.381 730.084 -307.139 0.5 0.5 0.5 5 lb
 .164 32.7279 470.779 -128.394 415.393 -289.516 0.5 0.5 0.5 5 lb
 .084 -307.139 572.738 -298.327 415.393 -289.516 0.5 0.5 0.5 5 lb
 .393 -289.516 173.71 -318.468 -67.9734 -347.42 1 0.5 0.5 5 lb
 		-67.9734 -347.42 -188.815 -202.662 -309.657 -57.9033 0.5 1 0.5 5 lb
 		-67.9734 -347.42 -195.758 -390.692 -323.543 -433.964 0.5 1 0.5 5 lb
 		-309.657 -57.9033 -424.775 -160.272 -539.894 -262.64 0.5 1 0.5 5 lb
 		-323.543 -433.964 -431.719 -348.302 -539.894 -262.64 0.5 1 0.5 5 lb
 		-26.6953 -19.9585 44.8558 -96.8093 116.407 -173.66 1 1 0 5 lb
 		-26.6953 -19.9585 87.2563 9.19185 201.208 38.3422 1 1 0 5 lb
 		-26.6953 -19.9585 -144.622 43.6422 -262.548 107.243 1 0 1 5 lb
 		-26.6953 -19.9585 -20.0703 56.8923 -13.4452 133.743 1 0 1 5 lb
 .407 -173.66 158.808 -67.6589 201.208 38.3422 1 1 0 5 lb
 		-262.548 107.243 -137.997 120.493 -13.4452 133.743 1 0 1 5 lb
 		-262.548 107.243 -221.472 176.144 -180.397 245.045 1 0 1 5 lb
 		-13.4452 133.743 -96.9211 189.394 -180.397 245.045 1 0 1 5 lb
 		-180.397 245.045 -140.307 344.649 -132.697 451.748 0 1 1 5 lb
 		-180.397 245.045 -172.787 352.144 -132.697 451.748 0 1 1 5 lb
 		-416.25 345.746 -274.474 398.747 -132.697 451.748 0.5 0 0 5 lb
 		-416.25 345.746 -393.725 457.048 -371.2 568.349 0.5 0 0 5 lb
 		-132.697 451.748 -251.948 510.048 -371.2 568.349 0.5 0 0 5 lb
 .264 274.195 629.188 409.347 588.113 544.499 0 0 1 5 lb
 .264 274.195 797.466 341.771 924.667 409.347 0 0 1 5 lb
 .113 544.499 756.39 476.923 924.667 409.347 0 0 1 5 lb
 		-689.204 -237.261 -612.964 -103.444 -567.302 43.6423 0 0 0 5 lb
 		-689.204 -237.261 -643.542 -90.1744 -567.302 43.6423 0 0 0 5 lb
 		grestore
 		%Nodes:
 		gsave
 		-567.302 43.6423 20 0 0 1 nc
 		-689.204 -237.261 20 0 0 1 nc
 .667 409.347 20 0 0 1 nc
 .113 544.499 20 0 0 1 nc
 .264 274.195 20 1 0 0 nc
 		-371.2 568.349 20 0 0 1 nc
 		-132.697 451.748 20 1 0 0 nc
 		-416.25 345.746 20 0 0 1 nc
 		-180.397 245.045 20 1 0 0 nc
 		-13.4452 133.743 20 0 0 1 nc
 		-262.548 107.243 20 0 0 1 nc
 .208 38.3422 20 0 0 1 nc
 .407 -173.66 20 0 0 1 nc
 		-26.6953 -19.9585 20 1 0 0 nc
 		-539.894 -262.64 20 0 0 1 nc
 		-323.543 -433.964 20 0 0 1 nc
 		-309.657 -57.9033 20 1 0 0 nc
 		-67.9734 -347.42 20 1 0 0 nc
 .393 -289.516 20 1 0 0 nc
 .084 -307.139 20 0 0 1 nc
 .164 32.7279 20 1 0 0 nc
 .812 -17.6227 20 1 0 0 nc
 		-67.9734 319.727 20 0 0 1 nc
 .797 314.692 20 0 0 1 nc
 		-5.03507 561.41 20 0 0 1 nc
 .945 521.129 20 0 0 1 nc
 		-470.779 158.605 20 1 0 0 nc
 .873 -115.807 20 0 0 1 nc
 .312 201.403 20 0 0 1 nc
 		-767.847 113.289 20 1 0 0 nc
 		-579.033 445.603 20 0 0 1 nc
 		-840.856 -246.718 20 0 0 1 nc
 .221 -205.967 20 0 0 1 nc
 .311 -252.33 20 0 0 1 nc
 .13 -175.058 20 1 0 0 nc
 .947 -110.15 20 1 0 0 nc
 .855 -196.694 20 0 0 1 nc
 .037 -88.514 20 0 0 1 nc
 .584 -48.3327 20 1 0 0 nc
 .403 -23.6057 20 0 0 1 nc
 .402 10.3938 20 0 0 1 nc
 .579 115.483 20 0 0 1 nc
 .035 177.301 20 0 0 1 nc
 		grestore
 		grestore
 		showpage

doc/images/strongly_connected_components.eps

Show inline comments

 		%!PS-Adobe-2.0 EPSF-2.0
 		%%Creator: LEMON, graphToEps()
 		%%CreationDate: Fri Nov  4 13:47:12 2005
 		%%BoundingBox: 0 0 842 596
 		%%EndComments
 		/lb { setlinewidth setrgbcolor newpath moveto
 2 roll 1 index 1 index curveto stroke } bind def
 		/l { setlinewidth setrgbcolor newpath moveto lineto stroke } bind def
 		/c { newpath dup 3 index add 2 index moveto 0 360 arc closepath } bind def
 		/sq { newpath 2 index 1 index add 2 index 2 index add moveto
 index 1 index sub 2 index 2 index add lineto
 index 1 index sub 2 index 2 index sub lineto
 index 1 index add 2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/di { newpath 2 index 1 index add 2 index moveto
 index             2 index 2 index add lineto
 index 1 index sub 2 index             lineto
 index             2 index 2 index sub lineto
 		      closepath pop pop pop} bind def
 		/nc { 0 0 0 setrgbcolor 5 index 5 index 5 index c fill
 		     setrgbcolor 1.1 div c fill
 		   } bind def
 		/nsq { 0 0 0 setrgbcolor 5 index 5 index 5 index sq fill
 		     setrgbcolor 1.1 div sq fill
 		   } bind def
 		/ndi { 0 0 0 setrgbcolor 5 index 5 index 5 index di fill
 		     setrgbcolor 1.1 div di fill
 		   } bind def
 		/arrl 10 def
 		/arrw 3 def
 		/lrl { 2 index mul exch 2 index mul exch rlineto pop} bind def
 		/arr { setrgbcolor /y1 exch def /x1 exch def /dy exch def /dx exch def
 		       /w exch def /len exch def
 		       newpath x1 dy w 2 div mul add y1 dx w 2 div mul sub moveto
 		       len w sub arrl sub dx dy lrl
 		       arrw dy dx neg lrl
 		       dx arrl w add mul dy w 2 div arrw add mul sub
 		       dy arrl w add mul dx w 2 div arrw add mul add rlineto
 		       dx arrl w add mul neg dy w 2 div arrw add mul sub
 		       dy arrl w add mul neg dx w 2 div arrw add mul add rlineto
 		       arrw dy dx neg lrl
 		       len w sub arrl sub neg dx dy lrl
 		       closepath fill } bind def
 		/cshow { 2 index 2 index moveto dup stringwidth pop
 		         neg 2 div fosi .35 mul neg rmoveto show pop pop} def
 		gsave
 rotate
 -842 translate
 .1122 15 translate
 .585745 dup scale
 rotate
 .963 -397.916 translate
 		%Edges:
 		gsave
 setlinewidth 0 0 1 setrgbcolor newpath
 .178 27.2723 moveto
 .373 -40.1551 188.622 -49.9556 169.228 -100.631 curveto stroke
 		newpath 164.939 -111.838 moveto 165.492 -99.2013 lineto 172.964 -102.061 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .8044 15.5841 moveto
 .293 20.6059 129.775 21.3125 186.25 25.1199 curveto stroke
 		newpath 198.223 25.927 moveto 186.519 21.1289 lineto 185.981 29.1108 lineto closepath fill
 setlinewidth 1 0 0 setrgbcolor newpath
 .178 27.2723 moveto
 .395 -87.4449 290.763 -96.6058 348.102 -194.464 curveto stroke
 		newpath 354.169 -204.818 moveto 344.651 -196.487 lineto 351.554 -192.442 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .79 -130.517 moveto
 .71 -67.0521 102.27 -58.7243 64.3804 -9.72954 curveto stroke
 		newpath 57.0394 -0.236898 moveto 67.5446 -7.28254 lineto 61.2162 -12.1765 lineto closepath fill
 setlinewidth 1 0 0 setrgbcolor newpath
 		-105.193 -261.035 moveto
 		-35.6576 -132.801 -30.5923 -123.459 29.5506 -12.5464 curveto stroke
 		newpath 35.2708 -1.99743 moveto 33.0669 -14.4531 lineto 26.0343 -10.6397 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-465.576 -42.8564 moveto
 		-559.078 -25.5413 -569.47 -23.6169 -644.498 -9.72286 curveto stroke
 		newpath -656.297 -7.5378 moveto -643.77 -5.78973 lineto -645.226 -13.656 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-574.666 -153.893 moveto
 		-528.842 -107.252 -521.515 -99.794 -488.002 -65.683 curveto stroke
 		newpath -479.592 -57.123 moveto -485.149 -68.4863 lineto -490.856 -62.8797 lineto closepath fill
 setlinewidth 1 0 0 setrgbcolor newpath
 		-490.901 120.777 moveto
 		-480.122 51.1328 -478.519 40.7713 -470.47 -11.2329 curveto stroke
 		newpath -468.635 -23.0917 moveto -474.423 -11.8447 lineto -466.517 -10.6212 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-675.963 -3.89604 moveto
 		-632.116 -68.8235 -626.228 -77.5422 -592.575 -127.374 curveto stroke
 		newpath -585.859 -137.319 moveto -595.89 -129.612 lineto -589.26 -125.135 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-490.901 120.777 moveto
 		-435.445 215.844 -430.107 224.995 -384.3 303.522 curveto stroke
 		newpath -378.253 313.887 moveto -380.845 301.507 lineto -387.755 305.537 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-266.879 114.933 moveto
 		-367.067 117.547 -377.642 117.822 -458.912 119.943 curveto stroke
 		newpath -470.908 120.255 moveto -458.807 123.941 lineto -459.016 115.944 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-368.176 331.163 moveto
 		-322.511 233.685 -318.018 224.095 -280.454 143.911 curveto stroke
 		newpath -275.364 133.044 moveto -284.076 142.214 lineto -276.832 145.608 lineto closepath fill
 setlinewidth 1 0 0 setrgbcolor newpath
 		-266.879 114.933 moveto
 		-224.004 235.52 -220.448 245.52 -184.094 347.765 curveto stroke
 		newpath -180.074 359.072 moveto -180.325 346.425 lineto -187.863 349.105 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-251.294 -335.059 moveto
 		-189.25 -303.624 -179.902 -298.887 -133.738 -275.498 curveto stroke
 		newpath -123.034 -270.074 moveto -131.93 -279.066 lineto -135.546 -271.93 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-389.604 -136.361 moveto
 		-327.15 -226.083 -321.098 -234.777 -269.576 -308.795 curveto stroke
 		newpath -262.72 -318.644 moveto -272.859 -311.081 lineto -266.293 -306.51 lineto closepath fill
 setlinewidth 1 0 0 setrgbcolor newpath
 .84406 175.322 moveto
 		-76.0754 267.926 -83.1051 275.873 -152.172 353.948 curveto stroke
 		newpath -160.122 362.936 moveto -149.176 356.598 lineto -155.168 351.298 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .478 311.683 moveto
 .8003 251.119 88.6819 244.353 30.4273 195.808 curveto stroke
 		newpath 21.2086 188.126 moveto 27.8666 198.881 lineto 32.988 192.735 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .851 111.037 moveto
 .766 202.563 256.831 210.589 190.4 287.47 curveto stroke
 		newpath 182.554 296.55 moveto 193.427 290.085 lineto 187.373 284.855 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .84406 175.322 moveto
 .16 145.314 173.605 143.321 311.418 117.033 curveto stroke
 		newpath 323.205 114.784 moveto 310.668 113.104 lineto 312.167 120.962 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .851 111.037 moveto
 .255 2.58683 505.964 -3.53033 643.932 -100.436 curveto stroke
 		newpath 653.752 -107.334 moveto 641.633 -103.71 lineto 646.231 -97.163 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .28 -222.074 moveto
 .298 -66.9063 353.616 -56.2971 344.905 79.1029 curveto stroke
 		newpath 344.135 91.0781 moveto 348.897 79.3597 lineto 340.914 78.8461 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 .118 -118.829 moveto
 .037 -166.793 517.967 -170.192 394.599 -211.839 curveto stroke
 		newpath 383.229 -215.677 moveto 393.32 -208.049 lineto 395.878 -215.629 lineto closepath fill
 setlinewidth 1 0 0 setrgbcolor newpath
 		-105.193 -261.035 moveto
 .401 -242.479 129.015 -241.598 332.39 -224.721 curveto stroke
 		newpath 344.348 -223.728 moveto 332.72 -228.707 lineto 332.059 -220.734 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-105.193 -261.035 moveto
 		-160.867 -161.176 -166.028 -151.918 -212.336 -68.858 curveto stroke
 		newpath -218.179 -58.3769 moveto -208.842 -66.9102 lineto -215.829 -70.8058 lineto closepath fill
 setlinewidth 0 0 1 setrgbcolor newpath
 		-227.918 -40.9084 moveto
 		-298.35 -82.4884 -307.42 -87.8432 -362.048 -120.093 curveto stroke
 		newpath -372.381 -126.193 moveto -364.081 -116.648 lineto -360.014 -123.537 lineto closepath fill
 		grestore
 		%Nodes:
 		gsave
 		-389.604 -136.361 20 0 1 0 nc
 		-227.918 -40.9084 20 0 1 0 nc
 		-105.193 -261.035 20 0 1 0 nc
 .28 -222.074 20 1 1 0 nc
 .118 -118.829 20 1 1 0 nc
 .851 111.037 20 1 1 0 nc
 .84406 175.322 20 1 1 0 nc
 .478 311.683 20 1 1 0 nc
 		-173.374 377.916 20 1 0 1 nc
 		-251.294 -335.059 20 0 1 0 nc
 		-266.879 114.933 20 0 0 0 nc
 		-368.176 331.163 20 0 0 0 nc
 		-490.901 120.777 20 0 0 0 nc
 		-574.666 -153.893 20 1 0 0 nc
 		-675.963 -3.89604 20 1 0 0 nc
 		-465.576 -42.8564 20 1 0 0 nc
 .8044 15.5841 20 0 0 1 nc
 .79 -130.517 20 0 0 1 nc
 .178 27.2723 20 0 0 1 nc
 		grestore
 		grestore
 		showpage

doc/min_cost_flow.dox

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		namespace lemon {
 		/**
 		\page min_cost_flow Minimum Cost Flow Problem
 		\section mcf_def Definition (GEQ form)
 		The \e minimum \e cost \e flow \e problem is to find a feasible flow of
 		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.
 		Formally, let \f$G=(V,A)\f$ be a digraph, \f$lower: A\rightarrow\mathbf{R}\f$,
 		\f$upper: A\rightarrow\mathbf{R}\cup\{+\infty\}\f$ denote the lower and
 		upper bounds for the flow values on the arcs, for which
 		\f$lower(uv) \leq upper(uv)\f$ must hold for all \f$uv\in A\f$,
 		\f$cost: A\rightarrow\mathbf{R}\f$ denotes the cost per unit flow
 		on the arcs and \f$sup: V\rightarrow\mathbf{R}\f$ denotes the
 		signed supply values of the nodes.
 		If \f$sup(u)>0\f$, then \f$u\f$ is a supply node with \f$sup(u)\f$
 		supply, if \f$sup(u)<0\f$, then \f$u\f$ is a demand node with
 		\f$-sup(u)\f$ demand.
 		A minimum cost flow is an \f$f: A\rightarrow\mathbf{R}\f$ solution
 		of the following optimization problem.
 		\f[ \min\sum_{uv\in A} f(uv) \cdot cost(uv) \f]
 		\f[ \sum_{uv\in A} f(uv) - \sum_{vu\in A} f(vu) \geq
 		    sup(u) \quad \forall u\in V \f]
 		\f[ lower(uv) \leq f(uv) \leq upper(uv) \quad \forall uv\in A \f]
 		The sum of the supply values, i.e. \f$\sum_{u\in V} sup(u)\f$ must be
 		zero or negative in order to have a feasible solution (since the sum
 		of the expressions on the left-hand side of the inequalities is zero).
 		It means that the total demand must be greater or equal to the total
 		supply and all the supplies have to be carried out from the supply nodes,
 		but there could be demands that are not satisfied.
 		If \f$\sum_{u\in V} sup(u)\f$ is zero, then all the supply/demand
 		constraints have to be satisfied with equality, i.e. all demands
 		have to be satisfied and all supplies have to be used.
 		\section mcf_algs Algorithms
 		LEMON contains several algorithms for solving this problem, for more
 		information see \ref min_cost_flow_algs "Minimum Cost Flow Algorithms".
 		A feasible solution for this problem can be found using \ref Circulation.
 		\section mcf_dual Dual Solution
 		The dual solution of the minimum cost flow problem is represented by
 		node potentials \f$\pi: V\rightarrow\mathbf{R}\f$.
 		An \f$f: A\rightarrow\mathbf{R}\f$ primal feasible solution is optimal
 		if and only if for some \f$\pi: V\rightarrow\mathbf{R}\f$ node potentials
 		the following \e complementary \e slackness optimality conditions hold.
 		 - For all \f$uv\in A\f$ arcs:
 		   - if \f$cost^\pi(uv)>0\f$, then \f$f(uv)=lower(uv)\f$;
 		   - if \f$lower(uv)<f(uv)<upper(uv)\f$, then \f$cost^\pi(uv)=0\f$;
 		   - if \f$cost^\pi(uv)<0\f$, then \f$f(uv)=upper(uv)\f$.
 		 - For all \f$u\in V\f$ nodes:
 		   - \f$\pi(u)<=0\f$;
 		   - if \f$\sum_{uv\in A} f(uv) - \sum_{vu\in A} f(vu) \neq sup(u)\f$,
 		     then \f$\pi(u)=0\f$.
 		Here \f$cost^\pi(uv)\f$ denotes the \e reduced \e cost of the arc
 		\f$uv\in A\f$ with respect to the potential function \f$\pi\f$, i.e.
 		\f[ cost^\pi(uv) = cost(uv) + \pi(u) - \pi(v).\f]
 		All algorithms provide dual solution (node potentials), as well,
 		if an optimal flow is found.
 		\section mcf_eq Equality Form
 		The above \ref mcf_def "definition" is actually more general than the
 		usual formulation of the minimum cost flow problem, in which strict
 		equalities are required in the supply/demand contraints.
 		\f[ \min\sum_{uv\in A} f(uv) \cdot cost(uv) \f]
 		\f[ \sum_{uv\in A} f(uv) - \sum_{vu\in A} f(vu) =
 		    sup(u) \quad \forall u\in V \f]
 		\f[ lower(uv) \leq f(uv) \leq upper(uv) \quad \forall uv\in A \f]
 		However if the sum of the supply values is zero, then these two problems
 		are equivalent.
 		The \ref min_cost_flow_algs "algorithms" in LEMON support the general
 		form, so if you need the equality form, you have to ensure this additional
 		contraint manually.
 		\section mcf_leq Opposite Inequalites (LEQ Form)
 		Another possible definition of the minimum cost flow problem is
 		when there are <em>"less or equal"</em> (LEQ) supply/demand constraints,
 		instead of the <em>"greater or equal"</em> (GEQ) constraints.
 		\f[ \min\sum_{uv\in A} f(uv) \cdot cost(uv) \f]
 		\f[ \sum_{uv\in A} f(uv) - \sum_{vu\in A} f(vu) \leq
 		    sup(u) \quad \forall u\in V \f]
 		\f[ lower(uv) \leq f(uv) \leq upper(uv) \quad \forall uv\in A \f]
 		It means that the total demand must be less or equal to the
 		total supply (i.e. \f$\sum_{u\in V} sup(u)\f$ must be zero or
 		positive) and all the demands have to be satisfied, but there
 		could be supplies that are not carried out from the supply
 		nodes.
 		The equality form is also a special case of this form, of course.
 		You could easily transform this case to the \ref mcf_def "GEQ form"
 		of the problem by reversing the direction of the arcs and taking the
 		negative of the supply values (e.g. using \ref ReverseDigraph and
 		\ref NegMap adaptors).
 		However \ref NetworkSimplex algorithm also supports this form directly
 		for the sake of convenience.
 		Note that the optimality conditions for this supply constraint type are
 		slightly differ from the conditions that are discussed for the GEQ form,
 		namely the potentials have to be non-negative instead of non-positive.
 		An \f$f: A\rightarrow\mathbf{R}\f$ feasible solution of this problem
 		is optimal if and only if for some \f$\pi: V\rightarrow\mathbf{R}\f$
 		node potentials the following conditions hold.
 		 - For all \f$uv\in A\f$ arcs:
 		   - if \f$cost^\pi(uv)>0\f$, then \f$f(uv)=lower(uv)\f$;
 		   - if \f$lower(uv)<f(uv)<upper(uv)\f$, then \f$cost^\pi(uv)=0\f$;
 		   - if \f$cost^\pi(uv)<0\f$, then \f$f(uv)=upper(uv)\f$.
 		 - For all \f$u\in V\f$ nodes:
 		   - \f$\pi(u)>=0\f$;
 		   - if \f$\sum_{uv\in A} f(uv) - \sum_{vu\in A} f(vu) \neq sup(u)\f$,
 		     then \f$\pi(u)=0\f$.
 		*/
+		}

doc/references.bib

Show inline comments

 		%%%%% Defining LEMON %%%%%
 		@misc{lemon,
 		  key =          {LEMON},
 		  title =        {{LEMON} -- {L}ibrary for {E}fficient {M}odeling and
 		                  {O}ptimization in {N}etworks},
 		  howpublished = {\url{http://lemon.cs.elte.hu/}},
 		  year =         2009
+		}
 		@misc{egres,
 		  key =          {EGRES},
 		  title =        {{EGRES} -- {E}gerv{\'a}ry {R}esearch {G}roup on
 		                  {C}ombinatorial {O}ptimization},
 		  url =          {http://www.cs.elte.hu/egres/}
+		}
 		@misc{coinor,
 		  key =          {COIN-OR},
 		  title =        {{COIN-OR} -- {C}omputational {I}nfrastructure for
 		                  {O}perations {R}esearch},
 		  url =          {http://www.coin-or.org/}
+		}
 		%%%%% Other libraries %%%%%%
 		@misc{boost,
 		  key =          {Boost},
 		  title =        {{B}oost {C++} {L}ibraries},
 		  url =          {http://www.boost.org/}
+		}
 		@book{bglbook,
 		  author =       {Jeremy G. Siek and Lee-Quan Lee and Andrew
 		                  Lumsdaine},
 		  title =        {The Boost Graph Library: User Guide and Reference
 		                  Manual},
 		  publisher =    {Addison-Wesley},
 		  year =         2002
+		}
 		@misc{leda,
 		  key =          {LEDA},
 		  title =        {{LEDA} -- {L}ibrary of {E}fficient {D}ata {T}ypes and
 		                  {A}lgorithms},
 		  url =          {http://www.algorithmic-solutions.com/}
+		}
 		@book{ledabook,
 		  author =       {Kurt Mehlhorn and Stefan N{\"a}her},
 		  title =        {{LEDA}: {A} platform for combinatorial and geometric
 		                  computing},
 		  isbn =         {0-521-56329-1},
 		  publisher =    {Cambridge University Press},
 		  address =      {New York, NY, USA},
 		  year =         1999
+		}
 		%%%%% Tools that LEMON depends on %%%%%
 		@misc{cmake,
 		  key =          {CMake},
 		  title =        {{CMake} -- {C}ross {P}latform {M}ake},
 		  url =          {http://www.cmake.org/}
+		}
 		@misc{doxygen,
 		  key =          {Doxygen},
 		  title =        {{Doxygen} -- {S}ource code documentation generator
 		                  tool},
 		  url =          {http://www.doxygen.org/}
+		}
 		%%%%% LP/MIP libraries %%%%%
 		@misc{glpk,
 		  key =          {GLPK},
 		  title =        {{GLPK} -- {GNU} {L}inear {P}rogramming {K}it},
 		  url =          {http://www.gnu.org/software/glpk/}
+		}
 		@misc{clp,
 		  key =          {Clp},
 		  title =        {{Clp} -- {Coin-Or} {L}inear {P}rogramming},
 		  url =          {http://projects.coin-or.org/Clp/}
+		}
 		@misc{cbc,
 		  key =          {Cbc},
 		  title =        {{Cbc} -- {Coin-Or} {B}ranch and {C}ut},
 		  url =          {http://projects.coin-or.org/Cbc/}
+		}
 		@misc{cplex,
 		  key =          {CPLEX},
 		  title =        {{ILOG} {CPLEX}},
 		  url =          {http://www.ilog.com/}
+		}
 		@misc{soplex,
 		  key =          {SoPlex},
 		  title =        {{SoPlex} -- {T}he {S}equential {O}bject-{O}riented
 		                  {S}implex},
 		  url =          {http://soplex.zib.de/}
+		}
 		%%%%% General books %%%%%
 		@book{amo93networkflows,
 		  author =       {Ravindra K. Ahuja and Thomas L. Magnanti and James
 		                  B. Orlin},
 		  title =        {Network Flows: Theory, Algorithms, and Applications},
 		  publisher =    {Prentice-Hall, Inc.},
 		  year =         1993,
 		  month =        feb,
 		  isbn =         {978-0136175490}
+		}
 		@book{schrijver03combinatorial,
 		  author =       {Alexander Schrijver},
 		  title =        {Combinatorial Optimization: Polyhedra and Efficiency},
 		  publisher =    {Springer-Verlag},
 		  year =         2003,
 		  isbn =         {978-3540443896}
+		}
 		@book{clrs01algorithms,
 		  author =       {Thomas H. Cormen and Charles E. Leiserson and Ronald
 		                  L. Rivest and Clifford Stein},
 		  title =        {Introduction to Algorithms},
 		  publisher =    {The MIT Press},
 		  year =         2001,
 		  edition =      {2nd}
+		}
 		@book{stroustrup00cpp,
 		  author =       {Bjarne Stroustrup},
 		  title =        {The C++ Programming Language},
 		  edition =      {3rd},
 		  publisher =    {Addison-Wesley Professional},
 		  isbn =         0201700735,
 		  month =        {February},
 		  year =         2000
+		}
 		%%%%% 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,
 		  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}
+		}
 		@article{dinic70algorithm,
 		  author =       {E. A. Dinic},
 		  title =        {Algorithm for solution of a problem of maximum flow
 		                  in a network with power estimation},
 		  journal =      {Soviet Math. Doklady},
 		  year =         1970,
 		  volume =       11,
 		  pages =        {1277-1280}
+		}
 		@article{goldberg08partial,
 		  author =       {Andrew V. Goldberg},
 		  title =        {The Partial Augment-Relabel Algorithm for the
 		                  Maximum Flow Problem},
 		  journal =      {16th Annual European Symposium on Algorithms},
 		  year =         2008,
 		  pages =        {466-477}
+		}
 		@article{sleator83dynamic,
 		  author =       {Daniel D. Sleator and Robert E. Tarjan},
 		  title =        {A data structure for dynamic trees},
 		  journal =      {Journal of Computer and System Sciences},
 		  year =         1983,
 		  volume =       26,
 		  number =       3,
 		  pages =        {362-391}
+		}
 		%%%%% Minimum mean cycle algorithms %%%%%
 		@article{karp78characterization,
 		  author =       {Richard M. Karp},
 		  title =        {A characterization of the minimum cycle mean in a
 		                  digraph},
 		  journal =      {Discrete Math.},
 		  year =         1978,
 		  volume =       23,
 		  pages =        {309-311}
+		}
 		@article{dasdan98minmeancycle,
 		  author =       {Ali Dasdan and Rajesh K. Gupta},
 		  title =        {Faster Maximum and Minimum Mean Cycle Alogrithms for
 		                  System Performance Analysis},
 		  journal =      {IEEE Transactions on Computer-Aided Design of
 		                  Integrated Circuits and Systems},
 		  year =         1998,
 		  volume =       17,
 		  number =       10,
 		  pages =        {889-899}
+		}
 		%%%%% Minimum cost flow algorithms %%%%%
 		@article{klein67primal,
 		  author =       {Morton Klein},
 		  title =        {A primal method for minimal cost flows with
 		                  applications to the assignment and transportation
 		                  problems},
 		  journal =      {Management Science},
 		  year =         1967,
 		  volume =       14,
 		  pages =        {205-220}
+		}
 		@article{goldberg89cyclecanceling,
 		  author =       {Andrew V. Goldberg and Robert E. Tarjan},
 		  title =        {Finding minimum-cost circulations by canceling
 		                  negative cycles},
 		  journal =      {Journal of the ACM},
 		  year =         1989,
 		  volume =       36,
 		  number =       4,
 		  pages =        {873-886}
+		}
 		@article{goldberg90approximation,
 		  author =       {Andrew V. Goldberg and Robert E. Tarjan},
 		  title =        {Finding Minimum-Cost Circulations by Successive
 		                  Approximation},
 		  journal =      {Mathematics of Operations Research},
 		  year =         1990,
 		  volume =       15,
 		  number =       3,
 		  pages =        {430-466}
+		}
 		@article{goldberg97efficient,
 		  author =       {Andrew V. Goldberg},
 		  title =        {An Efficient Implementation of a Scaling
 		                  Minimum-Cost Flow Algorithm},
 		  journal =      {Journal of Algorithms},
 		  year =         1997,
 		  volume =       22,
 		  number =       1,
 		  pages =        {1-29}
+		}
 		@article{bunnagel98efficient,
 		  author =       {Ursula B{\"u}nnagel and Bernhard Korte and Jens
 		                  Vygen},
 		  title =        {Efficient implementation of the {G}oldberg-{T}arjan
 		                  minimum-cost flow algorithm},
 		  journal =      {Optimization Methods and Software},
 		  year =         1998,
 		  volume =       10,
 		  pages =        {157-174}
+		}
 		@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},
 		  title =        {The Minimum Cost Flow Problem and The Network
 		                  Simplex Method},
 		  school =       {University College},
 		  address =      {Dublin, Ireland},
 		  year =         1991,
 		  month =        sep,
+		}

lemon/bellman_ford.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_BELLMAN_FORD_H
 		#define LEMON_BELLMAN_FORD_H
 		/// \ingroup shortest_path
 		/// \file
 		/// \brief Bellman-Ford algorithm.
 		#include <lemon/list_graph.h>
 		#include <lemon/bits/path_dump.h>
 		#include <lemon/core.h>
 		#include <lemon/error.h>
 		#include <lemon/maps.h>
 		#include <lemon/path.h>
 		#include <limits>
 		namespace lemon {
 		  /// \brief Default OperationTraits for the BellmanFord algorithm class.
 		  ///
 		  /// This operation traits class defines all computational operations
 		  /// and constants that are used in the Bellman-Ford algorithm.
 		  /// The default implementation is based on the \c numeric_limits class.
 		  /// If the numeric type does not have infinity value, then the maximum
 		  /// value is used as extremal infinity value.
 		  template <
 		    typename V,
 		    bool has_inf = std::numeric_limits<V>::has_infinity>
 		  struct BellmanFordDefaultOperationTraits {
 		    /// \e
 		    typedef V Value;
 		    /// \brief Gives back the zero value of the type.
 		    static Value zero() {
 		      return static_cast<Value>(0);
+		    }
 		    /// \brief Gives back the positive infinity value of the type.
 		    static Value infinity() {
 		      return std::numeric_limits<Value>::infinity();
+		    }
 		    /// \brief Gives back the sum of the given two elements.
 		    static Value plus(const Value& left, const Value& right) {
 		      return left + right;
+		    }
 		    /// \brief Gives back \c true only if the first value is less than
 		    /// the second.
 		    static bool less(const Value& left, const Value& right) {
 		      return left < right;
+		    }
 		  };
 		  template <typename V>
 		  struct BellmanFordDefaultOperationTraits<V, false> {
 		    typedef V Value;
 		    static Value zero() {
 		      return static_cast<Value>(0);
+		    }
 		    static Value infinity() {
 		      return std::numeric_limits<Value>::max();
+		    }
 		    static Value plus(const Value& left, const Value& right) {
 		      if (left == infinity() || right == infinity()) return infinity();
 		      return left + right;
+		    }
 		    static bool less(const Value& left, const Value& right) {
 		      return left < right;
+		    }
 		  };
 		  /// \brief Default traits class of BellmanFord class.
 		  ///
 		  /// Default traits class of BellmanFord class.
 		  /// \param GR The type of the digraph.
 		  /// \param LEN The type of the length map.
 		  template<typename GR, typename LEN>
 		  struct BellmanFordDefaultTraits {
 		    /// The type of the digraph the algorithm runs on.
 		    typedef GR Digraph;
 		    /// \brief The type of the map that stores the arc lengths.
 		    ///
 		    /// The type of the map that stores the arc lengths.
 		    /// It must conform to the \ref concepts::ReadMap "ReadMap" concept.
 		    typedef LEN LengthMap;
 		    /// The type of the arc lengths.
 		    typedef typename LEN::Value Value;
 		    /// \brief Operation traits for Bellman-Ford algorithm.
 		    ///
 		    /// It defines the used operations and the infinity value for the
 		    /// given \c Value type.
 		    /// \see BellmanFordDefaultOperationTraits
 		    typedef BellmanFordDefaultOperationTraits<Value> OperationTraits;
 		    /// \brief The type of the map that stores the last arcs of the
 		    /// shortest paths.
 		    ///
 		    /// The type of the map that stores the last
 		    /// arcs of the shortest paths.
 		    /// It must conform to the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename GR::template NodeMap<typename GR::Arc> PredMap;
 		    /// \brief Instantiates a \c PredMap.
 		    ///
 		    /// This function instantiates a \ref PredMap.
 		    /// \param g is the digraph to which we would like to define the
 		    /// \ref PredMap.
 		    static PredMap *createPredMap(const GR& g) {
 		      return new PredMap(g);
+		    }
 		    /// \brief The type of the map that stores the distances of the nodes.
 		    ///
 		    /// The type of the map that stores the distances of the nodes.
 		    /// It must conform to the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename GR::template NodeMap<typename LEN::Value> DistMap;
 		    /// \brief Instantiates a \c DistMap.
 		    ///
 		    /// This function instantiates a \ref DistMap.
 		    /// \param g is the digraph to which we would like to define the
 		    /// \ref DistMap.
 		    static DistMap *createDistMap(const GR& g) {
 		      return new DistMap(g);
+		    }
 		  };
 		  /// \brief %BellmanFord algorithm class.
 		  ///
 		  /// \ingroup shortest_path
 		  /// This class provides an efficient implementation of the Bellman-Ford
 		  /// algorithm. The maximum time complexity of the algorithm is
 		  /// <tt>O(ne)</tt>.
 		  ///
 		  /// The Bellman-Ford algorithm solves the single-source shortest path
 		  /// problem when the arcs can have negative lengths, but the digraph
 		  /// should not contain directed cycles with negative total length.
 		  /// If all arc costs are non-negative, consider to use the Dijkstra
 		  /// algorithm instead, since it is more efficient.
 		  ///
 		  /// The arc lengths are passed to the algorithm using a
 		  /// \ref concepts::ReadMap "ReadMap", so it is easy to change it to any
 		  /// kind of length. The type of the length values is determined by the
 		  /// \ref concepts::ReadMap::Value "Value" type of the length map.
 		  ///
 		  /// There is also a \ref bellmanFord() "function-type interface" for the
 		  /// Bellman-Ford algorithm, which is convenient in the simplier cases and
 		  /// it can be used easier.
 		  ///
 		  /// \tparam GR The type of the digraph the algorithm runs on.
 		  /// The default type is \ref ListDigraph.
 		  /// \tparam LEN A \ref concepts::ReadMap "readable" arc map that specifies
 		  /// the lengths of the arcs. The default map type is
 		  /// \ref concepts::Digraph::ArcMap "GR::ArcMap<int>".
 		#ifdef DOXYGEN
 		  template <typename GR, typename LEN, typename TR>
 		#else
 		  template <typename GR=ListDigraph,
 		            typename LEN=typename GR::template ArcMap<int>,
 		            typename TR=BellmanFordDefaultTraits<GR,LEN> >
 		#endif
 		  class BellmanFord {
 		  public:
 		    ///The type of the underlying digraph.
 		    typedef typename TR::Digraph Digraph;
 		    /// \brief The type of the arc lengths.
 		    typedef typename TR::LengthMap::Value Value;
 		    /// \brief The type of the map that stores the arc lengths.
 		    typedef typename TR::LengthMap LengthMap;
 		    /// \brief The type of the map that stores the last
 		    /// arcs of the shortest paths.
 		    typedef typename TR::PredMap PredMap;
 		    /// \brief The type of the map that stores the distances of the nodes.
 		    typedef typename TR::DistMap DistMap;
 		    /// The type of the paths.
 		    typedef PredMapPath<Digraph, PredMap> Path;
 		    ///\brief The \ref BellmanFordDefaultOperationTraits
 		    /// "operation traits class" of the algorithm.
 		    typedef typename TR::OperationTraits OperationTraits;
 		    ///The \ref BellmanFordDefaultTraits "traits class" of the algorithm.
 		    typedef TR Traits;
 		  private:
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::NodeIt NodeIt;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::OutArcIt OutArcIt;
 		    // Pointer to the underlying digraph.
 		    const Digraph *_gr;
 		    // Pointer to the length map
 		    const LengthMap *_length;
 		    // Pointer to the map of predecessors arcs.
 		    PredMap *_pred;
 		    // Indicates if _pred is locally allocated (true) or not.
 		    bool _local_pred;
 		    // Pointer to the map of distances.
 		    DistMap *_dist;
 		    // Indicates if _dist is locally allocated (true) or not.
 		    bool _local_dist;
 		    typedef typename Digraph::template NodeMap<bool> MaskMap;
 		    MaskMap *_mask;
 		    std::vector<Node> _process;
 		    // Creates the maps if necessary.
 		    void create_maps() {
 		      if(!_pred) {
 			_local_pred = true;
 			_pred = Traits::createPredMap(*_gr);
+		      }
 		      if(!_dist) {
 			_local_dist = true;
 			_dist = Traits::createDistMap(*_gr);
+		      }
 		      _mask = new MaskMap(*_gr, false);
+		    }
 		  public :
 		    typedef BellmanFord Create;
 		    /// \name Named Template Parameters
 		    ///@{
 		    template <class T>
 		    struct SetPredMapTraits : public Traits {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph&) {
 		        LEMON_ASSERT(false, "PredMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// \c PredMap type.
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting
 		    /// \c PredMap type.
 		    /// It must conform to the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetPredMap
 		      : public BellmanFord< Digraph, LengthMap, SetPredMapTraits<T> > {
 		      typedef BellmanFord< Digraph, LengthMap, SetPredMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct SetDistMapTraits : public Traits {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph&) {
 		        LEMON_ASSERT(false, "DistMap is not initialized");
 		        return 0; // ignore warnings
+		      }
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// \c DistMap type.
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting
 		    /// \c DistMap type.
 		    /// It must conform to the \ref concepts::WriteMap "WriteMap" concept.
 		    template <class T>
 		    struct SetDistMap
 		      : public BellmanFord< Digraph, LengthMap, SetDistMapTraits<T> > {
 		      typedef BellmanFord< Digraph, LengthMap, SetDistMapTraits<T> > Create;
 		    };
 		    template <class T>
 		    struct SetOperationTraitsTraits : public Traits {
 		      typedef T OperationTraits;
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// \c OperationTraits type.
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting
 		    /// \c OperationTraits type.
 		    /// For more information see \ref BellmanFordDefaultOperationTraits.
 		    template <class T>
 		    struct SetOperationTraits
 		      : public BellmanFord< Digraph, LengthMap, SetOperationTraitsTraits<T> > {
 		      typedef BellmanFord< Digraph, LengthMap, SetOperationTraitsTraits<T> >
 		      Create;
 		    };
 		    ///@}
 		  protected:
 		    BellmanFord() {}
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor.
 		    /// \param g The digraph the algorithm runs on.
 		    /// \param length The length map used by the algorithm.
 		    BellmanFord(const Digraph& g, const LengthMap& length) :
 		      _gr(&g), _length(&length),
 		      _pred(0), _local_pred(false),
 		      _dist(0), _local_dist(false), _mask(0) {}
 		    ///Destructor.
 		    ~BellmanFord() {
 		      if(_local_pred) delete _pred;
 		      if(_local_dist) delete _dist;
 		      if(_mask) delete _mask;
+		    }
 		    /// \brief Sets the length map.
 		    ///
 		    /// Sets the length map.
 		    /// \return <tt>(*this)</tt>
 		    BellmanFord &lengthMap(const LengthMap &map) {
 		      _length = &map;
 		      return *this;
+		    }
 		    /// \brief Sets the map that stores the predecessor arcs.
 		    ///
 		    /// Sets the map that stores the predecessor arcs.
 		    /// If you don't use this function before calling \ref run()
 		    /// or \ref init(), an instance will be allocated automatically.
 		    /// The destructor deallocates this automatically allocated map,
 		    /// of course.
 		    /// \return <tt>(*this)</tt>
 		    BellmanFord &predMap(PredMap &map) {
 		      if(_local_pred) {
 			delete _pred;
 			_local_pred=false;
+		      }
 		      _pred = &map;
 		      return *this;
+		    }
 		    /// \brief Sets the map that stores the distances of the nodes.
 		    ///
 		    /// Sets the map that stores the distances of the nodes calculated
 		    /// by the algorithm.
 		    /// If you don't use this function before calling \ref run()
 		    /// or \ref init(), an instance will be allocated automatically.
 		    /// The destructor deallocates this automatically allocated map,
 		    /// of course.
 		    /// \return <tt>(*this)</tt>
 		    BellmanFord &distMap(DistMap &map) {
 		      if(_local_dist) {
 			delete _dist;
 			_local_dist=false;
+		      }
 		      _dist = &map;
 		      return *this;
+		    }
 		    /// \name Execution Control
 		    /// The simplest way to execute the Bellman-Ford algorithm is to use
 		    /// one of the member functions called \ref run().\n
 		    /// If you need better control on the execution, you have to call
 		    /// \ref init() first, then you can add several source nodes
 		    /// with \ref addSource(). Finally the actual path computation can be
 		    /// performed with \ref start(), \ref checkedStart() or
 		    /// \ref limitedStart().
 		    ///@{
 		    /// \brief Initializes the internal data structures.
 		    ///
 		    /// Initializes the internal data structures. The optional parameter
 		    /// is the initial distance of each node.
 		    void init(const Value value = OperationTraits::infinity()) {
 		      create_maps();
 		      for (NodeIt it(*_gr); it != INVALID; ++it) {
 			_pred->set(it, INVALID);
 			_dist->set(it, value);
+		      }
 		      _process.clear();
 		      if (OperationTraits::less(value, OperationTraits::infinity())) {
 			for (NodeIt it(*_gr); it != INVALID; ++it) {
 			  _process.push_back(it);
 			  _mask->set(it, true);
+			}
+		      }
+		    }
 		    /// \brief Adds a new source node.
 		    ///
 		    /// This function adds a new source node. The optional second parameter
 		    /// is the initial distance of the node.
 		    void addSource(Node source, Value dst = OperationTraits::zero()) {
 		      _dist->set(source, dst);
 		      if (!(*_mask)[source]) {
 			_process.push_back(source);
 			_mask->set(source, true);
+		      }
+		    }
 		    /// \brief Executes one round from the Bellman-Ford algorithm.
 		    ///
 		    /// If the algoritm calculated the distances in the previous round
 		    /// exactly for the paths of at most \c k arcs, then this function
 		    /// will calculate the distances exactly for the paths of at most
 		    /// <tt>k+1</tt> arcs. Performing \c k iterations using this function
 		    /// calculates the shortest path distances exactly for the paths
 		    /// consisting of at most \c k arcs.
 		    ///
 		    /// \warning The paths with limited arc number cannot be retrieved
 		    /// easily with \ref path() or \ref predArc() functions. If you also
 		    /// need the shortest paths and not only the distances, you should
 		    /// store the \ref predMap() "predecessor map" after each iteration
 		    /// and build the path manually.
 		    ///
 		    /// \return \c true when the algorithm have not found more shorter
 		    /// paths.
 		    ///
 		    /// \see ActiveIt
 		    bool processNextRound() {
 		      for (int i = 0; i < int(_process.size()); ++i) {
 			_mask->set(_process[i], false);
+		      }
 		      std::vector<Node> nextProcess;
 		      std::vector<Value> values(_process.size());
 		      for (int i = 0; i < int(_process.size()); ++i) {
 			values[i] = (*_dist)[_process[i]];
+		      }
 		      for (int i = 0; i < int(_process.size()); ++i) {
 			for (OutArcIt it(*_gr, _process[i]); it != INVALID; ++it) {
 			  Node target = _gr->target(it);
 			  Value relaxed = OperationTraits::plus(values[i], (*_length)[it]);
 			  if (OperationTraits::less(relaxed, (*_dist)[target])) {
 			    _pred->set(target, it);
 			    _dist->set(target, relaxed);
 			    if (!(*_mask)[target]) {
 			      _mask->set(target, true);
 			      nextProcess.push_back(target);
+			    }
+			  }
+			}
+		      }
 		      _process.swap(nextProcess);
 		      return _process.empty();
+		    }
 		    /// \brief Executes one weak round from the Bellman-Ford algorithm.
 		    ///
 		    /// If the algorithm calculated the distances in the previous round
 		    /// at least for the paths of at most \c k arcs, then this function
 		    /// will calculate the distances at least for the paths of at most
 		    /// <tt>k+1</tt> arcs.
 		    /// This function does not make it possible to calculate the shortest
 		    /// path distances exactly for paths consisting of at most \c k arcs,
 		    /// this is why it is called weak round.
 		    ///
 		    /// \return \c true when the algorithm have not found more shorter
 		    /// paths.
 		    ///
 		    /// \see ActiveIt
 		    bool processNextWeakRound() {
 		      for (int i = 0; i < int(_process.size()); ++i) {
 			_mask->set(_process[i], false);
+		      }
 		      std::vector<Node> nextProcess;
 		      for (int i = 0; i < int(_process.size()); ++i) {
 			for (OutArcIt it(*_gr, _process[i]); it != INVALID; ++it) {
 			  Node target = _gr->target(it);
 			  Value relaxed =
 			    OperationTraits::plus((*_dist)[_process[i]], (*_length)[it]);
 			  if (OperationTraits::less(relaxed, (*_dist)[target])) {
 			    _pred->set(target, it);
 			    _dist->set(target, relaxed);
 			    if (!(*_mask)[target]) {
 			      _mask->set(target, true);
 			      nextProcess.push_back(target);
+			    }
+			  }
+			}
+		      }
 		      _process.swap(nextProcess);
 		      return _process.empty();
+		    }
 		    /// \brief Executes the algorithm.
 		    ///
 		    /// Executes the algorithm.
 		    ///
 		    /// This method runs the Bellman-Ford algorithm from the root node(s)
 		    /// in order to compute the shortest path to each node.
 		    ///
 		    /// The algorithm computes
 		    /// - the shortest path tree (forest),
 		    /// - the distance of each node from the root(s).
 		    ///
 		    /// \pre init() must be called and at least one root node should be
 		    /// added with addSource() before using this function.
 		    void start() {
 		      int num = countNodes(*_gr) - 1;
 		      for (int i = 0; i < num; ++i) {
 			if (processNextWeakRound()) break;
+		      }
+		    }
 		    /// \brief Executes the algorithm and checks the negative cycles.
 		    ///
 		    /// Executes the algorithm and checks the negative cycles.
 		    ///
 		    /// This method runs the Bellman-Ford algorithm from the root node(s)
 		    /// in order to compute the shortest path to each node and also checks
 		    /// if the digraph contains cycles with negative total length.
 		    ///
 		    /// The algorithm computes
 		    /// - the shortest path tree (forest),
 		    /// - the distance of each node from the root(s).
 		    ///
 		    /// \return \c false if there is a negative cycle in the digraph.
 		    ///
 		    /// \pre init() must be called and at least one root node should be
 		    /// added with addSource() before using this function.
 		    bool checkedStart() {
 		      int num = countNodes(*_gr);
 		      for (int i = 0; i < num; ++i) {
 			if (processNextWeakRound()) return true;
+		      }
 		      return _process.empty();
+		    }
 		    /// \brief Executes the algorithm with arc number limit.
 		    ///
 		    /// Executes the algorithm with arc number limit.
 		    ///
 		    /// This method runs the Bellman-Ford algorithm from the root node(s)
 		    /// in order to compute the shortest path distance for each node
 		    /// using only the paths consisting of at most \c num arcs.
 		    ///
 		    /// The algorithm computes
 		    /// - the limited distance of each node from the root(s),
 		    /// - the predecessor arc for each node.
 		    ///
 		    /// \warning The paths with limited arc number cannot be retrieved
 		    /// easily with \ref path() or \ref predArc() functions. If you also
 		    /// need the shortest paths and not only the distances, you should
 		    /// store the \ref predMap() "predecessor map" after each iteration
 		    /// and build the path manually.
 		    ///
 		    /// \pre init() must be called and at least one root node should be
 		    /// added with addSource() before using this function.
 		    void limitedStart(int num) {
 		      for (int i = 0; i < num; ++i) {
 			if (processNextRound()) break;
+		      }
+		    }
 		    /// \brief Runs the algorithm from the given root node.
 		    ///
 		    /// This method runs the Bellman-Ford algorithm from the given root
 		    /// node \c s in order to compute the shortest path to each node.
 		    ///
 		    /// The algorithm computes
 		    /// - the shortest path tree (forest),
 		    /// - the distance of each node from the root(s).
 		    ///
 		    /// \note bf.run(s) is just a shortcut of the following code.
 		    /// \code
 		    ///   bf.init();
 		    ///   bf.addSource(s);
 		    ///   bf.start();
 		    /// \endcode
 		    void run(Node s) {
 		      init();
 		      addSource(s);
 		      start();
+		    }
 		    /// \brief Runs the algorithm from the given root node with arc
 		    /// number limit.
 		    ///
 		    /// This method runs the Bellman-Ford algorithm from the given root
 		    /// node \c s in order to compute the shortest path distance for each
 		    /// node using only the paths consisting of at most \c num arcs.
 		    ///
 		    /// The algorithm computes
 		    /// - the limited distance of each node from the root(s),
 		    /// - the predecessor arc for each node.
 		    ///
 		    /// \warning The paths with limited arc number cannot be retrieved
 		    /// easily with \ref path() or \ref predArc() functions. If you also
 		    /// need the shortest paths and not only the distances, you should
 		    /// store the \ref predMap() "predecessor map" after each iteration
 		    /// and build the path manually.
 		    ///
 		    /// \note bf.run(s, num) is just a shortcut of the following code.
 		    /// \code
 		    ///   bf.init();
 		    ///   bf.addSource(s);
 		    ///   bf.limitedStart(num);
 		    /// \endcode
 		    void run(Node s, int num) {
 		      init();
 		      addSource(s);
 		      limitedStart(num);
+		    }
 		    ///@}
 		    /// \brief LEMON iterator for getting the active nodes.
 		    ///
 		    /// This class provides a common style LEMON iterator that traverses
 		    /// the active nodes of the Bellman-Ford algorithm after the last
 		    /// phase. These nodes should be checked in the next phase to
 		    /// find augmenting arcs outgoing from them.
 		    class ActiveIt {
 		    public:
 		      /// \brief Constructor.
 		      ///
 		      /// Constructor for getting the active nodes of the given BellmanFord
 		      /// instance.
 		      ActiveIt(const BellmanFord& algorithm) : _algorithm(&algorithm)
+		      {
 		        _index = _algorithm->_process.size() - 1;
+		      }
 		      /// \brief Invalid constructor.
 		      ///
 		      /// Invalid constructor.
 		      ActiveIt(Invalid) : _algorithm(0), _index(-1) {}
 		      /// \brief Conversion to \c Node.
 		      ///
 		      /// Conversion to \c Node.
 		      operator Node() const {
 		        return _index >= 0 ? _algorithm->_process[_index] : INVALID;
+		      }
 		      /// \brief Increment operator.
 		      ///
 		      /// Increment operator.
 		      ActiveIt& operator++() {
 		        --_index;
 		        return *this;
+		      }
 		      bool operator==(const ActiveIt& it) const {
 		        return static_cast<Node>(*this) == static_cast<Node>(it);
+		      }
 		      bool operator!=(const ActiveIt& it) const {
 		        return static_cast<Node>(*this) != static_cast<Node>(it);
+		      }
 		      bool operator<(const ActiveIt& it) const {
 		        return static_cast<Node>(*this) < static_cast<Node>(it);
+		      }
 		    private:
 		      const BellmanFord* _algorithm;
 		      int _index;
 		    };
 		    /// \name Query Functions
 		    /// The result of the Bellman-Ford algorithm can be obtained using these
 		    /// functions.\n
 		    /// Either \ref run() or \ref init() should be called before using them.
 		    ///@{
 		    /// \brief The shortest path to the given node.
 		    ///
 		    /// Gives back the shortest path to the given node from the root(s).
 		    ///
 		    /// \warning \c t should be reached from the root(s).
 		    ///
 		    /// \pre Either \ref run() or \ref init() must be called before
 		    /// using this function.
 		    Path path(Node t) const
+		    {
 		      return Path(*_gr, *_pred, t);
+		    }
 		    /// \brief The distance of the given node from the root(s).
 		    ///
 		    /// Returns the distance of the given node from the root(s).
 		    ///
 		    /// \warning If node \c v is not reached from the root(s), then
 		    /// the return value of this function is undefined.
 		    ///
 		    /// \pre Either \ref run() or \ref init() must be called before
 		    /// using this function.
 		    Value dist(Node v) const { return (*_dist)[v]; }
 		    /// \brief Returns the 'previous arc' of the shortest path tree for
 		    /// the given node.
 		    ///
 		    /// This function returns the 'previous arc' of the shortest path
 		    /// tree for node \c v, i.e. it returns the last arc of a
 		    /// shortest path from a root to \c v. It is \c INVALID if \c v
 		    /// is not reached from the root(s) or if \c v is a root.
 		    ///
 		    /// The shortest path tree used here is equal to the shortest path
 		    /// tree used in \ref predNode() and \predMap().
 		    ///
 		    /// \pre Either \ref run() or \ref init() must be called before
 		    /// using this function.
 		    Arc predArc(Node v) const { return (*_pred)[v]; }
 		    /// \brief Returns the 'previous node' of the shortest path tree for
 		    /// the given node.
 		    ///
 		    /// This function returns the 'previous node' of the shortest path
 		    /// tree for node \c v, i.e. it returns the last but one node of
 		    /// a shortest path from a root to \c v. It is \c INVALID if \c v
 		    /// is not reached from the root(s) or if \c v is a root.
 		    ///
 		    /// The shortest path tree used here is equal to the shortest path
 		    /// tree used in \ref predArc() and \predMap().
 		    ///
 		    /// \pre Either \ref run() or \ref init() must be called before
 		    /// using this function.
 		    Node predNode(Node v) const {
 		      return (*_pred)[v] == INVALID ? INVALID : _gr->source((*_pred)[v]);
+		    }
 		    /// \brief Returns a const reference to the node map that stores the
 		    /// distances of the nodes.
 		    ///
 		    /// Returns a const reference to the node map that stores the distances
 		    /// of the nodes calculated by the algorithm.
 		    ///
 		    /// \pre Either \ref run() or \ref init() must be called before
 		    /// using this function.
 		    const DistMap &distMap() const { return *_dist;}
 		    /// \brief Returns a const reference to the node map that stores the
 		    /// predecessor arcs.
 		    ///
 		    /// Returns a const reference to the node map that stores the predecessor
 		    /// arcs, which form the shortest path tree (forest).
 		    ///
 		    /// \pre Either \ref run() or \ref init() must be called before
 		    /// using this function.
 		    const PredMap &predMap() const { return *_pred; }
 		    /// \brief Checks if a node is reached from the root(s).
 		    ///
 		    /// Returns \c true if \c v is reached from the root(s).
 		    ///
 		    /// \pre Either \ref run() or \ref init() must be called before
 		    /// using this function.
 		    bool reached(Node v) const {
 		      return (*_dist)[v] != OperationTraits::infinity();
+		    }
 		    /// \brief Gives back a negative cycle.
 		    ///
 		    /// This function gives back a directed cycle with negative total
 		    /// length if the algorithm has already found one.
 		    /// Otherwise it gives back an empty path.
 		    lemon::Path<Digraph> negativeCycle() const {
 		      typename Digraph::template NodeMap<int> state(*_gr, -1);
 		      lemon::Path<Digraph> cycle;
 		      for (int i = 0; i < int(_process.size()); ++i) {
 		        if (state[_process[i]] != -1) continue;
 		        for (Node v = _process[i]; (*_pred)[v] != INVALID;
 		             v = _gr->source((*_pred)[v])) {
 		          if (state[v] == i) {
 		            cycle.addFront((*_pred)[v]);
 		            for (Node u = _gr->source((*_pred)[v]); u != v;
 		                 u = _gr->source((*_pred)[u])) {
 		              cycle.addFront((*_pred)[u]);
+		            }
 		            return cycle;
+		          }
 		          else if (state[v] >= 0) {
 		            break;
+		          }
 		          state[v] = i;
+		        }
+		      }
 		      return cycle;
+		    }
 		    ///@}
 		  };
 		  /// \brief Default traits class of bellmanFord() function.
 		  ///
 		  /// Default traits class of bellmanFord() function.
 		  /// \tparam GR The type of the digraph.
 		  /// \tparam LEN The type of the length map.
 		  template <typename GR, typename LEN>
 		  struct BellmanFordWizardDefaultTraits {
 		    /// The type of the digraph the algorithm runs on.
 		    typedef GR Digraph;
 		    /// \brief The type of the map that stores the arc lengths.
 		    ///
 		    /// The type of the map that stores the arc lengths.
 		    /// It must meet the \ref concepts::ReadMap "ReadMap" concept.
 		    typedef LEN LengthMap;
 		    /// The type of the arc lengths.
 		    typedef typename LEN::Value Value;
 		    /// \brief Operation traits for Bellman-Ford algorithm.
 		    ///
 		    /// It defines the used operations and the infinity value for the
 		    /// given \c Value type.
 		    /// \see BellmanFordDefaultOperationTraits
 		    typedef BellmanFordDefaultOperationTraits<Value> OperationTraits;
 		    /// \brief The type of the map that stores the last
 		    /// arcs of the shortest paths.
 		    ///
 		    /// The type of the map that stores the last arcs of the shortest paths.
 		    /// It must conform to the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename GR::template NodeMap<typename GR::Arc> PredMap;
 		    /// \brief Instantiates a \c PredMap.
 		    ///
 		    /// This function instantiates a \ref PredMap.
 		    /// \param g is the digraph to which we would like to define the
 		    /// \ref PredMap.
 		    static PredMap *createPredMap(const GR &g) {
 		      return new PredMap(g);
+		    }
 		    /// \brief The type of the map that stores the distances of the nodes.
 		    ///
 		    /// The type of the map that stores the distances of the nodes.
 		    /// It must conform to the \ref concepts::WriteMap "WriteMap" concept.
 		    typedef typename GR::template NodeMap<Value> DistMap;
 		    /// \brief Instantiates a \c DistMap.
 		    ///
 		    /// This function instantiates a \ref DistMap.
 		    /// \param g is the digraph to which we would like to define the
 		    /// \ref DistMap.
 		    static DistMap *createDistMap(const GR &g) {
 		      return new DistMap(g);
+		    }
 		    ///The type of the shortest paths.
 		    ///The type of the shortest paths.
 		    ///It must meet the \ref concepts::Path "Path" concept.
 		    typedef lemon::Path<Digraph> Path;
 		  };
 		  /// \brief Default traits class used by BellmanFordWizard.
 		  ///
 		  /// Default traits class used by BellmanFordWizard.
 		  /// \tparam GR The type of the digraph.
 		  /// \tparam LEN The type of the length map.
 		  template <typename GR, typename LEN>
 		  class BellmanFordWizardBase
 		    : public BellmanFordWizardDefaultTraits<GR, LEN> {
 		    typedef BellmanFordWizardDefaultTraits<GR, LEN> Base;
 		  protected:
 		    // Type of the nodes in the digraph.
 		    typedef typename Base::Digraph::Node Node;
 		    // Pointer to the underlying digraph.
 		    void *_graph;
 		    // Pointer to the length map
 		    void *_length;
 		    // Pointer to the map of predecessors arcs.
 		    void *_pred;
 		    // Pointer to the map of distances.
 		    void *_dist;
 		    //Pointer to the shortest path to the target node.
 		    void *_path;
 		    //Pointer to the distance of the target node.
 		    void *_di;
 		    public:
 		    /// Constructor.
 		    /// This constructor does not require parameters, it initiates
 		    /// all of the attributes to default values \c 0.
 		    BellmanFordWizardBase() :
 		      _graph(0), _length(0), _pred(0), _dist(0), _path(0), _di(0) {}
 		    /// Constructor.
 		    /// This constructor requires two parameters,
 		    /// others are initiated to \c 0.
 		    /// \param gr The digraph the algorithm runs on.
 		    /// \param len The length map.
 		    BellmanFordWizardBase(const GR& gr,
 					  const LEN& len) :
 		      _graph(reinterpret_cast<void*>(const_cast<GR*>(&gr))),
 		      _length(reinterpret_cast<void*>(const_cast<LEN*>(&len))),
 		      _pred(0), _dist(0), _path(0), _di(0) {}
 		  };
 		  /// \brief Auxiliary class for the function-type interface of the
 		  /// \ref BellmanFord "Bellman-Ford" algorithm.
 		  ///
 		  /// This auxiliary class is created to implement the
 		  /// \ref bellmanFord() "function-type interface" of the
 		  /// \ref BellmanFord "Bellman-Ford" algorithm.
 		  /// It does not have own \ref run() method, it uses the
 		  /// functions and features of the plain \ref BellmanFord.
 		  ///
 		  /// This class should only be used through the \ref bellmanFord()
 		  /// function, which makes it easier to use the algorithm.
 		  template<class TR>
 		  class BellmanFordWizard : public TR {
 		    typedef TR Base;
 		    typedef typename TR::Digraph Digraph;
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::NodeIt NodeIt;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::OutArcIt ArcIt;
 		    typedef typename TR::LengthMap LengthMap;
 		    typedef typename LengthMap::Value Value;
 		    typedef typename TR::PredMap PredMap;
 		    typedef typename TR::DistMap DistMap;
 		    typedef typename TR::Path Path;
 		  public:
 		    /// Constructor.
 		    BellmanFordWizard() : TR() {}
 		    /// \brief Constructor that requires parameters.
 		    ///
 		    /// Constructor that requires parameters.
 		    /// These parameters will be the default values for the traits class.
 		    /// \param gr The digraph the algorithm runs on.
 		    /// \param len The length map.
 		    BellmanFordWizard(const Digraph& gr, const LengthMap& len)
 		      : TR(gr, len) {}
 		    /// \brief Copy constructor
 		    BellmanFordWizard(const TR &b) : TR(b) {}
 		    ~BellmanFordWizard() {}
 		    /// \brief Runs the Bellman-Ford algorithm from the given source node.
 		    ///
 		    /// This method runs the Bellman-Ford algorithm from the given source
 		    /// node in order to compute the shortest path to each node.
 		    void run(Node s) {
 		      BellmanFord<Digraph,LengthMap,TR>
 			bf(*reinterpret_cast<const Digraph*>(Base::_graph),
 		           *reinterpret_cast<const LengthMap*>(Base::_length));
 		      if (Base::_pred) bf.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
 		      if (Base::_dist) bf.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
 		      bf.run(s);
+		    }
 		    /// \brief Runs the Bellman-Ford algorithm to find the shortest path
 		    /// between \c s and \c t.
 		    ///
 		    /// This method runs the Bellman-Ford algorithm from node \c s
 		    /// in order to compute the shortest path to node \c t.
 		    /// Actually, it computes the shortest path to each node, but using
 		    /// this function you can retrieve the distance and the shortest path
 		    /// for a single target node easier.
 		    ///
 		    /// \return \c true if \c t is reachable form \c s.
 		    bool run(Node s, Node t) {
 		      BellmanFord<Digraph,LengthMap,TR>
 		        bf(*reinterpret_cast<const Digraph*>(Base::_graph),
 		           *reinterpret_cast<const LengthMap*>(Base::_length));
 		      if (Base::_pred) bf.predMap(*reinterpret_cast<PredMap*>(Base::_pred));
 		      if (Base::_dist) bf.distMap(*reinterpret_cast<DistMap*>(Base::_dist));
 		      bf.run(s);
 		      if (Base::_path) *reinterpret_cast<Path*>(Base::_path) = bf.path(t);
 		      if (Base::_di) *reinterpret_cast<Value*>(Base::_di) = bf.dist(t);
 		      return bf.reached(t);
+		    }
 		    template<class T>
 		    struct SetPredMapBase : public Base {
 		      typedef T PredMap;
 		      static PredMap *createPredMap(const Digraph &) { return 0; };
 		      SetPredMapBase(const TR &b) : TR(b) {}
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// the predecessor map.
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting
 		    /// the map that stores the predecessor arcs of the nodes.
 		    template<class T>
 		    BellmanFordWizard<SetPredMapBase<T> > predMap(const T &t) {
 		      Base::_pred=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BellmanFordWizard<SetPredMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct SetDistMapBase : public Base {
 		      typedef T DistMap;
 		      static DistMap *createDistMap(const Digraph &) { return 0; };
 		      SetDistMapBase(const TR &b) : TR(b) {}
 		    };
 		    /// \brief \ref named-templ-param "Named parameter" for setting
 		    /// the distance map.
 		    ///
 		    /// \ref named-templ-param "Named parameter" for setting
 		    /// the map that stores the distances of the nodes calculated
 		    /// by the algorithm.
 		    template<class T>
 		    BellmanFordWizard<SetDistMapBase<T> > distMap(const T &t) {
 		      Base::_dist=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BellmanFordWizard<SetDistMapBase<T> >(*this);
+		    }
 		    template<class T>
 		    struct SetPathBase : public Base {
 		      typedef T Path;
 		      SetPathBase(const TR &b) : TR(b) {}
 		    };
 		    /// \brief \ref named-func-param "Named parameter" for getting
 		    /// the shortest path to the target node.
 		    ///
 		    /// \ref named-func-param "Named parameter" for getting
 		    /// the shortest path to the target node.
 		    template<class T>
 		    BellmanFordWizard<SetPathBase<T> > path(const T &t)
+		    {
 		      Base::_path=reinterpret_cast<void*>(const_cast<T*>(&t));
 		      return BellmanFordWizard<SetPathBase<T> >(*this);
+		    }
 		    /// \brief \ref named-func-param "Named parameter" for getting
 		    /// the distance of the target node.
 		    ///
 		    /// \ref named-func-param "Named parameter" for getting
 		    /// the distance of the target node.
 		    BellmanFordWizard dist(const Value &d)
+		    {
 		      Base::_di=reinterpret_cast<void*>(const_cast<Value*>(&d));
 		      return *this;
+		    }
 		  };
 		  /// \brief Function type interface for the \ref BellmanFord "Bellman-Ford"
 		  /// algorithm.
 		  ///
 		  /// \ingroup shortest_path
 		  /// Function type interface for the \ref BellmanFord "Bellman-Ford"
 		  /// algorithm.
 		  ///
 		  /// This function also has several \ref named-templ-func-param
 		  /// "named parameters", they are declared as the members of class
 		  /// \ref BellmanFordWizard.
 		  /// The following examples show how to use these parameters.
 		  /// \code
 		  ///   // Compute shortest path from node s to each node
 		  ///   bellmanFord(g,length).predMap(preds).distMap(dists).run(s);
 		  ///
 		  ///   // Compute shortest path from s to t
 		  ///   bool reached = bellmanFord(g,length).path(p).dist(d).run(s,t);
 		  /// \endcode
 		  /// \warning Don't forget to put the \ref BellmanFordWizard::run() "run()"
 		  /// to the end of the parameter list.
 		  /// \sa BellmanFordWizard
 		  /// \sa BellmanFord
 		  template<typename GR, typename LEN>
 		  BellmanFordWizard<BellmanFordWizardBase<GR,LEN> >
 		  bellmanFord(const GR& digraph,
 			      const LEN& length)
+		  {
 		    return BellmanFordWizard<BellmanFordWizardBase<GR,LEN> >(digraph, length);
+		  }
 		} //END OF NAMESPACE LEMON
 		#endif

.hgignore

Show inline comments

@@ -24,2 +24,3 @@
 		doc/Doxyfile
 		cmake/version.cmake
 		.dirstamp
@@ -41,3 +42,3 @@
 		^build-aux/.*
 		^objs.*/.*
+		^.*objs.*/.*
 		^test/[a-z_]*$
@@ -45,3 +46,3 @@
 		^demo/.*_demo$
 		^build/.*
+		^.*build.*/.*
 		^doc/gen-images/.*

CMakeLists.txt

Show inline comments

@@ -3,10 +3,37 @@
 		SET(PROJECT_NAME "LEMON")
 		SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.")
 		PROJECT(${PROJECT_NAME})
-		SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+		IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
 		  INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
 		ELSEIF(DEFINED ENV{LEMON_VERSION})
 		  SET(LEMON_VERSION $ENV{LEMON_VERSION} CACHE STRING "LEMON version string.")
 		ELSE()
 		  EXECUTE_PROCESS(
 		    COMMAND hg id -i
 		    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 		    OUTPUT_VARIABLE HG_REVISION
 		    ERROR_QUIET
 		    OUTPUT_STRIP_TRAILING_WHITESPACE
+		  )
 		  IF(HG_REVISION STREQUAL "")
 		    SET(HG_REVISION "hg-tip")
 		  ENDIF()
 		  SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
 		ENDIF()
 		INCLUDE(FindDoxygen)
 		INCLUDE(FindGhostscript)
 		SET(PROJECT_VERSION ${LEMON_VERSION})
 		SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 		FIND_PACKAGE(Doxygen)
 		FIND_PACKAGE(Ghostscript)
 		FIND_PACKAGE(GLPK 4.33)
 		FIND_PACKAGE(CPLEX)
 		FIND_PACKAGE(COIN)
 		INCLUDE(CheckTypeSize)
 		CHECK_TYPE_SIZE("long long" LONG_LONG)
 		SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
 		INCLUDE(FindPythonInterp)
@@ -15,18 +42,32 @@
 		ADD_SUBDIRECTORY(lemon)
 		ADD_SUBDIRECTORY(demo)
 		ADD_SUBDIRECTORY(doc)
-		ADD_SUBDIRECTORY(test)
+		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		  ADD_SUBDIRECTORY(demo)
 		  ADD_SUBDIRECTORY(tools)
 		  ADD_SUBDIRECTORY(doc)
 		  ADD_SUBDIRECTORY(test)
 		ENDIF()
 		IF(WIN32)
 		  INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico
 		    DESTINATION bin)
 		ENDIF(WIN32)
 		CONFIGURE_FILE(
 		  ${PROJECT_SOURCE_DIR}/cmake/LEMONConfig.cmake.in
 		  ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
 		  @ONLY
+		)
 		IF(UNIX)
 		  INSTALL(
 		    FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
 		    DESTINATION share/lemon/cmake
+		  )
 		ELSEIF(WIN32)
 		  INSTALL(
 		    FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
 		    DESTINATION cmake
+		  )
 		ENDIF()
 		IF(WIN32)
+		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} AND WIN32)
 		  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 		  SET(CPACK_PACKAGE_VENDOR
 		    "EGRES - Egervary Research Group on Combinatorial Optimization")
 		  SET(CPACK_PACKAGE_VENDOR "EGRES")
 		  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
 		    "LEMON - Library of Efficient Models and Optimization in Networks")
 		  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 		    "LEMON - Library for Efficient Modeling and Optimization in Networks")
 		  SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
@@ -39,37 +80,39 @@
 		  # Variables to generate a component-based installer.
 		  #SET(CPACK_COMPONENTS_ALL headers library html_documentation)
 		  SET(CPACK_COMPONENTS_ALL headers library html_documentation bin)
 		  #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
 		  #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library")
-		  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
+		  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
 		  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
 		  SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
 		  #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
 		  #  "C++ header files for use with the LEMON library")
 		  #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
 		  #  "Static library used to build programs with LEMON")
 		  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
 		  #  "Doxygen generated documentation")
 		  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
 		    "C++ header files")
 		  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
 		    "DLL and import library")
 		  SET(CPACK_COMPONENT_BIN_DESCRIPTION
 		    "Command line utilities")
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
 		    "Doxygen generated documentation")
-		  #SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
 		  SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
 		  #SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
 		  #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
-		  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
+		  SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
 		  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
 		  #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
 		  #  "Components needed to develop software using LEMON")
 		  #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
 		  #  "Documentation of LEMON")
 		  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
 		    "Components needed to develop software using LEMON")
 		  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
 		    "Documentation of LEMON")
-		  #SET(CPACK_ALL_INSTALL_TYPES Full Developer)
 		  SET(CPACK_ALL_INSTALL_TYPES Full Developer)
 		  #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
 		  #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
-		  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
+		  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
 		  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
 		  SET(CPACK_GENERATOR "NSIS")
 		  SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		  SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")
-		  #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
+		  SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		  SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
 		  #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
 		  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
@@ -80,3 +123,3 @@
 		  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
 		    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\"
+		    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
 		    ")
@@ -88,2 +131,2 @@
 		  INCLUDE(CPack)
-		ENDIF(WIN32)
 		ENDIF()

INSTALL

Show inline comments

@@ -7,2 +7,8 @@
 		LEMON provides two different build environments, one is based on "autotool",
 		while the other is based on "cmake". This file contains instructions only for
 		the former one, which is the recommended build environment on Linux, Mac OSX
 		and other unices or if you use Cygwin on Windows. For cmake installation
 		instructions visit http://lemon.cs.elte.hu.
 		In order to install LEMON from the extracted source tarball you have to
@@ -23,4 +29,4 @@
 		      This command compiles the non-template part of LEMON into libemon.a
 		      file. It also compiles the programs in the tools and demo subdirectories
 		      when enabled.
 		      file. It also compiles the programs in the tools subdirectory by
 		      default.
@@ -71,10 +77,2 @@
 		--enable-demo
 		   Build the examples in the demo subdirectory.
 		--disable-demo
 		   Do not build the examples in the demo subdirectory (default).
 		--enable-tools
@@ -154,1 +152,24 @@
 		   Disable SoPlex support.
 		--with-coin[=PREFIX]
 		   Enable support for COIN-OR solvers (CLP and CBC). You should
 		   specify the prefix too. (by default, COIN-OR tools install
 		   themselves to the source code directory). This command enables the
 		   solvers that are actually found.
 		--with-coin-includedir=DIR
 		   The directory where the COIN-OR header files are located. This is
 		   only useful when the COIN-OR headers and libraries are not under
 		   the same prefix (which is unlikely).
 		--with-coin-libdir=DIR
 		   The directory where the COIN-OR libraries are located. This is only
 		   useful when the COIN-OR headers and libraries are not under the
 		   same prefix (which is unlikely).
 		--without-coin
 		   Disable COIN-OR support.

LICENSE

Show inline comments

 		LEMON code without an explicit copyright is covered by the following
+		LEMON code without an explicit copyright notice is covered by the following
 		copyright/license.
@@ -7,2 +7,6 @@
 		===========================================================================
 		Boost Software License, Version 1.0
 		===========================================================================
 		Permission is hereby granted, free of charge, to any person or organization
@@ -28,6 +32,1 @@
 		DEALINGS IN THE SOFTWARE.
 		===========================================================================
 		This license is a verbatim copy of the Boost Software License, Version 1.0.

Makefile.am

Show inline comments

@@ -13,4 +13,13 @@
 			m4/lx_check_soplex.m4 \
 			m4/lx_check_coin.m4 \
 			CMakeLists.txt \
 			cmake
+			cmake/FindGhostscript.cmake \
 			cmake/FindCPLEX.cmake \
 			cmake/FindGLPK.cmake \
 			cmake/FindCOIN.cmake \
 			cmake/LEMONConfig.cmake.in \
 			cmake/version.cmake.in \
 			cmake/version.cmake \
 			cmake/nsis/lemon.ico \
 			cmake/nsis/uninstall.ico
@@ -36,5 +45,9 @@
 		include doc/Makefile.am
 		include demo/Makefile.am
 		include tools/Makefile.am
 		DIST_SUBDIRS = demo
 		demo:
 			$(MAKE) $(AM_MAKEFLAGS) -C demo
 		MRPROPERFILES = \
@@ -65,2 +78,2 @@
-		.PHONY: mrproper dist-bz2 distcheck-bz2
+		.PHONY: demo mrproper dist-bz2 distcheck-bz2

NEWS

Show inline comments

 -05-13 Version 1.1 released
 		        This is the second stable release of the 1.x series. It
 		        features a better coverage of the tools available in the 0.x
 		        series, a thoroughly reworked LP/MIP interface plus various
 		        improvements in the existing tools.
 		        * Much improved M$ Windows support
 		          * Various improvements in the CMAKE build system
 		          * Compilation warnings are fixed/suppressed
 		        * Support IBM xlC compiler
 		        * New algorithms
 		          * Connectivity related algorithms (#61)
 		          * Euler walks (#65)
 		          * Preflow push-relabel max. flow algorithm (#176)
 		          * Circulation algorithm (push-relabel based) (#175)
 		          * Suurballe algorithm (#47)
 		          * Gomory-Hu algorithm (#66)
 		          * Hao-Orlin algorithm (#58)
 		          * Edmond's maximum cardinality and weighted matching algorithms
 		            in general graphs (#48,#265)
 		          * Minimum cost arborescence/branching (#60)
 		          * Network Simplex min. cost flow algorithm (#234)
 		        * New data structures
 		          * Full graph structure (#57)
 		          * Grid graph structure (#57)
 		          * Hypercube graph structure (#57)
 		          * Graph adaptors (#67)
 		          * ArcSet and EdgeSet classes (#67)
 		          * Elevator class (#174)
 		        * Other new tools
 		          * LP/MIP interface (#44)
 		            * Support for GLPK, CPLEX, Soplex, COIN-OR CLP and CBC
 		          * Reader for the Nauty file format (#55)
 		          * DIMACS readers (#167)
 		          * Radix sort algorithms (#72)
 		          * RangeIdMap and CrossRefMap (#160)
 		        * New command line tools
 		          * DIMACS to LGF converter (#182)
 		          * lgf-gen - a graph generator (#45)
 		          * DIMACS solver utility (#226)
 		        * Other code improvements
 		          * Lognormal distribution added to Random (#102)
 		          * Better (i.e. O(1) time) item counting in SmartGraph (#3)
 		          * The standard maps of graphs are guaranteed to be
 		            reference maps (#190)
 		        * Miscellaneous
 		          * Various doc improvements
 		          * Improved 0.x -> 1.x converter script
 		        * Several bugfixes (compared to release 1.0):
 		          #170: Bugfix SmartDigraph::split()
 		          #171: Bugfix in SmartGraph::restoreSnapshot()
 		          #172: Extended test cases for graphs and digraphs
 		          #173: Bugfix in Random
 		                * operator()s always return a double now
 		                * the faulty real<Num>(Num) and real<Num>(Num,Num)
 		                  have been removed
 		          #187: Remove DijkstraWidestPathOperationTraits
 		          #61:  Bugfix in DfsVisit
 		          #193: Bugfix in GraphReader::skipSection()
 		          #195: Bugfix in ConEdgeIt()
 		          #197: Bugfix in heap unionfind
 		                * This bug affects Edmond's general matching algorithms
 		          #207: Fix 'make install' without 'make html' using CMAKE
 		          #208: Suppress or fix VS2008 compilation warnings
 		          ----: Update the LEMON icon
 		          ----: Enable the component-based installer
 		                (in installers made by CPACK)
 		          ----: Set the proper version for CMAKE in the tarballs
 		                (made by autotools)
 		          ----: Minor clarification in the LICENSE file
 		          ----: Add missing unistd.h include to time_measure.h
 		          #204: Compilation bug fixed in graph_to_eps.h with VS2005
 		          #214,#215: windows.h should never be included by lemon headers
 		          #230: Build systems check the availability of 'long long' type
 		          #229: Default implementation of Tolerance<> is used for integer types
 		          #211,#212: Various fixes for compiling on AIX
 		          ----: Improvements in CMAKE config
 		                - docs is installed in share/doc/
 		                - detects newer versions of Ghostscript
 		          #239: Fix missing 'inline' specifier in time_measure.h
 		          #274,#280: Install lemon/config.h
 		          #275: Prefix macro names with LEMON_ in lemon/config.h
 		          ----: Small script for making the release tarballs added
 		          ----: Minor improvement in unify-sources.sh (a76f55d7d397)
 -03-27 LEMON joins to the COIN-OR initiative
 		        COIN-OR (Computational Infrastructure for Operations Research,
 		        http://www.coin-or.org) project is an initiative to spur the
 		        development of open-source software for the operations research
 		        community.
 -10-13 Version 1.0 released

README

Show inline comments

 		==================================================================
 		LEMON - a Library of Efficient Models and Optimization in Networks
 		==================================================================
+		=====================================================================
 		LEMON - a Library for Efficient Modeling and Optimization in Networks
 		=====================================================================

cmake/FindGhostscript.cmake

Show inline comments

@@ -5,3 +5,3 @@
 		  PATHS "$ENV{ProgramFiles}/gs"
 		  PATH_SUFFIXES gs8.61/bin gs8.62/bin
+		  PATH_SUFFIXES gs8.61/bin gs8.62/bin gs8.63/bin gs8.64/bin gs8.65/bin
 		  DOC "Ghostscript: PostScript and PDF language interpreter and previewer."

cmake/nsis/lemon.ico

Show inline comments

modified binary file

configure.ac

Show inline comments

@@ -4,10 +4,13 @@
 		m4_define([lemon_version_number],
-			[m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
+		          [m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
 		dnl m4_define([lemon_version_number], [])
 		m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))])
 		m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
+		m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i 2> /dev/null]))])
 		m4_define([lemon_version], [ifelse(lemon_version_number(),
 					   [],
 					   [lemon_hg_path().lemon_hg_revision()],
-					   [lemon_version_number()])])
+		                           [],
 		                           [ifelse(lemon_hg_revision(),
 		                           [],
 		                           [hg-tip],
 		                           [lemon_hg_path().lemon_hg_revision()])],
 		                           [lemon_version_number()])])
@@ -21,2 +24,4 @@
 		AC_DEFINE([LEMON_VERSION], [lemon_version()], [The version string])
 		dnl Do compilation tests using the C++ compiler.
@@ -24,2 +29,8 @@
 		dnl Check the existence of long long type.
 		AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
 		if test x"$long_long_found" = x"yes"; then
 		  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
 		fi
 		dnl Checks for programs.
@@ -32,2 +43,3 @@
 		AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
 		AC_CHECK_PROG([python_found],[python],[yes],[no])
 		AC_CHECK_PROG([gs_found],[gs],[yes],[no])
@@ -55,3 +67,3 @@
 		LX_CHECK_SOPLEX
-		LX_CHECK_CLP
+		LX_CHECK_COIN
@@ -60,15 +72,2 @@
 		dnl Disable/enable building the demo programs.
 		AC_ARG_ENABLE([demo],
 		AS_HELP_STRING([--enable-demo], [build the demo programs])
 		AS_HELP_STRING([--disable-demo], [do not build the demo programs @<:@default@:>@]),
 		              [], [enable_demo=no])
 		AC_MSG_CHECKING([whether to build the demo programs])
 		if test x"$enable_demo" != x"no"; then
 		  AC_MSG_RESULT([yes])
 		else
 		  AC_MSG_RESULT([no])
 		fi
 		AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
 		dnl Disable/enable building the binary tools.
@@ -102,3 +101,3 @@
 		AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
 		  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in'])
+		  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
@@ -106,2 +105,4 @@
 		Makefile
 		demo/Makefile
 		cmake/version.cmake
 		doc/Doxyfile
@@ -120,2 +121,4 @@
 		echo
 		echo Compiler supports long long... : $long_long_found
 		echo
 		echo GLPK support.................. : $lx_glpk_found
@@ -124,4 +127,4 @@
 		echo CLP support................... : $lx_clp_found
 		echo CBC support................... : $lx_cbc_found
 		echo
 		echo Build demo programs........... : $enable_demo
 		echo Build additional tools........ : $enable_tools

demo/CMakeLists.txt

Show inline comments

-		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 		INCLUDE_DIRECTORIES(
 		  ${PROJECT_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
-		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
 		LINK_DIRECTORIES(
 		  ${PROJECT_BINARY_DIR}/lemon
+		)
@@ -7,3 +12,4 @@
 		  graph_to_eps_demo
-		  lgf_demo)
 		  lgf_demo
+		)
@@ -12,2 +18,2 @@
 		  TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon)
-		ENDFOREACH(DEMO_NAME)
 		ENDFOREACH()

demo/Makefile.am

Show inline comments

 		EXTRA_DIST += \
 			demo/CMakeLists.txt \
-			demo/digraph.lgf
+		AM_CXXFLAGS = $(WARNINGCXXFLAGS)
-		if WANT_DEMO
+		AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 		LDADD = $(top_builddir)/lemon/libemon.la
 		noinst_PROGRAMS += \
 			demo/arg_parser_demo \
 			demo/graph_to_eps_demo \
 			demo/lgf_demo
 		EXTRA_DIST = \
 			CMakeLists.txt \
 			digraph.lgf
-		endif WANT_DEMO
+		noinst_PROGRAMS = \
 			arg_parser_demo \
 			graph_to_eps_demo \
 			lgf_demo
 		demo_arg_parser_demo_SOURCES = demo/arg_parser_demo.cc
 		demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
-		demo_lgf_demo_SOURCES = demo/lgf_demo.cc
+		arg_parser_demo_SOURCES = arg_parser_demo.cc
 		graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
 		lgf_demo_SOURCES = lgf_demo.cc

demo/graph_to_eps_demo.cc

Show inline comments

@@ -184,3 +184,3 @@
 		  int cols=int(sqrt(double(palette.size())));
+		  int cols=int(std::sqrt(double(palette.size())));
 		  for(int i=0;i<int(paletteW.size());i++) {

doc/CMakeLists.txt

Show inline comments

@@ -2,42 +2,51 @@
 		SET(PACKAGE_VERSION ${PROJECT_VERSION})
 		SET(abs_top_srcdir ${CMAKE_SOURCE_DIR})
 		SET(abs_top_builddir ${CMAKE_BINARY_DIR})
 		SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
 		SET(abs_top_builddir ${PROJECT_BINARY_DIR})
 		CONFIGURE_FILE(
 		  ${CMAKE_SOURCE_DIR}/doc/Doxyfile.in
 		  ${CMAKE_BINARY_DIR}/doc/Doxyfile
-		  @ONLY)
+		  ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
 		  ${PROJECT_BINARY_DIR}/doc/Doxyfile
 		  @ONLY
+		)
 		IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
+		IF(DOXYGEN_EXECUTABLE AND PYTHONINTERP_FOUND AND GHOSTSCRIPT_EXECUTABLE)
 		  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)
 		  SET(GHOSTSCRIPT_OPTIONS -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha)
 		  ADD_CUSTOM_TARGET(html
 		    COMMAND ${CMAKE_COMMAND} -E remove_directory gen-images
 		    COMMAND ${CMAKE_COMMAND} -E make_directory gen-images
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/bipartite_matching.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_matching.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/bipartite_partitions.png ${CMAKE_CURRENT_SOURCE_DIR}/images/bipartite_partitions.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/connected_components.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/edge_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/edge_biconnected_components.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/grid_graph.png ${CMAKE_CURRENT_SOURCE_DIR}/images/grid_graph.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/node_biconnected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/node_biconnected_components.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_0.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_0.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_1.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_1.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_2.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_2.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
 		    COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r18 -sOutputFile=gen-images/strongly_connected_components.png ${CMAKE_CURRENT_SOURCE_DIR}/images/strongly_connected_components.eps
 		    COMMAND ${CMAKE_COMMAND} -E remove_directory html
 		    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/bib2dox.py ${CMAKE_CURRENT_SOURCE_DIR}/references.bib >references.dox
 		    COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
 		    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+		  )
 		  SET_TARGET_PROPERTIES(html PROPERTIES PROJECT_LABEL BUILD_DOC)
 		  IF(UNIX)
 		    ADD_CUSTOM_TARGET(html
 		      COMMAND rm -rf gen-images
 		      COMMAND mkdir gen-images
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/grid_graph.png ${CMAKE_CURRENT_SOURCE_DIR}/images/grid_graph.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_0.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_0.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_1.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_1.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_2.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_2.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
 		      COMMAND rm -rf html
 		      COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
 		      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 		    INSTALL(
 		      DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
 		      DESTINATION share/doc/lemon/html
 		      COMPONENT html_documentation
+		    )
 		  ELSEIF(WIN32)
 		    ADD_CUSTOM_TARGET(html
 		      COMMAND if exist gen-images rmdir /s /q gen-images
 		      COMMAND mkdir gen-images
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_0.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_0.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_1.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_1.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_2.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_2.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_3.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_3.eps
 		      COMMAND ${GHOSTSCRIPT_EXECUTABLE} -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha -r18 -sOutputFile=gen-images/nodeshape_4.png ${CMAKE_CURRENT_SOURCE_DIR}/images/nodeshape_4.eps
 		      COMMAND if exist html rmdir /s /q html
 		      COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
 		      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 		  ENDIF(UNIX)
-		ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
+		    INSTALL(
 		      DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
 		      DESTINATION doc
 		      COMPONENT html_documentation
+		    )
 		  ENDIF()
 		INSTALL(
 		  DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
 		  DESTINATION doc
 		  COMPONENT html_documentation)
 		ENDIF()

doc/Doxyfile.in

Show inline comments

-		# Doxyfile 1.5.7.1
+		# Doxyfile 1.5.9
@@ -23,3 +23,2 @@
 		MULTILINE_CPP_IS_BRIEF = NO
 		DETAILS_AT_TOP         = YES
 		INHERIT_DOCS           = NO
@@ -93,3 +92,4 @@
 		                         "@abs_top_srcdir@/tools" \
 		                         "@abs_top_srcdir@/test/test_tools.h"
+		                         "@abs_top_srcdir@/test/test_tools.h" \
 		                         "@abs_top_builddir@/doc/references.dox"
 		INPUT_ENCODING         = UTF-8
@@ -225,3 +225,3 @@
 		#---------------------------------------------------------------------------
-		# Configuration::additions related to external references
+		# Options related to the search engine
 		#---------------------------------------------------------------------------

doc/Makefile.am

Show inline comments

@@ -10,2 +10,3 @@
 			doc/migration.dox \
 			doc/min_cost_flow.dox \
 			doc/named-param.dox \
@@ -23,4 +24,13 @@
 		DOC_EPS_IMAGES27 = \
 			bipartite_matching.eps \
 			bipartite_partitions.eps \
 			connected_components.eps \
 			edge_biconnected_components.eps \
 			node_biconnected_components.eps \
 			strongly_connected_components.eps
 		DOC_EPS_IMAGES = \
 			$(DOC_EPS_IMAGES18)
+			$(DOC_EPS_IMAGES18) \
 			$(DOC_EPS_IMAGES27)
@@ -47,3 +57,26 @@
-		html-local: $(DOC_PNG_IMAGES)
+		$(DOC_EPS_IMAGES27:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
 			-mkdir doc/gen-images
 			if test ${gs_found} = yes; then \
 			  $(GS_COMMAND) -sDEVICE=pngalpha -r27 -sOutputFile=$@ $<; \
 			else \
 			  echo; \
 			  echo "Ghostscript not found."; \
 			  echo; \
 			  exit 1; \
 			fi
 		references.dox: doc/references.bib
 			if test ${python_found} = yes; then \
 			  cd doc; \
 			  python @abs_top_srcdir@/scripts/bib2dox.py @abs_top_builddir@/$< >$@; \
 			  cd ..; \
 			else \
 			  echo; \
 			  echo "Python not found."; \
 			  echo; \
 			  exit 1; \
 			fi
 		html-local: $(DOC_PNG_IMAGES) references.dox
 			if test ${doxygen_found} = yes; then \
@@ -72,7 +105,7 @@
 			@$(NORMAL_INSTALL)
-			$(mkinstalldirs) $(DESTDIR)$(htmldir)/docs
+			$(mkinstalldirs) $(DESTDIR)$(htmldir)/html
 			for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
 			  f="`echo $$p | sed -e 's|^.*/||'`"; \
 			  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f"; \
 			  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f; \
 			  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f"; \
 			  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f; \
 			done
@@ -83,4 +116,4 @@
 			  f="`echo $$p | sed -e 's|^.*/||'`"; \
 			  echo " rm -f $(DESTDIR)$(htmldir)/docs/$$f"; \
 			  rm -f $(DESTDIR)$(htmldir)/docs/$$f; \
 			  echo " rm -f $(DESTDIR)$(htmldir)/html/$$f"; \
 			  rm -f $(DESTDIR)$(htmldir)/html/$$f; \
 			done

doc/groups.dox

Show inline comments

@@ -22,3 +22,3 @@
 		@defgroup datas Data Structures
-		This group describes the several data structures implemented in LEMON.
+		This group contains the several data structures implemented in LEMON.
 		*/
@@ -140,12 +140,2 @@
 		/**
 		@defgroup semi_adaptors Semi-Adaptor Classes for Graphs
 		@ingroup graphs
 		\brief Graph types between real graphs and graph adaptors.
 		This group describes some graph types between real graphs and graph adaptors.
 		These classes wrap graphs to give new functionality as the adaptors do it.
 		On the other hand they are not light-weight structures as the adaptors.
 		*/
 		/**
 		@defgroup maps Maps
@@ -154,3 +144,3 @@
-		This group describes the map structures implemented in LEMON.
+		This group contains the map structures implemented in LEMON.
@@ -167,3 +157,3 @@
-		This group describes maps that are specifically designed to assign
+		This group contains maps that are specifically designed to assign
 		values to the nodes and arcs/edges of graphs.
@@ -179,3 +169,3 @@
-		This group describes map adaptors that are used to create "implicit"
+		This group contains map adaptors that are used to create "implicit"
 		maps from other maps.
@@ -238,10 +228,2 @@
 		/**
 		@defgroup matrices Matrices
 		@ingroup datas
 		\brief Two dimensional data storages implemented in LEMON.
 		This group describes two dimensional data storages implemented in LEMON.
 		*/
 		/**
 		@defgroup paths Path Structures
@@ -250,3 +232,3 @@
-		This group describes the path structures implemented in LEMON.
+		This group contains the path structures implemented in LEMON.
@@ -258,3 +240,32 @@
-		\sa lemon::concepts::Path
+		\sa \ref concepts::Path "Path concept"
 		*/
 		/**
 		@defgroup heaps Heap Structures
 		@ingroup datas
 		\brief %Heap structures implemented in LEMON.
 		This group contains the heap structures implemented in LEMON.
 		LEMON provides several heap classes. They are efficient implementations
 		of the abstract data type \e priority \e queue. They store items with
 		specified values called \e priorities in such a way that finding and
 		removing the item with minimum priority are efficient.
 		The basic operations are adding and erasing items, changing the priority
 		of an item, etc.
 		Heaps are crucial in several algorithms, such as Dijkstra and Prim.
 		The heap implementations have the same interface, thus any of them can be
 		used easily in such algorithms.
 		\sa \ref concepts::Heap "Heap concept"
 		*/
 		/**
 		@defgroup matrices Matrices
 		@ingroup datas
 		\brief Two dimensional data storages implemented in LEMON.
 		This group contains two dimensional data storages implemented in LEMON.
 		*/
@@ -266,3 +277,3 @@
-		This group describes some data structures implemented in LEMON in
+		This group contains some data structures implemented in LEMON in
 		order to make it easier to implement combinatorial algorithms.
@@ -271,7 +282,29 @@
 		/**
 		@defgroup geomdat Geometric Data Structures
 		@ingroup auxdat
 		\brief Geometric data structures implemented in LEMON.
 		This group contains geometric data structures implemented in LEMON.
 		 - \ref lemon::dim2::Point "dim2::Point" implements a two dimensional
 		   vector with the usual operations.
 		 - \ref lemon::dim2::Box "dim2::Box" can be used to determine the
 		   rectangular bounding box of a set of \ref lemon::dim2::Point
 		   "dim2::Point"'s.
 		*/
 		/**
 		@defgroup matrices Matrices
 		@ingroup auxdat
 		\brief Two dimensional data storages implemented in LEMON.
 		This group contains two dimensional data storages implemented in LEMON.
 		*/
 		/**
 		@defgroup algs Algorithms
-		\brief This group describes the several algorithms
+		\brief This group contains the several algorithms
 		implemented in LEMON.
-		This group describes the several algorithms
+		This group contains the several algorithms
 		implemented in LEMON.
@@ -284,4 +317,5 @@
 		This group describes the common graph search algorithms, namely
 		\e breadth-first \e search (BFS) and \e depth-first \e search (DFS).
 		This group contains the common graph search algorithms, namely
 		\e breadth-first \e search (BFS) and \e depth-first \e search (DFS)
 		\ref clrs01algorithms.
 		*/
@@ -293,3 +327,4 @@
-		This group describes the algorithms for finding shortest paths in digraphs.
+		This group contains the algorithms for finding shortest paths in digraphs
 		\ref clrs01algorithms.
@@ -310,2 +345,11 @@
 		/**
 		@defgroup spantree Minimum Spanning Tree Algorithms
 		@ingroup algs
 		\brief Algorithms for finding minimum cost spanning trees and arborescences.
 		This group contains the algorithms for finding minimum cost spanning
 		trees and arborescences \ref clrs01algorithms.
 		*/
 		/**
 		@defgroup max_flow Maximum Flow Algorithms
@@ -314,4 +358,4 @@
 		This group describes the algorithms for finding maximum flows and
 		feasible circulations.
 		This group contains the algorithms for finding maximum flows and
 		feasible circulations \ref clrs01algorithms, \ref amo93networkflows.
@@ -319,22 +363,31 @@
 		a single source and a single target. Formally, there is a \f$G=(V,A)\f$
 		digraph, a \f$cap:A\rightarrow\mathbf{R}^+_0\f$ capacity function and
+		digraph, a \f$cap: A\rightarrow\mathbf{R}^+_0\f$ capacity function and
 		\f$s, t \in V\f$ source and target nodes.
 		A maximum flow is an \f$f:A\rightarrow\mathbf{R}^+_0\f$ solution of the
+		A maximum flow is an \f$f: A\rightarrow\mathbf{R}^+_0\f$ solution of the
 		following optimization problem.
 		\f[ \max\sum_{a\in\delta_{out}(s)}f(a) - \sum_{a\in\delta_{in}(s)}f(a) \f]
 		\f[ \sum_{a\in\delta_{out}(v)} f(a) = \sum_{a\in\delta_{in}(v)} f(a)
 		    \qquad \forall v\in V\setminus\{s,t\} \f]
 		\f[ 0 \leq f(a) \leq cap(a) \qquad \forall a\in A \f]
 		\f[ \max\sum_{sv\in A} f(sv) - \sum_{vs\in A} f(vs) \f]
 		\f[ \sum_{uv\in A} f(uv) = \sum_{vu\in A} f(vu)
 		    \quad \forall u\in V\setminus\{s,t\} \f]
 		\f[ 0 \leq f(uv) \leq cap(uv) \quad \forall uv\in A \f]
 		LEMON contains several algorithms for solving maximum flow problems:
 		- \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.
 		- \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 "Preflow" algorithm provides the
 		In most cases the \ref Preflow algorithm provides the
 		fastest method for computing a maximum flow. All implementations
 		provides functions to also query the minimum cut, which is the dual
 		problem of the maximum flow.
 		also provide functions to query the minimum cut, which is the dual
 		problem of maximum flow.
 		\ref Circulation is a preflow push-relabel algorithm implemented directly
 		for finding feasible circulations, which is a somewhat different problem,
 		but it is strongly related to maximum flow.
 		For more information, see \ref Circulation.
 		*/
@@ -342,3 +395,3 @@
 		/**
-		@defgroup min_cost_flow Minimum Cost Flow Algorithms
+		@defgroup min_cost_flow_algs Minimum Cost Flow Algorithms
 		@ingroup algs
@@ -347,31 +400,24 @@
 		This group describes the algorithms for finding minimum cost flows and
 		circulations.
 		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".
 		The \e minimum \e cost \e flow \e problem is to find a feasible flow of
 		minimum total cost from a set of supply nodes to a set of demand nodes
 		in a network with capacity constraints and arc costs.
 		Formally, let \f$G=(V,A)\f$ be a digraph,
 		\f$lower, upper: A\rightarrow\mathbf{Z}^+_0\f$ denote the lower and
 		upper bounds for the flow values on the arcs,
 		\f$cost: A\rightarrow\mathbf{Z}^+_0\f$ denotes the cost per unit flow
 		on the arcs, and
 		\f$supply: V\rightarrow\mathbf{Z}\f$ denotes the supply/demand values
 		of the nodes.
 		A minimum cost flow is an \f$f:A\rightarrow\mathbf{R}^+_0\f$ solution of
 		the following optimization problem.
 		LEMON contains several algorithms for this problem.
 		 - \ref NetworkSimplex Primal Network Simplex algorithm with various
 		   pivot strategies \ref dantzig63linearprog, \ref kellyoneill91netsimplex.
 		 - \ref CostScaling Push-Relabel and Augment-Relabel algorithms based on
 		   cost scaling \ref goldberg90approximation, \ref goldberg97efficient,
 		   \ref bunnagel98efficient.
 		 - \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.
 		\f[ \min\sum_{a\in A} f(a) cost(a) \f]
 		\f[ \sum_{a\in\delta_{out}(v)} f(a) - \sum_{a\in\delta_{in}(v)} f(a) =
 		    supply(v) \qquad \forall v\in V \f]
 		\f[ lower(a) \leq f(a) \leq upper(a) \qquad \forall a\in A \f]
 		LEMON contains several algorithms for solving minimum cost flow problems:
 		 - \ref CycleCanceling Cycle-canceling algorithms.
 		 - \ref CapacityScaling Successive shortest path algorithm with optional
 		   capacity scaling.
 		 - \ref CostScaling Push-relabel and augment-relabel algorithms based on
 		   cost scaling.
 		 - \ref NetworkSimplex Primal network simplex algorithm with various
-		   pivot strategies.
+		In general NetworkSimplex is the most efficient implementation,
 		but in special cases other algorithms could be faster.
 		For example, if the total supply and/or capacities are rather small,
 		CapacityScaling is usually the fastest algorithm (without effective scaling).
 		*/
@@ -384,3 +430,3 @@
-		This group describes the algorithms for finding minimum cut in graphs.
+		This group contains the algorithms for finding minimum cut in graphs.
@@ -393,3 +439,3 @@
 		\f[ \min_{X \subset V, X\not\in \{\emptyset, V\}}
-		    \sum_{uv\in A, u\in X, v\not\in X}cap(uv) \f]
+		    \sum_{uv\in A: u\in X, v\not\in X}cap(uv) \f]
@@ -401,3 +447,3 @@
 		  calculating minimum cut in undirected graphs.
-		- \ref GomoryHuTree "Gomory-Hu tree computation" for calculating
+		- \ref GomoryHu "Gomory-Hu tree computation" for calculating
 		  all-pairs minimum cut in undirected graphs.
@@ -409,23 +455,36 @@
 		/**
-		@defgroup graph_prop Connectivity and Other Graph Properties
+		@defgroup min_mean_cycle Minimum Mean Cycle Algorithms
 		@ingroup algs
-		\brief Algorithms for discovering the graph properties
+		\brief Algorithms for finding minimum mean cycles.
 		This group describes the algorithms for discovering the graph properties
 		like connectivity, bipartiteness, euler property, simplicity etc.
 		This group contains the algorithms for finding minimum mean cycles
 		\ref clrs01algorithms, \ref amo93networkflows.
 		\image html edge_biconnected_components.png
 		\image latex edge_biconnected_components.eps "bi-edge-connected components" width=\textwidth
-		*/
+		The \e minimum \e mean \e cycle \e problem is to find a directed cycle
 		of minimum mean length (cost) in a digraph.
 		The mean length of a cycle is the average length of its arcs, i.e. the
 		ratio between the total length of the cycle and the number of arcs on it.
 		/**
 		@defgroup planar Planarity Embedding and Drawing
 		@ingroup algs
 		\brief Algorithms for planarity checking, embedding and drawing
 		This problem has an important connection to \e conservative \e length
 		\e functions, too. A length function on the arcs of a digraph is called
 		conservative if and only if there is no directed cycle of negative total
 		length. For an arbitrary length function, the negative of the minimum
 		cycle mean is the smallest \f$\epsilon\f$ value so that increasing the
 		arc lengths uniformly by \f$\epsilon\f$ results in a conservative length
 		function.
 		This group describes the algorithms for planarity checking,
 		embedding and drawing.
 		LEMON contains three algorithms for solving the minimum mean cycle problem:
 		- \ref Karp "Karp"'s original algorithm \ref amo93networkflows,
 		  \ref dasdan98minmeancycle.
 		- \ref HartmannOrlin "Hartmann-Orlin"'s algorithm, which is an improved
 		  version of Karp's algorithm \ref dasdan98minmeancycle.
 		- \ref Howard "Howard"'s policy iteration algorithm
 		  \ref dasdan98minmeancycle.
 		\image html planar.png
 		\image latex planar.eps "Plane graph" width=\textwidth
 		In practice, the Howard algorithm proved to be by far the most efficient
 		one, though the best known theoretical bound on its running time is
 		exponential.
 		Both Karp and HartmannOrlin algorithms run in time O(ne) and use space
 		O(n<sup>2</sup>+e), but the latter one is typically faster due to the
 		applied early termination scheme.
 		*/
@@ -437,5 +496,6 @@
-		This group contains algorithm objects and functions to calculate
+		This group contains the algorithms for calculating
 		matchings in graphs and bipartite graphs. The general matching problem is
-		finding a subset of the arcs which does not shares common endpoints.
+		finding a subset of the edges for which each node has at most one incident
 		edge.
@@ -472,8 +532,32 @@
 		/**
-		@defgroup spantree Minimum Spanning Tree Algorithms
+		@defgroup graph_properties Connectivity and Other Graph Properties
 		@ingroup algs
-		\brief Algorithms for finding a minimum cost spanning tree in a graph.
+		\brief Algorithms for discovering the graph properties
 		This group describes the algorithms for finding a minimum cost spanning
 		tree in a graph.
 		This group contains the algorithms for discovering the graph properties
 		like connectivity, bipartiteness, euler property, simplicity etc.
 		\image html connected_components.png
 		\image latex connected_components.eps "Connected components" width=\textwidth
 		*/
 		/**
 		@defgroup planar Planarity Embedding and Drawing
 		@ingroup algs
 		\brief Algorithms for planarity checking, embedding and drawing
 		This group contains the algorithms for planarity checking,
 		embedding and drawing.
 		\image html planar.png
 		\image latex planar.eps "Plane graph" width=\textwidth
 		*/
 		/**
 		@defgroup approx Approximation Algorithms
 		@ingroup algs
 		\brief Approximation algorithms.
 		This group contains the approximation and heuristic algorithms
 		implemented in LEMON.
 		*/
@@ -485,3 +569,3 @@
-		This group describes some algorithms implemented in LEMON
+		This group contains some algorithms implemented in LEMON
 		in order to make it easier to implement complex algorithms.
@@ -490,7 +574,7 @@
 		/**
 		@defgroup approx Approximation Algorithms
 		@ingroup algs
-		\brief Approximation algorithms.
+		@defgroup gen_opt_group General Optimization Tools
 		\brief This group contains some general optimization frameworks
 		implemented in LEMON.
-		This group describes the approximation and heuristic algorithms
+		This group contains some general optimization frameworks
 		implemented in LEMON.
@@ -499,18 +583,12 @@
 		/**
 		@defgroup gen_opt_group General Optimization Tools
 		\brief This group describes some general optimization frameworks
-		implemented in LEMON.
+		@defgroup lp_group LP and MIP Solvers
 		@ingroup gen_opt_group
 		\brief LP and MIP solver interfaces for LEMON.
 		This group describes some general optimization frameworks
 		implemented in 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.
 		/**
 		@defgroup lp_group Lp and Mip Solvers
 		@ingroup gen_opt_group
 		\brief Lp and Mip solver interfaces for LEMON.
 		This group describes Lp and Mip solver interfaces for LEMON. The
 		various LP solvers could be used in the same manner with this
 		interface.
 		The currently supported solvers are \ref glpk, \ref clp, \ref cbc,
 		\ref cplex, \ref soplex.
 		*/
@@ -531,3 +609,3 @@
-		This group describes some metaheuristic optimization tools.
+		This group contains some metaheuristic optimization tools.
 		*/
@@ -546,3 +624,3 @@
-		This group describes some simple basic graph utilities.
+		This group contains some simple basic graph utilities.
 		*/
@@ -554,3 +632,3 @@
-		This group describes several useful tools for development,
+		This group contains several useful tools for development,
 		debugging and testing.
@@ -563,3 +641,3 @@
-		This group describes simple tools for measuring the performance
+		This group contains simple tools for measuring the performance
 		of algorithms.
@@ -572,3 +650,3 @@
-		This group describes the exceptions defined in LEMON.
+		This group contains the exceptions defined in LEMON.
 		*/
@@ -579,3 +657,3 @@
-		This group describes the tools for importing and exporting graphs
+		This group contains the tools for importing and exporting graphs
 		and graph related data. Now it supports the \ref lgf-format
@@ -590,3 +668,3 @@
-		This group describes methods for reading and writing
+		This group contains methods for reading and writing
 		\ref lgf-format "LEMON Graph Format".
@@ -599,3 +677,3 @@
-		This group describes general \c EPS drawing methods and special
+		This group contains general \c EPS drawing methods and special
 		graph exporting tools.
@@ -604,3 +682,3 @@
 		/**
-		@defgroup dimacs_group DIMACS format
+		@defgroup dimacs_group DIMACS Format
 		@ingroup io_group
@@ -623,3 +701,3 @@
-		This group describes the data/algorithm skeletons and concept checking
+		This group contains the data/algorithm skeletons and concept checking
 		classes implemented in LEMON.
@@ -653,4 +731,4 @@
 		This group describes the skeletons and concept checking classes of LEMON's
 		graph structures and helper classes used to implement these.
 		This group contains the skeletons and concept checking classes of
 		graph structures.
 		*/
@@ -662,15 +740,3 @@
 		This group describes the skeletons and concept checking classes of maps.
 		*/
 		/**
 		\anchor demoprograms
 		@defgroup demos Demo Programs
 		Some demo programs are listed here. Their full source codes can be found in
 		the \c demo subdirectory of the source tree.
 		It order to compile them, use <tt>--enable-demo</tt> configure option when
-		build the library.
+		This group contains the skeletons and concept checking classes of maps.
 		*/
@@ -686,2 +752,14 @@
 		/**
 		\anchor demoprograms
 		@defgroup demos Demo Programs
 		Some demo programs are listed here. Their full source codes can be found in
 		the \c demo subdirectory of the source tree.
 		In order to compile them, use the <tt>make demo</tt> or the
 		<tt>make check</tt> commands.
 		*/
+		}

doc/mainpage.dox

Show inline comments

@@ -23,11 +23,7 @@
 		\subsection whatis What is LEMON
 		LEMON stands for
 		<b>L</b>ibrary of <b>E</b>fficient <b>M</b>odels
 		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>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.
@@ -41,18 +37,18 @@
-		\subsection howtoread How to read the documentation
+		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.
 		If you want to get a quick start and see the most important features then
 		take a look at our \ref quicktour
-		"Quick Tour to LEMON" which will guide you along.
+		\section howtoread How to Read the Documentation
 		If you already feel like using our library, see the page that tells you
 		\ref getstart "How to start using LEMON".
 		If you would like to get to know the library, see
 		<a class="el" href="http://lemon.cs.elte.hu/pub/tutorial/">LEMON Tutorial</a>.
 		If you
 		want to see how LEMON works, see
 		some \ref demoprograms "demo programs".
 		If you know what you are looking for then try to find it under the
 		<a class="el" href="modules.html">Modules</a>
-		section.
+		If you know what you are looking for, then try to find it under the
 		<a class="el" href="modules.html">Modules</a> section.

lemon/CMakeLists.txt

Show inline comments

-		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 		INCLUDE_DIRECTORIES(
 		  ${PROJECT_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
-		ADD_LIBRARY(lemon
+		CONFIGURE_FILE(
 		  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
 		  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+		)
 		SET(LEMON_SOURCES
 		  arg_parser.cc
@@ -6,3 +14,37 @@
 		  color.cc
-		  random.cc)
+		  lp_base.cc
 		  lp_skeleton.cc
 		  random.cc
 		  bits/windows.cc
+		)
 		IF(LEMON_HAVE_GLPK)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
 		  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
 		  IF(WIN32)
 		    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
 		    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
 		    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
 		  ENDIF()
 		ENDIF()
 		IF(LEMON_HAVE_CPLEX)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
 		  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
 		ENDIF()
 		IF(LEMON_HAVE_CLP)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
 		ENDIF()
 		IF(LEMON_HAVE_CBC)
 		  SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
 		ENDIF()
 		ADD_LIBRARY(lemon ${LEMON_SOURCES})
 		IF(UNIX)
 		  SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
 		ENDIF()
@@ -11,3 +53,4 @@
 		  ARCHIVE DESTINATION lib
-		  COMPONENT library)
 		  COMPONENT library
+		)
@@ -17,2 +60,9 @@
 		  COMPONENT headers
-		  FILES_MATCHING PATTERN "*.h")
 		  FILES_MATCHING PATTERN "*.h"
+		)
 		INSTALL(
 		  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
 		  DESTINATION include/lemon
 		  COMPONENT headers
+		)

lemon/Makefile.am

Show inline comments

@@ -2,3 +2,4 @@
 			lemon/lemon.pc.in \
 			lemon/CMakeLists.txt
+			lemon/CMakeLists.txt \
 			lemon/config.h.cmake
@@ -14,6 +15,9 @@
 			lemon/lp_skeleton.cc \
 			lemon/random.cc
+			lemon/random.cc \
 			lemon/bits/windows.cc
 		nodist_lemon_HEADERS = lemon/config.h
 		lemon_libemon_la_CXXFLAGS = \
 			$(AM_CXXFLAGS) \
 			$(GLPK_CFLAGS) \
@@ -21,3 +25,4 @@
 			$(SOPLEX_CXXFLAGS) \
 			$(CLP_CXXFLAGS)
+			$(CLP_CXXFLAGS) \
 			$(CBC_CXXFLAGS)
@@ -27,3 +32,4 @@
 			$(SOPLEX_LIBS) \
 			$(CLP_LIBS)
+			$(CLP_LIBS) \
 			$(CBC_LIBS)
@@ -45,2 +51,6 @@
 		if HAVE_CBC
 		lemon_libemon_la_SOURCES += lemon/cbc.cc
 		endif
 		lemon_HEADERS += \
@@ -49,4 +59,8 @@
 			lemon/assert.h \
 			lemon/bellman_ford.h \
 			lemon/bfs.h \
 			lemon/bin_heap.h \
 			lemon/binom_heap.h \
 			lemon/bucket_heap.h \
 			lemon/cbc.h \
 			lemon/circulation.h \
@@ -55,2 +69,3 @@
 			lemon/concept_check.h \
 			lemon/connectivity.h \
 			lemon/counter.h \
@@ -65,7 +80,15 @@
 			lemon/error.h \
 			lemon/euler.h \
 			lemon/fib_heap.h \
 			lemon/fourary_heap.h \
 			lemon/full_graph.h \
 			lemon/glpk.h \
 			lemon/gomory_hu.h \
 			lemon/graph_to_eps.h \
 			lemon/grid_graph.h \
 			lemon/hartmann_orlin.h \
 			lemon/howard.h \
 			lemon/hypercube_graph.h \
 			lemon/karp.h \
 			lemon/kary_heap.h \
 			lemon/kruskal.h \
@@ -78,9 +101,12 @@
 			lemon/lp_skeleton.h \
 			lemon/list_graph.h \
 			lemon/maps.h \
 			lemon/matching.h \
 			lemon/math.h \
-			lemon/max_matching.h \
+			lemon/min_cost_arborescence.h \
 			lemon/nauty_reader.h \
 			lemon/network_simplex.h \
 			lemon/pairing_heap.h \
 			lemon/path.h \
 			lemon/preflow.h \
 			lemon/radix_heap.h \
 			lemon/radix_sort.h \
@@ -89,2 +115,3 @@
 			lemon/soplex.h \
 			lemon/static_graph.h \
 			lemon/suurballe.h \
@@ -92,3 +119,4 @@
 			lemon/tolerance.h \
 			lemon/unionfind.h
+			lemon/unionfind.h \
 			lemon/bits/windows.h
@@ -97,3 +125,2 @@
 			lemon/bits/array_map.h \
 			lemon/bits/base_extender.h \
 			lemon/bits/bezier.h \

lemon/adaptors.h

Show inline comments

@@ -32,2 +32,3 @@
 		#include <lemon/bits/graph_adaptor_extender.h>
 		#include <lemon/bits/map_extender.h>
 		#include <lemon/tolerance.h>
@@ -38,19 +39,24 @@
-		  template<typename _Digraph>
+		#ifdef _MSC_VER
 		#define LEMON_SCOPE_FIX(OUTER, NESTED) OUTER::NESTED
 		#else
 		#define LEMON_SCOPE_FIX(OUTER, NESTED) typename OUTER::template NESTED
 		#endif
 		  template<typename DGR>
 		  class DigraphAdaptorBase {
 		  public:
-		    typedef _Digraph Digraph;
+		    typedef DGR Digraph;
 		    typedef DigraphAdaptorBase Adaptor;
 		    typedef Digraph ParentDigraph;
 		  protected:
-		    Digraph* _digraph;
+		    DGR* _digraph;
 		    DigraphAdaptorBase() : _digraph(0) { }
-		    void setDigraph(Digraph& digraph) { _digraph = &digraph; }
+		    void initialize(DGR& digraph) { _digraph = &digraph; }
 		  public:
 		    DigraphAdaptorBase(Digraph& digraph) : _digraph(&digraph) { }
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::Arc Arc;
 		    DigraphAdaptorBase(DGR& digraph) : _digraph(&digraph) { }
 		    typedef typename DGR::Node Node;
 		    typedef typename DGR::Arc Arc;
@@ -69,9 +75,9 @@
-		    typedef NodeNumTagIndicator<Digraph> NodeNumTag;
+		    typedef NodeNumTagIndicator<DGR> NodeNumTag;
 		    int nodeNum() const { return _digraph->nodeNum(); }
-		    typedef ArcNumTagIndicator<Digraph> ArcNumTag;
+		    typedef ArcNumTagIndicator<DGR> ArcNumTag;
 		    int arcNum() const { return _digraph->arcNum(); }
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& u, const Node& v, const Arc& prev = INVALID) const {
@@ -97,18 +103,16 @@
-		    typedef typename ItemSetTraits<Digraph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<DGR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Digraph, Arc>::ItemNotifier ArcNotifier;
+		    typedef typename ItemSetTraits<DGR, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _digraph->notifier(Arc()); }
 		    template <typename _Value>
 		    class NodeMap : public Digraph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public DGR::template NodeMap<V> {
 		      typedef typename DGR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename Digraph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const Adaptor& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      NodeMap(const Adaptor& adaptor, const _Value& value)
 		      NodeMap(const Adaptor& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) { }
@@ -128,12 +132,10 @@
 		    template <typename _Value>
 		    class ArcMap : public Digraph::template ArcMap<_Value> {
 		    template <typename V>
 		    class ArcMap : public DGR::template ArcMap<V> {
 		      typedef typename DGR::template ArcMap<V> Parent;
 		    public:
 		      typedef typename Digraph::template ArcMap<_Value> Parent;
 		      explicit ArcMap(const Adaptor& adaptor)
 		      explicit ArcMap(const DigraphAdaptorBase<DGR>& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      ArcMap(const Adaptor& adaptor, const _Value& value)
 		      ArcMap(const DigraphAdaptorBase<DGR>& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) {}
@@ -155,10 +157,9 @@
-		  template<typename _Graph>
+		  template<typename GR>
 		  class GraphAdaptorBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef Graph ParentGraph;
 		    typedef GR Graph;
 		  protected:
-		    Graph* _graph;
+		    GR* _graph;
@@ -166,10 +167,10 @@
-		    void setGraph(Graph& graph) { _graph = &graph; }
+		    void initialize(GR& graph) { _graph = &graph; }
 		  public:
 		    GraphAdaptorBase(Graph& graph) : _graph(&graph) {}
 		    typedef typename Graph::Node Node;
 		    typedef typename Graph::Arc Arc;
-		    typedef typename Graph::Edge Edge;
+		    GraphAdaptorBase(GR& graph) : _graph(&graph) {}
 		    typedef typename GR::Node Node;
 		    typedef typename GR::Arc Arc;
 		    typedef typename GR::Edge Edge;
@@ -241,18 +242,19 @@
-		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
+		    typedef typename ItemSetTraits<GR, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
-		    typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
+		    typedef typename ItemSetTraits<GR, Edge>::ItemNotifier EdgeNotifier;
 		    EdgeNotifier& notifier(Edge) const { return _graph->notifier(Edge()); }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename Graph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const GraphAdaptorBase<Graph>& adapter)
 		      explicit NodeMap(const GraphAdaptorBase<GR>& adapter)
 		        : Parent(*adapter._graph) {}
-		      NodeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
+		      NodeMap(const GraphAdaptorBase<GR>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
@@ -272,9 +274,10 @@
 		    template <typename _Value>
 		    class ArcMap : public Graph::template ArcMap<_Value> {
 		    template <typename V>
 		    class ArcMap : public GR::template ArcMap<V> {
 		      typedef typename GR::template ArcMap<V> Parent;
 		    public:
 		      typedef typename Graph::template ArcMap<_Value> Parent;
 		      explicit ArcMap(const GraphAdaptorBase<Graph>& adapter)
 		      explicit ArcMap(const GraphAdaptorBase<GR>& adapter)
 		        : Parent(*adapter._graph) {}
-		      ArcMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
+		      ArcMap(const GraphAdaptorBase<GR>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
@@ -293,9 +296,10 @@
 		    template <typename _Value>
 		    class EdgeMap : public Graph::template EdgeMap<_Value> {
 		    template <typename V>
 		    class EdgeMap : public GR::template EdgeMap<V> {
 		      typedef typename GR::template EdgeMap<V> Parent;
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      explicit EdgeMap(const GraphAdaptorBase<Graph>& adapter)
 		      explicit EdgeMap(const GraphAdaptorBase<GR>& adapter)
 		        : Parent(*adapter._graph) {}
-		      EdgeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
+		      EdgeMap(const GraphAdaptorBase<GR>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
@@ -316,7 +320,7 @@
 		  template <typename _Digraph>
 		  class ReverseDigraphBase : public DigraphAdaptorBase<_Digraph> {
 		  template <typename DGR>
 		  class ReverseDigraphBase : public DigraphAdaptorBase<DGR> {
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef DigraphAdaptorBase<_Digraph> Parent;
 		    typedef DGR Digraph;
 		  protected:
@@ -338,3 +342,3 @@
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& u, const Node& v,
@@ -358,3 +362,3 @@
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
@@ -364,3 +368,3 @@
 		  /// digraph are convertible to each other.
-		  template<typename GR>
+		  template<typename DGR>
 		#ifdef DOXYGEN
@@ -369,8 +373,8 @@
 		  class ReverseDigraph :
-		    public DigraphAdaptorExtender<ReverseDigraphBase<GR> > {
+		    public DigraphAdaptorExtender<ReverseDigraphBase<DGR> > {
 		#endif
 		    typedef DigraphAdaptorExtender<ReverseDigraphBase<DGR> > Parent;
 		  public:
 		    /// The type of the adapted digraph.
 		    typedef GR Digraph;
 		    typedef DigraphAdaptorExtender<ReverseDigraphBase<GR> > Parent;
 		    typedef DGR Digraph;
 		  protected:
@@ -382,4 +386,4 @@
 		    /// Creates a reverse digraph adaptor for the given digraph.
 		    explicit ReverseDigraph(Digraph& digraph) {
 		      Parent::setDigraph(digraph);
 		    explicit ReverseDigraph(DGR& digraph) {
 		      Parent::initialize(digraph);
+		    }
@@ -392,5 +396,5 @@
 		  /// \relates ReverseDigraph
 		  template<typename GR>
 		  ReverseDigraph<const GR> reverseDigraph(const GR& digraph) {
-		    return ReverseDigraph<const GR>(digraph);
+		  template<typename DGR>
 		  ReverseDigraph<const DGR> reverseDigraph(const DGR& digraph) {
 		    return ReverseDigraph<const DGR>(digraph);
+		  }
@@ -398,15 +402,14 @@
 		  template <typename _Digraph, typename _NodeFilterMap,
 		            typename _ArcFilterMap, bool _checked = true>
-		  class SubDigraphBase : public DigraphAdaptorBase<_Digraph> {
+		  template <typename DGR, typename NF, typename AF, bool ch = true>
 		  class SubDigraphBase : public DigraphAdaptorBase<DGR> {
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _ArcFilterMap ArcFilterMap;
+		    typedef DGR Digraph;
 		    typedef NF NodeFilterMap;
 		    typedef AF ArcFilterMap;
 		    typedef SubDigraphBase Adaptor;
 		    typedef DigraphAdaptorBase<_Digraph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter;
 		    ArcFilterMap* _arc_filter;
 		    NF* _node_filter;
 		    AF* _arc_filter;
 		    SubDigraphBase()
@@ -414,7 +417,6 @@
-		    void setNodeFilterMap(NodeFilterMap& node_filter) {
+		    void initialize(DGR& digraph, NF& node_filter, AF& arc_filter) {
 		      Parent::initialize(digraph);
 		      _node_filter = &node_filter;
+		    }
 		    void setArcFilterMap(ArcFilterMap& arc_filter) {
 		      _arc_filter = &arc_filter;
+		      _arc_filter = &arc_filter;
+		    }
@@ -489,3 +491,3 @@
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& source, const Node& target,
@@ -502,14 +504,18 @@
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		  public:
 		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			      LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -522,3 +528,3 @@
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -527,14 +533,16 @@
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			      LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -547,3 +555,3 @@
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -554,15 +562,15 @@
 		  template <typename _Digraph, typename _NodeFilterMap, typename _ArcFilterMap>
 		  class SubDigraphBase<_Digraph, _NodeFilterMap, _ArcFilterMap, false>
-		    : public DigraphAdaptorBase<_Digraph> {
+		  template <typename DGR, typename NF, typename AF>
 		  class SubDigraphBase<DGR, NF, AF, false>
 		    : public DigraphAdaptorBase<DGR> {
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _ArcFilterMap ArcFilterMap;
+		    typedef DGR Digraph;
 		    typedef NF NodeFilterMap;
 		    typedef AF ArcFilterMap;
 		    typedef SubDigraphBase Adaptor;
 		    typedef DigraphAdaptorBase<Digraph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter;
 		    ArcFilterMap* _arc_filter;
 		    NF* _node_filter;
 		    AF* _arc_filter;
 		    SubDigraphBase()
@@ -570,7 +578,6 @@
-		    void setNodeFilterMap(NodeFilterMap& node_filter) {
+		    void initialize(DGR& digraph, NF& node_filter, AF& arc_filter) {
 		      Parent::initialize(digraph);
 		      _node_filter = &node_filter;
+		    }
 		    void setArcFilterMap(ArcFilterMap& arc_filter) {
 		      _arc_filter = &arc_filter;
+		      _arc_filter = &arc_filter;
+		    }
@@ -629,3 +636,3 @@
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& source, const Node& target,
@@ -642,14 +649,16 @@
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -662,3 +671,3 @@
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -667,14 +676,16 @@
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -687,3 +698,3 @@
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -710,3 +721,3 @@
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
@@ -716,3 +727,3 @@
 		  /// adapted digraph. The default type is
-		  /// \ref concepts::Digraph::NodeMap "GR::NodeMap<bool>".
+		  /// \ref concepts::Digraph::NodeMap "DGR::NodeMap<bool>".
 		  /// \tparam AF The type of the arc filter map.
@@ -720,3 +731,3 @@
 		  /// adapted digraph. The default type is
-		  /// \ref concepts::Digraph::ArcMap "GR::ArcMap<bool>".
+		  /// \ref concepts::Digraph::ArcMap "DGR::ArcMap<bool>".
 		  ///
@@ -728,10 +739,10 @@
 		#ifdef DOXYGEN
-		  template<typename GR, typename NF, typename AF>
+		  template<typename DGR, typename NF, typename AF>
 		  class SubDigraph {
 		#else
 		  template<typename GR,
 		           typename NF = typename GR::template NodeMap<bool>,
-		           typename AF = typename GR::template ArcMap<bool> >
+		  template<typename DGR,
 		           typename NF = typename DGR::template NodeMap<bool>,
 		           typename AF = typename DGR::template ArcMap<bool> >
 		  class SubDigraph :
-		    public DigraphAdaptorExtender<SubDigraphBase<GR, NF, AF, true> > {
+		    public DigraphAdaptorExtender<SubDigraphBase<DGR, NF, AF, true> > {
 		#endif
@@ -739,3 +750,3 @@
 		    /// The type of the adapted digraph.
-		    typedef GR Digraph;
+		    typedef DGR Digraph;
 		    /// The type of the node filter map.
@@ -745,3 +756,3 @@
-		    typedef DigraphAdaptorExtender<SubDigraphBase<GR, NF, AF, true> >
+		    typedef DigraphAdaptorExtender<SubDigraphBase<DGR, NF, AF, true> >
 		      Parent;
@@ -759,7 +770,4 @@
 		    /// given node and arc filter maps.
 		    SubDigraph(Digraph& digraph, NodeFilterMap& node_filter,
 		               ArcFilterMap& arc_filter) {
 		      setDigraph(digraph);
 		      setNodeFilterMap(node_filter);
-		      setArcFilterMap(arc_filter);
+		    SubDigraph(DGR& digraph, NF& node_filter, AF& arc_filter) {
 		      Parent::initialize(digraph, node_filter, arc_filter);
+		    }
@@ -825,32 +833,32 @@
 		  /// \relates SubDigraph
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, NF, AF>
 		  subDigraph(const GR& digraph,
 		             NF& node_filter_map, AF& arc_filter_map) {
 		    return SubDigraph<const GR, NF, AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, NF, AF>
 		  subDigraph(const DGR& digraph,
 		             NF& node_filter, AF& arc_filter) {
 		    return SubDigraph<const DGR, NF, AF>
 		      (digraph, node_filter, arc_filter);
+		  }
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, const NF, AF>
 		  subDigraph(const GR& digraph,
 		             const NF& node_filter_map, AF& arc_filter_map) {
 		    return SubDigraph<const GR, const NF, AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, const NF, AF>
 		  subDigraph(const DGR& digraph,
 		             const NF& node_filter, AF& arc_filter) {
 		    return SubDigraph<const DGR, const NF, AF>
 		      (digraph, node_filter, arc_filter);
+		  }
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, NF, const AF>
 		  subDigraph(const GR& digraph,
 		             NF& node_filter_map, const AF& arc_filter_map) {
 		    return SubDigraph<const GR, NF, const AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, NF, const AF>
 		  subDigraph(const DGR& digraph,
 		             NF& node_filter, const AF& arc_filter) {
 		    return SubDigraph<const DGR, NF, const AF>
 		      (digraph, node_filter, arc_filter);
+		  }
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, const NF, const AF>
 		  subDigraph(const GR& digraph,
 		             const NF& node_filter_map, const AF& arc_filter_map) {
 		    return SubDigraph<const GR, const NF, const AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, const NF, const AF>
 		  subDigraph(const DGR& digraph,
 		             const NF& node_filter, const AF& arc_filter) {
 		    return SubDigraph<const DGR, const NF, const AF>
 		      (digraph, node_filter, arc_filter);
+		  }
@@ -858,25 +866,23 @@
 		  template <typename _Graph, typename _NodeFilterMap,
 		            typename _EdgeFilterMap, bool _checked = true>
-		  class SubGraphBase : public GraphAdaptorBase<_Graph> {
+		  template <typename GR, typename NF, typename EF, bool ch = true>
 		  class SubGraphBase : public GraphAdaptorBase<GR> {
 		    typedef GraphAdaptorBase<GR> Parent;
 		  public:
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _EdgeFilterMap EdgeFilterMap;
+		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef EF EdgeFilterMap;
 		    typedef SubGraphBase Adaptor;
 		    typedef GraphAdaptorBase<_Graph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter_map;
 		    EdgeFilterMap* _edge_filter_map;
 		    NF* _node_filter;
 		    EF* _edge_filter;
 		    SubGraphBase()
 		      : Parent(), _node_filter_map(0), _edge_filter_map(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter_map) {
 		      _node_filter_map=&node_filter_map;
+		    }
 		    void setEdgeFilterMap(EdgeFilterMap& edge_filter_map) {
-		      _edge_filter_map=&edge_filter_map;
+		      : Parent(), _node_filter(0), _edge_filter(0) { }
 		    void initialize(GR& graph, NF& node_filter, EF& edge_filter) {
 		      Parent::initialize(graph);
 		      _node_filter = &node_filter;
 		      _edge_filter = &edge_filter;
+		    }
@@ -891,3 +897,3 @@
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
@@ -896,5 +902,5 @@
 		      Parent::first(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]
-		                            || !(*_node_filter_map)[Parent::target(i)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::source(i)]
 		                            || !(*_node_filter)[Parent::target(i)]))
 		        Parent::next(i);
@@ -904,5 +910,5 @@
 		      Parent::first(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
-		                            || !(*_node_filter_map)[Parent::v(i)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[Parent::v(i)]))
 		        Parent::next(i);
@@ -912,4 +918,4 @@
 		      Parent::firstIn(i, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]))
 		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::source(i)]))
 		        Parent::nextIn(i);
@@ -919,4 +925,4 @@
 		      Parent::firstOut(i, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::target(i)]))
 		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::target(i)]))
 		        Parent::nextOut(i);
@@ -926,5 +932,5 @@
 		      Parent::firstInc(i, d, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
-		                            || !(*_node_filter_map)[Parent::v(i)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[Parent::v(i)]))
 		        Parent::nextInc(i, d);
@@ -934,3 +940,3 @@
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
@@ -939,5 +945,5 @@
 		      Parent::next(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]
-		                            || !(*_node_filter_map)[Parent::target(i)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::source(i)]
 		                            || !(*_node_filter)[Parent::target(i)]))
 		        Parent::next(i);
@@ -947,5 +953,5 @@
 		      Parent::next(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
-		                            || !(*_node_filter_map)[Parent::v(i)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[Parent::v(i)]))
 		        Parent::next(i);
@@ -955,4 +961,4 @@
 		      Parent::nextIn(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]))
 		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::source(i)]))
 		        Parent::nextIn(i);
@@ -962,4 +968,4 @@
 		      Parent::nextOut(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::target(i)]))
 		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::target(i)]))
 		        Parent::nextOut(i);
@@ -969,5 +975,5 @@
 		      Parent::nextInc(i, d);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
-		                            || !(*_node_filter_map)[Parent::v(i)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[Parent::v(i)]))
 		        Parent::nextInc(i, d);
@@ -975,7 +981,7 @@
 		    void status(const Node& n, bool v) const { _node_filter_map->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter_map->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter_map)[n]; }
-		    bool status(const Edge& e) const { return (*_edge_filter_map)[e]; }
+		    void status(const Node& n, bool v) const { _node_filter->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter)[n]; }
 		    bool status(const Edge& e) const { return (*_edge_filter)[e]; }
@@ -988,3 +994,3 @@
 		                const Arc& prev = INVALID) const {
-		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
+		      if (!(*_node_filter)[u] || !(*_node_filter)[v]) {
 		        return INVALID;
@@ -992,3 +998,3 @@
 		      Arc arc = Parent::findArc(u, v, prev);
-		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
+		      while (arc != INVALID && !(*_edge_filter)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
@@ -1001,3 +1007,3 @@
 		                  const Edge& prev = INVALID) const {
-		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
+		      if (!(*_node_filter)[u] || !(*_node_filter)[v]) {
 		        return INVALID;
@@ -1005,3 +1011,3 @@
 		      Edge edge = Parent::findEdge(u, v, prev);
-		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
+		      while (edge != INVALID && !(*_edge_filter)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
@@ -1011,14 +1017,16 @@
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      NodeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -1031,3 +1039,3 @@
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -1036,14 +1044,16 @@
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      ArcMap(const SubGraphBase<GR, NF, EF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubGraphBase<GR, NF, EF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -1056,3 +1066,3 @@
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -1061,15 +1071,17 @@
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template EdgeMap<_Value> > {
+		    template <typename V>
 		    class EdgeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template EdgeMap<Value> > MapParent;
 		      EdgeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      EdgeMap(const Adaptor& adaptor, const Value& value)
-		        : MapParent(adaptor, value) {}
+		      typedef V Value;
 		      EdgeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      EdgeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -1082,3 +1094,3 @@
 		      EdgeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -1089,23 +1101,22 @@
 		  template <typename _Graph, typename _NodeFilterMap, typename _EdgeFilterMap>
 		  class SubGraphBase<_Graph, _NodeFilterMap, _EdgeFilterMap, false>
-		    : public GraphAdaptorBase<_Graph> {
+		  template <typename GR, typename NF, typename EF>
 		  class SubGraphBase<GR, NF, EF, false>
 		    : public GraphAdaptorBase<GR> {
 		    typedef GraphAdaptorBase<GR> Parent;
 		  public:
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _EdgeFilterMap EdgeFilterMap;
+		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef EF EdgeFilterMap;
 		    typedef SubGraphBase Adaptor;
 		    typedef GraphAdaptorBase<_Graph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter_map;
 		    EdgeFilterMap* _edge_filter_map;
 		    SubGraphBase() : Parent(),
 		                     _node_filter_map(0), _edge_filter_map(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter_map) {
 		      _node_filter_map=&node_filter_map;
+		    }
 		    void setEdgeFilterMap(EdgeFilterMap& edge_filter_map) {
 		      _edge_filter_map=&edge_filter_map;
 		    NF* _node_filter;
 		    EF* _edge_filter;
 		    SubGraphBase()
 			  : Parent(), _node_filter(0), _edge_filter(0) { }
 		    void initialize(GR& graph, NF& node_filter, EF& edge_filter) {
 		      Parent::initialize(graph);
 		      _node_filter = &node_filter;
 		      _edge_filter = &edge_filter;
+		    }
@@ -1120,3 +1131,3 @@
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
@@ -1125,3 +1136,3 @@
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::next(i);
+		    }
@@ -1130,3 +1141,3 @@
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::next(i);
+		    }
@@ -1135,3 +1146,3 @@
 		      Parent::firstIn(i, n);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextIn(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextIn(i);
+		    }
@@ -1140,3 +1151,3 @@
 		      Parent::firstOut(i, n);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextOut(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextOut(i);
+		    }
@@ -1145,3 +1156,3 @@
 		      Parent::firstInc(i, d, n);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextInc(i, d);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextInc(i, d);
+		    }
@@ -1150,3 +1161,3 @@
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
@@ -1154,3 +1165,3 @@
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::next(i);
+		    }
@@ -1158,3 +1169,3 @@
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::next(i);
+		    }
@@ -1162,3 +1173,3 @@
 		      Parent::nextIn(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextIn(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextIn(i);
+		    }
@@ -1167,3 +1178,3 @@
 		      Parent::nextOut(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextOut(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextOut(i);
+		    }
@@ -1171,10 +1182,10 @@
 		      Parent::nextInc(i, d);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextInc(i, d);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextInc(i, d);
+		    }
 		    void status(const Node& n, bool v) const { _node_filter_map->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter_map->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter_map)[n]; }
-		    bool status(const Edge& e) const { return (*_edge_filter_map)[e]; }
+		    void status(const Node& n, bool v) const { _node_filter->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter)[n]; }
 		    bool status(const Edge& e) const { return (*_edge_filter)[e]; }
@@ -1188,3 +1199,3 @@
 		      Arc arc = Parent::findArc(u, v, prev);
-		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
+		      while (arc != INVALID && !(*_edge_filter)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
@@ -1198,3 +1209,3 @@
 		      Edge edge = Parent::findEdge(u, v, prev);
-		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
+		      while (edge != INVALID && !(*_edge_filter)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
@@ -1204,14 +1215,16 @@
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      NodeMap(const SubGraphBase<GR, NF, EF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubGraphBase<GR, NF, EF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -1224,3 +1237,3 @@
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -1229,14 +1242,16 @@
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		      typedef V Value;
 		      ArcMap(const SubGraphBase<GR, NF, EF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubGraphBase<GR, NF, EF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -1249,3 +1264,3 @@
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -1254,15 +1269,17 @@
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template EdgeMap<_Value> > {
+		    template <typename V>
 		    class EdgeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 			LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template EdgeMap<Value> > MapParent;
 		      EdgeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      EdgeMap(const Adaptor& adaptor, const _Value& value)
-		        : MapParent(adaptor, value) {}
+		      typedef V Value;
 		      EdgeMap(const SubGraphBase<GR, NF, EF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      EdgeMap(const SubGraphBase<GR, NF, EF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -1275,3 +1292,3 @@
 		      EdgeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
@@ -1334,3 +1351,3 @@
-		    typedef GraphAdaptorExtender< SubGraphBase<GR, NF, EF, true> >
 		    typedef GraphAdaptorExtender<SubGraphBase<GR, NF, EF, true> >
 		      Parent;
@@ -1348,7 +1365,4 @@
 		    /// and edge filter maps.
 		    SubGraph(Graph& graph, NodeFilterMap& node_filter_map,
 		             EdgeFilterMap& edge_filter_map) {
 		      setGraph(graph);
 		      setNodeFilterMap(node_filter_map);
-		      setEdgeFilterMap(edge_filter_map);
+		    SubGraph(GR& graph, NF& node_filter, EF& edge_filter) {
 		      initialize(graph, node_filter, edge_filter);
+		    }
@@ -1416,6 +1430,5 @@
 		  SubGraph<const GR, NF, EF>
 		  subGraph(const GR& graph,
 		           NF& node_filter_map, EF& edge_filter_map) {
 		  subGraph(const GR& graph, NF& node_filter, EF& edge_filter) {
 		    return SubGraph<const GR, NF, EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
@@ -1424,6 +1437,5 @@
 		  SubGraph<const GR, const NF, EF>
 		  subGraph(const GR& graph,
 		           const NF& node_filter_map, EF& edge_filter_map) {
 		  subGraph(const GR& graph, const NF& node_filter, EF& edge_filter) {
 		    return SubGraph<const GR, const NF, EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
@@ -1432,6 +1444,5 @@
 		  SubGraph<const GR, NF, const EF>
 		  subGraph(const GR& graph,
 		           NF& node_filter_map, const EF& edge_filter_map) {
 		  subGraph(const GR& graph, NF& node_filter, const EF& edge_filter) {
 		    return SubGraph<const GR, NF, const EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
@@ -1440,6 +1451,5 @@
 		  SubGraph<const GR, const NF, const EF>
 		  subGraph(const GR& graph,
 		           const NF& node_filter_map, const EF& edge_filter_map) {
 		  subGraph(const GR& graph, const NF& node_filter, const EF& edge_filter) {
 		    return SubGraph<const GR, const NF, const EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
@@ -1483,4 +1493,9 @@
 		    public DigraphAdaptorExtender<
-		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, bool>, true> > {
+		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, Const<bool, true> >,
 		                     true> > {
 		#endif
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, Const<bool, true> >,
 		                     true> > Parent;
 		  public:
@@ -1490,6 +1505,2 @@
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, bool>, true> >
 		      Parent;
 		    typedef typename Parent::Node Node;
@@ -1497,7 +1508,5 @@
 		  protected:
 		    ConstMap<typename Digraph::Arc, bool> const_true_map;
 		    FilterNodes() : const_true_map(true) {
 		      Parent::setArcFilterMap(const_true_map);
+		    }
+		    ConstMap<typename Digraph::Arc, Const<bool, true> > const_true_map;
 		    FilterNodes() : const_true_map() {}
@@ -1509,8 +1518,6 @@
 		    /// given node filter map.
 		    FilterNodes(GR& graph, NodeFilterMap& node_filter) :
 		      Parent(), const_true_map(true)
 		    FilterNodes(GR& graph, NF& node_filter)
 		      : Parent(), const_true_map()
+		    {
 		      Parent::setDigraph(graph);
 		      Parent::setNodeFilterMap(node_filter);
-		      Parent::setArcFilterMap(const_true_map);
+		      Parent::initialize(graph, node_filter, const_true_map);
+		    }
@@ -1549,18 +1556,20 @@
 		    public GraphAdaptorExtender<
-		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, bool>, true> > {
+		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
 		                   true> > {
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
 		                   true> > Parent;
 		  public:
 		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, bool>, true> >
 		      Parent;
 		    typedef typename Parent::Node Node;
 		  protected:
 		    ConstMap<typename Graph::Edge, bool> const_true_map;
 		    FilterNodes() : const_true_map(true) {
 		      Parent::setEdgeFilterMap(const_true_map);
+		    }
+		    ConstMap<typename GR::Edge, Const<bool, true> > const_true_map;
 		    FilterNodes() : const_true_map() {}
@@ -1568,7 +1577,5 @@
 		    FilterNodes(Graph& _graph, NodeFilterMap& node_filter_map) :
 		      Parent(), const_true_map(true) {
 		      Parent::setGraph(_graph);
 		      Parent::setNodeFilterMap(node_filter_map);
-		      Parent::setEdgeFilterMap(const_true_map);
+		    FilterNodes(GR& graph, NodeFilterMap& node_filter) :
 		      Parent(), const_true_map() {
 		      Parent::initialize(graph, node_filter, const_true_map);
+		    }
@@ -1590,4 +1597,4 @@
 		  FilterNodes<const GR, NF>
 		  filterNodes(const GR& graph, NF& node_filter_map) {
 		    return FilterNodes<const GR, NF>(graph, node_filter_map);
 		  filterNodes(const GR& graph, NF& node_filter) {
 		    return FilterNodes<const GR, NF>(graph, node_filter);
+		  }
@@ -1596,4 +1603,4 @@
 		  FilterNodes<const GR, const NF>
 		  filterNodes(const GR& graph, const NF& node_filter_map) {
 		    return FilterNodes<const GR, const NF>(graph, node_filter_map);
 		  filterNodes(const GR& graph, const NF& node_filter) {
 		    return FilterNodes<const GR, const NF>(graph, node_filter);
+		  }
@@ -1614,3 +1621,3 @@
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
@@ -1620,3 +1627,3 @@
 		  /// adapted digraph. The default type is
-		  /// \ref concepts::Digraph::ArcMap "GR::ArcMap<bool>".
+		  /// \ref concepts::Digraph::ArcMap "DGR::ArcMap<bool>".
 		  ///
@@ -1625,3 +1632,3 @@
 		#ifdef DOXYGEN
-		  template<typename GR,
+		  template<typename DGR,
 		           typename AF>
@@ -1629,11 +1636,17 @@
 		#else
 		  template<typename GR,
 		           typename AF = typename GR::template ArcMap<bool> >
 		  template<typename DGR,
 		           typename AF = typename DGR::template ArcMap<bool> >
 		  class FilterArcs :
 		    public DigraphAdaptorExtender<
-		      SubDigraphBase<GR, ConstMap<typename GR::Node, bool>, AF, false> > {
+		      SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
 		                     AF, false> > {
 		#endif
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
 		                     AF, false> > Parent;
 		  public:
 		    /// The type of the adapted digraph.
-		    typedef GR Digraph;
+		    typedef DGR Digraph;
 		    /// The type of the arc filter map.
@@ -1641,6 +1654,2 @@
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<GR, ConstMap<typename GR::Node, bool>, AF, false> >
 		      Parent;
 		    typedef typename Parent::Arc Arc;
@@ -1648,7 +1657,5 @@
 		  protected:
 		    ConstMap<typename Digraph::Node, bool> const_true_map;
 		    FilterArcs() : const_true_map(true) {
 		      Parent::setNodeFilterMap(const_true_map);
+		    }
+		    ConstMap<typename DGR::Node, Const<bool, true> > const_true_map;
 		    FilterArcs() : const_true_map() {}
@@ -1660,7 +1667,5 @@
 		    /// filter map.
 		    FilterArcs(Digraph& digraph, ArcFilterMap& arc_filter)
 		      : Parent(), const_true_map(true) {
 		      Parent::setDigraph(digraph);
 		      Parent::setNodeFilterMap(const_true_map);
-		      Parent::setArcFilterMap(arc_filter);
+		    FilterArcs(DGR& digraph, ArcFilterMap& arc_filter)
 		      : Parent(), const_true_map() {
 		      Parent::initialize(digraph, const_true_map, arc_filter);
+		    }
@@ -1700,12 +1705,12 @@
 		  /// \relates FilterArcs
 		  template<typename GR, typename AF>
 		  FilterArcs<const GR, AF>
 		  filterArcs(const GR& digraph, AF& arc_filter_map) {
 		    return FilterArcs<const GR, AF>(digraph, arc_filter_map);
 		  template<typename DGR, typename AF>
 		  FilterArcs<const DGR, AF>
 		  filterArcs(const DGR& digraph, AF& arc_filter) {
 		    return FilterArcs<const DGR, AF>(digraph, arc_filter);
+		  }
 		  template<typename GR, typename AF>
 		  FilterArcs<const GR, const AF>
 		  filterArcs(const GR& digraph, const AF& arc_filter_map) {
 		    return FilterArcs<const GR, const AF>(digraph, arc_filter_map);
 		  template<typename DGR, typename AF>
 		  FilterArcs<const DGR, const AF>
 		  filterArcs(const DGR& digraph, const AF& arc_filter) {
 		    return FilterArcs<const DGR, const AF>(digraph, arc_filter);
+		  }
@@ -1745,5 +1750,11 @@
 		    public GraphAdaptorExtender<
-		      SubGraphBase<GR, ConstMap<typename GR::Node,bool>, EF, false> > {
+		      SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true> >,
 		                   EF, false> > {
 		#endif
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true > >,
 		                   EF, false> > Parent;
 		  public:
 		    /// The type of the adapted graph.
@@ -1753,6 +1764,2 @@
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, ConstMap<typename GR::Node,bool>, EF, false> >
 		      Parent;
 		    typedef typename Parent::Edge Edge;
@@ -1760,3 +1767,3 @@
 		  protected:
-		    ConstMap<typename Graph::Node, bool> const_true_map;
+		    ConstMap<typename GR::Node, Const<bool, true> > const_true_map;
@@ -1772,7 +1779,5 @@
 		    /// filter map.
 		    FilterEdges(Graph& graph, EdgeFilterMap& edge_filter_map) :
 		      Parent(), const_true_map(true) {
 		      Parent::setGraph(graph);
 		      Parent::setNodeFilterMap(const_true_map);
-		      Parent::setEdgeFilterMap(edge_filter_map);
+		    FilterEdges(GR& graph, EF& edge_filter)
 		      : Parent(), const_true_map() {
 		      Parent::initialize(graph, const_true_map, edge_filter);
+		    }
@@ -1814,4 +1819,4 @@
 		  FilterEdges<const GR, EF>
 		  filterEdges(const GR& graph, EF& edge_filter_map) {
 		    return FilterEdges<const GR, EF>(graph, edge_filter_map);
 		  filterEdges(const GR& graph, EF& edge_filter) {
 		    return FilterEdges<const GR, EF>(graph, edge_filter);
+		  }
@@ -1820,4 +1825,4 @@
 		  FilterEdges<const GR, const EF>
 		  filterEdges(const GR& graph, const EF& edge_filter_map) {
 		    return FilterEdges<const GR, const EF>(graph, edge_filter_map);
 		  filterEdges(const GR& graph, const EF& edge_filter) {
 		    return FilterEdges<const GR, const EF>(graph, edge_filter);
+		  }
@@ -1825,6 +1830,6 @@
-		  template <typename _Digraph>
+		  template <typename DGR>
 		  class UndirectorBase {
 		  public:
-		    typedef _Digraph Digraph;
+		    typedef DGR Digraph;
 		    typedef UndirectorBase Adaptor;
@@ -1836,9 +1841,10 @@
-		    class Arc : public Edge {
 		    class Arc {
 		      friend class UndirectorBase;
 		    protected:
 		      Edge _edge;
 		      bool _forward;
 		      Arc(const Edge& edge, bool forward) :
 		        Edge(edge), _forward(forward) {}
 		      Arc(const Edge& edge, bool forward)
 		        : _edge(edge), _forward(forward) {}
@@ -1847,11 +1853,11 @@
-		      Arc(Invalid) : Edge(INVALID), _forward(true) {}
+		      Arc(Invalid) : _edge(INVALID), _forward(true) {}
 		      operator const Edge&() const { return _edge; }
 		      bool operator==(const Arc &other) const {
 		        return _forward == other._forward &&
 		          static_cast<const Edge&>(*this) == static_cast<const Edge&>(other);
 		        return _forward == other._forward && _edge == other._edge;
+		      }
 		      bool operator!=(const Arc &other) const {
 		        return _forward != other._forward ||
 		          static_cast<const Edge&>(*this) != static_cast<const Edge&>(other);
 		        return _forward != other._forward || _edge != other._edge;
+		      }
@@ -1859,4 +1865,3 @@
 		        return _forward < other._forward ||
 		          (_forward == other._forward &&
 		           static_cast<const Edge&>(*this) < static_cast<const Edge&>(other));
 		          (_forward == other._forward && _edge < other._edge);
+		      }
@@ -1873,3 +1878,3 @@
 		    void first(Arc& a) const {
 		      _digraph->first(a);
+		      _digraph->first(a._edge);
 		      a._forward = true;
@@ -1881,3 +1886,3 @@
 		      } else {
 		        _digraph->next(a);
+		        _digraph->next(a._edge);
 		        a._forward = true;
@@ -1895,7 +1900,7 @@
 		    void firstOut(Arc& a, const Node& n) const {
 		      _digraph->firstIn(a, n);
 		      if( static_cast<const Edge&>(a) != INVALID ) {
 		      _digraph->firstIn(a._edge, n);
 		      if (a._edge != INVALID ) {
 		        a._forward = false;
 		      } else {
 		        _digraph->firstOut(a, n);
+		        _digraph->firstOut(a._edge, n);
 		        a._forward = true;
@@ -1905,6 +1910,6 @@
 		      if (!a._forward) {
 		        Node n = _digraph->target(a);
 		        _digraph->nextIn(a);
 		        if (static_cast<const Edge&>(a) == INVALID ) {
 		          _digraph->firstOut(a, n);
 		        Node n = _digraph->target(a._edge);
 		        _digraph->nextIn(a._edge);
 		        if (a._edge == INVALID) {
 		          _digraph->firstOut(a._edge, n);
 		          a._forward = true;
@@ -1913,3 +1918,3 @@
 		      else {
 		        _digraph->nextOut(a);
+		        _digraph->nextOut(a._edge);
+		      }
@@ -1918,7 +1923,7 @@
 		    void firstIn(Arc &a, const Node &n) const {
 		      _digraph->firstOut(a, n);
 		      if (static_cast<const Edge&>(a) != INVALID ) {
 		      _digraph->firstOut(a._edge, n);
 		      if (a._edge != INVALID ) {
 		        a._forward = false;
 		      } else {
 		        _digraph->firstIn(a, n);
+		        _digraph->firstIn(a._edge, n);
 		        a._forward = true;
@@ -1928,6 +1933,6 @@
 		      if (!a._forward) {
 		        Node n = _digraph->source(a);
 		        _digraph->nextOut(a);
 		        if( static_cast<const Edge&>(a) == INVALID ) {
 		          _digraph->firstIn(a, n);
 		        Node n = _digraph->source(a._edge);
 		        _digraph->nextOut(a._edge);
 		        if (a._edge == INVALID ) {
 		          _digraph->firstIn(a._edge, n);
 		          a._forward = true;
@@ -1936,3 +1941,3 @@
 		      else {
 		        _digraph->nextIn(a);
+		        _digraph->nextIn(a._edge);
+		      }
@@ -1969,3 +1974,3 @@
 		    Node source(const Arc &a) const {
 		      return a._forward ? _digraph->source(a) : _digraph->target(a);
+		      return a._forward ? _digraph->source(a._edge) : _digraph->target(a._edge);
+		    }
@@ -1973,3 +1978,3 @@
 		    Node target(const Arc &a) const {
 		      return a._forward ? _digraph->target(a) : _digraph->source(a);
+		      return a._forward ? _digraph->target(a._edge) : _digraph->source(a._edge);
+		    }
@@ -1979,5 +1984,2 @@
+		    }
 		    Arc direct(const Edge &e, const Node& n) const {
 		      return Arc(e, _digraph->source(e) == n);
+		    }
@@ -2064,3 +2066,3 @@
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMapBase {
@@ -2068,3 +2070,3 @@
-		      typedef typename Digraph::template ArcMap<_Value> MapImpl;
+		      typedef typename DGR::template ArcMap<V> MapImpl;
@@ -2074,3 +2076,3 @@
-		      typedef _Value Value;
+		      typedef V Value;
 		      typedef Arc Key;
@@ -2081,13 +2083,14 @@
-		      ArcMapBase(const Adaptor& adaptor) :
+		      ArcMapBase(const UndirectorBase<DGR>& adaptor) :
 		        _forward(*adaptor._digraph), _backward(*adaptor._digraph) {}
 		      ArcMapBase(const Adaptor& adaptor, const Value& v)
 		        : _forward(*adaptor._digraph, v), _backward(*adaptor._digraph, v) {}
 		      void set(const Arc& a, const Value& v) {
 		      ArcMapBase(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : _forward(*adaptor._digraph, value),
 		          _backward(*adaptor._digraph, value) {}
 		      void set(const Arc& a, const V& value) {
 		        if (direction(a)) {
-		          _forward.set(a, v);
+		          _forward.set(a, value);
 		        } else {
-		          _backward.set(a, v);
+		          _backward.set(a, value);
+		        }
@@ -2119,13 +2122,13 @@
 		    template <typename _Value>
 		    class NodeMap : public Digraph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public DGR::template NodeMap<V> {
 		      typedef typename DGR::template NodeMap<V> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef typename Digraph::template NodeMap<Value> Parent;
-		      explicit NodeMap(const Adaptor& adaptor)
+		      typedef V Value;
 		      explicit NodeMap(const UndirectorBase<DGR>& adaptor)
 		        : Parent(*adaptor._digraph) {}
-		      NodeMap(const Adaptor& adaptor, const _Value& value)
+		      NodeMap(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) { }
@@ -2145,14 +2148,14 @@
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
+		    {
 		      : public SubMapExtender<UndirectorBase<DGR>, ArcMapBase<V> > {
 		      typedef SubMapExtender<UndirectorBase<DGR>, ArcMapBase<V> > Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<Value> > Parent;
 		      explicit ArcMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      explicit ArcMap(const UndirectorBase<DGR>& adaptor)
 		        : Parent(adaptor) {}
-		      ArcMap(const Adaptor& adaptor, const Value& value)
+		      ArcMap(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -2171,13 +2174,13 @@
 		    template <typename _Value>
 		    class EdgeMap : public Digraph::template ArcMap<_Value> {
 		    template <typename V>
 		    class EdgeMap : public Digraph::template ArcMap<V> {
 		      typedef typename Digraph::template ArcMap<V> Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef typename Digraph::template ArcMap<Value> Parent;
-		      explicit EdgeMap(const Adaptor& adaptor)
+		      typedef V Value;
 		      explicit EdgeMap(const UndirectorBase<DGR>& adaptor)
 		        : Parent(*adaptor._digraph) {}
-		      EdgeMap(const Adaptor& adaptor, const Value& value)
+		      EdgeMap(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) {}
@@ -2197,7 +2200,10 @@
-		    typedef typename ItemSetTraits<Digraph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<DGR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Digraph, Edge>::ItemNotifier EdgeNotifier;
+		    typedef typename ItemSetTraits<DGR, Edge>::ItemNotifier EdgeNotifier;
 		    EdgeNotifier& notifier(Edge) const { return _digraph->notifier(Edge()); }
 		    typedef EdgeNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _digraph->notifier(Edge()); }
@@ -2207,5 +2213,5 @@
 		    Digraph* _digraph;
-		    void setDigraph(Digraph& digraph) {
+		    DGR* _digraph;
 		    void initialize(DGR& digraph) {
 		      _digraph = &digraph;
@@ -2228,3 +2234,3 @@
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
@@ -2238,3 +2244,3 @@
 		  /// of the adapted digraph.)
-		  template<typename GR>
+		  template<typename DGR>
 		#ifdef DOXYGEN
@@ -2243,8 +2249,8 @@
 		  class Undirector :
-		    public GraphAdaptorExtender<UndirectorBase<GR> > {
+		    public GraphAdaptorExtender<UndirectorBase<DGR> > {
 		#endif
 		    typedef GraphAdaptorExtender<UndirectorBase<DGR> > Parent;
 		  public:
 		    /// The type of the adapted digraph.
 		    typedef GR Digraph;
 		    typedef GraphAdaptorExtender<UndirectorBase<GR> > Parent;
 		    typedef DGR Digraph;
 		  protected:
@@ -2256,4 +2262,4 @@
 		    /// Creates an undirected graph from the given digraph.
 		    Undirector(Digraph& digraph) {
 		      setDigraph(digraph);
 		    Undirector(DGR& digraph) {
 		      initialize(digraph);
+		    }
@@ -2264,5 +2270,6 @@
 		    /// digraph to get an arc map of the undirected graph.
 		    /// Its value type is inherited from the first arc map type
 		    /// (\c %ForwardMap).
-		    template <typename ForwardMap, typename BackwardMap>
+		    /// Its value type is inherited from the first arc map type (\c FW).
 		    /// \tparam FW The type of the "foward" arc map.
 		    /// \tparam BK The type of the "backward" arc map.
 		    template <typename FW, typename BK>
 		    class CombinedArcMap {
@@ -2273,13 +2280,13 @@
 		      /// The value type of the map
 		      typedef typename ForwardMap::Value Value;
 		      typedef typename MapTraits<ForwardMap>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<ForwardMap>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<ForwardMap>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<ForwardMap>::ReturnValue Reference;
 		      typedef typename MapTraits<ForwardMap>::ConstReturnValue ConstReference;
 		      typedef typename FW::Value Value;
 		      typedef typename MapTraits<FW>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<FW>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<FW>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<FW>::ReturnValue Reference;
 		      typedef typename MapTraits<FW>::ConstReturnValue ConstReference;
 		      /// Constructor
-		      CombinedArcMap(ForwardMap& forward, BackwardMap& backward)
+		      CombinedArcMap(FW& forward, BK& backward)
 		        : _forward(&forward), _backward(&backward) {}
@@ -2315,4 +2322,4 @@
 		      ForwardMap* _forward;
 		      BackwardMap* _backward;
 		      FW* _forward;
 		      BK* _backward;
@@ -2323,27 +2330,24 @@
 		    /// This function just returns a combined arc map.
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<ForwardMap, BackwardMap>
 		    combinedArcMap(ForwardMap& forward, BackwardMap& backward) {
 		      return CombinedArcMap<ForwardMap, BackwardMap>(forward, backward);
 		    template <typename FW, typename BK>
 		    static CombinedArcMap<FW, BK>
 		    combinedArcMap(FW& forward, BK& backward) {
 		      return CombinedArcMap<FW, BK>(forward, backward);
+		    }
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<const ForwardMap, BackwardMap>
 		    combinedArcMap(const ForwardMap& forward, BackwardMap& backward) {
 		      return CombinedArcMap<const ForwardMap,
-		        BackwardMap>(forward, backward);
+		    template <typename FW, typename BK>
 		    static CombinedArcMap<const FW, BK>
 		    combinedArcMap(const FW& forward, BK& backward) {
 		      return CombinedArcMap<const FW, BK>(forward, backward);
+		    }
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<ForwardMap, const BackwardMap>
 		    combinedArcMap(ForwardMap& forward, const BackwardMap& backward) {
 		      return CombinedArcMap<ForwardMap,
-		        const BackwardMap>(forward, backward);
+		    template <typename FW, typename BK>
 		    static CombinedArcMap<FW, const BK>
 		    combinedArcMap(FW& forward, const BK& backward) {
 		      return CombinedArcMap<FW, const BK>(forward, backward);
+		    }
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<const ForwardMap, const BackwardMap>
 		    combinedArcMap(const ForwardMap& forward, const BackwardMap& backward) {
 		      return CombinedArcMap<const ForwardMap,
-		        const BackwardMap>(forward, backward);
+		    template <typename FW, typename BK>
 		    static CombinedArcMap<const FW, const BK>
 		    combinedArcMap(const FW& forward, const BK& backward) {
 		      return CombinedArcMap<const FW, const BK>(forward, backward);
+		    }
@@ -2357,5 +2361,5 @@
 		  /// \relates Undirector
 		  template<typename GR>
 		  Undirector<const GR> undirector(const GR& digraph) {
-		    return Undirector<const GR>(digraph);
+		  template<typename DGR>
 		  Undirector<const DGR> undirector(const DGR& digraph) {
 		    return Undirector<const DGR>(digraph);
+		  }
@@ -2363,3 +2367,3 @@
-		  template <typename _Graph, typename _DirectionMap>
+		  template <typename GR, typename DM>
 		  class OrienterBase {
@@ -2367,7 +2371,7 @@
 		    typedef _Graph Graph;
 		    typedef _DirectionMap DirectionMap;
 		    typedef typename Graph::Node Node;
-		    typedef typename Graph::Edge Arc;
+		    typedef GR Graph;
 		    typedef DM DirectionMap;
 		    typedef typename GR::Node Node;
 		    typedef typename GR::Edge Arc;
@@ -2450,18 +2454,18 @@
-		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
+		    typedef typename ItemSetTraits<GR, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
 		    template <typename _Value>
 		    class NodeMap : public _Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		      typedef typename GR::template NodeMap<V> Parent;
 		    public:
 		      typedef typename _Graph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const OrienterBase& adapter)
+		      explicit NodeMap(const OrienterBase<GR, DM>& adapter)
 		        : Parent(*adapter._graph) {}
-		      NodeMap(const OrienterBase& adapter, const _Value& value)
+		      NodeMap(const OrienterBase<GR, DM>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
@@ -2481,12 +2485,12 @@
 		    template <typename _Value>
 		    class ArcMap : public _Graph::template EdgeMap<_Value> {
 		    template <typename V>
 		    class ArcMap : public GR::template EdgeMap<V> {
 		      typedef typename Graph::template EdgeMap<V> Parent;
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      explicit ArcMap(const OrienterBase& adapter)
+		      explicit ArcMap(const OrienterBase<GR, DM>& adapter)
 		        : Parent(*adapter._graph) { }
-		      ArcMap(const OrienterBase& adapter, const _Value& value)
+		      ArcMap(const OrienterBase<GR, DM>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) { }
@@ -2509,5 +2513,6 @@
 		    Graph* _graph;
 		    DirectionMap* _direction;
-		    void setDirectionMap(DirectionMap& direction) {
+		    DM* _direction;
 		    void initialize(GR& graph, DM& direction) {
 		      _graph = &graph;
 		      _direction = &direction;
@@ -2515,6 +2520,2 @@
 		    void setGraph(Graph& graph) {
 		      _graph = &graph;
+		    }
 		  };
@@ -2558,2 +2559,3 @@
 		#endif
 		    typedef DigraphAdaptorExtender<OrienterBase<GR, DM> > Parent;
 		  public:
@@ -2565,6 +2567,7 @@
 		    typedef DigraphAdaptorExtender<OrienterBase<GR, DM> > Parent;
 		    typedef typename Parent::Arc Arc;
 		  protected:
 		    Orienter() { }
 		  public:
@@ -2574,5 +2577,4 @@
 		    /// Constructor of the adaptor.
 		    Orienter(Graph& graph, DirectionMap& direction) {
 		      setGraph(graph);
-		      setDirectionMap(direction);
+		    Orienter(GR& graph, DM& direction) {
 		      Parent::initialize(graph, direction);
+		    }
@@ -2596,4 +2598,4 @@
 		  Orienter<const GR, DM>
 		  orienter(const GR& graph, DM& direction_map) {
 		    return Orienter<const GR, DM>(graph, direction_map);
 		  orienter(const GR& graph, DM& direction) {
 		    return Orienter<const GR, DM>(graph, direction);
+		  }
@@ -2602,4 +2604,4 @@
 		  Orienter<const GR, const DM>
 		  orienter(const GR& graph, const DM& direction_map) {
 		    return Orienter<const GR, const DM>(graph, direction_map);
 		  orienter(const GR& graph, const DM& direction) {
 		    return Orienter<const GR, const DM>(graph, direction);
+		  }
@@ -2608,6 +2610,3 @@
 		    template<typename Digraph,
 		             typename CapacityMap,
 		             typename FlowMap,
 		             typename Tolerance>
 		    template <typename DGR, typename CM, typename FM, typename TL>
 		    class ResForwardFilter {
@@ -2615,3 +2614,3 @@
-		      typedef typename Digraph::Arc Key;
+		      typedef typename DGR::Arc Key;
 		      typedef bool Value;
@@ -2620,12 +2619,13 @@
 		      const CapacityMap* _capacity;
 		      const FlowMap* _flow;
-		      Tolerance _tolerance;
+		      const CM* _capacity;
 		      const FM* _flow;
 		      TL _tolerance;
 		    public:
 		      ResForwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                       const Tolerance& tolerance = Tolerance())
 		      ResForwardFilter(const CM& capacity, const FM& flow,
 		                       const TL& tolerance = TL())
 		        : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
-		      bool operator[](const typename Digraph::Arc& a) const {
+		      bool operator[](const typename DGR::Arc& a) const {
 		        return _tolerance.positive((*_capacity)[a] - (*_flow)[a]);
@@ -2634,6 +2634,3 @@
 		    template<typename Digraph,
 		             typename CapacityMap,
 		             typename FlowMap,
 		             typename Tolerance>
 		    template<typename DGR,typename CM, typename FM, typename TL>
 		    class ResBackwardFilter {
@@ -2641,3 +2638,3 @@
-		      typedef typename Digraph::Arc Key;
+		      typedef typename DGR::Arc Key;
 		      typedef bool Value;
@@ -2646,5 +2643,5 @@
 		      const CapacityMap* _capacity;
 		      const FlowMap* _flow;
-		      Tolerance _tolerance;
+		      const CM* _capacity;
 		      const FM* _flow;
 		      TL _tolerance;
@@ -2652,7 +2649,7 @@
 		      ResBackwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                        const Tolerance& tolerance = Tolerance())
 		      ResBackwardFilter(const CM& capacity, const FM& flow,
 		                        const TL& tolerance = TL())
 		        : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
-		      bool operator[](const typename Digraph::Arc& a) const {
+		      bool operator[](const typename DGR::Arc& a) const {
 		        return _tolerance.positive((*_flow)[a]);
@@ -2683,3 +2680,3 @@
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
@@ -2705,15 +2702,16 @@
 		#ifdef DOXYGEN
-		  template<typename GR, typename CM, typename FM, typename TL>
+		  template<typename DGR, typename CM, typename FM, typename TL>
 		  class ResidualDigraph
 		#else
 		  template<typename GR,
 		           typename CM = typename GR::template ArcMap<int>,
 		  template<typename DGR,
 		           typename CM = typename DGR::template ArcMap<int>,
 		           typename FM = CM,
 		           typename TL = Tolerance<typename CM::Value> >
 		  class ResidualDigraph :
 		    public FilterArcs<
 		      Undirector<const GR>,
 		      typename Undirector<const GR>::template CombinedArcMap<
 		        _adaptor_bits::ResForwardFilter<const GR, CM, FM, TL>,
 		        _adaptor_bits::ResBackwardFilter<const GR, CM, FM, TL> > >
 		  class ResidualDigraph
 		    : public SubDigraph<
 		        Undirector<const DGR>,
 		        ConstMap<typename DGR::Node, Const<bool, true> >,
 		        typename Undirector<const DGR>::template CombinedArcMap<
 		          _adaptor_bits::ResForwardFilter<const DGR, CM, FM, TL>,
 		          _adaptor_bits::ResBackwardFilter<const DGR, CM, FM, TL> > >
 		#endif
@@ -2723,3 +2721,3 @@
 		    /// The type of the underlying digraph.
-		    typedef GR Digraph;
+		    typedef DGR Digraph;
 		    /// The type of the capacity map.
@@ -2738,7 +2736,9 @@
 		    typedef _adaptor_bits::ResForwardFilter<const Digraph, CapacityMap,
 		                                            FlowMap, Tolerance> ForwardFilter;
 		    typedef _adaptor_bits::ResBackwardFilter<const Digraph, CapacityMap,
-		                                             FlowMap, Tolerance> BackwardFilter;
+		    typedef ConstMap<typename DGR::Node, Const<bool, true> > NodeFilter;
 		    typedef _adaptor_bits::ResForwardFilter<const DGR, CM,
 		                                            FM, TL> ForwardFilter;
 		    typedef _adaptor_bits::ResBackwardFilter<const DGR, CM,
 		                                             FM, TL> BackwardFilter;
@@ -2747,3 +2747,3 @@
-		    typedef FilterArcs<Undirected, ArcFilter> Parent;
+		    typedef SubDigraph<Undirected, NodeFilter, ArcFilter> Parent;
@@ -2753,2 +2753,3 @@
 		    Undirected _graph;
 		    NodeFilter _node_filter;
 		    ForwardFilter _forward_filter;
@@ -2763,5 +2764,6 @@
 		    /// digraph, the capacity map, the flow map, and a tolerance object.
 		    ResidualDigraph(const Digraph& digraph, const CapacityMap& capacity,
 		                    FlowMap& flow, const Tolerance& tolerance = Tolerance())
-		      : Parent(), _capacity(&capacity), _flow(&flow), _graph(digraph),
+		    ResidualDigraph(const DGR& digraph, const CM& capacity,
 		                    FM& flow, const TL& tolerance = Tolerance())
 		      : Parent(), _capacity(&capacity), _flow(&flow),
 		        _graph(digraph), _node_filter(),
 		        _forward_filter(capacity, flow, tolerance),
@@ -2770,4 +2772,3 @@
+		    {
 		      Parent::setDigraph(_graph);
 		      Parent::setArcFilterMap(_arc_filter);
 		      Parent::initialize(_graph, _node_filter, _arc_filter);
+		    }
@@ -2847,3 +2848,4 @@
 		      /// Constructor
-		      ResidualCapacity(const Adaptor& adaptor) : _adaptor(&adaptor) {}
+		      ResidualCapacity(const ResidualDigraph<DGR, CM, FM, TL>& adaptor)
 		        : _adaptor(&adaptor) {}
@@ -2867,9 +2869,9 @@
 		  ///
-		  /// This function just returns a (read-only) \ref Residual adaptor.
+		  /// This function just returns a (read-only) \ref ResidualDigraph adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates Residual
 		  template<typename GR, typename CM, typename FM>
 		  ResidualDigraph<GR, CM, FM>
 		  residualDigraph(const GR& digraph, const CM& capacity_map, FM& flow_map) {
-		    return ResidualDigraph<GR, CM, FM> (digraph, capacity_map, flow_map);
+		  /// \relates ResidualDigraph
 		    template<typename DGR, typename CM, typename FM>
 		  ResidualDigraph<DGR, CM, FM>
 		  residualDigraph(const DGR& digraph, const CM& capacity_map, FM& flow_map) {
 		    return ResidualDigraph<DGR, CM, FM> (digraph, capacity_map, flow_map);
+		  }
@@ -2877,12 +2879,13 @@
-		  template <typename _Digraph>
+		  template <typename DGR>
 		  class SplitNodesBase {
 		    typedef DigraphAdaptorBase<const DGR> Parent;
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef DigraphAdaptorBase<const _Digraph> Parent;
 		    typedef DGR Digraph;
 		    typedef SplitNodesBase Adaptor;
 		    typedef typename Digraph::Node DigraphNode;
 		    typedef typename Digraph::Arc DigraphArc;
 		    typedef typename DGR::Node DigraphNode;
 		    typedef typename DGR::Arc DigraphArc;
@@ -3150,9 +3153,9 @@
-		    template <typename _Value>
+		    template <typename V>
 		    class NodeMapBase
 		      : public MapTraits<typename Parent::template NodeMap<_Value> > {
 		      typedef typename Parent::template NodeMap<_Value> NodeImpl;
 		      : public MapTraits<typename Parent::template NodeMap<V> > {
 		      typedef typename Parent::template NodeMap<V> NodeImpl;
 		    public:
 		      typedef Node Key;
-		      typedef _Value Value;
+		      typedef V Value;
 		      typedef typename MapTraits<NodeImpl>::ReferenceMapTag ReferenceMapTag;
@@ -3163,5 +3166,5 @@
-		      NodeMapBase(const Adaptor& adaptor)
+		      NodeMapBase(const SplitNodesBase<DGR>& adaptor)
 		        : _in_map(*adaptor._digraph), _out_map(*adaptor._digraph) {}
-		      NodeMapBase(const Adaptor& adaptor, const Value& value)
+		      NodeMapBase(const SplitNodesBase<DGR>& adaptor, const V& value)
 		        : _in_map(*adaptor._digraph, value),
@@ -3169,4 +3172,4 @@
 		      void set(const Node& key, const Value& val) {
 		        if (Adaptor::inNode(key)) { _in_map.set(key, val); }
 		      void set(const Node& key, const V& val) {
 		        if (SplitNodesBase<DGR>::inNode(key)) { _in_map.set(key, val); }
 		        else {_out_map.set(key, val); }
@@ -3175,3 +3178,3 @@
 		      ReturnValue operator[](const Node& key) {
-		        if (Adaptor::inNode(key)) { return _in_map[key]; }
+		        if (SplitNodesBase<DGR>::inNode(key)) { return _in_map[key]; }
 		        else { return _out_map[key]; }
@@ -3188,10 +3191,10 @@
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMapBase
 		      : public MapTraits<typename Parent::template ArcMap<_Value> > {
 		      typedef typename Parent::template ArcMap<_Value> ArcImpl;
-		      typedef typename Parent::template NodeMap<_Value> NodeImpl;
+		      : public MapTraits<typename Parent::template ArcMap<V> > {
 		      typedef typename Parent::template ArcMap<V> ArcImpl;
 		      typedef typename Parent::template NodeMap<V> NodeImpl;
 		    public:
 		      typedef Arc Key;
-		      typedef _Value Value;
+		      typedef V Value;
 		      typedef typename MapTraits<ArcImpl>::ReferenceMapTag ReferenceMapTag;
@@ -3202,5 +3205,5 @@
-		      ArcMapBase(const Adaptor& adaptor)
+		      ArcMapBase(const SplitNodesBase<DGR>& adaptor)
 		        : _arc_map(*adaptor._digraph), _node_map(*adaptor._digraph) {}
-		      ArcMapBase(const Adaptor& adaptor, const Value& value)
+		      ArcMapBase(const SplitNodesBase<DGR>& adaptor, const V& value)
 		        : _arc_map(*adaptor._digraph, value),
@@ -3208,7 +3211,7 @@
 		      void set(const Arc& key, const Value& val) {
 		        if (Adaptor::origArc(key)) {
-		          _arc_map.set(key._item.first(), val);
+		      void set(const Arc& key, const V& val) {
 		        if (SplitNodesBase<DGR>::origArc(key)) {
 		          _arc_map.set(static_cast<const DigraphArc&>(key), val);
 		        } else {
-		          _node_map.set(key._item.second(), val);
+		          _node_map.set(static_cast<const DigraphNode&>(key), val);
+		        }
@@ -3217,6 +3220,6 @@
 		      ReturnValue operator[](const Arc& key) {
 		        if (Adaptor::origArc(key)) {
 		          return _arc_map[key._item.first()];
 		        if (SplitNodesBase<DGR>::origArc(key)) {
 		          return _arc_map[static_cast<const DigraphArc&>(key)];
 		        } else {
-		          return _node_map[key._item.second()];
+		          return _node_map[static_cast<const DigraphNode&>(key)];
+		        }
@@ -3225,6 +3228,6 @@
 		      ConstReturnValue operator[](const Arc& key) const {
 		        if (Adaptor::origArc(key)) {
 		          return _arc_map[key._item.first()];
 		        if (SplitNodesBase<DGR>::origArc(key)) {
 		          return _arc_map[static_cast<const DigraphArc&>(key)];
 		        } else {
-		          return _node_map[key._item.second()];
+		          return _node_map[static_cast<const DigraphNode&>(key)];
+		        }
@@ -3239,14 +3242,14 @@
-		    template <typename _Value>
+		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<Adaptor, NodeMapBase<_Value> >
+		    {
 		      : public SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<V> > {
 		      typedef SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<V> > Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, NodeMapBase<Value> > Parent;
 		      NodeMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      NodeMap(const SplitNodesBase<DGR>& adaptor)
 		        : Parent(adaptor) {}
-		      NodeMap(const Adaptor& adaptor, const Value& value)
+		      NodeMap(const SplitNodesBase<DGR>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -3265,14 +3268,14 @@
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
+		    {
 		      : public SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<V> > {
 		      typedef SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<V> > Parent;
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<Value> > Parent;
 		      ArcMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      ArcMap(const SplitNodesBase<DGR>& adaptor)
 		        : Parent(adaptor) {}
-		      ArcMap(const Adaptor& adaptor, const Value& value)
+		      ArcMap(const SplitNodesBase<DGR>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
@@ -3295,5 +3298,5 @@
 		    Digraph* _digraph;
-		    void setDigraph(Digraph& digraph) {
+		    DGR* _digraph;
 		    void initialize(Digraph& digraph) {
 		      _digraph = &digraph;
@@ -3324,3 +3327,3 @@
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
@@ -3330,3 +3333,3 @@
 		  /// type of the adapted digraph.
-		  template <typename GR>
+		  template <typename DGR>
 		#ifdef DOXYGEN
@@ -3335,10 +3338,11 @@
 		  class SplitNodes
-		    : public DigraphAdaptorExtender<SplitNodesBase<const GR> > {
+		    : public DigraphAdaptorExtender<SplitNodesBase<const DGR> > {
 		#endif
 		    typedef DigraphAdaptorExtender<SplitNodesBase<const DGR> > Parent;
 		  public:
 		    typedef GR Digraph;
 		    typedef DigraphAdaptorExtender<SplitNodesBase<const GR> > Parent;
 		    typedef typename Digraph::Node DigraphNode;
-		    typedef typename Digraph::Arc DigraphArc;
+		    typedef DGR Digraph;
 		    typedef typename DGR::Node DigraphNode;
 		    typedef typename DGR::Arc DigraphArc;
@@ -3350,4 +3354,4 @@
 		    /// Constructor of the adaptor.
 		    SplitNodes(const Digraph& g) {
 		      Parent::setDigraph(g);
 		    SplitNodes(const DGR& g) {
 		      Parent::initialize(g);
+		    }
@@ -3420,5 +3424,6 @@
 		    /// to get a node map of the split digraph.
 		    /// Its value type is inherited from the first node map type
 		    /// (\c InNodeMap).
-		    template <typename InNodeMap, typename OutNodeMap>
+		    /// Its value type is inherited from the first node map type (\c IN).
 		    /// \tparam IN The type of the node map for the in-nodes.
 		    /// \tparam OUT The type of the node map for the out-nodes.
 		    template <typename IN, typename OUT>
 		    class CombinedNodeMap {
@@ -3429,12 +3434,12 @@
 		      /// The value type of the map
 		      typedef typename InNodeMap::Value Value;
 		      typedef typename MapTraits<InNodeMap>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<InNodeMap>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<InNodeMap>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<InNodeMap>::ReturnValue Reference;
-		      typedef typename MapTraits<InNodeMap>::ConstReturnValue ConstReference;
+		      typedef typename IN::Value Value;
 		      typedef typename MapTraits<IN>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<IN>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<IN>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<IN>::ReturnValue Reference;
 		      typedef typename MapTraits<IN>::ConstReturnValue ConstReference;
 		      /// Constructor
-		      CombinedNodeMap(InNodeMap& in_map, OutNodeMap& out_map)
+		      CombinedNodeMap(IN& in_map, OUT& out_map)
 		        : _in_map(in_map), _out_map(out_map) {}
@@ -3443,3 +3448,3 @@
 		      Value operator[](const Key& key) const {
-		        if (Parent::inNode(key)) {
+		        if (SplitNodesBase<const DGR>::inNode(key)) {
 		          return _in_map[key];
@@ -3452,3 +3457,3 @@
 		      Value& operator[](const Key& key) {
-		        if (Parent::inNode(key)) {
+		        if (SplitNodesBase<const DGR>::inNode(key)) {
 		          return _in_map[key];
@@ -3461,3 +3466,3 @@
 		      void set(const Key& key, const Value& value) {
-		        if (Parent::inNode(key)) {
+		        if (SplitNodesBase<const DGR>::inNode(key)) {
 		          _in_map.set(key, value);
@@ -3470,4 +3475,4 @@
 		      InNodeMap& _in_map;
 		      OutNodeMap& _out_map;
 		      IN& _in_map;
 		      OUT& _out_map;
@@ -3479,25 +3484,24 @@
 		    /// This function just returns a combined node map.
 		    template <typename InNodeMap, typename OutNodeMap>
 		    static CombinedNodeMap<InNodeMap, OutNodeMap>
 		    combinedNodeMap(InNodeMap& in_map, OutNodeMap& out_map) {
 		      return CombinedNodeMap<InNodeMap, OutNodeMap>(in_map, out_map);
 		    template <typename IN, typename OUT>
 		    static CombinedNodeMap<IN, OUT>
 		    combinedNodeMap(IN& in_map, OUT& out_map) {
 		      return CombinedNodeMap<IN, OUT>(in_map, out_map);
+		    }
 		    template <typename InNodeMap, typename OutNodeMap>
 		    static CombinedNodeMap<const InNodeMap, OutNodeMap>
 		    combinedNodeMap(const InNodeMap& in_map, OutNodeMap& out_map) {
 		      return CombinedNodeMap<const InNodeMap, OutNodeMap>(in_map, out_map);
 		    template <typename IN, typename OUT>
 		    static CombinedNodeMap<const IN, OUT>
 		    combinedNodeMap(const IN& in_map, OUT& out_map) {
 		      return CombinedNodeMap<const IN, OUT>(in_map, out_map);
+		    }
 		    template <typename InNodeMap, typename OutNodeMap>
 		    static CombinedNodeMap<InNodeMap, const OutNodeMap>
 		    combinedNodeMap(InNodeMap& in_map, const OutNodeMap& out_map) {
 		      return CombinedNodeMap<InNodeMap, const OutNodeMap>(in_map, out_map);
 		    template <typename IN, typename OUT>
 		    static CombinedNodeMap<IN, const OUT>
 		    combinedNodeMap(IN& in_map, const OUT& out_map) {
 		      return CombinedNodeMap<IN, const OUT>(in_map, out_map);
+		    }
 		    template <typename InNodeMap, typename OutNodeMap>
 		    static CombinedNodeMap<const InNodeMap, const OutNodeMap>
 		    combinedNodeMap(const InNodeMap& in_map, const OutNodeMap& out_map) {
 		      return CombinedNodeMap<const InNodeMap,
-		        const OutNodeMap>(in_map, out_map);
+		    template <typename IN, typename OUT>
 		    static CombinedNodeMap<const IN, const OUT>
 		    combinedNodeMap(const IN& in_map, const OUT& out_map) {
 		      return CombinedNodeMap<const IN, const OUT>(in_map, out_map);
+		    }
@@ -3509,5 +3513,6 @@
 		    /// original digraph to get an arc map of the split digraph.
 		    /// Its value type is inherited from the original arc map type
 		    /// (\c ArcMap).
-		    template <typename ArcMap, typename NodeMap>
+		    /// Its value type is inherited from the original arc map type (\c AM).
 		    /// \tparam AM The type of the arc map.
 		    /// \tparam NM the type of the node map.
 		    template <typename AM, typename NM>
 		    class CombinedArcMap {
@@ -3518,12 +3523,12 @@
 		      /// The value type of the map
 		      typedef typename ArcMap::Value Value;
 		      typedef typename MapTraits<ArcMap>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<ArcMap>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<ArcMap>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<ArcMap>::ReturnValue Reference;
-		      typedef typename MapTraits<ArcMap>::ConstReturnValue ConstReference;
+		      typedef typename AM::Value Value;
 		      typedef typename MapTraits<AM>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<AM>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<AM>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<AM>::ReturnValue Reference;
 		      typedef typename MapTraits<AM>::ConstReturnValue ConstReference;
 		      /// Constructor
-		      CombinedArcMap(ArcMap& arc_map, NodeMap& node_map)
+		      CombinedArcMap(AM& arc_map, NM& node_map)
 		        : _arc_map(arc_map), _node_map(node_map) {}
@@ -3532,3 +3537,3 @@
 		      Value operator[](const Key& arc) const {
-		        if (Parent::origArc(arc)) {
+		        if (SplitNodesBase<const DGR>::origArc(arc)) {
 		          return _arc_map[arc];
@@ -3541,3 +3546,3 @@
 		      Value& operator[](const Key& arc) {
-		        if (Parent::origArc(arc)) {
+		        if (SplitNodesBase<const DGR>::origArc(arc)) {
 		          return _arc_map[arc];
@@ -3550,3 +3555,3 @@
 		      void set(const Arc& arc, const Value& val) {
-		        if (Parent::origArc(arc)) {
+		        if (SplitNodesBase<const DGR>::origArc(arc)) {
 		          _arc_map.set(arc, val);
@@ -3558,4 +3563,6 @@
 		    private:
 		      ArcMap& _arc_map;
 		      NodeMap& _node_map;
 		      AM& _arc_map;
 		      NM& _node_map;
 		    };
@@ -3596,8 +3603,10 @@
 		  /// \relates SplitNodes
 		  template<typename GR>
 		  SplitNodes<GR>
 		  splitNodes(const GR& digraph) {
 		    return SplitNodes<GR>(digraph);
 		  template<typename DGR>
 		  SplitNodes<DGR>
 		  splitNodes(const DGR& digraph) {
 		    return SplitNodes<DGR>(digraph);
+		  }
 		#undef LEMON_SCOPE_FIX
 		} //namespace lemon

lemon/base.cc

Show inline comments

@@ -25,3 +25,3 @@
 		  float Tolerance<float>::def_epsilon = 1e-4;
+		  float Tolerance<float>::def_epsilon = static_cast<float>(1e-4);
 		  double Tolerance<double>::def_epsilon = 1e-10;

Changeset was too big and was cut off... Show full diff

0 comments (0 inline)

RhodeCode

Login to your account

Changeset was too big and was cut off... Show full diff

Changeset was too big and was cut off... Show full diff