Changeset 822:f903263902f6 in lemon-main

Timestamp:

12/14/09 06:07:52 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

823:a7e93de12cbd, 848:e05b2b48515a, 1151:43647f48e971

Parents:

821:072ec8120958 (diff), 803:1b89e29c9fc7 (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 #180 and a bugfix in #51

Files:

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

lemon/Makefile.am

@@ -63 +63 @@
         lemon/binom_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/dijkstra.h \

lemon/Makefile.am

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