Changeset 859:ac5f72c48367 in lemon-main

Timestamp:

03/03/10 18:22:13 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

858:9f6ed854d409 (diff), 855:65a0521e744e (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 #301

Location:

lemon

Files:

• Makefile.am (modified) (5 diffs)
• Makefile.am (modified) (5 diffs)
• binom_heap.h (deleted)
• fourary_heap.h (deleted)
• kary_heap.h (deleted)

lemon/Makefile.am

@@ -63 +63 @@
         lemon/binomial_heap.h \
         lemon/bucket_heap.h \
+        lemon/capacity_scaling.h \
         lemon/cbc.h \
         lemon/circulation.h \
@@ -69 +70 @@
         lemon/concept_check.h \
         lemon/connectivity.h \
+        lemon/core.h \
+        lemon/cost_scaling.h \
         lemon/counter.h \
-        lemon/core.h \
         lemon/cplex.h \
+        lemon/cycle_canceling.h \
         lemon/dfs.h \
         lemon/dheap.h \
@@ -87 +90 @@
         lemon/graph_to_eps.h \
         lemon/grid_graph.h \
+        lemon/hartmann_orlin.h \
+        lemon/howard.h \
         lemon/hypercube_graph.h \
+        lemon/karp.h \
         lemon/kruskal.h \
         lemon/hao_orlin.h \
@@ -104 +110 @@
         lemon/pairing_heap.h \
         lemon/path.h \
+        lemon/planarity.h \
         lemon/preflow.h \
         lemon/quad_heap.h \
@@ -111 +118 @@
         lemon/smart_graph.h \
         lemon/soplex.h \
+        lemon/static_graph.h \
         lemon/suurballe.h \
         lemon/time_measure.h \

lemon/Makefile.am

@@ -61 +61 @@
         lemon/bfs.h \
         lemon/bin_heap.h \
-        lemon/binom_heap.h \
+        lemon/binomial_heap.h \
         lemon/bucket_heap.h \
         lemon/capacity_scaling.h \
@@ -76 +76 @@
         lemon/cycle_canceling.h \
         lemon/dfs.h \
+        lemon/dheap.h \
         lemon/dijkstra.h \
         lemon/dim2.h \
@@ -84 +85 @@
         lemon/euler.h \
         lemon/fib_heap.h \
-        lemon/fourary_heap.h \
         lemon/full_graph.h \
         lemon/glpk.h \
@@ -94 +94 @@
         lemon/hypercube_graph.h \
         lemon/karp.h \
-        lemon/kary_heap.h \
         lemon/kruskal.h \
         lemon/hao_orlin.h \
@@ -113 +112 @@
         lemon/planarity.h \
         lemon/preflow.h \
+        lemon/quad_heap.h \
         lemon/radix_heap.h \
         lemon/radix_sort.h \