Changeset 106:9ba2d265e191 in lemon-main

Timestamp:

03/21/08 00:06:35 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

104:cdbba181b786 (diff), 105:e4948ef6a4ca (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) (2 diffs)
• lemon/Makefile.am (modified) (4 diffs)
• test/Makefile.am (modified) (3 diffs)
• test/Makefile.am (modified) (3 diffs)

lemon/Makefile.am

@@ -24 +24 @@
         lemon/dim2.h \
         lemon/error.h \
-        lemon/graph_utils.h \
+        lemon/graph_utils.h \
+        lemon/kruskal.h \
         lemon/list_graph.h \
         lemon/maps.h \
@@ -30 +31 @@
         lemon/path.h \
         lemon/random.h \
-        lemon/tolerance.h
+        lemon/tolerance.h \
+        lemon/unionfind.h
 
 bits_HEADERS += \

lemon/Makefile.am

@@ -8 +8 @@
 
 lemon_libemon_la_SOURCES = \
+        lemon/arg_parser.cc \
         lemon/base.cc \
         lemon/random.cc
@@ -16 +17 @@
 
 lemon_HEADERS += \
-        lemon/concept_check.h \
+        lemon/arg_parser.h \
+        lemon/bfs.h \
+        lemon/bin_heap.h \
+        lemon/dfs.h \
+        lemon/dijkstra.h \
         lemon/dim2.h \
         lemon/error.h \
+        lemon/graph_utils.h \
         lemon/kruskal.h \
         lemon/list_graph.h \
         lemon/maps.h \
         lemon/math.h \
+        lemon/path.h \
         lemon/random.h \
         lemon/tolerance.h \
@@ -35 +42 @@
         lemon/bits/invalid.h \
         lemon/bits/map_extender.h \
+        lemon/bits/path_dump.h \
         lemon/bits/traits.h \
         lemon/bits/utility.h \
@@ -43 +51 @@
         lemon/concepts/digraph.h \
         lemon/concepts/graph.h \
+        lemon/concepts/heap.h \
         lemon/concepts/maps.h \
+        lemon/concepts/path.h \
         lemon/concepts/graph_components.h

test/Makefile.am

@@ -14 +14 @@
         test/dim_test \
         test/graph_test \
+        test/kruskal_test \
         test/maps_test \
         test/random_test \
         test/path_test \
         test/test_tools_fail \
-        test/test_tools_pass
+        test/test_tools_pass \
+        test/unionfind_test
 
 TESTS += $(check_PROGRAMS)
@@ -30 +32 @@
 test_graph_test_SOURCES = test/graph_test.cc
 # test_heap_test_SOURCES = test/heap_test.cc
+test_kruskal_test_SOURCES = test/kruskal_test.cc
 test_maps_test_SOURCES = test/maps_test.cc
 test_path_test_SOURCES = test/path_test.cc
@@ -35 +38 @@
 test_test_tools_fail_SOURCES = test/test_tools_fail.cc
 test_test_tools_pass_SOURCES = test/test_tools_pass.cc
+test_unionfind_test_SOURCES = test/unionfind_test.cc

test/Makefile.am

@@ -4 +4 @@
 noinst_HEADERS += \
         test/digraph_test.h \
+        test/heap_test.h \
         test/map_test.h \
         test/test_tools.h
 
 check_PROGRAMS += \
+        test/bfs_test \
+        test/dfs_test \
         test/digraph_test \
         test/dim_test \
@@ -14 +17 @@
         test/maps_test \
         test/random_test \
+        test/path_test \
         test/test_tools_fail \
         test/test_tools_pass \
@@ -21 +25 @@
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
+test_bfs_test_SOURCES = test/bfs_test.cc
+test_dfs_test_SOURCES = test/dfs_test.cc
 test_digraph_test_SOURCES = test/digraph_test.cc
 test_dim_test_SOURCES = test/dim_test.cc
 #test_error_test_SOURCES = test/error_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
+# test_heap_test_SOURCES = test/heap_test.cc
 test_kruskal_test_SOURCES = test/kruskal_test.cc
 test_maps_test_SOURCES = test/maps_test.cc
+test_path_test_SOURCES = test/path_test.cc
 test_random_test_SOURCES = test/random_test.cc
 test_test_tools_fail_SOURCES = test/test_tools_fail.cc