From f6fa93a41c2be9220c0fa73887d18bcf822d1b15 Mon Sep 17 00:00:00 2001 From: ellson Date: Fri, 28 Apr 2006 20:33:44 +0000 Subject: [PATCH] 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 " constraint.h - remove classname prefix in declaration of slack() variable.h - remove classname prefix in declaration of position() --- lib/vpsc/generate-constraints.h | 3 +++ lib/vpsc/pairingheap/PairingHeap.h | 3 +++ lib/vpsc/pairingheap/dsexceptions.h | 3 +++ lib/vpsc/remove_rectangle_overlap.h | 3 +++ lib/vpsc/solve_VPSC.h | 3 +++ lib/vpsc/variable.h | 5 ++++- 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/vpsc/generate-constraints.h b/lib/vpsc/generate-constraints.h index 5508175b9..b3b8298be 100644 --- 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 08e29bee8..e9fe40b0b 100644 --- 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 bef2c78c5..e72521295 100644 --- 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 af9133e5d..10a56407b 100644 --- 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 b73a70460..a7ddfb825 100644 --- 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 82d47b613..2bfa94e4c 100644 --- 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; -- 2.40.0