X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=mgraph.h;h=de26852f9974aef3960c09e4e2acff63ffb17537;hb=62f97dcbc53754ef8a81add86946e54825c4c096;hp=46383677d2ec6c153e799d5936329529d3e75de2;hpb=2c2c1cc2745430048709dc3b11aef7071d802c86;p=moebius2.git

diff --git a/mgraph.h b/mgraph.h
index 4638367..de26852 100644
--- a/mgraph.h
+++ b/mgraph.h
@@ -4,26 +4,35 @@
 /*
  * Vertices in strip are numbered as follows:
  *
- *     ___ X-2 ___ X-1 ___ 0   ___ 1   ___ 2   ___ 3   ___ 4   __
- *         Y-1     Y-1      0       0       0       0       0
+ *			  |
+ *     ___ 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
- *       \    /  \    /  \    /  \    /  \    /  \    /  \    /
+ *       /    \  /    \  /|   \  /    \  /    \  /    \  /    \
+ *     X-3 ___ X-2 ___ X-1|___  0  ___  1  ___  2  ___  3  ___  4
+ *     Y-2     Y-2     Y-2|    1       1       1       1       1
+ *       \    /  \    /  \|   /  \    /  \    /  \    /  \    /
  *        \  /    \  /    \  /    \  /    \  /    \  /    \  /
- *     ___ X-3 ___ X-2 ___ X-1 ___ 0   ___ 1   ___ 2   ___ 3   __
- *         Y-3     Y-3     Y-3      2       2       2       2
- *
- *       .   .   .   .   .   .   .   .   .   .   .   .   .   .   .
- *
- *      X-4 ___ X-3 ___ X-2 ___ X-1 ___ 0   ___ 1   ___ 2   ___ 3
- *       1       1       1       1      Y-2     Y-2     Y-2     Y-2
- *        \    /  \    /  \    /  \    /  \    /  \    /  \    /
- *         \  /    \  /    \  /    \  /    \  /    \  /    \  /
- *      ___ X-4 ___ X-3 ___ X-2 ___ X-1 ___ 0   ___ 1   ___ 2   __
- *           0       0       0       0      Y-1     Y-1     Y-1
- *
+ *     ___ X-2 ___ X-1 ___| 0  ___  1  ___  2  ___  3  __   4 ___
+ *         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
+ *			  |
+ *       .   .   .   .   .|  .   .   .   .   .   .   .   .   .   .
+ *			  |
+ *     ___ 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
+ *    /  \    /  \    /  \|   /  \    /  \    /	 \    /  \    /
+ *   /    \  /    \  /    \  /    \  /    \  /	  \  /    \  /
+ *  -3 ___ X-2 ___ X-1 ___| 0  ___  1  ___  2  ___  3  ___  4 ___
+ *  0      0       0      |Y-1     Y-1     Y-1     Y-1     Y-1
+ *			  |
  * Node x,y for
  *   0 <= x < X     x = distance along
  *   0 <= y < Y     y = distance across
@@ -33,29 +42,37 @@
  * Y must be even.  The actual location opposite (0,0) is (X-(Y-1)/2,0),
  * and likewise opposite (0,Y-1) is ((Y-1)/2,0).
  *
- * We label edges as follows:
+ * Note that though presentation above is equilateral triangles, this
+ * is not the case.  It's actually a square lattice with half of the
+ * diagonals added.  We can't straighten it out because at the join
+ * the diagonals point the other way!
  *
- *			    \0   /1
- *			     \  /
- *			  ___ 0   __
- *			  2    1   3
- *			     /  \
- *			   4/   5\
+ * We label edges as follows:        Or in the square view:
  *
- * (This numbering permits the order-4 nodes at the strip's edge
- *  to have a contiguous edge numbering 2..5 or 0..3.)
+ *		    \2   /1                 2  1
+ *		     \  /	            | /
+ *		  ___ 0   __	            |/
+ *		  3    1   0	         3--*--0
+ *		     /  \	           /|
+ *		   4/   5\	          / |
+ *				         4  5
  *
- * When we iterate over edges, we iterate first over vertices and then
- * over edges 0 to 2, disregarding edges 3 to 5.
+ *                                   (This makes the numbering
+ *                                   discontinuity, at the join,
+ *                                   vertical and thus tractable.)
  */
 
 #ifndef MGRAPH_H
 #define MGRAPH_H
 
-#define XBITS 4
+#include "common.h"
+
+#define DIMBITS 4
+
+#define XBITS DIMBITS
 #define X (1<<XBITS)
-#define YBITS 4
-#define Y (1<<YBITS)
+#define YBITS DIMBITS
+#define Y ((1<<YBITS) - 1)
 
 /* vertex number:   0000 | y     | x
  *                        YBITS   XBITS
@@ -65,27 +82,28 @@
 #define XMASK (X-1)
 #define YSHIFT XBITS
 #define Y1 (1 << YSHIFT)
-#define YMASK (Y-1 << YSHIFT)
+#define YMASK (Y << YSHIFT)
+
+#define DIM (N*D3)
 
 #define V6 6
 
 #define FOR_VERTEX(v) \
   for ((v)=0; (v)<N; (v)++)
 
-#define VE_MIN(v) ((v) & YMASK ? 0 : 2)
-#define VE_MAX(v) (~(v) & YMASK ? V6 : 4)
-
 #define FOR_VPEDGE(v,e) \
-  for ((e)=VE_MIN(v); (e)<VE_MAX(v); (e)++)
+  for ((e)=0; (e)<V6; (e)++)
 
 extern int edge_end2(unsigned v1, int e);
 #define EDGE_END2 edge_end2
 
+#define RIM_VERTEX_P(v) (((v) & YMASK) == 0 || ((v) & YMASK) == (Y-1)*Y1)
+
 #define FOR_VEDGE_X(v1,e,v2,init,otherwise)	\
   FOR_VPEDGE((v1),(e))				\
     if (((v2)= EDGE_END2((v1),(e)),		\
 	 (init),				\
-	 (v2)) < 0) { otherwise } else
+	 (v2)) < 0) { otherwise; } else
 
 #define NOTHING ((void)0)
 
@@ -96,11 +114,6 @@ extern int edge_end2(unsigned v1, int e);
   FOR_VERTEX((v1))				\
     FOR_VEDGE((v1),(e),(v2))
 
-#define FOR_COORD(k) \
-  for ((k)=0; (k)<D3; (k)++)
-
-#define K FOR_COORD(k)
-
 #define FOR_RIM_VERTEX(vy,vx,v)					\
   for ((vy)=0; (vy)<Y; (vy)+=Y-1)				\
     for ((vx)=0; (v)= (vy)<<YSHIFT | (vx), (vx)<X; (vx)++)