X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=mgraph.h;h=43494c7ebc9c38246b97222582f71dbe1476d3b7;hp=19cd60137c624b16ff62148643e42303510cfc40;hb=7968bc4aca3306473e7ab0a55d4bdc721a3eacd5;hpb=2377b968f55ddd5d6a8ff79ee9150316a218afc8

diff --git a/mgraph.h b/mgraph.h
index 19cd601..43494c7 100644
--- a/mgraph.h
+++ b/mgraph.h
@@ -4,41 +4,45 @@
 /*
  * Vertices in strip are numbered as follows:
  *
- *			  |
+ *                          :axis of symmetry
+ *			  | :
+ *			  | :
  *     ___ X-2 ___ X-1 ___| 0  ___  1  ___  2  ___  3  ___  4  __
- *         Y-1     Y-1    |0       0       0       0       0
- *        /  \    /  \    /  \    /  \    /  \    /  \    /  \
- *       /    \  /    \  /|   \  /    \  /    \  /    \  /    \
+ *         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
- *       \    /  \    /  \|   /  \    /  \    /  \    /  \    /
- *        \  /    \  /    \  /    \  /    \  /    \  /    \  /
+ *     Y-2     Y-2     Y-2| :  1       1       1       1       1
+ *       \    /  \    /  \| : /  \    /  \    /  \    /  \    /
+ *        \  /    \  /    \ :/    \  /    \  /    \  /    \  /
  *     ___ X-2 ___ X-1 ___| 0  ___  1  ___  2  ___  3  __   4 ___
- *         Y-3     Y-3    |2       2       2       2 	   2
- *        /  \    /  \    /  \    /  \    /  \    /  \    /  \
- *       /    \  /    \  /|   \  /    \  /    \  /    \  /    \
+ *         Y-3     Y-3    |2:      2       2       2 	   2
+ *        /  \    /  \    / :\    /  \    /  \    /  \    /  \
+ *       /    \  /    \  /| : \  /    \  /    \  /    \  /    \
  *     X-3 ___ X-2 ___ X-1|___  0  ___  1  ___  2  ___  3  ___  4
- *     Y-4     Y-4     Y-4|    3       3       3       3       3
- *			  |
- *       .   .   .   .   .|  .   .   .   .   .   .   .   .   .   .
- *			  |
+ *     Y-4     Y-4     Y-4| :  3       3       3       3       3
+ *			  | :
+ *       .   .   .   .   .| :.   .   .   .   .   .   .   .   .   .
+ *			  | :
  *     ___ X-2 ___ X-1 ___| 0  ___  1  ___  2  ___  3  ___  4 ___
  *         2       2      |Y-3     Y-3     Y-3     Y-3     Y-3
- *        /  \    /  \    /  \    /  \    /  \    /  \    /  \
- *       /    \  /    \  /|   \  /    \  /    \  /    \  /    \
+ *        /  \    /  \    / :\    /  \    /  \    /  \    /  \
+ *       /    \  /    \  /| : \  /    \  /    \  /    \  /    \
  *          __ X-2 ___ X-1|___  0  ___  1  ___  2  ___  3  ___  3  ___  4
- *             1       1  |    Y-2     Y-2     Y-2     Y-2     Y-2     Y-2
- *    /  \    /  \    /  \|   /  \    /  \    /	 \    /  \    /
- *   /    \  /    \  /    \  /    \  /    \  /	  \  /    \  /
+ *             1       1  | :  Y-2     Y-2     Y-2     Y-2     Y-2     Y-2
+ *    /  \    /  \    /  \| : /  \    /  \    /	 \    /  \    /
+ *   /    \  /    \  /    \ :/    \  /    \  /	  \  /    \  /
  *  -3 ___ X-2 ___ X-1 ___| 0  ___  1  ___  2  ___  3  ___  4 ___
  *  0      0       0      |Y-1     Y-1     Y-1     Y-1     Y-1
+ *			  | :
+ *			  | :
  *			  |
  *                        ^ join, where there is
  *                           a discontinuity in numbering
  *
  * 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.
  *
@@ -55,6 +59,9 @@
  *		  3    1   0
  *		     /  \
  *		   4/   5\
+ *
+ * vertex number:   0000 | y     | x
+ *                        YBITS   XBITS
  */
 
 #ifndef MGRAPH_H
@@ -62,23 +69,17 @@
 
 #include "common.h"
 
-#define XBITS 4
+#define XBITS 3
 #define X (1<<XBITS)
 #define YBITS 3
 #define Y ((1<<YBITS) - 1)
 
-/* vertex number:   0000 | y     | x
- *                        YBITS   XBITS
- */
-
 #define N (X*Y)
 #define XMASK (X-1)
 #define YSHIFT XBITS
 #define Y1 (1 << YSHIFT)
 #define YMASK (Y << YSHIFT)
 
-#define DIM (N*D3)
-
 #define V6 6
 
 #define FOR_VERTEX(v) \
@@ -87,9 +88,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)	\
@@ -112,5 +117,6 @@ extern int edge_end2(unsigned v1, int e);
     for ((vx)=0; (v)= (vy)<<YSHIFT | (vx), (vx)<X; (vx)++)
 
 typedef double Vertices[N][D3];
+struct Vertices { Vertices a; };
 
 #endif /*MGRAPH_H*/