rename project to view; do not clean best

[moebius2.git] / bgl.cpp

diff --git a/bgl.cpp b/bgl.cpp
index 4b06897df09a4ba5e65a903427ab021ce9261cc9..0d1f355323cb9f064281e0079e709f1e55f61d9d 100644 (file)
--- a/bgl.cpp
+++ b/bgl.cpp
@@ -22,10 +22,11 @@ extern "C" {
 }
 
 /*
- * edge descriptor f =   00 | e | y     | x
- *                            3  YBITS   XBITS
+ * edge descriptor f =   0000 | e | y     | x
+ *                              3  YBITS   XBITS
  *
- * e is 0..5.  The edge is edge e out of vertex (x,y).
+ * e is 0..6.  The edge is edge e out of vertex (x,y), or if
+ * e==6 it's the `at end' value for the out edge iterator.
  *
  * BGL expects an undirected graph's edges to have two descriptors
  * each, one in each direction (otherwise e would be just 0..2).
@@ -93,7 +94,7 @@ class OutEdgeIterator :
   OutEdgeIterator() { }
   OutEdgeIterator(int _f) : f(_f) { }
   OutEdgeIterator(int v, int e) : f(e<<ESHIFT | v) {
-    //printf("constructed v=%x e=%x f=%03x\n",v,e,f);
+    //printf("constructed v=%02x e=%x f=%03x\n",v,e,f);
   }
 
   static int voe_min(int _v) { return (_v & YMASK) ? 2 : 3; }
@@ -136,7 +137,11 @@ namespace boost {
 
   // Concept IncidenceGraph:
   inline int source(int f, const Graph&) { return f&VMASK; }
-  inline int target(int f, const Graph&) { return EDGE_END2(f&VMASK, f>>ESHIFT); }
+  inline int target(int f, const Graph&) {
+    int v2= EDGE_END2(f&VMASK, f>>ESHIFT);
+    //printf("traversed %03x..%02x\n",f,v2);
+    return v2;
+  }
   inline std::pair<OutEdgeIterator,OutEdgeIterator>
   out_edges(int v, const Graph&) {
     return std::make_pair(OutEdgeIterator(v, OutEdgeIterator::voe_min(v)),
@@ -198,9 +203,13 @@ double graph_layout_cost(const Vertices v, const double vertex_areas[N]) {
     FOR_VERTEX(v2) {
       double a2= vertex_areas[v2];
       double d2= hypotD2plus(v[v1],v[v2], d2_epsilon);
-      double sd= vertex_distances[v2] / d2;
+      double s= vertex_distances[v2];
+      double sd= s / d2;
       double sd2= sd*sd;
-      total_cost += a1*a2 * (sd2 - 1) / (d2*d2);
+      double cost_contrib= a1*a2 * (sd2 - 1) / (d2*d2);
+      //printf("layout %03x..%03x (a=%g,%g) s=%g d2=%g cost+=%g\n",
+      //            v1,v2, a1,a2, s,d2, cost_contrib);
+      total_cost += cost_contrib;
     }
   }
   return total_cost;