Changeset 799:6be1f9bd2ac0 in lemon-main

Timestamp:

12/09/09 11:14:06 (15 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:

• lemon/Makefile.am (modified) (1 diff)
• lemon/Makefile.am (modified) (2 diffs)
• test/CMakeLists.txt (modified) (1 diff)
• test/CMakeLists.txt (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/Makefile.am (modified) (3 diffs)

lemon/Makefile.am

@@ -108 +108 @@
         lemon/pairing_heap.h \
         lemon/path.h \
+        lemon/planarity.h \
         lemon/preflow.h \
         lemon/radix_heap.h \

lemon/Makefile.am

@@ -87 +87 @@
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
+        lemon/hartmann_orlin.h \
+        lemon/howard.h \
         lemon/hypercube_graph.h \
+        lemon/karp.h \
         lemon/kary_heap.h \
         lemon/kruskal.h \
@@ -112 +115 @@
         lemon/smart_graph.h \
         lemon/soplex.h \
+        lemon/static_graph.h \
         lemon/suurballe.h \
         lemon/time_measure.h \

test/CMakeLists.txt

@@ -35 +35 @@
   min_mean_cycle_test
   path_test
+  planarity_test
   preflow_test
   radix_sort_test

test/CMakeLists.txt

@@ -33 +33 @@
   min_cost_arborescence_test
   min_cost_flow_test
+  min_mean_cycle_test
   path_test
   planarity_test

test/Makefile.am

@@ -37 +37 @@
         test/min_mean_cycle_test \
         test/path_test \
+        test/planarity_test \
         test/preflow_test \
         test/radix_sort_test \
@@ -86 +87 @@
 test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
 test_path_test_SOURCES = test/path_test.cc
+test_planarity_test_SOURCES = test/planarity_test.cc
 test_preflow_test_SOURCES = test/preflow_test.cc
 test_radix_sort_test_SOURCES = test/radix_sort_test.cc

test/Makefile.am

@@ +1 @@
+if USE_VALGRIND
+TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh
+endif
+
 EXTRA_DIST += \
         test/CMakeLists.txt
@@ -31 +35 @@
         test/min_cost_arborescence_test \
         test/min_cost_flow_test \
+        test/min_mean_cycle_test \
         test/path_test \
         test/planarity_test \
@@ -80 +85 @@
 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_path_test_SOURCES = test/path_test.cc
 test_planarity_test_SOURCES = test/planarity_test.cc