Hook up IPSEPCOLA into GNU build process.

To enable use "./configure --with-ipsepcola"

Changes include minor C++ source changes to work with latest gcc
	csolve_VPSC.cpp  - add "#include <cassert>"
	constraint.h - remove classname prefix in declaration of slack()
	variable.h - remove classname prefix in declaration of position()

diff --git a/lib/vpsc/generate-constraints.h b/lib/vpsc/generate-constraints.h
index 5508175b91bd92704890208c648cefb399b87835..b3b8298be12f53183b618ba2178d24dafecc052d 100644 (file)
--- a/lib/vpsc/generate-constraints.h
+++ b/lib/vpsc/generate-constraints.h
@@ -1,3 +1,6 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
 /**
  * \brief Functions to automatically generate constraints for the rectangular
  * node overlap removal problem.

diff --git a/lib/vpsc/pairingheap/PairingHeap.h b/lib/vpsc/pairingheap/PairingHeap.h
index 08e29bee86e9cc5961e8a1ca25d979e0940243fa..e9fe40b0b0b17f3b190045bec7aec1a4cfccbb18 100644 (file)
--- a/lib/vpsc/pairingheap/PairingHeap.h
+++ b/lib/vpsc/pairingheap/PairingHeap.h
@@ -1,3 +1,6 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
 /**
  * \brief Pairing heap datastructure implementation
  *

diff --git a/lib/vpsc/pairingheap/dsexceptions.h b/lib/vpsc/pairingheap/dsexceptions.h
index bef2c78c5240b88026229fbe99972b8bc8b1746b..e7252129505c84f36d40ea10354bb7b35c66dc8b 100644 (file)
--- a/lib/vpsc/pairingheap/dsexceptions.h
+++ b/lib/vpsc/pairingheap/dsexceptions.h
@@ -1,3 +1,6 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
 #ifndef DSEXCEPTIONS_H_
 #define DSEXCEPTIONS_H_
 

diff --git a/lib/vpsc/remove_rectangle_overlap.h b/lib/vpsc/remove_rectangle_overlap.h
index af9133e5d6e612c703e613a9c1816fd309188dab..10a56407bde71b9ec5c621d6b01343f26d93e9b1 100644 (file)
--- a/lib/vpsc/remove_rectangle_overlap.h
+++ b/lib/vpsc/remove_rectangle_overlap.h
@@ -1,3 +1,6 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
 /**
  * \brief remove overlaps between a set of rectangles.
  *

diff --git a/lib/vpsc/solve_VPSC.h b/lib/vpsc/solve_VPSC.h
index b73a70460ed505049485506ad6a322c5d8226274..a7ddfb8257edcec25dad9f3a859e77988c62581b 100644 (file)
--- a/lib/vpsc/solve_VPSC.h
+++ b/lib/vpsc/solve_VPSC.h
@@ -1,3 +1,6 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
 /**
  * \brief Solve an instance of the "Variable Placement with Separation
  * Constraints" problem.

diff --git a/lib/vpsc/variable.h b/lib/vpsc/variable.h
index 82d47b61304720177a4f5c1e7629502a2fa3a742..2bfa94e4c1700449c698753cf8763b647f11c689 100644 (file)
--- a/lib/vpsc/variable.h
+++ b/lib/vpsc/variable.h
@@ -1,3 +1,6 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
 /**
  *
  * Authors:
@@ -44,7 +47,7 @@ public:
                , visited(false)
        {
        }
-       inline double Variable::position() const {
+       inline double position() const {
                return block->posn+offset;
        }
        //double position() const;