Changeset 404:59d3aa4f921f in lemon-main

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:

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

lemon/Makefile.am

@@ -21 +21 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
+        lemon/circulation.h \
         lemon/color.h \
         lemon/concept_check.h \

lemon/Makefile.am

@@ -29 +29 @@
         lemon/dijkstra.h \
         lemon/dim2.h \
+        lemon/dimacs.h \
         lemon/elevator.h \
         lemon/error.h \
@@ -44 +45 @@
         lemon/nauty_reader.h \
         lemon/path.h \
+        lemon/preflow.h \
         lemon/random.h \
         lemon/smart_graph.h \

test/Makefile.am

@@ -10 +10 @@
 check_PROGRAMS += \
         test/bfs_test \
+        test/circulation_test \
         test/counter_test \
         test/dfs_test \
@@ -36 +37 @@
 
 test_bfs_test_SOURCES = test/bfs_test.cc
+test_circulation_test_SOURCES = test/circulation_test.cc
 test_counter_test_SOURCES = test/counter_test.cc
 test_dfs_test_SOURCES = test/dfs_test.cc

test/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST += \
         test/CMakeLists.txt \
-        test/min_cost_flow_test.lgf
+        test/min_cost_flow_test.lgf \
+        test/preflow_graph.lgf
 
 noinst_HEADERS += \
@@ -25 +26 @@
         test/random_test \
         test/path_test \
+        test/preflow_test \
         test/suurballe_test \
         test/test_tools_fail \
@@ -50 +52 @@
 test_max_matching_test_SOURCES = test/max_matching_test.cc
 test_path_test_SOURCES = test/path_test.cc
+test_preflow_test_SOURCES = test/preflow_test.cc
 test_suurballe_test_SOURCES = test/suurballe_test.cc
 test_random_test_SOURCES = test/random_test.cc