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/remove_rectangle_overlap.h | |
| 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/remove_rectangle_overlap.h')
| -rwxr-xr-x | src/removeoverlap/remove_rectangle_overlap.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/removeoverlap/remove_rectangle_overlap.h b/src/removeoverlap/remove_rectangle_overlap.h deleted file mode 100755 index 08b035e31..000000000 --- a/src/removeoverlap/remove_rectangle_overlap.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef REMOVE_RECTANGLE_OVERLAP_H_SEEN -#define REMOVE_RECTANGLE_OVERLAP_H_SEEN - -/** - * \file Declaration of main internal remove-overlaps function. - */ -/* - * Authors: - * Tim Dwyer <tgdwyer@gmail.com> - * - * Copyright (C) 2005 Authors - * - * Released under GNU LGPL. Read the file 'COPYING' for more information. - */ - -class Rectangle; - -void removeRectangleOverlap(unsigned n, Rectangle *rs[], double xBorder, double yBorder); - - -#endif /* !REMOVE_RECTANGLE_OVERLAP_H_SEEN */ |
