Updated libs from the Adaptagrams project: libavoid, libcola and libvspc; changed the code to match the new API

Signed-off-by: Sylvain Chiron <chironsylvain@orange.fr>

1 files changed, 61 insertions, 0 deletions

diff --git a/src/libcola/tests/overlappingClusters04.cpp b/src/libcola/tests/overlappingClusters04.cpp
new file mode 100644
index 000000000..36a85bd19
--- /dev/null
+++ b/src/libcola/tests/overlappingClusters04.cpp
@@ -0,0 +1,61 @@
+// From Aidan Delaney: a_b_ab_abc.json.svg 
+// Regression test for SEGFAULT caused by specifing an invalid node index 7
+// in cluster description.
+#include <vector>
+#include <utility>
+#include "libcola/cola.h"
+using namespace cola;
+int main(void) {
+    CompoundConstraints ccs;
+    std::vector<Edge> es;
+    EdgeLengths eLengths;
+    double defaultEdgeLength=10;
+    std::vector<vpsc::Rectangle*> rs;
+    vpsc::Rectangle *rect = NULL;
+
+    rect = new vpsc::Rectangle(0, 5, 0, 5);
+    rs.push_back(rect);
+
+    rect = new vpsc::Rectangle(-2, 3, -2, 3);
+    rs.push_back(rect);
+
+    rect = new vpsc::Rectangle(-1, 4, -1, 4);
+    rs.push_back(rect);
+
+    rect = new vpsc::Rectangle(1, 6, 1, 6);
+    rs.push_back(rect);
+
+    rect = new vpsc::Rectangle(1, 6, 1, 6);
+    rs.push_back(rect);
+
+
+    ConstrainedFDLayout alg(rs, es, defaultEdgeLength, eLengths);
+    alg.setAvoidNodeOverlaps(true);
+
+    RootCluster *cluster33771480 = new RootCluster();
+    RectangularCluster *cluster33771952 = new RectangularCluster();
+    cluster33771952->setPadding(Box(2));
+    cluster33771952->addChildNode(1);
+    cluster33771952->addChildNode(3);
+    cluster33771952->addChildNode(7);
+    cluster33771480->addChildCluster(cluster33771952);
+    
+    RectangularCluster *cluster33772496 = new RectangularCluster();
+    cluster33772496->setPadding(Box(2));
+    cluster33772496->addChildNode(2);
+    cluster33772496->addChildNode(3);
+    cluster33772496->addChildNode(7);
+    cluster33771480->addChildCluster(cluster33772496);
+    
+    RectangularCluster *cluster33773040 = new RectangularCluster();
+    cluster33773040->setPadding(Box(2));
+    cluster33773040->addChildNode(7);
+    cluster33771480->addChildCluster(cluster33773040);
+    
+    alg.setClusterHierarchy(cluster33771480);
+    
+    alg.setConstraints(ccs);
+    alg.makeFeasible();
+    //alg.outputInstanceToSVG("overlappingCLusters04");
+    alg.freeAssociatedObjects();
+};