* src/conn-avoid-ref.cpp, src/libavoid/connector.h,

      src/libavoid/shape.cpp, src/libavoid/graph.cpp, src/libavoid/shape.h,
      src/libavoid/graph.h, src/libavoid/router.cpp, src/libavoid/router.h,
      src/libavoid/connector.cpp, src/libavoid/debug.h:

      Some speed improvements and interface cleanups to libavoid.

(bzr r192)

1 files changed, 6 insertions, 3 deletions

diff --git a/src/libavoid/graph.h b/src/libavoid/graph.h
index 080309d52..92451f205 100644
--- a/src/libavoid/graph.h
+++ b/src/libavoid/graph.h
@@ -45,13 +45,16 @@ class EdgeInf
     public:
         EdgeInf(VertInf *v1, VertInf *v2);
         ~EdgeInf();
-        double getDist(void);
+        inline double getDist(void)
+        {
+            return _dist;
+        }
         void setDist(double dist);
         void alertConns(void);
         void addConn(bool *flag);
         void addCycleBlocker(void);
         void addBlocker(int b);
-        bool hasBlocker(int b);
+
         pair<VertID, VertID> ids(void);
         pair<Point, Point> points(void);
         void db_print(void);
@@ -63,6 +66,7 @@ class EdgeInf
 
         EdgeInf *lstPrev;
         EdgeInf *lstNext;
+        int _blocker;
     private:
         Router *_router;
         bool _added;
@@ -71,7 +75,6 @@ class EdgeInf
         VertInf *_v2;
         EdgeInfList::iterator _pos1;
         EdgeInfList::iterator _pos2;
-        ShapeList _blockers;
         FlagList  _conns;
         double  _dist;