Changeset 468:75a5df083951 in lemon
- Timestamp:
- 01/08/09 18:19:26 (16 years ago)
- Branch:
- default
- Parents:
- 463:88ed40ad0d4f (diff), 467:ba49101c9b07 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/Makefile.am
r463 r468 48 48 lemon/path.h \ 49 49 lemon/preflow.h \ 50 lemon/radix_sort.h \ 50 51 lemon/random.h \ 51 52 lemon/smart_graph.h \ -
lemon/Makefile.am
r464 r468 8 8 9 9 lemon_libemon_la_SOURCES = \ 10 11 12 13 10 lemon/arg_parser.cc \ 11 lemon/base.cc \ 12 lemon/color.cc \ 13 lemon/random.cc 14 14 15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) 15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS) 16 16 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS) 17 17 18 18 lemon_HEADERS += \ 19 lemon/arg_parser.h \ 19 lemon/adaptors.h \ 20 lemon/arg_parser.h \ 20 21 lemon/assert.h \ 21 lemon/bfs.h \ 22 lemon/bin_heap.h \ 23 lemon/color.h \ 22 lemon/bfs.h \ 23 lemon/bin_heap.h \ 24 lemon/circulation.h \ 25 lemon/color.h \ 24 26 lemon/concept_check.h \ 25 27 lemon/counter.h \ 26 28 lemon/core.h \ 27 lemon/dfs.h \ 28 lemon/dijkstra.h \ 29 lemon/dim2.h \ 29 lemon/dfs.h \ 30 lemon/dijkstra.h \ 31 lemon/dim2.h \ 32 lemon/dimacs.h \ 33 lemon/elevator.h \ 30 34 lemon/error.h \ 31 lemon/graph_to_eps.h \ 35 lemon/full_graph.h \ 36 lemon/graph_to_eps.h \ 37 lemon/grid_graph.h \ 38 lemon/hypercube_graph.h \ 32 39 lemon/kruskal.h \ 40 lemon/hao_orlin.h \ 33 41 lemon/lgf_reader.h \ 34 42 lemon/lgf_writer.h \ … … 36 44 lemon/maps.h \ 37 45 lemon/math.h \ 46 lemon/max_matching.h \ 47 lemon/nauty_reader.h \ 38 48 lemon/path.h \ 49 lemon/preflow.h \ 39 50 lemon/radix_sort.h \ 40 51 lemon/random.h \ 41 52 lemon/smart_graph.h \ 42 lemon/time_measure.h \ 43 lemon/tolerance.h \ 53 lemon/suurballe.h \ 54 lemon/time_measure.h \ 55 lemon/tolerance.h \ 44 56 lemon/unionfind.h 45 57 … … 48 60 lemon/bits/array_map.h \ 49 61 lemon/bits/base_extender.h \ 50 62 lemon/bits/bezier.h \ 51 63 lemon/bits/default_map.h \ 52 lemon/bits/enable_if.h \ 64 lemon/bits/enable_if.h \ 65 lemon/bits/graph_adaptor_extender.h \ 53 66 lemon/bits/graph_extender.h \ 54 67 lemon/bits/map_extender.h \ 55 68 lemon/bits/path_dump.h \ 56 69 lemon/bits/traits.h \ 70 lemon/bits/variant.h \ 57 71 lemon/bits/vector_map.h 58 72 -
test/CMakeLists.txt
r443 r468 21 21 maps_test 22 22 max_matching_test 23 radix_sort_test 23 24 path_test 24 25 preflow_test -
test/CMakeLists.txt
r464 r468 5 5 SET(TESTS 6 6 bfs_test 7 circulation_test 7 8 counter_test 8 9 dfs_test … … 11 12 dim_test 12 13 error_test 14 graph_adaptor_test 13 15 graph_copy_test 14 16 graph_test 15 17 graph_utils_test 18 hao_orlin_test 16 19 heap_test 17 20 kruskal_test 18 21 maps_test 22 max_matching_test 19 23 radix_sort_test 24 path_test 25 preflow_test 20 26 random_test 21 path_test27 suurballe_test 22 28 time_measure_test 23 29 unionfind_test) -
test/Makefile.am
r463 r468 26 26 test/path_test \ 27 27 test/preflow_test \ 28 test/radix_sort_test \ 28 29 test/random_test \ 29 30 test/suurballe_test \ … … 55 56 test_path_test_SOURCES = test/path_test.cc 56 57 test_preflow_test_SOURCES = test/preflow_test.cc 58 test_radix_sort_test_SOURCES = test/radix_sort_test.cc 57 59 test_suurballe_test_SOURCES = test/suurballe_test.cc 58 60 test_random_test_SOURCES = test/random_test.cc -
test/Makefile.am
r464 r468 4 4 noinst_HEADERS += \ 5 5 test/graph_test.h \ 6 6 test/test_tools.h 7 7 8 8 check_PROGRAMS += \ 9 9 test/bfs_test \ 10 test/counter_test \ 10 test/circulation_test \ 11 test/counter_test \ 11 12 test/dfs_test \ 12 13 test/digraph_test \ 13 14 test/dijkstra_test \ 14 15 test/dim_test \ 15 16 test/error_test \ 17 test/graph_adaptor_test \ 16 18 test/graph_copy_test \ 17 19 test/graph_test \ 18 20 test/graph_utils_test \ 21 test/hao_orlin_test \ 19 22 test/heap_test \ 20 23 test/kruskal_test \ 21 test/maps_test \ 24 test/maps_test \ 25 test/max_matching_test \ 26 test/path_test \ 27 test/preflow_test \ 22 28 test/radix_sort_test \ 23 24 test/path_test \25 26 27 29 test/random_test \ 30 test/suurballe_test \ 31 test/test_tools_fail \ 32 test/test_tools_pass \ 33 test/time_measure_test \ 28 34 test/unionfind_test 29 35 … … 32 38 33 39 test_bfs_test_SOURCES = test/bfs_test.cc 40 test_circulation_test_SOURCES = test/circulation_test.cc 34 41 test_counter_test_SOURCES = test/counter_test.cc 35 42 test_dfs_test_SOURCES = test/dfs_test.cc … … 38 45 test_dim_test_SOURCES = test/dim_test.cc 39 46 test_error_test_SOURCES = test/error_test.cc 47 test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc 40 48 test_graph_copy_test_SOURCES = test/graph_copy_test.cc 41 49 test_graph_test_SOURCES = test/graph_test.cc … … 43 51 test_heap_test_SOURCES = test/heap_test.cc 44 52 test_kruskal_test_SOURCES = test/kruskal_test.cc 53 test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc 45 54 test_maps_test_SOURCES = test/maps_test.cc 55 test_max_matching_test_SOURCES = test/max_matching_test.cc 46 56 test_path_test_SOURCES = test/path_test.cc 57 test_preflow_test_SOURCES = test/preflow_test.cc 47 58 test_radix_sort_test_SOURCES = test/radix_sort_test.cc 59 test_suurballe_test_SOURCES = test/suurballe_test.cc 48 60 test_random_test_SOURCES = test/random_test.cc 49 61 test_test_tools_fail_SOURCES = test/test_tools_fail.cc
Note: See TracChangeset
for help on using the changeset viewer.