COIN-OR::LEMON - Graph Library

Changeset 106:9ba2d265e191 in lemon


Ignore:
Timestamp:
03/21/08 00:06:35 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
104:cdbba181b786 (diff), 105:e4948ef6a4ca (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:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r101 r106  
    2424        lemon/dim2.h \
    2525        lemon/error.h \
    26         lemon/graph_utils.h \
     26        lemon/graph_utils.h \
     27        lemon/kruskal.h \
    2728        lemon/list_graph.h \
    2829        lemon/maps.h \
     
    3031        lemon/path.h \
    3132        lemon/random.h \
    32         lemon/tolerance.h
     33        lemon/tolerance.h \
     34        lemon/unionfind.h
    3335
    3436bits_HEADERS += \
  • lemon/Makefile.am

    r103 r106  
    88
    99lemon_libemon_la_SOURCES = \
     10        lemon/arg_parser.cc \
    1011        lemon/base.cc \
    1112        lemon/random.cc
     
    1617
    1718lemon_HEADERS += \
    18         lemon/concept_check.h \
     19        lemon/arg_parser.h \
     20        lemon/bfs.h \
     21        lemon/bin_heap.h \
     22        lemon/dfs.h \
     23        lemon/dijkstra.h \
    1924        lemon/dim2.h \
    2025        lemon/error.h \
     26        lemon/graph_utils.h \
    2127        lemon/kruskal.h \
    2228        lemon/list_graph.h \
    2329        lemon/maps.h \
    2430        lemon/math.h \
     31        lemon/path.h \
    2532        lemon/random.h \
    2633        lemon/tolerance.h \
     
    3542        lemon/bits/invalid.h \
    3643        lemon/bits/map_extender.h \
     44        lemon/bits/path_dump.h \
    3745        lemon/bits/traits.h \
    3846        lemon/bits/utility.h \
     
    4351        lemon/concepts/digraph.h \
    4452        lemon/concepts/graph.h \
     53        lemon/concepts/heap.h \
    4554        lemon/concepts/maps.h \
     55        lemon/concepts/path.h \
    4656        lemon/concepts/graph_components.h
  • test/Makefile.am

    r100 r106  
    1414        test/dim_test \
    1515        test/graph_test \
     16        test/kruskal_test \
    1617        test/maps_test \
    1718        test/random_test \
    1819        test/path_test \
    1920        test/test_tools_fail \
    20         test/test_tools_pass
     21        test/test_tools_pass \
     22        test/unionfind_test
    2123
    2224TESTS += $(check_PROGRAMS)
     
    3032test_graph_test_SOURCES = test/graph_test.cc
    3133# test_heap_test_SOURCES = test/heap_test.cc
     34test_kruskal_test_SOURCES = test/kruskal_test.cc
    3235test_maps_test_SOURCES = test/maps_test.cc
    3336test_path_test_SOURCES = test/path_test.cc
     
    3538test_test_tools_fail_SOURCES = test/test_tools_fail.cc
    3639test_test_tools_pass_SOURCES = test/test_tools_pass.cc
     40test_unionfind_test_SOURCES = test/unionfind_test.cc
  • test/Makefile.am

    r103 r106  
    44noinst_HEADERS += \
    55        test/digraph_test.h \
     6        test/heap_test.h \
    67        test/map_test.h \
    78        test/test_tools.h
    89
    910check_PROGRAMS += \
     11        test/bfs_test \
     12        test/dfs_test \
    1013        test/digraph_test \
    1114        test/dim_test \
     
    1417        test/maps_test \
    1518        test/random_test \
     19        test/path_test \
    1620        test/test_tools_fail \
    1721        test/test_tools_pass \
     
    2125XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
    2226
     27test_bfs_test_SOURCES = test/bfs_test.cc
     28test_dfs_test_SOURCES = test/dfs_test.cc
    2329test_digraph_test_SOURCES = test/digraph_test.cc
    2430test_dim_test_SOURCES = test/dim_test.cc
    2531#test_error_test_SOURCES = test/error_test.cc
    2632test_graph_test_SOURCES = test/graph_test.cc
     33# test_heap_test_SOURCES = test/heap_test.cc
    2734test_kruskal_test_SOURCES = test/kruskal_test.cc
    2835test_maps_test_SOURCES = test/maps_test.cc
     36test_path_test_SOURCES = test/path_test.cc
    2937test_random_test_SOURCES = test/random_test.cc
    3038test_test_tools_fail_SOURCES = test/test_tools_fail.cc
Note: See TracChangeset for help on using the changeset viewer.