From 6c1b5f9a4f33efab311c5165f4449b29085728fa Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Mon, 5 Jul 2010 00:28:05 +0200
Subject: [PATCH] Fix PF_ANY for SELFATARI, CAPTURE, AESCAPE after recent
 changes

---
 pattern.c                 | 10 ++++++----
 patternscan/patternscan.c |  3 ++-
 playout/elo.c             |  6 ++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pattern.c b/pattern.c
index 55ad238..4431798 100644
--- a/pattern.c
+++ b/pattern.c
@@ -27,6 +27,8 @@ struct pattern_config FAST_PATTERN_CONFIG = {
 	.mcsims = 0,
 };
 
+#define PF_MATCH 15
+
 pattern_spec PATTERN_SPEC_MATCHALL = {
 	[FEAT_PASS] = ~0,
 	[FEAT_CAPTURE] = ~0,
@@ -47,9 +49,9 @@ pattern_spec PATTERN_SPEC_MATCHALL = {
  * BOARD_GAMMA code! You cannot just tinker with this spec freely. */
 pattern_spec PATTERN_SPEC_MATCHFAST = {
 	[FEAT_PASS] = 0,
-	[FEAT_CAPTURE] = (1<<PF_CAPTURE_1STONE | 1<<PF_CAPTURE_TRAPPED),
-	[FEAT_AESCAPE] = (1<<PF_AESCAPE_1STONE | 1<<PF_AESCAPE_TRAPPED),
-	[FEAT_SELFATARI] = (1<<PF_SELFATARI_STUPID),
+	[FEAT_CAPTURE] = (1<<PF_MATCH | 1<<PF_CAPTURE_1STONE | 1<<PF_CAPTURE_TRAPPED),
+	[FEAT_AESCAPE] = (1<<PF_MATCH | 1<<PF_AESCAPE_1STONE | 1<<PF_AESCAPE_TRAPPED),
+	[FEAT_SELFATARI] = (1<<PF_MATCH | 1<<PF_SELFATARI_STUPID),
 	[FEAT_ATARI] = 0,
 	[FEAT_BORDER] = 0,
 	[FEAT_LDIST] = 0,
@@ -132,7 +134,7 @@ feature_payloads(struct pattern_config *pc, enum feature_id f)
 
 
 /* pattern_spec helpers */
-#define PS_ANY(F) (ps[FEAT_ ## F] & (1 << 15))
+#define PS_ANY(F) (ps[FEAT_ ## F] & (1 << PF_MATCH))
 #define PS_PF(F, P) (ps[FEAT_ ## F] & (1 << PF_ ## F ## _ ## P))
 
 static struct feature *
diff --git a/patternscan/patternscan.c b/patternscan/patternscan.c
index 61a60ce..0b42d83 100644
--- a/patternscan/patternscan.c
+++ b/patternscan/patternscan.c
@@ -354,7 +354,8 @@ patternscan_state_init(char *arg)
 				/* Use precise self-atari detection instead
 				 * of quick one; makes sense ONLY with
 				 * matchfast, otherwise we always do this. */
-				ps->ps[FEAT_SELFATARI] = ~(1<<PF_SELFATARI_STUPID);
+				ps->ps[FEAT_SELFATARI] &= ~(1<<PF_SELFATARI_STUPID);
+				ps->ps[FEAT_SELFATARI] |= (1<<PF_SELFATARI_SMART);
 
 			} else if (!strcasecmp(optname, "mm")) {
 				/* Generate output almost suitable for the
diff --git a/playout/elo.c b/playout/elo.c
index 43586a6..d9c39bd 100644
--- a/playout/elo.c
+++ b/playout/elo.c
@@ -448,8 +448,10 @@ playout_elo_init(char *arg, struct board *b)
 	for (int i = 0; i < FEAT_MAX; i++)
 		if ((xspat == 0 && i == FEAT_SPATIAL) || (xspat == 1 && i != FEAT_SPATIAL))
 			pp->choose.ps[i] = 0;
-	if (precise_selfatari)
-		pp->choose.ps[FEAT_SELFATARI] = ~(1<<PF_SELFATARI_STUPID);
+	if (precise_selfatari) {
+		pp->choose.ps[FEAT_SELFATARI] &= ~(1<<PF_SELFATARI_STUPID);
+		pp->choose.ps[FEAT_SELFATARI] |= (1<<PF_SELFATARI_SMART);
+	}
 	board_gamma_set(b, pp->choose.fg, precise_selfatari);
 
 	return p;
-- 
2.11.4.GIT