chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
really edgewise vertex displacement - new calculations, experimental
[moebius2.git]
/
mgraph.h
diff --git
a/mgraph.h
b/mgraph.h
index e3079787033836ff8845816f94c5825a9a51afb5..2267fdbda1ffcf59bbf7a9919c651bee46ffa6b0 100644
(file)
--- a/
mgraph.h
+++ b/
mgraph.h
@@
-4,41
+4,45
@@
/*
* Vertices in strip are numbered as follows:
*
/*
* Vertices in strip are numbered as follows:
*
- * |
+ * :axis of symmetry
+ * | :
+ * | :
* ___ X-2 ___ X-1 ___| 0 ___ 1 ___ 2 ___ 3 ___ 4 __
* ___ 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
* 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 ___
* ___ 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
* 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 ___ 4 ___
* 2 2 |Y-3 Y-3 Y-3 Y-3 Y-3
- * / \ / \ /
\ / \ / \ / \ / \
- * / \ / \ /|
\ / \ / \ / \ / \
+ * / \ / \ /
:
\ / \ / \ / \ / \
+ * / \ / \ /|
:
\ / \ / \ / \ / \
* __ X-2 ___ X-1|___ 0 ___ 1 ___ 2 ___ 3 ___ 3 ___ 4
* __ 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
* -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
* |
* ^ 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.
*
*
* Vertices are in reading order from diagram above ie x varies fastest.
*
@@
-55,6
+59,9
@@
* 3 1 0
* / \
* 4/ 5\
* 3 1 0
* / \
* 4/ 5\
+ *
+ * vertex number: 0000 | y | x
+ * (YBITS) XBITS
*/
#ifndef MGRAPH_H
*/
#ifndef MGRAPH_H
@@
-62,38
+69,53
@@
#include "common.h"
#include "common.h"
-#
define XBITS 6 /*3
*/
-#define X
(1<<XBITS)
-#define YBITS
4
+#
ifndef DEFSZ /* DEFSZ may be (Y/2-1)*10 + XBITS ie Y is 2*<tens>+1
*/
+#define X
BITS 3
+#define YBITS
3
#define Y ((1<<YBITS) - 1)
#define Y ((1<<YBITS) - 1)
+#define YMASK (Y << YSHIFT)
+#else
+#define XBITS (DEFSZ % 10)
+#define Y ((DEFSZ / 10)*2+1)
+#endif
-/* vertex number: 0000 | y | x
- * YBITS XBITS
- */
+#define X (1<<XBITS)
#define N (X*Y)
#define XMASK (X-1)
#define YSHIFT XBITS
#define Y1 (1 << YSHIFT)
#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 V6 6
+#define V3 3
+
+
+/* Loop constructors are macros of the form
+ * LOOP(v,zero,n, precomp)
+ * which work much like this one:
+ */
+#define INNER(v,zero,n, precomp) \
+ for ((v)=(zero); precomp, (v)<(n); (v)++)
-#define FOR_VERTEX(v) \
-
for ((v)=0; (v)<N; (v)++
)
+#define FOR_VERTEX(v
,loop
) \
+
loop ((v), 0, N, NOTHING
)
-#define FOR_VPEDGE(
v,
e) \
+#define FOR_VPEDGE(e) \
for ((e)=0; (e)<V6; (e)++)
for ((e)=0; (e)<V6; (e)++)
-extern
int edge_end2(unsigned v1, int e)
;
-#define EDGE_END2
edge_end2
+extern
short edge_end2_memo[][V6]
;
+#define EDGE_END2
(v1,e) edge_end2_memo[v1][e]
-#define RIM_VERTEX_P(v) (((v) & YMASK) == 0 || ((v) & YMASK) == (Y-1)*Y1)
+/* 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 EDGE_OPPOSITE(e) (((e)+V3) % V6)
+
+#define RIM_VERTEX_P(v) (((v) & ~XMASK) == 0 || ((v) & ~XMASK) == (Y-1)*Y1)
#define FOR_VEDGE_X(v1,e,v2,init,otherwise) \
#define FOR_VEDGE_X(v1,e,v2,init,otherwise) \
- FOR_VPEDGE((
v1),(e))
\
+ FOR_VPEDGE((
e))
\
if (((v2)= EDGE_END2((v1),(e)), \
(init), \
(v2)) < 0) { otherwise; } else
if (((v2)= EDGE_END2((v1),(e)), \
(init), \
(v2)) < 0) { otherwise; } else
@@
-103,14
+125,19
@@
extern int edge_end2(unsigned v1, int e);
#define FOR_VEDGE(v1,e,v2) \
FOR_VEDGE_X(v1,e,v2,NOTHING,NOTHING)
#define FOR_VEDGE(v1,e,v2) \
FOR_VEDGE_X(v1,e,v2,NOTHING,NOTHING)
-#define FOR_EDGE(v1,e,v2
)
\
- FOR_VERTEX((v1)
)
\
+#define FOR_EDGE(v1,e,v2
, loop)
\
+ FOR_VERTEX((v1)
, loop)
\
FOR_VEDGE((v1),(e),(v2))
FOR_VEDGE((v1),(e),(v2))
-#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)++)
+#define FOR_RIM_VERTEX(vy,vx,v, loop) \
+ for ((vy)=0; (vy)<Y; (vy)+=Y-1) \
+ loop ((vx), 0, X, (v)= (vy)<<YSHIFT | (vx))
+
+int vertices_span_join_p(int v0, int v1);
typedef double Vertices[N][D3];
typedef double Vertices[N][D3];
+struct Vertices { Vertices a; };
+
+void mgraph_prepare(void);
#endif /*MGRAPH_H*/
#endif /*MGRAPH_H*/