new vertex numbering for project too

[moebius2.git] / mgraph.h

diff --git a/mgraph.h b/mgraph.h
index 85577e92c3e325b79ba5a2a3a2762b3f2b4bc740..3995d463ed0bda1160791fa997d2da40fde6ea66 100644 (file)
--- a/mgraph.h
+++ b/mgraph.h
@@ -35,18 +35,12 @@
  *
  * We label edges as follows:
  *
- *                         \0   /1
+ *             e:          \2   /1
  *                          \  /
  *                       ___ 0   __
- *                       2    1   3
+ *                       3    1   0
  *                          /  \
  *                        4/   5\
- *
- * (This numbering permits the order-4 nodes at the strip's edge
- *  to have a contiguous edge numbering 2..5 or 0..3.)
- *
- * When we iterate over edges, we iterate first over vertices and then
- * over edges 0 to 2, disregarding edges 3 to 5.
  */
 
 #ifndef MGRAPH_H
@@ -69,16 +63,15 @@
 #define Y1 (1 << YSHIFT)
 #define YMASK ((Y-1) << 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