compiles

[moebius2.git] / bgl.cpp

diff --git a/bgl.cpp b/bgl.cpp
index 1beae8cc59f8032c94c2f91e59527a83fad7de94..ae36ea4abb5d6ecf8a8027a00598aff5048a95c4 100644 (file)
--- a/bgl.cpp
+++ b/bgl.cpp
@@ -48,12 +48,25 @@ extern "C" {
 
 class Graph { }; // this is a dummy as our graph has no actual representation
 
-struct OutEdgeIncrable {
+using namespace boost;
+
+struct OutEdgeIterator :
+  public iterator_facade<
+    OutEdgeIterator,
+    int const,
+    forward_traversal_tag
+> {
   int f;
-  OutEdgeIncrable& operator++() { f += 1<<ESHIFT; return *this; }
-  OutEdgeIncrable(int v, int e) : f(v | (e << ESHIFT)) { }
+  void increment() { f += 1<<ESHIFT; }
+  bool equal(OutEdgeIterator const& other) const { return f == other.f; }
+  int const& dereference() const { return f; }
+  OutEdgeIterator() { }
+  OutEdgeIterator(int _f) : f(_f) { }
+  OutEdgeIterator(int v, int e) : f(e << ESHIFT | v) { }
 };
  
+typedef counting_iterator<int> VertexIterator;
+
 namespace boost {
   // We make Graph a model of various BGL Graph concepts.
   // This mainly means that graph_traits<Graph> has lots of stuff.
@@ -64,44 +77,44 @@ namespace boost {
     public virtual incidence_graph_tag,
     public virtual vertex_list_graph_tag,
     public virtual edge_list_graph_tag { };
-  
-  struct graph_traits<Graph> {
 
+  struct graph_traits<Graph> {
     // Concept Graph:
-  
     typedef int vertex_descriptor; /* vertex number, -1 => none */
     typedef int edge_descriptor; /* see above */
     typedef undirected_tag directed_category;
     typedef disallow_parallel_edge_tag edge_parallel_category;
     typedef layout_graph_traversal_category traversal_category;
-    inline int null_vertex() { return -1; }
 
     // Concept IncidenceGraph:
-    
-    typedef counting_iterator<OutEdgeIncrable,
-      std::forward_iterator_tag> out_edge_iterator;
+    typedef OutEdgeIterator out_edge_iterator;
     typedef unsigned degree_size_type;
-    
-    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 std::pair<out_edge_iterator,out_edge_iterator>
-    out_edges(int v, const Graph&) {
-      return std::make_pair(out_edge_iterator(OutEdgeIncrable(v, VE_MIN(v))),
-                           out_edge_iterator(OutEdgeIncrable(v, VE_MAX(v))));
-    }
-    inline unsigned out_degree(int v, const Graph&) {
-      return VE_MAX(v) - VE_MIN(v);
-    }
 
     // Concept VertexListGraph:
-    typedef counting_iterator<int> vertex_iterator;
+    typedef VertexIterator vertex_iterator;
     typedef unsigned vertices_size_type;
-    inline std::pair<vertex_iterator,vertex_iterator>
-    vertices(const Graph&) {
-      return std::make_pair(vertex_iterator(0), vertex_iterator(N));
-    }
-    inline unsigned num_vertices(const Graph&) { return N; }
   };
+    
+  // Concept Graph:
+  inline int null_vertex() { return -1; }
+
+  // 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 std::pair<OutEdgeIterator,OutEdgeIterator>
+  out_edges(int v, const Graph&) {
+    return std::make_pair(OutEdgeIterator(v, VE_MIN(v)),
+                         OutEdgeIterator(v, VE_MAX(v)));
+  }
+  inline unsigned out_degree(int v, const Graph&) {
+    return VE_MAX(v) - VE_MIN(v);
+  }
+
+  // Concept VertexListGraph:
+  inline std::pair<VertexIterator,VertexIterator> vertices(const Graph&) {
+    return std::make_pair(VertexIterator(0), VertexIterator(N));
+  }
+  inline unsigned num_vertices(const Graph&) { return N; }
 };
 
 static void single_source_shortest_paths(int v1,
@@ -109,7 +122,7 @@ static void single_source_shortest_paths(int v1,
                                         double vertex_distances[/*v*/]) {
   Graph g;
 
-  boost::dijkstra_shortest_paths(g, v1,
+  dijkstra_shortest_paths(g, v1,
      weight_map(edge_weights).
      vertex_index_map(identity_property_map()).
      distance_map(vertex_distances));
@@ -132,15 +145,16 @@ double graph_layout_cost(const Vertices v, const double vertex_areas[N]) {
    * (In practice we compute d^2+epsilon and use it for the
    *  divisions, to avoid division by zero.)
    */
-  static const d2_epsilon= 1e-6;
+  static const double d2_epsilon= 1e-6;
   
-  double edge_weights[N*V6], vertex_distances[N], total_cost;
+  double edge_weights[N*V6], vertex_distances[N], total_cost=0;
   int v1,v2,e,f;
 
-  FOR_VEDGE_X(v1,e,v2,
-             f= v1 | e << ESHIFT,
-             edge_weights[f]= NaN)
-    edge_weights[f]= hypotD(v[v1], v[v2]);
+  FOR_VERTEX(v1)
+    FOR_VEDGE_X(v1,e,v2,
+               f= v1 | e << ESHIFT,
+               edge_weights[f]= NAN)
+      edge_weights[f]= hypotD(v[v1], v[v2]);
 
   FOR_VERTEX(v1) {
     double a1= vertex_areas[v1];