COIN-OR::LEMON - Graph Library

Changeset 1111:c8fce9beb46a in lemon


Ignore:
Timestamp:
12/20/11 19:25:40 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1095:9a716871028e (diff), 1108:a1fd7008a052 (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 head merging

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1107 r1111  
    115115SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
    116116
    117 INCLUDE(FindPythonInterp)
    118 
    119117ENABLE_TESTING()
    120118
     
    127125ADD_SUBDIRECTORY(lemon)
    128126IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
     127  ADD_SUBDIRECTORY(contrib)
    129128  ADD_SUBDIRECTORY(demo)
    130129  ADD_SUBDIRECTORY(tools)
  • doc/Doxyfile.in

    r1107 r1111  
    9696                         "@abs_top_srcdir@/lemon/concepts" \
    9797                         "@abs_top_srcdir@/demo" \
     98                         "@abs_top_srcdir@/contrib" \
    9899                         "@abs_top_srcdir@/tools" \
    99100                         "@abs_top_srcdir@/test/test_tools.h" \
  • lemon/Makefile.am

    r1107 r1111  
    9292        lemon/graph_to_eps.h \
    9393        lemon/grid_graph.h \
     94        lemon/grosso_locatelli_pullan_mc.h \
    9495        lemon/hartmann_orlin_mmc.h \
    9596        lemon/howard_mmc.h \
     
    108109        lemon/math.h \
    109110        lemon/min_cost_arborescence.h \
     111        lemon/max_cardinality_search.h \
     112        lemon/nagamochi_ibaraki.h \
    110113        lemon/nauty_reader.h \
    111114        lemon/network_simplex.h \
  • lemon/core.h

    r1107 r1111  
    447447
    448448  }
     449
     450  /// \brief Check whether a graph is undirected.
     451  ///
     452  /// This function returns \c true if the given graph is undirected.
     453#ifdef DOXYGEN
     454  template <typename GR>
     455  bool undirected(const GR& g) { return false; }
     456#else
     457  template <typename GR>
     458  typename enable_if<UndirectedTagIndicator<GR>, bool>::type
     459  undirected(const GR&) {
     460    return true;
     461  }
     462  template <typename GR>
     463  typename disable_if<UndirectedTagIndicator<GR>, bool>::type
     464  undirected(const GR&) {
     465    return false;
     466  }
     467#endif
    449468
    450469  /// \brief Class to copy a digraph.
  • test/CMakeLists.txt

    r1107 r1111  
    3737  maps_test
    3838  matching_test
     39  max_cardinality_search_test
     40  max_clique_test
    3941  min_cost_arborescence_test
    4042  min_cost_flow_test
    4143  min_mean_cycle_test
     44  nagamochi_ibaraki_test
    4245  path_test
    4346  planarity_test
  • test/Makefile.am

    r1107 r1111  
    3535        test/maps_test \
    3636        test/matching_test \
     37        test/max_cardinality_search_test \
     38        test/max_clique_test \
    3739        test/min_cost_arborescence_test \
    3840        test/min_cost_flow_test \
    3941        test/min_mean_cycle_test \
     42        test/nagamochi_ibaraki_test \
    4043        test/path_test \
    4144        test/planarity_test \
     
    7982test_graph_test_SOURCES = test/graph_test.cc
    8083test_graph_utils_test_SOURCES = test/graph_utils_test.cc
     84test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
    8185test_heap_test_SOURCES = test/heap_test.cc
    8286test_kruskal_test_SOURCES = test/kruskal_test.cc
    83 test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
    8487test_lgf_test_SOURCES = test/lgf_test.cc
    8588test_lp_test_SOURCES = test/lp_test.cc
     
    8790test_mip_test_SOURCES = test/mip_test.cc
    8891test_matching_test_SOURCES = test/matching_test.cc
     92test_max_cardinality_search_test_SOURCES = test/max_cardinality_search_test.cc
     93test_max_clique_test_SOURCES = test/max_clique_test.cc
    8994test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
    9095test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
    9196test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
     97test_nagamochi_ibaraki_test_SOURCES = test/nagamochi_ibaraki_test.cc
    9298test_path_test_SOURCES = test/path_test.cc
    9399test_planarity_test_SOURCES = test/planarity_test.cc
Note: See TracChangeset for help on using the changeset viewer.