COIN-OR::LEMON - Graph Library

Changeset 404:59d3aa4f921f in lemon-main


Ignore:
Timestamp:
12/01/08 15:18:40 (16 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
407:e22fc10ab6f1, 409:b8ce15103485
Parents:
398:532f34ea9cf3 (diff), 403:940587667b47 (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

    r395 r404  
    2121        lemon/bfs.h \
    2222        lemon/bin_heap.h \
     23        lemon/circulation.h \
    2324        lemon/color.h \
    2425        lemon/concept_check.h \
  • lemon/Makefile.am

    r399 r404  
    2929        lemon/dijkstra.h \
    3030        lemon/dim2.h \
     31        lemon/dimacs.h \
    3132        lemon/elevator.h \
    3233        lemon/error.h \
     
    4445        lemon/nauty_reader.h \
    4546        lemon/path.h \
     47        lemon/preflow.h \
    4648        lemon/random.h \
    4749        lemon/smart_graph.h \
  • test/Makefile.am

    r389 r404  
    1010check_PROGRAMS += \
    1111        test/bfs_test \
     12        test/circulation_test \
    1213        test/counter_test \
    1314        test/dfs_test \
     
    3637
    3738test_bfs_test_SOURCES = test/bfs_test.cc
     39test_circulation_test_SOURCES = test/circulation_test.cc
    3840test_counter_test_SOURCES = test/counter_test.cc
    3941test_dfs_test_SOURCES = test/dfs_test.cc
  • test/Makefile.am

    r400 r404  
    11EXTRA_DIST += \
    22        test/CMakeLists.txt \
    3         test/min_cost_flow_test.lgf
     3        test/min_cost_flow_test.lgf \
     4        test/preflow_graph.lgf
    45
    56noinst_HEADERS += \
     
    2526        test/random_test \
    2627        test/path_test \
     28        test/preflow_test \
    2729        test/suurballe_test \
    2830        test/test_tools_fail \
     
    5052test_max_matching_test_SOURCES = test/max_matching_test.cc
    5153test_path_test_SOURCES = test/path_test.cc
     54test_preflow_test_SOURCES = test/preflow_test.cc
    5255test_suurballe_test_SOURCES = test/suurballe_test.cc
    5356test_random_test_SOURCES = test/random_test.cc
Note: See TracChangeset for help on using the changeset viewer.