COIN-OR::LEMON - Graph Library

Changeset 799:6be1f9bd2ac0 in lemon-1.2


Ignore:
Timestamp:
12/09/09 11:14:06 (14 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
800:28c7ad6f8d91, 834:207ba6c0f2e4
Parents:
798:58c330ad0b5c (diff), 796:9cc6e98c487d (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 #62

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r780 r799  
    108108        lemon/pairing_heap.h \
    109109        lemon/path.h \
     110        lemon/planarity.h \
    110111        lemon/preflow.h \
    111112        lemon/radix_heap.h \
  • lemon/Makefile.am

    r797 r799  
    8787        lemon/graph_to_eps.h \
    8888        lemon/grid_graph.h \
     89        lemon/hartmann_orlin.h \
     90        lemon/howard.h \
    8991        lemon/hypercube_graph.h \
     92        lemon/karp.h \
    9093        lemon/kary_heap.h \
    9194        lemon/kruskal.h \
     
    112115        lemon/smart_graph.h \
    113116        lemon/soplex.h \
     117        lemon/static_graph.h \
    114118        lemon/suurballe.h \
    115119        lemon/time_measure.h \
  • test/CMakeLists.txt

    r770 r799  
    3535  min_mean_cycle_test
    3636  path_test
     37  planarity_test
    3738  preflow_test
    3839  radix_sort_test
  • test/CMakeLists.txt

    r797 r799  
    3333  min_cost_arborescence_test
    3434  min_cost_flow_test
     35  min_mean_cycle_test
    3536  path_test
    3637  planarity_test
  • test/Makefile.am

    r793 r799  
    3737        test/min_mean_cycle_test \
    3838        test/path_test \
     39        test/planarity_test \
    3940        test/preflow_test \
    4041        test/radix_sort_test \
     
    8687test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
    8788test_path_test_SOURCES = test/path_test.cc
     89test_planarity_test_SOURCES = test/planarity_test.cc
    8890test_preflow_test_SOURCES = test/preflow_test.cc
    8991test_radix_sort_test_SOURCES = test/radix_sort_test.cc
  • test/Makefile.am

    r797 r799  
     1if USE_VALGRIND
     2TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh
     3endif
     4
    15EXTRA_DIST += \
    26        test/CMakeLists.txt
     
    3135        test/min_cost_arborescence_test \
    3236        test/min_cost_flow_test \
     37        test/min_mean_cycle_test \
    3338        test/path_test \
    3439        test/planarity_test \
     
    8085test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
    8186test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
     87test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
    8288test_path_test_SOURCES = test/path_test.cc
    8389test_planarity_test_SOURCES = test/planarity_test.cc
Note: See TracChangeset for help on using the changeset viewer.