COIN-OR::LEMON - Graph Library

Changeset 468:75a5df083951 in lemon


Ignore:
Timestamp:
01/08/09 18:19:26 (11 years ago)
Author:
Alpar Juttner <alpar@…>
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
Message:

Merge

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r463 r468  
    4848        lemon/path.h \
    4949        lemon/preflow.h \
     50        lemon/radix_sort.h \
    5051        lemon/random.h \
    5152        lemon/smart_graph.h \
  • lemon/Makefile.am

    r464 r468  
    88
    99lemon_libemon_la_SOURCES = \
    10         lemon/arg_parser.cc \
    11         lemon/base.cc \
    12         lemon/color.cc \
    13         lemon/random.cc
     10        lemon/arg_parser.cc \
     11        lemon/base.cc \
     12        lemon/color.cc \
     13        lemon/random.cc
    1414
    15 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
     15#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
    1616#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
    1717
    1818lemon_HEADERS += \
    19         lemon/arg_parser.h \
     19        lemon/adaptors.h \
     20        lemon/arg_parser.h \
    2021        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 \
    2426        lemon/concept_check.h \
    25         lemon/counter.h \
     27        lemon/counter.h \
    2628        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 \
    3034        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 \
    3239        lemon/kruskal.h \
     40        lemon/hao_orlin.h \
    3341        lemon/lgf_reader.h \
    3442        lemon/lgf_writer.h \
     
    3644        lemon/maps.h \
    3745        lemon/math.h \
     46        lemon/max_matching.h \
     47        lemon/nauty_reader.h \
    3848        lemon/path.h \
     49        lemon/preflow.h \
    3950        lemon/radix_sort.h \
    40         lemon/random.h \
     51        lemon/random.h \
    4152        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 \
    4456        lemon/unionfind.h
    4557
     
    4860        lemon/bits/array_map.h \
    4961        lemon/bits/base_extender.h \
    50         lemon/bits/bezier.h \
     62        lemon/bits/bezier.h \
    5163        lemon/bits/default_map.h \
    52         lemon/bits/enable_if.h \
     64        lemon/bits/enable_if.h \
     65        lemon/bits/graph_adaptor_extender.h \
    5366        lemon/bits/graph_extender.h \
    5467        lemon/bits/map_extender.h \
    5568        lemon/bits/path_dump.h \
    5669        lemon/bits/traits.h \
     70        lemon/bits/variant.h \
    5771        lemon/bits/vector_map.h
    5872
  • test/CMakeLists.txt

    r443 r468  
    2121  maps_test
    2222  max_matching_test
     23  radix_sort_test
    2324  path_test
    2425  preflow_test
  • test/CMakeLists.txt

    r464 r468  
    55SET(TESTS
    66  bfs_test
     7  circulation_test
    78  counter_test
    89  dfs_test
     
    1112  dim_test
    1213  error_test
     14  graph_adaptor_test
    1315  graph_copy_test
    1416  graph_test
    1517  graph_utils_test
     18  hao_orlin_test
    1619  heap_test
    1720  kruskal_test
    1821  maps_test
     22  max_matching_test
    1923  radix_sort_test
     24  path_test
     25  preflow_test
    2026  random_test
    21   path_test
     27  suurballe_test
    2228  time_measure_test
    2329  unionfind_test)
  • test/Makefile.am

    r463 r468  
    2626        test/path_test \
    2727        test/preflow_test \
     28        test/radix_sort_test \
    2829        test/random_test \
    2930        test/suurballe_test \
     
    5556test_path_test_SOURCES = test/path_test.cc
    5657test_preflow_test_SOURCES = test/preflow_test.cc
     58test_radix_sort_test_SOURCES = test/radix_sort_test.cc
    5759test_suurballe_test_SOURCES = test/suurballe_test.cc
    5860test_random_test_SOURCES = test/random_test.cc
  • test/Makefile.am

    r464 r468  
    44noinst_HEADERS += \
    55        test/graph_test.h \
    6         test/test_tools.h
     6        test/test_tools.h
    77
    88check_PROGRAMS += \
    99        test/bfs_test \
    10         test/counter_test \
     10        test/circulation_test \
     11        test/counter_test \
    1112        test/dfs_test \
    1213        test/digraph_test \
    1314        test/dijkstra_test \
    14         test/dim_test \
     15        test/dim_test \
    1516        test/error_test \
     17        test/graph_adaptor_test \
    1618        test/graph_copy_test \
    1719        test/graph_test \
    1820        test/graph_utils_test \
     21        test/hao_orlin_test \
    1922        test/heap_test \
    2023        test/kruskal_test \
    21         test/maps_test \
     24        test/maps_test \
     25        test/max_matching_test \
     26        test/path_test \
     27        test/preflow_test \
    2228        test/radix_sort_test \
    23         test/random_test \
    24         test/path_test \
    25         test/test_tools_fail \
    26         test/test_tools_pass \
    27         test/time_measure_test \
     29        test/random_test \
     30        test/suurballe_test \
     31        test/test_tools_fail \
     32        test/test_tools_pass \
     33        test/time_measure_test \
    2834        test/unionfind_test
    2935
     
    3238
    3339test_bfs_test_SOURCES = test/bfs_test.cc
     40test_circulation_test_SOURCES = test/circulation_test.cc
    3441test_counter_test_SOURCES = test/counter_test.cc
    3542test_dfs_test_SOURCES = test/dfs_test.cc
     
    3845test_dim_test_SOURCES = test/dim_test.cc
    3946test_error_test_SOURCES = test/error_test.cc
     47test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
    4048test_graph_copy_test_SOURCES = test/graph_copy_test.cc
    4149test_graph_test_SOURCES = test/graph_test.cc
     
    4351test_heap_test_SOURCES = test/heap_test.cc
    4452test_kruskal_test_SOURCES = test/kruskal_test.cc
     53test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
    4554test_maps_test_SOURCES = test/maps_test.cc
     55test_max_matching_test_SOURCES = test/max_matching_test.cc
    4656test_path_test_SOURCES = test/path_test.cc
     57test_preflow_test_SOURCES = test/preflow_test.cc
    4758test_radix_sort_test_SOURCES = test/radix_sort_test.cc
     59test_suurballe_test_SOURCES = test/suurballe_test.cc
    4860test_random_test_SOURCES = test/random_test.cc
    4961test_test_tools_fail_SOURCES = test/test_tools_fail.cc
Note: See TracChangeset for help on using the changeset viewer.