diff options
| author | Tim Dwyer <tgdwyer@gmail.com> | 2006-07-12 00:55:58 +0000 |
|---|---|---|
| committer | tgdwyer <tgdwyer@users.sourceforge.net> | 2006-07-12 00:55:58 +0000 |
| commit | 12b21e1d27f43deaa748419919b40b80cedd0ddd (patch) | |
| tree | 9748126a763c5a10b9ee25401cf2463a65a2aed6 /src/removeoverlap/Makefile_insert | |
| parent | update (diff) | |
| download | inkscape-12b21e1d27f43deaa748419919b40b80cedd0ddd.tar.gz inkscape-12b21e1d27f43deaa748419919b40b80cedd0ddd.zip | |
Previously graph layout was done using the Kamada-Kawai layout algorithm
implemented in Boost. I am replacing this with a custom implementation of
a constrained stress-majorization algorithm.
The stress-majorization algorithm is more robust and has better convergence
characteristics than Kamada-Kawai, and also simple constraints can be placed
on node position (for example, to enforce downward-pointing edges, non-overlap constraints, or cluster constraints).
Another big advantage is that we no longer need Boost.
I've tested the basic functionality, but I have yet to properly handle
disconnected graphs or to properly scale the resulting layout.
This commit also includes significant refactoring... the quadratic program solver - libvpsc (Variable Placement with Separation Constraints) has been moved to src/libvpsc and the actual graph layout algorithm is in libcola.
(bzr r1394)
Diffstat (limited to 'src/removeoverlap/Makefile_insert')
| -rw-r--r-- | src/removeoverlap/Makefile_insert | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/removeoverlap/Makefile_insert b/src/removeoverlap/Makefile_insert index e28304431..9df2ca2e3 100644 --- a/src/removeoverlap/Makefile_insert +++ b/src/removeoverlap/Makefile_insert @@ -6,26 +6,5 @@ removeoverlap/clean: rm -f removeoverlap/libremoveoverlap.a $(removeoverlap_libremoveoverlap_a_OBJECTS) removeoverlap_libremoveoverlap_a_SOURCES = \ - removeoverlap/block.cpp \ - removeoverlap/block.h \ - removeoverlap/blocks.cpp \ - removeoverlap/blocks.h \ - removeoverlap/constraint.cpp \ - removeoverlap/constraint.h \ - removeoverlap/generate-constraints.cpp \ - removeoverlap/generate-constraints.h \ - removeoverlap/remove_rectangle_overlap.cpp \ - removeoverlap/remove_rectangle_overlap.h \ removeoverlap/removeoverlap.cpp \ - removeoverlap/removeoverlap.h \ - removeoverlap/solve_VPSC.cpp \ - removeoverlap/solve_VPSC.h \ - removeoverlap/variable.cpp \ - removeoverlap/variable.h \ - removeoverlap/pairingheap/dsexceptions.h \ - removeoverlap/pairingheap/PairingHeap.cpp \ - removeoverlap/pairingheap/PairingHeap.h - -removeoverlap_remove_rectangle_overlap_test_SOURCES = \ - removeoverlap/remove_rectangle_overlap-test.cpp -removeoverlap_remove_rectangle_overlap_test_LDADD = removeoverlap/libremoveoverlap.a -lglib-2.0 + removeoverlap/removeoverlap.h |