COIN-OR::LEMON - Graph Library

Changeset 1021:4980b05606bd in lemon


Ignore:
Timestamp:
11/16/10 07:46:01 (9 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
1022:8583fb74238c, 1025:140c953ad5d1, 1199:ae0b056593a7
Parents:
1020:70bee017b584 (diff), 1019:234d635ad721 (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

    r1017 r1021  
    108108        lemon/math.h \
    109109        lemon/min_cost_arborescence.h \
     110        lemon/max_cardinality_search.h \
    110111        lemon/nagamochi_ibaraki.h \
    111112        lemon/nauty_reader.h \
  • lemon/Makefile.am

    r1020 r1021  
    109109        lemon/min_cost_arborescence.h \
    110110        lemon/max_cardinality_search.h \
     111        lemon/nagamochi_ibaraki.h \
    111112        lemon/nauty_reader.h \
    112113        lemon/network_simplex.h \
  • test/CMakeLists.txt

    r1018 r1021  
    3232  maps_test
    3333  matching_test
     34  max_cardinality_search_test
    3435  max_clique_test
    3536  min_cost_arborescence_test
  • test/CMakeLists.txt

    r1020 r1021  
    3737  min_cost_flow_test
    3838  min_mean_cycle_test
     39  nagamochi_ibaraki_test
    3940  path_test
    4041  planarity_test
     
    4849
    4950IF(LEMON_HAVE_LP)
    50   ADD_EXECUTABLE(lp_test lp_test.cc)
     51  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
     52    ADD_EXECUTABLE(lp_test lp_test.cc)
     53  ELSE()
     54    ADD_EXECUTABLE(lp_test EXCLUDE_FROM_ALL lp_test.cc)
     55  ENDIF()
     56
    5157  SET(LP_TEST_LIBS lemon)
    5258
     
    8490
    8591IF(LEMON_HAVE_MIP)
    86   ADD_EXECUTABLE(mip_test mip_test.cc)
     92  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
     93    ADD_EXECUTABLE(mip_test mip_test.cc)
     94  ELSE()
     95    ADD_EXECUTABLE(mip_test EXCLUDE_FROM_ALL mip_test.cc)
     96  ENDIF()
     97
    8798  SET(MIP_TEST_LIBS lemon)
    8899
  • test/Makefile.am

    r1017 r1021  
    3434        test/maps_test \
    3535        test/matching_test \
     36        test/max_cardinality_search_test \
    3637        test/max_clique_test \
    3738        test/min_cost_arborescence_test \
     
    8788test_mip_test_SOURCES = test/mip_test.cc
    8889test_matching_test_SOURCES = test/matching_test.cc
     90test_max_cardinality_search_test_SOURCES = test/max_cardinality_search_test.cc
    8991test_max_clique_test_SOURCES = test/max_clique_test.cc
    9092test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
  • test/Makefile.am

    r1020 r1021  
    3939        test/min_cost_flow_test \
    4040        test/min_mean_cycle_test \
     41        test/nagamochi_ibaraki_test \
    4142        test/path_test \
    4243        test/planarity_test \
     
    9293test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
    9394test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
     95test_nagamochi_ibaraki_test_SOURCES = test/nagamochi_ibaraki_test.cc
    9496test_path_test_SOURCES = test/path_test.cc
    9597test_planarity_test_SOURCES = test/planarity_test.cc
Note: See TracChangeset for help on using the changeset viewer.