wip; EdgeListGraph will be annoying

[moebius2.git] / bgl.cpp

diff --git a/bgl.cpp b/bgl.cpp
index 3e2912ebb07bdd56c05c3a23f6104c2aa025ed06..4ed253734affb30301cdc91e1df8465afec82b07 100644 (file)
--- a/bgl.cpp
+++ b/bgl.cpp
@@ -18,7 +18,7 @@ extern "C" {
 
 #define VMASK (YMASK|XMASK)
 #define ESHIFT (YBITS|XBITS)
-#define FMAX ((5 << ESHIFT) | VMASK)
+
 
 namespace boost {
   // We make Layout a model of various BGL Graph concepts.
@@ -28,15 +28,27 @@ namespace boost {
   
   struct layout_graph_traversal_category : 
     public virtual incidence_graph_tag,
-    public virtual edge_list_graph_tag
-    public virtual vertex_list_graph_tag { };
+    public virtual vertex_list_graph_tag,
+    public virtual edge_list_graph_tag { };
   
   struct OutEdgeIncrable {
     int f;
-    OutEdgeIncrable operator++(OutEdgeIncrable f) { return f + 1<<ESHIFT; }
+    OutEdgeIncrable operator++(OutEdgeIncrable i) {
+      f += 1<<ESHIFT;
+      return self;
+    }
     OutEdgeIncrable(int v, int e) : f(v | (e << ESHIFT)) { }
   }
-    
+  struct AnyEdgeIncrable {
+    int f;
+    AnyEdgeIncrable operator++(AnyEdgeIncrable f) {
+      f++;
+      if (!(f & XMASK)) {
+       if (!(f & YMASK) && (f & EMASK) < (2 << EMASK)) { f += Y1; }
+       
+
+      return f + 1<<ESHIFT; }
+ 
   struct graph_traits<Layout> {
 
     // Concept Graph:
@@ -56,8 +68,7 @@ namespace boost {
     
     inline int source(int f, const Layout& g) { return f&VMASK; }
     inline int target(int f, const Layout& g) { return EDGE_END2(f&VMASK, f>>ESHIFT); }
-    inline std::pair<typename graph_traits<Layout>::out_edge_iterator,
-                     typename graph_traits<Layout>::out_edge_iterator>
+    inline std::pair<out_edge_iterator,out_edge_iterator>
     out_edges(int v, const Layout& g) {
       return std::make_pair(out_edge_iterator(OutEdgeIncrable(v, VE_MIN(v))),
                            out_edge_iterator(OutEdgeIncrable(v, VE_MAX(v))));
@@ -66,6 +77,16 @@ namespace boost {
 
     // Concept VertexListGraph:
     typedef counting_iterator<int> vertex_iterator;
+    typedef unsigned vertices_size_type;
+    inline std::pair<vertex_iterator,vertex_iterator>
+    vertices(const Layout& g) {
+      return std::make_pair(vertex_iterator(0), vertex_iterator(N));
+    }
+    inline unsigned num_vertices(const Layout& g) { return N; }
+
+    // Concept EdgeListGraph:
+    typedef counting_iterator<int> edge_iterator;
+    inline std::pair
     
 }