X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=mgraph.h;h=e98fa850a53658bacf17ff452d03d2341c89afa9;hb=97ef96dd318b684d829ac950403582788df427d8;hp=714ff7ffb72319e2d9a874e615ad7cf8b0814fa1;hpb=190a54bc07e4c1497938a31373543650d3f19c55;p=moebius2.git

diff --git a/mgraph.h b/mgraph.h
index 714ff7f..e98fa85 100644
--- a/mgraph.h
+++ b/mgraph.h
@@ -9,7 +9,7 @@
  *			  | :
  *     ___ X-2 ___ X-1 ___| 0  ___  1  ___  2  ___  3  ___  4  __
  *         Y-1     Y-1    |0:      0       0       0       0
- *        /  \    /  \    / :\    /  \    /  \    /  \    / !! \
+ *        /  \    /  \    / :\    /  \    /  \    /  \    /  \
  *       /    \  /    \  /| : \  /    \  /    \  /    \  /    \
  *     X-3 ___ X-2 ___ X-1|___  0  ___  1  ___  2  ___  3  ___  4
  *     Y-2     Y-2     Y-2| :  1       1       1       1       1
@@ -42,7 +42,7 @@
  *
  * Node x,y for
  *   0 <= x < X = 2^XBITS     x = distance along
- *   0 <= y < Y = 2^YBITS-1     y = distance across
+ *   0 <= y < Y = 2^YBITS-1   y = distance across
  *
  * Vertices are in reading order from diagram above ie x varies fastest.
  *
@@ -69,9 +69,15 @@
 
 #include "common.h"
 
+#ifndef DEFBITS
 #define XBITS 3
-#define X (1<<XBITS)
 #define YBITS 3
+#else
+#define XBITS (DEFBITS / 10)
+#define YBITS (DEFBITS % 10)
+#endif
+
+#define X (1<<XBITS)
 #define Y ((1<<YBITS) - 1)
 
 #define N (X*Y)
@@ -88,9 +94,13 @@
 #define FOR_VPEDGE(v,e) \
   for ((e)=0; (e)<V6; (e)++)
 
-extern int edge_end2(unsigned v1, int e);
+int edge_end2(unsigned v1, int e);
 #define EDGE_END2 edge_end2
 
+/* given v1,e  s.t.  v2==EDGE_END2(v1,e) >= 0,
+ * returns  eprime s.t. v1==EDGE_END2(v2,eprime) */
+int edge_reverse(int v1, int e);
+
 #define RIM_VERTEX_P(v) (((v) & YMASK) == 0 || ((v) & YMASK) == (Y-1)*Y1)
 
 #define FOR_VEDGE_X(v1,e,v2,init,otherwise)	\