1.1 --- a/Makefile.am Thu Jun 22 15:16:11 2006 +0000
1.2 +++ b/Makefile.am Thu Jun 22 18:20:25 2006 +0000
1.3 @@ -1,5 +1,8 @@
1.4 ACLOCAL_AMFLAGS = -I m4
1.5
1.6 +AM_CPPFLAGS = -I$(top_srcdir)
1.7 +LDADD = $(top_builddir)/lemon/libemon.la
1.8 +
1.9 EXTRA_DIST = \
1.10 LICENSE \
1.11 lemon.spec \
1.12 @@ -7,17 +10,26 @@
1.13 m4/lx_check_cplex.m4 \
1.14 m4/lx_check_glpk.m4
1.15
1.16 -if WANT_DOC
1.17 - MAYBE_DOC = doc
1.18 -endif
1.19 -if WANT_DEMO
1.20 - MAYBE_DEMO = demo
1.21 -endif
1.22 -if WANT_BENCHMARK
1.23 - MAYBE_BENCHMARK = benchmark
1.24 -endif
1.25 +pkgconfigdir = $(libdir)/pkgconfig
1.26 +lemondir = $(pkgincludedir)
1.27 +bitsdir = $(lemondir)/bits
1.28 +conceptdir = $(lemondir)/concept
1.29 +pkgconfig_DATA =
1.30 +lib_LTLIBRARIES =
1.31 +lemon_HEADERS =
1.32 +bits_HEADERS =
1.33 +concept_HEADERS =
1.34 +noinst_HEADERS =
1.35 +noinst_PROGRAMS =
1.36 +check_PROGRAMS =
1.37 +TESTS =
1.38 +XFAIL_TESTS =
1.39
1.40 -SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_DOC) test
1.41 +include lemon/Makefile.am
1.42 +include test/Makefile.am
1.43 +include doc/Makefile.am
1.44 +include demo/Makefile.am
1.45 +include benchmark/Makefile.am
1.46
1.47 MRPROPERFILES = \
1.48 aclocal.m4 \
1.49 @@ -39,16 +51,6 @@
1.50 benchmark/Makefile.in \
1.51 demo/Makefile.in
1.52
1.53 -doc-clean:
1.54 - $(MAKE) -C doc $(AM_MAKEFLAGS) clean html
1.55 -
1.56 -doc:
1.57 - -rm -f doc/html/index.html
1.58 - $(MAKE) -C doc $(AM_MAKEFLAGS) html
1.59 -
1.60 -benchmark:
1.61 - $(MAKE) -C benchmark $(AM_MAKEFLAGS)
1.62 -
1.63 mrproper:
1.64 $(MAKE) $(AM_MAKEFLAGS) maintainer-clean
1.65 -rm -f $(MRPROPERFILES)
1.66 @@ -68,4 +70,4 @@
1.67 zcat $(PACKAGE)-$(VERSION).tar.gz | \
1.68 bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
1.69
1.70 -.PHONY: doc benchmark mrproper deb rpm dist-bz2 distcheck-bz2
1.71 +.PHONY: mrproper deb rpm dist-bz2 distcheck-bz2
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/benchmark/Makefile Thu Jun 22 18:20:25 2006 +0000
2.3 @@ -0,0 +1,2 @@
2.4 +all:
2.5 + $(MAKE) -C ..
3.1 --- a/benchmark/Makefile.am Thu Jun 22 15:16:11 2006 +0000
3.2 +++ b/benchmark/Makefile.am Thu Jun 22 18:20:25 2006 +0000
3.3 @@ -1,21 +1,23 @@
3.4 -AM_CPPFLAGS = -I$(top_srcdir)
3.5 +noinst_HEADERS += benchmark/bench_tools.h
3.6
3.7 -noinst_HEADERS = bench_tools.h
3.8 +if WANT_BENCHMARK
3.9
3.10 -noinst_PROGRAMS = \
3.11 - graph-bench \
3.12 - hcube \
3.13 - swap_bipartite_bench \
3.14 - bfs-bench \
3.15 - radix_sort-bench \
3.16 - swap_bipartite_bench
3.17 +noinst_PROGRAMS += \
3.18 + benchmark/graph-bench \
3.19 + benchmark/hcube \
3.20 + benchmark/swap_bipartite_bench \
3.21 + benchmark/bfs-bench \
3.22 + benchmark/radix_sort-bench \
3.23 + benchmark/swap_bipartite_bench
3.24
3.25 -graph_bench_SOURCES = graph-bench.cc
3.26 +endif WANT_BENCHMARK
3.27
3.28 -hcube_SOURCES = hcube.cc
3.29 +benchmark_graph_bench_SOURCES = benchmark/graph-bench.cc
3.30
3.31 -bfs_bench_SOURCES = bfs-bench.cc
3.32 +benchmark_hcube_SOURCES = benchmark/hcube.cc
3.33
3.34 -radix_sort_bench_SOURCES = radix_sort-bench.cc
3.35 +benchmark_bfs_bench_SOURCES = benchmark/bfs-bench.cc
3.36
3.37 -swap_bipartite_bench_SOURCES = swap_bipartite_bench.cc
3.38 +benchmark_radix_sort_bench_SOURCES = benchmark/radix_sort-bench.cc
3.39 +
3.40 +benchmark_swap_bipartite_bench_SOURCES = benchmark/swap_bipartite_bench.cc
4.1 --- a/configure.ac Thu Jun 22 15:16:11 2006 +0000
4.2 +++ b/configure.ac Thu Jun 22 18:20:25 2006 +0000
4.3 @@ -3,8 +3,7 @@
4.4 AC_INIT([LEMON], [svn-head], [etik-ol@cs.elte.hu], [lemon])
4.5 AC_CONFIG_AUX_DIR([build-aux])
4.6 AC_CONFIG_MACRO_DIR([m4])
4.7 -dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign])
4.8 -AM_INIT_AUTOMAKE([-Wall foreign])
4.9 +AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
4.10 AC_CONFIG_SRCDIR([lemon/list_graph.h])
4.11 AC_CONFIG_HEADERS([config.h lemon/config.h])
4.12
4.13 @@ -98,13 +97,8 @@
4.14 Makefile
4.15 lemon.spec
4.16 autopackage/default.apspec
4.17 -doc/Makefile
4.18 doc/Doxyfile
4.19 -lemon/Makefile
4.20 lemon/lemon.pc
4.21 -benchmark/Makefile
4.22 -demo/Makefile
4.23 -test/Makefile
4.24 ])
4.25
4.26 AC_OUTPUT
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/demo/Makefile Thu Jun 22 18:20:25 2006 +0000
5.3 @@ -0,0 +1,2 @@
5.4 +all:
5.5 + $(MAKE) -C ..
6.1 --- a/demo/Makefile.am Thu Jun 22 15:16:11 2006 +0000
6.2 +++ b/demo/Makefile.am Thu Jun 22 18:20:25 2006 +0000
6.3 @@ -1,74 +1,74 @@
6.4 -AM_CPPFLAGS = -I$(top_srcdir)
6.5 -LDADD = $(top_builddir)/lemon/libemon.la
6.6 +EXTRA_DIST += demo/sub_graph_adaptor_demo.dim
6.7
6.8 -EXTRA_DIST = sub_graph_adaptor_demo.dim
6.9 +if WANT_DEMO
6.10
6.11 -noinst_PROGRAMS = \
6.12 - dim_to_dot \
6.13 - dijkstra_demo \
6.14 - reader_writer_demo \
6.15 - dim_to_lgf \
6.16 - eps_demo \
6.17 - graph_to_eps_demo \
6.18 - graph_orientation \
6.19 - min_route \
6.20 - hello_lemon \
6.21 - sub_graph_adaptor_demo \
6.22 - descriptor_map_demo \
6.23 - coloring \
6.24 - grid_ugraph_demo \
6.25 - topology_demo \
6.26 - simann_maxcut_demo \
6.27 - disjoint_paths_demo \
6.28 - strongly_connected_orientation
6.29 +noinst_PROGRAMS += \
6.30 + demo/dim_to_dot \
6.31 + demo/dijkstra_demo \
6.32 + demo/reader_writer_demo \
6.33 + demo/dim_to_lgf \
6.34 + demo/eps_demo \
6.35 + demo/graph_to_eps_demo \
6.36 + demo/graph_orientation \
6.37 + demo/min_route \
6.38 + demo/hello_lemon \
6.39 + demo/sub_graph_adaptor_demo \
6.40 + demo/descriptor_map_demo \
6.41 + demo/coloring \
6.42 + demo/grid_ugraph_demo \
6.43 + demo/topology_demo \
6.44 + demo/simann_maxcut_demo \
6.45 + demo/disjoint_paths_demo \
6.46 + demo/strongly_connected_orientation
6.47
6.48 if HAVE_GLPK
6.49 -noinst_PROGRAMS += lp_demo lp_maxflow_demo
6.50 +noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo
6.51 else !HAVE_GLPK
6.52 if HAVE_CPLEX
6.53 -noinst_PROGRAMS += lp_demo lp_maxflow_demo
6.54 +noinst_PROGRAMS += demo/lp_demo demo/lp_maxflow_demo
6.55 endif HAVE_CPLEX
6.56 endif !HAVE_GLPK
6.57
6.58 +endif WANT_DEMO
6.59
6.60 -dim_to_dot_SOURCES = dim_to_dot.cc
6.61 +demo_dim_to_dot_SOURCES = demo/dim_to_dot.cc
6.62
6.63 -dijkstra_demo_SOURCES = dijkstra_demo.cc
6.64 +demo_dijkstra_demo_SOURCES = demo/dijkstra_demo.cc
6.65
6.66 -eps_demo_SOURCES = eps_demo.cc
6.67 +demo_eps_demo_SOURCES = demo/eps_demo.cc
6.68
6.69 -reader_writer_demo_SOURCES = reader_writer_demo.cc
6.70 +demo_reader_writer_demo_SOURCES = demo/reader_writer_demo.cc
6.71
6.72 -dim_to_lgf_SOURCES = dim_to_lgf.cc
6.73 +demo_dim_to_lgf_SOURCES = demo/dim_to_lgf.cc
6.74
6.75 -coloring_SOURCES = coloring.cc
6.76 +demo_coloring_SOURCES = demo/coloring.cc
6.77
6.78 -graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
6.79 +demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
6.80
6.81 -grid_ugraph_demo_SOURCES = grid_ugraph_demo.cc
6.82 +demo_grid_ugraph_demo_SOURCES = demo/grid_ugraph_demo.cc
6.83
6.84 -graph_orientation_SOURCES = graph_orientation.cc
6.85 +demo_graph_orientation_SOURCES = demo/graph_orientation.cc
6.86
6.87 -min_route_SOURCES = min_route.cc
6.88 +demo_min_route_SOURCES = demo/min_route.cc
6.89
6.90 -hello_lemon_SOURCES = hello_lemon.cc
6.91 +demo_hello_lemon_SOURCES = demo/hello_lemon.cc
6.92
6.93 -sub_graph_adaptor_demo_SOURCES = \
6.94 - sub_graph_adaptor_demo.cc \
6.95 - tight_edge_filter_map.h
6.96 +demo_sub_graph_adaptor_demo_SOURCES = \
6.97 + demo/sub_graph_adaptor_demo.cc \
6.98 + demo/tight_edge_filter_map.h
6.99
6.100 -lp_demo_SOURCES = lp_demo.cc
6.101 -lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
6.102 +demo_lp_demo_SOURCES = demo/lp_demo.cc
6.103 +demo_lp_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
6.104
6.105 -lp_maxflow_demo_SOURCES = lp_maxflow_demo.cc
6.106 -lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
6.107 +demo_lp_maxflow_demo_SOURCES = demo/lp_maxflow_demo.cc
6.108 +demo_lp_maxflow_demo_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
6.109
6.110 -descriptor_map_demo_SOURCES = descriptor_map_demo.cc
6.111 +demo_descriptor_map_demo_SOURCES = demo/descriptor_map_demo.cc
6.112
6.113 -topology_demo_SOURCES = topology_demo.cc
6.114 +demo_topology_demo_SOURCES = demo/topology_demo.cc
6.115
6.116 -simann_maxcut_demo_SOURCES = simann_maxcut_demo.cc
6.117 +demo_simann_maxcut_demo_SOURCES = demo/simann_maxcut_demo.cc
6.118
6.119 -disjoint_paths_demo_SOURCES = disjoint_paths_demo.cc
6.120 +demo_disjoint_paths_demo_SOURCES = demo/disjoint_paths_demo.cc
6.121
6.122 -strongly_connected_orientation_SOURCES = strongly_connected_orientation.cc
6.123 \ No newline at end of file
6.124 +demo_strongly_connected_orientation_SOURCES = demo/strongly_connected_orientation.cc
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/doc/Makefile Thu Jun 22 18:20:25 2006 +0000
7.3 @@ -0,0 +1,2 @@
7.4 +all:
7.5 + $(MAKE) -C ..
8.1 --- a/doc/Makefile.am Thu Jun 22 15:16:11 2006 +0000
8.2 +++ b/doc/Makefile.am Thu Jun 22 18:20:25 2006 +0000
8.3 @@ -1,50 +1,66 @@
8.4 htmldir = $(datadir)/doc/$(PACKAGE)/html
8.5
8.6 -EXTRA_DIST = \
8.7 - html \
8.8 - icons/geom/ftv2doc.png \
8.9 - icons/geom/ftv2folderclosed.png \
8.10 - icons/geom/ftv2folderopen.png \
8.11 - coding_style.dox \
8.12 - developers_interface.dox \
8.13 - dirs.dox \
8.14 - getstart.dox \
8.15 - graph-adaptors.dox \
8.16 - graph_io.dox \
8.17 - graphs.dox \
8.18 - groups.dox \
8.19 - license.dox \
8.20 - mainpage.dox \
8.21 - maps.dox \
8.22 - named-param.dox \
8.23 - namespaces.dox \
8.24 - quicktour.dox \
8.25 - ugraphs.dox
8.26 +EXTRA_DIST += \
8.27 + doc/html \
8.28 + doc/icons/geom/ftv2doc.png \
8.29 + doc/icons/geom/ftv2folderclosed.png \
8.30 + doc/icons/geom/ftv2folderopen.png \
8.31 + doc/coding_style.dox \
8.32 + doc/developers_interface.dox \
8.33 + doc/dirs.dox \
8.34 + doc/getstart.dox \
8.35 + doc/graph-adaptors.dox \
8.36 + doc/graph_io.dox \
8.37 + doc/graphs.dox \
8.38 + doc/groups.dox \
8.39 + doc/license.dox \
8.40 + doc/mainpage.dox \
8.41 + doc/maps.dox \
8.42 + doc/named-param.dox \
8.43 + doc/namespaces.dox \
8.44 + doc/quicktour.dox \
8.45 + doc/ugraphs.dox
8.46
8.47 -html/index.html:
8.48 +doc:
8.49 if test ${doxygen_found} = yes; then \
8.50 + cd doc; \
8.51 doxygen Doxyfile; \
8.52 - cp $(srcdir)/icons/geom/ftv2* html; \
8.53 + cd ..; \
8.54 + cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
8.55 fi
8.56
8.57 -html: html/index.html
8.58 +doc-clean:
8.59 + if test ${doxygen_found} = yes; then \
8.60 + rm -rf doc/html; \
8.61 + rm -f doc/doxygen.log; \
8.62 + cd doc; \
8.63 + doxygen Doxyfile; \
8.64 + cd ..; \
8.65 + cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
8.66 + fi
8.67
8.68 clean-local:
8.69 - -rm -rf html
8.70 + -rm -rf doc/html
8.71 + -rm -f doc/doxygen.log
8.72
8.73 -install-data-local: html/index.html
8.74 +doc/html:
8.75 + $(MAKE) $(AM_MAKEFLAGS) doc-clean
8.76 +
8.77 +install-data-local: doc/html
8.78 @$(NORMAL_INSTALL)
8.79 $(mkinstalldirs) $(DESTDIR)$(htmldir)
8.80 - @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
8.81 + @dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
8.82 f="`echo $$p | sed -e 's|^.*/||'`"; \
8.83 echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
8.84 $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
8.85 done
8.86
8.87 -uninstall-local: html/index.html
8.88 +uninstall-local: doc/html
8.89 @$(NORMAL_UNINSTALL)
8.90 - @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
8.91 + @dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
8.92 f="`echo $$p | sed -e 's|^.*/||'`"; \
8.93 echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
8.94 rm -f $(DESTDIR)$(htmldir)/$$f; \
8.95 done
8.96 +
8.97 +.PHONY: doc doc-clean
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/lemon/Makefile Thu Jun 22 18:20:25 2006 +0000
9.3 @@ -0,0 +1,2 @@
9.4 +all:
9.5 + $(MAKE) -C ..
10.1 --- a/lemon/Makefile.am Thu Jun 22 15:16:11 2006 +0000
10.2 +++ b/lemon/Makefile.am Thu Jun 22 18:20:25 2006 +0000
10.3 @@ -1,117 +1,118 @@
10.4 -AM_CPPFLAGS = -I$(top_srcdir)
10.5 +pkgconfig_DATA += lemon/lemon.pc
10.6
10.7 -pkgconfigdir = $(libdir)/pkgconfig
10.8 -pkgconfig_DATA = lemon.pc
10.9 +lib_LTLIBRARIES += lemon/libemon.la
10.10
10.11 -lib_LTLIBRARIES = libemon.la
10.12 +lemon_libemon_la_SOURCES = \
10.13 + lemon/lp_base.cc \
10.14 + lemon/lp_skeleton.cc \
10.15 + lemon/base.cc \
10.16 + lemon/eps.cc \
10.17 + lemon/bits/mingw32_rand.cc \
10.18 + lemon/bits/mingw32_time.cc
10.19
10.20 -libemon_la_SOURCES = \
10.21 - lp_base.cc \
10.22 - lp_skeleton.cc \
10.23 - base.cc \
10.24 - eps.cc \
10.25 - bits/mingw32_rand.cc \
10.26 - bits/mingw32_time.cc
10.27 -
10.28 -libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
10.29 -libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
10.30 +lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
10.31 +lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
10.32
10.33 if HAVE_GLPK
10.34 -libemon_la_SOURCES += lp_glpk.cc
10.35 +lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
10.36 endif
10.37
10.38 if HAVE_CPLEX
10.39 -libemon_la_SOURCES += lp_cplex.cc
10.40 +lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
10.41 endif
10.42
10.43 -nobase_pkginclude_HEADERS = \
10.44 - bellman_ford.h \
10.45 - bezier.h \
10.46 - bfs.h \
10.47 - bin_heap.h \
10.48 - bipartite_matching.h \
10.49 - bits/alteration_notifier.h \
10.50 - bits/array_map.h \
10.51 - bits/base_extender.h \
10.52 - bits/default_map.h \
10.53 - bits/edge_set_extender.h \
10.54 - bits/graph_adaptor_extender.h \
10.55 - bits/graph_extender.h \
10.56 - bits/invalid.h \
10.57 - bits/item_reader.h \
10.58 - bits/item_writer.h \
10.59 - bits/map_extender.h \
10.60 - bits/mingw32_rand.h \
10.61 - bits/mingw32_time.h \
10.62 - bits/traits.h \
10.63 - bits/utility.h \
10.64 - bits/vector_map.h \
10.65 - bpugraph_adaptor.h \
10.66 - bucket_heap.h \
10.67 - color.h \
10.68 - concept_check.h \
10.69 - concept/bpugraph.h \
10.70 - concept/graph.h \
10.71 - concept/graph_component.h \
10.72 - concept/heap.h \
10.73 - concept/maps.h \
10.74 - concept/matrix_maps.h \
10.75 - concept/path.h \
10.76 - concept/ugraph.h \
10.77 - config.h \
10.78 - counter.h \
10.79 - dag_shortest_path.h \
10.80 - dfs.h \
10.81 - dijkstra.h \
10.82 - dimacs.h \
10.83 - edge_set.h \
10.84 - edmonds_karp.h \
10.85 - eps.h \
10.86 - error.h \
10.87 - fib_heap.h \
10.88 - floyd_warshall.h \
10.89 - fredman_tarjan.h \
10.90 - full_graph.h \
10.91 - graph_adaptor.h \
10.92 - graph_reader.h \
10.93 - graph_to_eps.h \
10.94 - graph_utils.h \
10.95 - graph_writer.h \
10.96 - grid_ugraph.h \
10.97 - hypercube_graph.h \
10.98 - iterable_maps.h \
10.99 - johnson.h \
10.100 - kruskal.h \
10.101 - lemon_reader.h \
10.102 - lemon_writer.h \
10.103 - list_graph.h \
10.104 - lp.h \
10.105 - lp_base.h \
10.106 - lp_cplex.h \
10.107 - lp_glpk.h \
10.108 - lp_skeleton.h \
10.109 - map_iterator.h \
10.110 - maps.h \
10.111 - matrix_maps.h \
10.112 - max_matching.h \
10.113 - min_cost_arborescence.h \
10.114 - min_cost_flow.h \
10.115 - min_cut.h \
10.116 - path.h \
10.117 - polynomial.h \
10.118 - preflow.h \
10.119 - prim.h \
10.120 - radix_heap.h \
10.121 - radix_sort.h \
10.122 - refptr.h \
10.123 - simann.h \
10.124 - smart_graph.h \
10.125 - sub_graph.h \
10.126 - suurballe.h \
10.127 - tabu_search.h \
10.128 - time_measure.h \
10.129 - tolerance.h \
10.130 - topology.h \
10.131 - ugraph_adaptor.h \
10.132 - unionfind.h \
10.133 - xy.h
10.134 +lemon_HEADERS += \
10.135 + lemon/bellman_ford.h \
10.136 + lemon/bezier.h \
10.137 + lemon/bfs.h \
10.138 + lemon/bin_heap.h \
10.139 + lemon/bipartite_matching.h \
10.140 + lemon/bpugraph_adaptor.h \
10.141 + lemon/bucket_heap.h \
10.142 + lemon/color.h \
10.143 + lemon/config.h \
10.144 + lemon/counter.h \
10.145 + lemon/dag_shortest_path.h \
10.146 + lemon/dfs.h \
10.147 + lemon/dijkstra.h \
10.148 + lemon/dimacs.h \
10.149 + lemon/edge_set.h \
10.150 + lemon/edmonds_karp.h \
10.151 + lemon/eps.h \
10.152 + lemon/error.h \
10.153 + lemon/fib_heap.h \
10.154 + lemon/floyd_warshall.h \
10.155 + lemon/fredman_tarjan.h \
10.156 + lemon/full_graph.h \
10.157 + lemon/graph_adaptor.h \
10.158 + lemon/graph_reader.h \
10.159 + lemon/graph_to_eps.h \
10.160 + lemon/graph_utils.h \
10.161 + lemon/graph_writer.h \
10.162 + lemon/grid_ugraph.h \
10.163 + lemon/hypercube_graph.h \
10.164 + lemon/iterable_maps.h \
10.165 + lemon/johnson.h \
10.166 + lemon/kruskal.h \
10.167 + lemon/lemon_reader.h \
10.168 + lemon/lemon_writer.h \
10.169 + lemon/list_graph.h \
10.170 + lemon/lp.h \
10.171 + lemon/lp_base.h \
10.172 + lemon/lp_cplex.h \
10.173 + lemon/lp_glpk.h \
10.174 + lemon/lp_skeleton.h \
10.175 + lemon/map_iterator.h \
10.176 + lemon/maps.h \
10.177 + lemon/matrix_maps.h \
10.178 + lemon/max_matching.h \
10.179 + lemon/min_cost_arborescence.h \
10.180 + lemon/min_cost_flow.h \
10.181 + lemon/min_cut.h \
10.182 + lemon/path.h \
10.183 + lemon/polynomial.h \
10.184 + lemon/preflow.h \
10.185 + lemon/prim.h \
10.186 + lemon/radix_heap.h \
10.187 + lemon/radix_sort.h \
10.188 + lemon/refptr.h \
10.189 + lemon/simann.h \
10.190 + lemon/smart_graph.h \
10.191 + lemon/sub_graph.h \
10.192 + lemon/suurballe.h \
10.193 + lemon/tabu_search.h \
10.194 + lemon/time_measure.h \
10.195 + lemon/tolerance.h \
10.196 + lemon/topology.h \
10.197 + lemon/ugraph_adaptor.h \
10.198 + lemon/unionfind.h \
10.199 + lemon/xy.h
10.200 +
10.201 +bits_HEADERS += \
10.202 + lemon/bits/alteration_notifier.h \
10.203 + lemon/bits/array_map.h \
10.204 + lemon/bits/base_extender.h \
10.205 + lemon/bits/default_map.h \
10.206 + lemon/bits/edge_set_extender.h \
10.207 + lemon/bits/graph_adaptor_extender.h \
10.208 + lemon/bits/graph_extender.h \
10.209 + lemon/bits/invalid.h \
10.210 + lemon/bits/item_reader.h \
10.211 + lemon/bits/item_writer.h \
10.212 + lemon/bits/map_extender.h \
10.213 + lemon/bits/mingw32_rand.h \
10.214 + lemon/bits/mingw32_time.h \
10.215 + lemon/bits/traits.h \
10.216 + lemon/bits/utility.h \
10.217 + lemon/bits/vector_map.h
10.218 +
10.219 +concept_HEADERS += \
10.220 + lemon/concept_check.h \
10.221 + lemon/concept/bpugraph.h \
10.222 + lemon/concept/graph.h \
10.223 + lemon/concept/graph_component.h \
10.224 + lemon/concept/heap.h \
10.225 + lemon/concept/maps.h \
10.226 + lemon/concept/matrix_maps.h \
10.227 + lemon/concept/path.h \
10.228 + lemon/concept/ugraph.h
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/test/Makefile Thu Jun 22 18:20:25 2006 +0000
11.3 @@ -0,0 +1,2 @@
11.4 +all:
11.5 + $(MAKE) -C ..
12.1 --- a/test/Makefile.am Thu Jun 22 15:16:11 2006 +0000
12.2 +++ b/test/Makefile.am Thu Jun 22 18:20:25 2006 +0000
12.3 @@ -1,89 +1,87 @@
12.4 -AM_CPPFLAGS = -I$(top_srcdir) -fno-inline
12.5 -LDADD = $(top_builddir)/lemon/libemon.la
12.6 +EXTRA_DIST += \
12.7 + test/preflow_graph.dim \
12.8 + test/dijkstra_test.lgf
12.9
12.10 -EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
12.11 +noinst_HEADERS += \
12.12 + test/test_tools.h \
12.13 + test/graph_test.h \
12.14 + test/map_test.h \
12.15 + test/graph_utils_test.h \
12.16 + test/heap_test.h
12.17
12.18 -noinst_HEADERS = \
12.19 - test_tools.h \
12.20 - graph_test.h \
12.21 - map_test.h \
12.22 - graph_utils_test.h \
12.23 - heap_test.h
12.24 -
12.25 -
12.26 -check_PROGRAMS = \
12.27 - all_pairs_shortest_path_test \
12.28 - arborescence_test \
12.29 - bfs_test \
12.30 - bipartite_matching_test \
12.31 - counter_test \
12.32 - dfs_test \
12.33 - dijkstra_test \
12.34 - edge_set_test \
12.35 - graph_adaptor_test \
12.36 - graph_test \
12.37 - graph_utils_test \
12.38 - heap_test \
12.39 - kruskal_test \
12.40 - maps_test \
12.41 - matrix_maps_test \
12.42 - max_matching_test \
12.43 - min_cost_flow_test \
12.44 - path_test \
12.45 - polynomial_test \
12.46 - preflow_test \
12.47 - radix_sort_test \
12.48 - refptr_test \
12.49 - simann_test \
12.50 - suurballe_test \
12.51 - test_tools_fail \
12.52 - test_tools_pass \
12.53 - time_measure_test \
12.54 - ugraph_test \
12.55 - unionfind_test \
12.56 - xy_test
12.57 +check_PROGRAMS += \
12.58 + test/all_pairs_shortest_path_test \
12.59 + test/arborescence_test \
12.60 + test/bfs_test \
12.61 + test/bipartite_matching_test \
12.62 + test/counter_test \
12.63 + test/dfs_test \
12.64 + test/dijkstra_test \
12.65 + test/edge_set_test \
12.66 + test/graph_adaptor_test \
12.67 + test/graph_test \
12.68 + test/graph_utils_test \
12.69 + test/heap_test \
12.70 + test/kruskal_test \
12.71 + test/maps_test \
12.72 + test/matrix_maps_test \
12.73 + test/max_matching_test \
12.74 + test/min_cost_flow_test \
12.75 + test/path_test \
12.76 + test/polynomial_test \
12.77 + test/preflow_test \
12.78 + test/radix_sort_test \
12.79 + test/refptr_test \
12.80 + test/simann_test \
12.81 + test/suurballe_test \
12.82 + test/test_tools_fail \
12.83 + test/test_tools_pass \
12.84 + test/time_measure_test \
12.85 + test/ugraph_test \
12.86 + test/unionfind_test \
12.87 + test/xy_test
12.88
12.89 if HAVE_GLPK
12.90 -check_PROGRAMS += lp_test
12.91 +check_PROGRAMS += test/lp_test
12.92 else !HAVE_GLPK
12.93 if HAVE_CPLEX
12.94 -check_PROGRAMS += lp_test
12.95 +check_PROGRAMS += test/lp_test
12.96 endif HAVE_CPLEX
12.97 endif !HAVE_GLPK
12.98
12.99 -TESTS = $(check_PROGRAMS)
12.100 -XFAIL_TESTS = test_tools_fail$(EXEEXT)
12.101 +TESTS += $(check_PROGRAMS)
12.102 +XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
12.103
12.104 -all_pairs_shortest_path_test_SOURCES = all_pairs_shortest_path_test.cc
12.105 -arborescence_test_SOURCES = arborescence_test.cc
12.106 -bfs_test_SOURCES = bfs_test.cc
12.107 -bipartite_matching_test_SOURCES = bipartite_matching_test.cc
12.108 -counter_test_SOURCES = counter_test.cc
12.109 -dfs_test_SOURCES = dfs_test.cc
12.110 -dijkstra_test_SOURCES = dijkstra_test.cc
12.111 -edge_set_test_SOURCES = edge_set_test.cc
12.112 -graph_adaptor_test_SOURCES = graph_adaptor_test.cc
12.113 -graph_test_SOURCES = graph_test.cc
12.114 -graph_utils_test_SOURCES = graph_utils_test.cc
12.115 -heap_test_SOURCES = heap_test.cc
12.116 -kruskal_test_SOURCES = kruskal_test.cc
12.117 -maps_test_SOURCES = maps_test.cc
12.118 -matrix_maps_test_SOURCES = matrix_maps_test.cc
12.119 -max_matching_test_SOURCES = max_matching_test.cc
12.120 -min_cost_flow_test_SOURCES = min_cost_flow_test.cc
12.121 -path_test_SOURCES = path_test.cc
12.122 -polynomial_test_SOURCES = polynomial_test.cc
12.123 -preflow_test_SOURCES = preflow_test.cc
12.124 -radix_sort_test_SOURCES = radix_sort_test.cc
12.125 -refptr_test_SOURCES = refptr_test.cc
12.126 -simann_test_SOURCES = simann_test.cc
12.127 -suurballe_test_SOURCES = suurballe_test.cc
12.128 -test_tools_fail_SOURCES = test_tools_fail.cc
12.129 -test_tools_pass_SOURCES = test_tools_pass.cc
12.130 -time_measure_test_SOURCES = time_measure_test.cc
12.131 -ugraph_test_SOURCES = ugraph_test.cc
12.132 -unionfind_test_SOURCES = unionfind_test.cc
12.133 -xy_test_SOURCES = xy_test.cc
12.134 +test_all_pairs_shortest_path_test_SOURCES = test/all_pairs_shortest_path_test.cc
12.135 +test_arborescence_test_SOURCES = test/arborescence_test.cc
12.136 +test_bfs_test_SOURCES = test/bfs_test.cc
12.137 +test_bipartite_matching_test_SOURCES = test/bipartite_matching_test.cc
12.138 +test_counter_test_SOURCES = test/counter_test.cc
12.139 +test_dfs_test_SOURCES = test/dfs_test.cc
12.140 +test_dijkstra_test_SOURCES = test/dijkstra_test.cc
12.141 +test_edge_set_test_SOURCES = test/edge_set_test.cc
12.142 +test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
12.143 +test_graph_test_SOURCES = test/graph_test.cc
12.144 +test_graph_utils_test_SOURCES = test/graph_utils_test.cc
12.145 +test_heap_test_SOURCES = test/heap_test.cc
12.146 +test_kruskal_test_SOURCES = test/kruskal_test.cc
12.147 +test_maps_test_SOURCES = test/maps_test.cc
12.148 +test_matrix_maps_test_SOURCES = test/matrix_maps_test.cc
12.149 +test_max_matching_test_SOURCES = test/max_matching_test.cc
12.150 +test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
12.151 +test_path_test_SOURCES = test/path_test.cc
12.152 +test_polynomial_test_SOURCES = test/polynomial_test.cc
12.153 +test_preflow_test_SOURCES = test/preflow_test.cc
12.154 +test_radix_sort_test_SOURCES = test/radix_sort_test.cc
12.155 +test_refptr_test_SOURCES = test/refptr_test.cc
12.156 +test_simann_test_SOURCES = test/simann_test.cc
12.157 +test_suurballe_test_SOURCES = test/suurballe_test.cc
12.158 +test_test_tools_fail_SOURCES = test/test_tools_fail.cc
12.159 +test_test_tools_pass_SOURCES = test/test_tools_pass.cc
12.160 +test_time_measure_test_SOURCES = test/time_measure_test.cc
12.161 +test_ugraph_test_SOURCES = test/ugraph_test.cc
12.162 +test_unionfind_test_SOURCES = test/unionfind_test.cc
12.163 +test_xy_test_SOURCES = test/xy_test.cc
12.164
12.165 -lp_test_SOURCES = lp_test.cc
12.166 -lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
12.167 +test_lp_test_SOURCES = test/lp_test.cc
12.168 +test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
13.1 --- a/test/heap_test.cc Thu Jun 22 15:16:11 2006 +0000
13.2 +++ b/test/heap_test.cc Thu Jun 22 18:20:25 2006 +0000
13.3 @@ -67,7 +67,7 @@
13.4 if( getenv("srcdir") )
13.5 f_name = std::string(getenv("srcdir"));
13.6 else f_name = ".";
13.7 - f_name += "/dijkstra_test.lgf";
13.8 + f_name += "/test/dijkstra_test.lgf";
13.9
13.10 std::ifstream input(f_name.c_str());
13.11 check(input, "Input file '" << f_name << "' not found.");
14.1 --- a/test/preflow_test.cc Thu Jun 22 15:16:11 2006 +0000
14.2 +++ b/test/preflow_test.cc Thu Jun 22 18:20:25 2006 +0000
14.3 @@ -91,7 +91,7 @@
14.4 if( getenv("srcdir") )
14.5 f_name = std::string(getenv("srcdir"));
14.6 else f_name = ".";
14.7 - f_name += "/preflow_graph.dim";
14.8 + f_name += "/test/preflow_graph.dim";
14.9
14.10 std::ifstream file(f_name.c_str());
14.11