summaryrefslogtreecommitdiffstats
path: root/src/libcola
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc.jeanmougin@telecom-paristech.fr>2018-04-29 14:25:32 +0000
committerMarc Jeanmougin <marc.jeanmougin@telecom-paristech.fr>2018-04-29 14:25:32 +0000
commitab5f8ff5869021958f4ae8b838c3d707a2e85eaa (patch)
tree4907675828a5401d013b7587538cc8541edd2764 /src/libcola
parentmoved libcroco, libuemf, libdepixelize to 3rdparty folder (diff)
downloadinkscape-ab5f8ff5869021958f4ae8b838c3d707a2e85eaa.tar.gz
inkscape-ab5f8ff5869021958f4ae8b838c3d707a2e85eaa.zip
Put adaptagrams into its own folder
Diffstat (limited to '')
-rw-r--r--src/3rdparty/adaptagrams/libcola/CMakeLists.txt (renamed from src/libcola/CMakeLists.txt)1
-rw-r--r--src/3rdparty/adaptagrams/libcola/Makefile.am (renamed from src/libcola/Makefile.am)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/README (renamed from src/libcola/README)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/box.cpp (renamed from src/libcola/box.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/box.h (renamed from src/libcola/box.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.cpp (renamed from src/libcola/cc_clustercontainmentconstraints.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.h (renamed from src/libcola/cc_clustercontainmentconstraints.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.cpp (renamed from src/libcola/cc_nonoverlapconstraints.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.h (renamed from src/libcola/cc_nonoverlapconstraints.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cluster.cpp (renamed from src/libcola/cluster.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cluster.h (renamed from src/libcola/cluster.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cola.cpp (renamed from src/libcola/cola.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cola.h (renamed from src/libcola/cola.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/cola_log.h (renamed from src/libcola/cola_log.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/colafd.cpp (renamed from src/libcola/colafd.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/commondefs.h (renamed from src/libcola/commondefs.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/compound_constraints.cpp (renamed from src/libcola/compound_constraints.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/compound_constraints.h (renamed from src/libcola/compound_constraints.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/conjugate_gradient.cpp (renamed from src/libcola/conjugate_gradient.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/conjugate_gradient.h (renamed from src/libcola/conjugate_gradient.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/connected_components.cpp (renamed from src/libcola/connected_components.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/connected_components.h (renamed from src/libcola/connected_components.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/convex_hull.cpp (renamed from src/libcola/convex_hull.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/convex_hull.h (renamed from src/libcola/convex_hull.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/doc/description.doc (renamed from src/libcola/doc/description.doc)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/exceptions.h (renamed from src/libcola/exceptions.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/gradient_projection.cpp (renamed from src/libcola/gradient_projection.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/gradient_projection.h (renamed from src/libcola/gradient_projection.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/libcola.pc.in (renamed from src/libcola/libcola.pc.in)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/output_svg.cpp (renamed from src/libcola/output_svg.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/output_svg.h (renamed from src/libcola/output_svg.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/pseudorandom.cpp (renamed from src/libcola/pseudorandom.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/pseudorandom.h (renamed from src/libcola/pseudorandom.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/shapepair.cpp (renamed from src/libcola/shapepair.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/shapepair.h (renamed from src/libcola/shapepair.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/shortest_paths.h (renamed from src/libcola/shortest_paths.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/sparse_matrix.h (renamed from src/libcola/sparse_matrix.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/straightener.cpp (renamed from src/libcola/straightener.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/straightener.h (renamed from src/libcola/straightener.h)0
-rwxr-xr-xsrc/3rdparty/adaptagrams/libcola/tests/FixedRelativeConstraint01.cpp (renamed from src/libcola/tests/FixedRelativeConstraint01.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/Makefile.am (renamed from src/libcola/tests/Makefile.am)0
-rwxr-xr-xsrc/3rdparty/adaptagrams/libcola/tests/StillOverlap01.cpp (renamed from src/libcola/tests/StillOverlap01.cpp)0
-rwxr-xr-xsrc/3rdparty/adaptagrams/libcola/tests/StillOverlap02.cpp (renamed from src/libcola/tests/StillOverlap02.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/boundary.cpp (renamed from src/libcola/tests/boundary.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/connected_components.cpp (renamed from src/libcola/tests/connected_components.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/constrained.cpp (renamed from src/libcola/tests/constrained.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/containment.cpp (renamed from src/libcola/tests/containment.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/containment2.cpp (renamed from src/libcola/tests/containment2.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/convex_hull.cpp (renamed from src/libcola/tests/convex_hull.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/cycle_detector.cpp (renamed from src/libcola/tests/cycle_detector.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/data/1138_bus.txt (renamed from src/libcola/tests/data/1138_bus.txt)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/data/uetzNetworkGSC-all.gml (renamed from src/libcola/tests/data/uetzNetworkGSC-all.gml)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/gml_graph.cpp (renamed from src/libcola/tests/gml_graph.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/graphlayouttest.h (renamed from src/libcola/tests/graphlayouttest.h)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/initialOverlap.cpp (renamed from src/libcola/tests/initialOverlap.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/invalid.cpp (renamed from src/libcola/tests/invalid.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/large_graph.cpp (renamed from src/libcola/tests/large_graph.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/makefeasible.cpp (renamed from src/libcola/tests/makefeasible.cpp)0
-rwxr-xr-xsrc/3rdparty/adaptagrams/libcola/tests/makefeasible02.cpp (renamed from src/libcola/tests/makefeasible02.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/makemovie.sh (renamed from src/libcola/tests/makemovie.sh)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/max_acyclic_subgraph.cpp (renamed from src/libcola/tests/max_acyclic_subgraph.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/overlappingClusters01.cpp (renamed from src/libcola/tests/overlappingClusters01.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/overlappingClusters02.cpp (renamed from src/libcola/tests/overlappingClusters02.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/overlappingClusters04.cpp (renamed from src/libcola/tests/overlappingClusters04.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/page_bounds.cpp (renamed from src/libcola/tests/page_bounds.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/planar.cpp (renamed from src/libcola/tests/planar.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/random_graph.cpp (renamed from src/libcola/tests/random_graph.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/rectangularClusters01.cpp (renamed from src/libcola/tests/rectangularClusters01.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/rectclustershapecontainment.cpp (renamed from src/libcola/tests/rectclustershapecontainment.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/resize.cpp (renamed from src/libcola/tests/resize.cpp)0
-rwxr-xr-xsrc/3rdparty/adaptagrams/libcola/tests/runtest.sh (renamed from src/libcola/tests/runtest.sh)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/scale_free.cpp (renamed from src/libcola/tests/scale_free.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/shortest_paths.cpp (renamed from src/libcola/tests/shortest_paths.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/small_graph.cpp (renamed from src/libcola/tests/small_graph.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/sparse_matrix.cpp (renamed from src/libcola/tests/sparse_matrix.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/test_cg.cpp (renamed from src/libcola/tests/test_cg.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/topology.cpp (renamed from src/libcola/tests/topology.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/trees.cpp (renamed from src/libcola/tests/trees.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/unconstrained.cpp (renamed from src/libcola/tests/unconstrained.cpp)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/tests/unsatisfiable.cpp (renamed from src/libcola/tests/unsatisfiable.cpp)0
-rwxr-xr-xsrc/3rdparty/adaptagrams/libcola/tests/view_cd_output.sh (renamed from src/libcola/tests/view_cd_output.sh)0
-rwxr-xr-xsrc/3rdparty/adaptagrams/libcola/tests/view_mas_output.sh (renamed from src/libcola/tests/view_mas_output.sh)0
-rw-r--r--src/3rdparty/adaptagrams/libcola/unused.h (renamed from src/libcola/unused.h)0
83 files changed, 1 insertions, 0 deletions
diff --git a/src/libcola/CMakeLists.txt b/src/3rdparty/adaptagrams/libcola/CMakeLists.txt
index 035b32dc2..59bbacc82 100644
--- a/src/libcola/CMakeLists.txt
+++ b/src/3rdparty/adaptagrams/libcola/CMakeLists.txt
@@ -26,4 +26,5 @@ set(libcola_SRC
straightener.h
)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
add_inkscape_lib(cola_LIB "${libcola_SRC}")
diff --git a/src/libcola/Makefile.am b/src/3rdparty/adaptagrams/libcola/Makefile.am
index e35f7ae18..e35f7ae18 100644
--- a/src/libcola/Makefile.am
+++ b/src/3rdparty/adaptagrams/libcola/Makefile.am
diff --git a/src/libcola/README b/src/3rdparty/adaptagrams/libcola/README
index 03d43be29..03d43be29 100644
--- a/src/libcola/README
+++ b/src/3rdparty/adaptagrams/libcola/README
diff --git a/src/libcola/box.cpp b/src/3rdparty/adaptagrams/libcola/box.cpp
index 8ad3cbaf6..8ad3cbaf6 100644
--- a/src/libcola/box.cpp
+++ b/src/3rdparty/adaptagrams/libcola/box.cpp
diff --git a/src/libcola/box.h b/src/3rdparty/adaptagrams/libcola/box.h
index ff8f0186e..ff8f0186e 100644
--- a/src/libcola/box.h
+++ b/src/3rdparty/adaptagrams/libcola/box.h
diff --git a/src/libcola/cc_clustercontainmentconstraints.cpp b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.cpp
index 93f94eb35..93f94eb35 100644
--- a/src/libcola/cc_clustercontainmentconstraints.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.cpp
diff --git a/src/libcola/cc_clustercontainmentconstraints.h b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.h
index 5fbe75eba..5fbe75eba 100644
--- a/src/libcola/cc_clustercontainmentconstraints.h
+++ b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.h
diff --git a/src/libcola/cc_nonoverlapconstraints.cpp b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.cpp
index 3911651f5..3911651f5 100644
--- a/src/libcola/cc_nonoverlapconstraints.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.cpp
diff --git a/src/libcola/cc_nonoverlapconstraints.h b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.h
index 04f756da9..04f756da9 100644
--- a/src/libcola/cc_nonoverlapconstraints.h
+++ b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.h
diff --git a/src/libcola/cluster.cpp b/src/3rdparty/adaptagrams/libcola/cluster.cpp
index d8b37d7b6..d8b37d7b6 100644
--- a/src/libcola/cluster.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cluster.cpp
diff --git a/src/libcola/cluster.h b/src/3rdparty/adaptagrams/libcola/cluster.h
index 118d703f6..118d703f6 100644
--- a/src/libcola/cluster.h
+++ b/src/3rdparty/adaptagrams/libcola/cluster.h
diff --git a/src/libcola/cola.cpp b/src/3rdparty/adaptagrams/libcola/cola.cpp
index 0009ef894..0009ef894 100644
--- a/src/libcola/cola.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cola.cpp
diff --git a/src/libcola/cola.h b/src/3rdparty/adaptagrams/libcola/cola.h
index 016012134..016012134 100644
--- a/src/libcola/cola.h
+++ b/src/3rdparty/adaptagrams/libcola/cola.h
diff --git a/src/libcola/cola_log.h b/src/3rdparty/adaptagrams/libcola/cola_log.h
index c2c9419c7..c2c9419c7 100644
--- a/src/libcola/cola_log.h
+++ b/src/3rdparty/adaptagrams/libcola/cola_log.h
diff --git a/src/libcola/colafd.cpp b/src/3rdparty/adaptagrams/libcola/colafd.cpp
index 748f3354b..748f3354b 100644
--- a/src/libcola/colafd.cpp
+++ b/src/3rdparty/adaptagrams/libcola/colafd.cpp
diff --git a/src/libcola/commondefs.h b/src/3rdparty/adaptagrams/libcola/commondefs.h
index 591fde57f..591fde57f 100644
--- a/src/libcola/commondefs.h
+++ b/src/3rdparty/adaptagrams/libcola/commondefs.h
diff --git a/src/libcola/compound_constraints.cpp b/src/3rdparty/adaptagrams/libcola/compound_constraints.cpp
index e4552e606..e4552e606 100644
--- a/src/libcola/compound_constraints.cpp
+++ b/src/3rdparty/adaptagrams/libcola/compound_constraints.cpp
diff --git a/src/libcola/compound_constraints.h b/src/3rdparty/adaptagrams/libcola/compound_constraints.h
index 5f62f9edb..5f62f9edb 100644
--- a/src/libcola/compound_constraints.h
+++ b/src/3rdparty/adaptagrams/libcola/compound_constraints.h
diff --git a/src/libcola/conjugate_gradient.cpp b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.cpp
index adb7fa67f..adb7fa67f 100644
--- a/src/libcola/conjugate_gradient.cpp
+++ b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.cpp
diff --git a/src/libcola/conjugate_gradient.h b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.h
index e21cd16d5..e21cd16d5 100644
--- a/src/libcola/conjugate_gradient.h
+++ b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.h
diff --git a/src/libcola/connected_components.cpp b/src/3rdparty/adaptagrams/libcola/connected_components.cpp
index a535e7448..a535e7448 100644
--- a/src/libcola/connected_components.cpp
+++ b/src/3rdparty/adaptagrams/libcola/connected_components.cpp
diff --git a/src/libcola/connected_components.h b/src/3rdparty/adaptagrams/libcola/connected_components.h
index 578eab293..578eab293 100644
--- a/src/libcola/connected_components.h
+++ b/src/3rdparty/adaptagrams/libcola/connected_components.h
diff --git a/src/libcola/convex_hull.cpp b/src/3rdparty/adaptagrams/libcola/convex_hull.cpp
index 3ecbfead4..3ecbfead4 100644
--- a/src/libcola/convex_hull.cpp
+++ b/src/3rdparty/adaptagrams/libcola/convex_hull.cpp
diff --git a/src/libcola/convex_hull.h b/src/3rdparty/adaptagrams/libcola/convex_hull.h
index e17c6a81b..e17c6a81b 100644
--- a/src/libcola/convex_hull.h
+++ b/src/3rdparty/adaptagrams/libcola/convex_hull.h
diff --git a/src/libcola/doc/description.doc b/src/3rdparty/adaptagrams/libcola/doc/description.doc
index 3f11f545f..3f11f545f 100644
--- a/src/libcola/doc/description.doc
+++ b/src/3rdparty/adaptagrams/libcola/doc/description.doc
diff --git a/src/libcola/exceptions.h b/src/3rdparty/adaptagrams/libcola/exceptions.h
index 516e69e10..516e69e10 100644
--- a/src/libcola/exceptions.h
+++ b/src/3rdparty/adaptagrams/libcola/exceptions.h
diff --git a/src/libcola/gradient_projection.cpp b/src/3rdparty/adaptagrams/libcola/gradient_projection.cpp
index 50b8d27d7..50b8d27d7 100644
--- a/src/libcola/gradient_projection.cpp
+++ b/src/3rdparty/adaptagrams/libcola/gradient_projection.cpp
diff --git a/src/libcola/gradient_projection.h b/src/3rdparty/adaptagrams/libcola/gradient_projection.h
index 522748b38..522748b38 100644
--- a/src/libcola/gradient_projection.h
+++ b/src/3rdparty/adaptagrams/libcola/gradient_projection.h
diff --git a/src/libcola/libcola.pc.in b/src/3rdparty/adaptagrams/libcola/libcola.pc.in
index f9d068858..f9d068858 100644
--- a/src/libcola/libcola.pc.in
+++ b/src/3rdparty/adaptagrams/libcola/libcola.pc.in
diff --git a/src/libcola/output_svg.cpp b/src/3rdparty/adaptagrams/libcola/output_svg.cpp
index 4176a5beb..4176a5beb 100644
--- a/src/libcola/output_svg.cpp
+++ b/src/3rdparty/adaptagrams/libcola/output_svg.cpp
diff --git a/src/libcola/output_svg.h b/src/3rdparty/adaptagrams/libcola/output_svg.h
index ae4b1cc69..ae4b1cc69 100644
--- a/src/libcola/output_svg.h
+++ b/src/3rdparty/adaptagrams/libcola/output_svg.h
diff --git a/src/libcola/pseudorandom.cpp b/src/3rdparty/adaptagrams/libcola/pseudorandom.cpp
index 6577b3a05..6577b3a05 100644
--- a/src/libcola/pseudorandom.cpp
+++ b/src/3rdparty/adaptagrams/libcola/pseudorandom.cpp
diff --git a/src/libcola/pseudorandom.h b/src/3rdparty/adaptagrams/libcola/pseudorandom.h
index bb3b2693c..bb3b2693c 100644
--- a/src/libcola/pseudorandom.h
+++ b/src/3rdparty/adaptagrams/libcola/pseudorandom.h
diff --git a/src/libcola/shapepair.cpp b/src/3rdparty/adaptagrams/libcola/shapepair.cpp
index 567332268..567332268 100644
--- a/src/libcola/shapepair.cpp
+++ b/src/3rdparty/adaptagrams/libcola/shapepair.cpp
diff --git a/src/libcola/shapepair.h b/src/3rdparty/adaptagrams/libcola/shapepair.h
index 18b160bc4..18b160bc4 100644
--- a/src/libcola/shapepair.h
+++ b/src/3rdparty/adaptagrams/libcola/shapepair.h
diff --git a/src/libcola/shortest_paths.h b/src/3rdparty/adaptagrams/libcola/shortest_paths.h
index 233624a3e..233624a3e 100644
--- a/src/libcola/shortest_paths.h
+++ b/src/3rdparty/adaptagrams/libcola/shortest_paths.h
diff --git a/src/libcola/sparse_matrix.h b/src/3rdparty/adaptagrams/libcola/sparse_matrix.h
index f4ec85816..f4ec85816 100644
--- a/src/libcola/sparse_matrix.h
+++ b/src/3rdparty/adaptagrams/libcola/sparse_matrix.h
diff --git a/src/libcola/straightener.cpp b/src/3rdparty/adaptagrams/libcola/straightener.cpp
index 8ad30a5ff..8ad30a5ff 100644
--- a/src/libcola/straightener.cpp
+++ b/src/3rdparty/adaptagrams/libcola/straightener.cpp
diff --git a/src/libcola/straightener.h b/src/3rdparty/adaptagrams/libcola/straightener.h
index 7112efcad..7112efcad 100644
--- a/src/libcola/straightener.h
+++ b/src/3rdparty/adaptagrams/libcola/straightener.h
diff --git a/src/libcola/tests/FixedRelativeConstraint01.cpp b/src/3rdparty/adaptagrams/libcola/tests/FixedRelativeConstraint01.cpp
index 50c34842e..50c34842e 100755
--- a/src/libcola/tests/FixedRelativeConstraint01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/FixedRelativeConstraint01.cpp
diff --git a/src/libcola/tests/Makefile.am b/src/3rdparty/adaptagrams/libcola/tests/Makefile.am
index a73ff8247..a73ff8247 100644
--- a/src/libcola/tests/Makefile.am
+++ b/src/3rdparty/adaptagrams/libcola/tests/Makefile.am
diff --git a/src/libcola/tests/StillOverlap01.cpp b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap01.cpp
index d277627c2..d277627c2 100755
--- a/src/libcola/tests/StillOverlap01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap01.cpp
diff --git a/src/libcola/tests/StillOverlap02.cpp b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap02.cpp
index 47b9958b0..47b9958b0 100755
--- a/src/libcola/tests/StillOverlap02.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap02.cpp
diff --git a/src/libcola/tests/boundary.cpp b/src/3rdparty/adaptagrams/libcola/tests/boundary.cpp
index 18522e1cf..18522e1cf 100644
--- a/src/libcola/tests/boundary.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/boundary.cpp
diff --git a/src/libcola/tests/connected_components.cpp b/src/3rdparty/adaptagrams/libcola/tests/connected_components.cpp
index d5df479e7..d5df479e7 100644
--- a/src/libcola/tests/connected_components.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/connected_components.cpp
diff --git a/src/libcola/tests/constrained.cpp b/src/3rdparty/adaptagrams/libcola/tests/constrained.cpp
index 550601131..550601131 100644
--- a/src/libcola/tests/constrained.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/constrained.cpp
diff --git a/src/libcola/tests/containment.cpp b/src/3rdparty/adaptagrams/libcola/tests/containment.cpp
index 0783b45cf..0783b45cf 100644
--- a/src/libcola/tests/containment.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/containment.cpp
diff --git a/src/libcola/tests/containment2.cpp b/src/3rdparty/adaptagrams/libcola/tests/containment2.cpp
index d411431b2..d411431b2 100644
--- a/src/libcola/tests/containment2.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/containment2.cpp
diff --git a/src/libcola/tests/convex_hull.cpp b/src/3rdparty/adaptagrams/libcola/tests/convex_hull.cpp
index 23ebbfb4a..23ebbfb4a 100644
--- a/src/libcola/tests/convex_hull.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/convex_hull.cpp
diff --git a/src/libcola/tests/cycle_detector.cpp b/src/3rdparty/adaptagrams/libcola/tests/cycle_detector.cpp
index 4f4fefb7e..4f4fefb7e 100644
--- a/src/libcola/tests/cycle_detector.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/cycle_detector.cpp
diff --git a/src/libcola/tests/data/1138_bus.txt b/src/3rdparty/adaptagrams/libcola/tests/data/1138_bus.txt
index fb63ec309..fb63ec309 100644
--- a/src/libcola/tests/data/1138_bus.txt
+++ b/src/3rdparty/adaptagrams/libcola/tests/data/1138_bus.txt
diff --git a/src/libcola/tests/data/uetzNetworkGSC-all.gml b/src/3rdparty/adaptagrams/libcola/tests/data/uetzNetworkGSC-all.gml
index 99c40536c..99c40536c 100644
--- a/src/libcola/tests/data/uetzNetworkGSC-all.gml
+++ b/src/3rdparty/adaptagrams/libcola/tests/data/uetzNetworkGSC-all.gml
diff --git a/src/libcola/tests/gml_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/gml_graph.cpp
index 03ad8cca4..03ad8cca4 100644
--- a/src/libcola/tests/gml_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/gml_graph.cpp
diff --git a/src/libcola/tests/graphlayouttest.h b/src/3rdparty/adaptagrams/libcola/tests/graphlayouttest.h
index 58715bab6..58715bab6 100644
--- a/src/libcola/tests/graphlayouttest.h
+++ b/src/3rdparty/adaptagrams/libcola/tests/graphlayouttest.h
diff --git a/src/libcola/tests/initialOverlap.cpp b/src/3rdparty/adaptagrams/libcola/tests/initialOverlap.cpp
index ba871990f..ba871990f 100644
--- a/src/libcola/tests/initialOverlap.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/initialOverlap.cpp
diff --git a/src/libcola/tests/invalid.cpp b/src/3rdparty/adaptagrams/libcola/tests/invalid.cpp
index 175a6b7a5..175a6b7a5 100644
--- a/src/libcola/tests/invalid.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/invalid.cpp
diff --git a/src/libcola/tests/large_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/large_graph.cpp
index 712bd692c..712bd692c 100644
--- a/src/libcola/tests/large_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/large_graph.cpp
diff --git a/src/libcola/tests/makefeasible.cpp b/src/3rdparty/adaptagrams/libcola/tests/makefeasible.cpp
index a67936de8..a67936de8 100644
--- a/src/libcola/tests/makefeasible.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/makefeasible.cpp
diff --git a/src/libcola/tests/makefeasible02.cpp b/src/3rdparty/adaptagrams/libcola/tests/makefeasible02.cpp
index 2c4da9a1f..2c4da9a1f 100755
--- a/src/libcola/tests/makefeasible02.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/makefeasible02.cpp
diff --git a/src/libcola/tests/makemovie.sh b/src/3rdparty/adaptagrams/libcola/tests/makemovie.sh
index cd571f969..cd571f969 100644
--- a/src/libcola/tests/makemovie.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/makemovie.sh
diff --git a/src/libcola/tests/max_acyclic_subgraph.cpp b/src/3rdparty/adaptagrams/libcola/tests/max_acyclic_subgraph.cpp
index 9e9b1d44e..9e9b1d44e 100644
--- a/src/libcola/tests/max_acyclic_subgraph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/max_acyclic_subgraph.cpp
diff --git a/src/libcola/tests/overlappingClusters01.cpp b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters01.cpp
index 7a00be676..7a00be676 100644
--- a/src/libcola/tests/overlappingClusters01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters01.cpp
diff --git a/src/libcola/tests/overlappingClusters02.cpp b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters02.cpp
index d721e9409..d721e9409 100644
--- a/src/libcola/tests/overlappingClusters02.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters02.cpp
diff --git a/src/libcola/tests/overlappingClusters04.cpp b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters04.cpp
index 36a85bd19..36a85bd19 100644
--- a/src/libcola/tests/overlappingClusters04.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters04.cpp
diff --git a/src/libcola/tests/page_bounds.cpp b/src/3rdparty/adaptagrams/libcola/tests/page_bounds.cpp
index 212036477..212036477 100644
--- a/src/libcola/tests/page_bounds.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/page_bounds.cpp
diff --git a/src/libcola/tests/planar.cpp b/src/3rdparty/adaptagrams/libcola/tests/planar.cpp
index 19deb8718..19deb8718 100644
--- a/src/libcola/tests/planar.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/planar.cpp
diff --git a/src/libcola/tests/random_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/random_graph.cpp
index 215e704cc..215e704cc 100644
--- a/src/libcola/tests/random_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/random_graph.cpp
diff --git a/src/libcola/tests/rectangularClusters01.cpp b/src/3rdparty/adaptagrams/libcola/tests/rectangularClusters01.cpp
index 087617abf..087617abf 100644
--- a/src/libcola/tests/rectangularClusters01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/rectangularClusters01.cpp
diff --git a/src/libcola/tests/rectclustershapecontainment.cpp b/src/3rdparty/adaptagrams/libcola/tests/rectclustershapecontainment.cpp
index 013c6343a..013c6343a 100644
--- a/src/libcola/tests/rectclustershapecontainment.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/rectclustershapecontainment.cpp
diff --git a/src/libcola/tests/resize.cpp b/src/3rdparty/adaptagrams/libcola/tests/resize.cpp
index cf43bfac8..cf43bfac8 100644
--- a/src/libcola/tests/resize.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/resize.cpp
diff --git a/src/libcola/tests/runtest.sh b/src/3rdparty/adaptagrams/libcola/tests/runtest.sh
index 2ee152609..2ee152609 100755
--- a/src/libcola/tests/runtest.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/runtest.sh
diff --git a/src/libcola/tests/scale_free.cpp b/src/3rdparty/adaptagrams/libcola/tests/scale_free.cpp
index d9c2934e7..d9c2934e7 100644
--- a/src/libcola/tests/scale_free.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/scale_free.cpp
diff --git a/src/libcola/tests/shortest_paths.cpp b/src/3rdparty/adaptagrams/libcola/tests/shortest_paths.cpp
index 617f13673..617f13673 100644
--- a/src/libcola/tests/shortest_paths.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/shortest_paths.cpp
diff --git a/src/libcola/tests/small_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/small_graph.cpp
index 116eb5ecf..116eb5ecf 100644
--- a/src/libcola/tests/small_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/small_graph.cpp
diff --git a/src/libcola/tests/sparse_matrix.cpp b/src/3rdparty/adaptagrams/libcola/tests/sparse_matrix.cpp
index 099fcf376..099fcf376 100644
--- a/src/libcola/tests/sparse_matrix.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/sparse_matrix.cpp
diff --git a/src/libcola/tests/test_cg.cpp b/src/3rdparty/adaptagrams/libcola/tests/test_cg.cpp
index 13e7d0202..13e7d0202 100644
--- a/src/libcola/tests/test_cg.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/test_cg.cpp
diff --git a/src/libcola/tests/topology.cpp b/src/3rdparty/adaptagrams/libcola/tests/topology.cpp
index c9ac63730..c9ac63730 100644
--- a/src/libcola/tests/topology.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/topology.cpp
diff --git a/src/libcola/tests/trees.cpp b/src/3rdparty/adaptagrams/libcola/tests/trees.cpp
index 7824af867..7824af867 100644
--- a/src/libcola/tests/trees.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/trees.cpp
diff --git a/src/libcola/tests/unconstrained.cpp b/src/3rdparty/adaptagrams/libcola/tests/unconstrained.cpp
index df614ae68..df614ae68 100644
--- a/src/libcola/tests/unconstrained.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/unconstrained.cpp
diff --git a/src/libcola/tests/unsatisfiable.cpp b/src/3rdparty/adaptagrams/libcola/tests/unsatisfiable.cpp
index 4e768f7db..4e768f7db 100644
--- a/src/libcola/tests/unsatisfiable.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/unsatisfiable.cpp
diff --git a/src/libcola/tests/view_cd_output.sh b/src/3rdparty/adaptagrams/libcola/tests/view_cd_output.sh
index cb74ae88e..cb74ae88e 100755
--- a/src/libcola/tests/view_cd_output.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/view_cd_output.sh
diff --git a/src/libcola/tests/view_mas_output.sh b/src/3rdparty/adaptagrams/libcola/tests/view_mas_output.sh
index 11f5a8a93..11f5a8a93 100755
--- a/src/libcola/tests/view_mas_output.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/view_mas_output.sh
diff --git a/src/libcola/unused.h b/src/3rdparty/adaptagrams/libcola/unused.h
index 1e519fe46..1e519fe46 100644
--- a/src/libcola/unused.h
+++ b/src/3rdparty/adaptagrams/libcola/unused.h