test/Makefile.am
author kpeter
Sun, 05 Oct 2008 13:36:43 +0000
changeset 2619 30fb4d68b0e8
parent 2549 88b81ec599ed
permissions -rw-r--r--
Improve network simplex algorithm

- Remove "Limited Search" and "Combined" pivot rules.
- Add a new pivot rule "Altering Candidate List".
- Make the edge selection faster in every pivot rule.
- Set the default rule to "Block Search".
- Doc improvements.

The algorithm became about 15-35 percent faster on various input files.
"Block Search" pivot rule proved to be by far the fastest on all inputs.
ladanyi@2108
     1
EXTRA_DIST += \
ladanyi@2119
     2
	test/Makefile \
ladanyi@2108
     3
	test/preflow_graph.dim \
deba@2604
     4
	test/dijkstra_test.lgf \
deba@2604
     5
	test/min_cost_flow_test.lgf \
deba@2604
     6
	test/min_cost_flow_test.net
ladanyi@542
     7
ladanyi@2108
     8
noinst_HEADERS += \
ladanyi@2108
     9
	test/test_tools.h \
ladanyi@2108
    10
	test/graph_test.h \
ladanyi@2108
    11
	test/map_test.h \
ladanyi@2108
    12
	test/graph_utils_test.h \
ladanyi@2108
    13
	test/heap_test.h
ladanyi@1349
    14
ladanyi@2108
    15
check_PROGRAMS += \
ladanyi@2108
    16
	test/all_pairs_shortest_path_test \
ladanyi@2108
    17
	test/arborescence_test \
ladanyi@2108
    18
	test/bfs_test \
ladanyi@2108
    19
	test/bipartite_matching_test \
deba@2231
    20
	test/bpugraph_test \
ladanyi@2108
    21
	test/counter_test \
ladanyi@2108
    22
	test/dfs_test \
ladanyi@2108
    23
	test/dijkstra_test \
alpar@2207
    24
	test/dim_test \
ladanyi@2108
    25
	test/edge_set_test \
ladanyi@2108
    26
	test/graph_adaptor_test \
deba@2290
    27
	test/graph_copy_test \
ladanyi@2108
    28
	test/graph_test \
ladanyi@2108
    29
	test/graph_utils_test \
ladanyi@2108
    30
	test/heap_test \
ladanyi@2108
    31
	test/kruskal_test \
ladanyi@2108
    32
	test/maps_test \
ladanyi@2108
    33
	test/matrix_maps_test \
ladanyi@2108
    34
	test/max_matching_test \
deba@2549
    35
	test/max_weighted_matching_test \
ladanyi@2108
    36
	test/min_cost_flow_test \
ladanyi@2108
    37
	test/path_test \
ladanyi@2108
    38
	test/polynomial_test \
ladanyi@2108
    39
	test/preflow_test \
ladanyi@2108
    40
	test/radix_sort_test \
ladanyi@2108
    41
	test/refptr_test \
alpar@2483
    42
	test/random_test \
ladanyi@2108
    43
	test/simann_test \
ladanyi@2108
    44
	test/suurballe_test \
ladanyi@2108
    45
	test/test_tools_fail \
ladanyi@2108
    46
	test/test_tools_pass \
ladanyi@2108
    47
	test/time_measure_test \
ladanyi@2108
    48
	test/ugraph_test \
alpar@2207
    49
	test/unionfind_test
alpar@790
    50
ladanyi@1349
    51
if HAVE_GLPK
alpar@2197
    52
check_PROGRAMS += test/lp_test test/mip_test
ladanyi@1387
    53
else !HAVE_GLPK
ladanyi@1387
    54
if HAVE_CPLEX
alpar@2197
    55
check_PROGRAMS += test/lp_test test/mip_test
deba@2363
    56
else !HAVE_CPLEX
deba@2363
    57
if HAVE_SOPLEX
deba@2363
    58
check_PROGRAMS += test/lp_test
deba@2363
    59
endif HAVE_SOPLEX
deba@2363
    60
endif !HAVE_CPLEX
ladanyi@1387
    61
endif !HAVE_GLPK
ladanyi@1349
    62
ladanyi@2108
    63
TESTS += $(check_PROGRAMS)
ladanyi@2108
    64
XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
ladanyi@542
    65
ladanyi@2108
    66
test_all_pairs_shortest_path_test_SOURCES = test/all_pairs_shortest_path_test.cc
ladanyi@2108
    67
test_arborescence_test_SOURCES = test/arborescence_test.cc
ladanyi@2108
    68
test_bfs_test_SOURCES = test/bfs_test.cc
ladanyi@2108
    69
test_bipartite_matching_test_SOURCES = test/bipartite_matching_test.cc
deba@2231
    70
test_bpugraph_test_SOURCES = test/bpugraph_test.cc
ladanyi@2108
    71
test_counter_test_SOURCES = test/counter_test.cc
ladanyi@2108
    72
test_dfs_test_SOURCES = test/dfs_test.cc
ladanyi@2108
    73
test_dijkstra_test_SOURCES = test/dijkstra_test.cc
alpar@2207
    74
test_dim_test_SOURCES = test/dim_test.cc
ladanyi@2108
    75
test_edge_set_test_SOURCES = test/edge_set_test.cc
ladanyi@2108
    76
test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
deba@2290
    77
test_graph_copy_test_SOURCES = test/graph_copy_test.cc
ladanyi@2108
    78
test_graph_test_SOURCES = test/graph_test.cc
ladanyi@2108
    79
test_graph_utils_test_SOURCES = test/graph_utils_test.cc
ladanyi@2108
    80
test_heap_test_SOURCES = test/heap_test.cc
ladanyi@2108
    81
test_kruskal_test_SOURCES = test/kruskal_test.cc
ladanyi@2108
    82
test_maps_test_SOURCES = test/maps_test.cc
ladanyi@2108
    83
test_matrix_maps_test_SOURCES = test/matrix_maps_test.cc
ladanyi@2108
    84
test_max_matching_test_SOURCES = test/max_matching_test.cc
deba@2549
    85
test_max_weighted_matching_test_SOURCES = test/max_weighted_matching_test.cc
ladanyi@2108
    86
test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
ladanyi@2108
    87
test_path_test_SOURCES = test/path_test.cc
ladanyi@2108
    88
test_polynomial_test_SOURCES = test/polynomial_test.cc
ladanyi@2108
    89
test_preflow_test_SOURCES = test/preflow_test.cc
ladanyi@2108
    90
test_radix_sort_test_SOURCES = test/radix_sort_test.cc
ladanyi@2108
    91
test_refptr_test_SOURCES = test/refptr_test.cc
alpar@2483
    92
test_random_test_SOURCES = test/random_test.cc
ladanyi@2108
    93
test_simann_test_SOURCES = test/simann_test.cc
ladanyi@2108
    94
test_suurballe_test_SOURCES = test/suurballe_test.cc
ladanyi@2108
    95
test_test_tools_fail_SOURCES = test/test_tools_fail.cc
ladanyi@2108
    96
test_test_tools_pass_SOURCES = test/test_tools_pass.cc
ladanyi@2108
    97
test_time_measure_test_SOURCES = test/time_measure_test.cc
ladanyi@2108
    98
test_ugraph_test_SOURCES = test/ugraph_test.cc
ladanyi@2108
    99
test_unionfind_test_SOURCES = test/unionfind_test.cc
alpar@1324
   100
ladanyi@2108
   101
test_lp_test_SOURCES = test/lp_test.cc
deba@2363
   102
test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
alpar@2197
   103
test_mip_test_SOURCES = test/mip_test.cc
deba@2363
   104
test_mip_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)