Changeset 1111:c8fce9beb46a in lemon

Timestamp:

12/20/11 19:25:40 (13 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:

• CMakeLists.txt (modified) (2 diffs)
• doc/Doxyfile.in (modified) (1 diff)
• lemon/Makefile.am (modified) (2 diffs)
• lemon/core.h (modified) (1 diff)
• test/CMakeLists.txt (modified) (1 diff)
• test/Makefile.am (modified) (3 diffs)

CMakeLists.txt

@@ -115 +115 @@
 SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
 
-INCLUDE(FindPythonInterp)
-
 ENABLE_TESTING()
 
@@ -127 +125 @@
 ADD_SUBDIRECTORY(lemon)
 IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+  ADD_SUBDIRECTORY(contrib)
   ADD_SUBDIRECTORY(demo)
   ADD_SUBDIRECTORY(tools)

doc/Doxyfile.in

@@ -96 +96 @@
                          "@abs_top_srcdir@/lemon/concepts" \
                          "@abs_top_srcdir@/demo" \
+                         "@abs_top_srcdir@/contrib" \
                          "@abs_top_srcdir@/tools" \
                          "@abs_top_srcdir@/test/test_tools.h" \

lemon/Makefile.am

@@ -92 +92 @@
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
+        lemon/grosso_locatelli_pullan_mc.h \
         lemon/hartmann_orlin_mmc.h \
         lemon/howard_mmc.h \
@@ -108 +109 @@
         lemon/math.h \
         lemon/min_cost_arborescence.h \
+        lemon/max_cardinality_search.h \
+        lemon/nagamochi_ibaraki.h \
         lemon/nauty_reader.h \
         lemon/network_simplex.h \

lemon/core.h

@@ -447 +447 @@
 
   }
+
+  /// \brief Check whether a graph is undirected.
+  ///
+  /// This function returns \c true if the given graph is undirected.
+#ifdef DOXYGEN
+  template <typename GR>
+  bool undirected(const GR& g) { return false; }
+#else
+  template <typename GR>
+  typename enable_if<UndirectedTagIndicator<GR>, bool>::type
+  undirected(const GR&) {
+    return true;
+  }
+  template <typename GR>
+  typename disable_if<UndirectedTagIndicator<GR>, bool>::type
+  undirected(const GR&) {
+    return false;
+  }
+#endif
 
   /// \brief Class to copy a digraph.

test/CMakeLists.txt

@@ -37 +37 @@
   maps_test
   matching_test
+  max_cardinality_search_test
+  max_clique_test
   min_cost_arborescence_test
   min_cost_flow_test
   min_mean_cycle_test
+  nagamochi_ibaraki_test
   path_test
   planarity_test

test/Makefile.am

@@ -35 +35 @@
         test/maps_test \
         test/matching_test \
+        test/max_cardinality_search_test \
+        test/max_clique_test \
         test/min_cost_arborescence_test \
         test/min_cost_flow_test \
         test/min_mean_cycle_test \
+        test/nagamochi_ibaraki_test \
         test/path_test \
         test/planarity_test \
@@ -79 +82 @@
 test_graph_test_SOURCES = test/graph_test.cc
 test_graph_utils_test_SOURCES = test/graph_utils_test.cc
+test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
 test_heap_test_SOURCES = test/heap_test.cc
 test_kruskal_test_SOURCES = test/kruskal_test.cc
-test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
 test_lgf_test_SOURCES = test/lgf_test.cc
 test_lp_test_SOURCES = test/lp_test.cc
@@ -87 +90 @@
 test_mip_test_SOURCES = test/mip_test.cc
 test_matching_test_SOURCES = test/matching_test.cc
+test_max_cardinality_search_test_SOURCES = test/max_cardinality_search_test.cc
+test_max_clique_test_SOURCES = test/max_clique_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
 test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
 test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
+test_nagamochi_ibaraki_test_SOURCES = test/nagamochi_ibaraki_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_planarity_test_SOURCES = test/planarity_test.cc