From 36d0f894484063807e8fb326e2bcf2fe4f621616 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Mon, 16 Jan 2012 22:02:02 +0100
Subject: [PATCH] is_middle_ladder(), wouldbe_ladder(): Pass group information

---
 playout/moggy.c  | 4 ++--
 tactics/ladder.c | 4 ++--
 tactics/ladder.h | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/playout/moggy.c b/playout/moggy.c
index ec51d87..0c1b731 100644
--- a/playout/moggy.c
+++ b/playout/moggy.c
@@ -312,7 +312,7 @@ local_ladder_check(struct playout_policy *p, struct board *b, struct move *m, st
 	for (int i = 0; i < 2; i++) {
 		coord_t chase = board_group_info(b, group).lib[i];
 		coord_t escape = board_group_info(b, group).lib[1 - i];
-		if (wouldbe_ladder(b, escape, chase, board_at(b, group)))
+		if (wouldbe_ladder(b, group, escape, chase, board_at(b, group)))
 			mq_add(q, chase, 1<<MQ_LADDER);
 	}
 
@@ -712,7 +712,7 @@ playout_moggy_assess_group(struct playout_policy *p, struct prior_map *map, grou
 			for (int i = 0; i < 2; i++) {
 				coord_t chase = board_group_info(b, g).lib[i];
 				coord_t escape = board_group_info(b, g).lib[1 - i];
-				if (wouldbe_ladder(b, escape, chase, board_at(b, g))) {
+				if (wouldbe_ladder(b, g, escape, chase, board_at(b, g))) {
 					add_prior_value(map, chase, 1, games);
 					ladderable = true;
 				}
diff --git a/tactics/ladder.c b/tactics/ladder.c
index 83f197e..a84a6cf 100644
--- a/tactics/ladder.c
+++ b/tactics/ladder.c
@@ -139,7 +139,7 @@ middle_ladder_walk(struct board *b, enum stone lcolor, int x, int y, int xd, int
 }
 
 bool
-is_middle_ladder(struct board *b, coord_t coord, enum stone lcolor)
+is_middle_ladder(struct board *b, coord_t coord, group_t laddered, enum stone lcolor)
 {
 	int x = coord_x(coord, b), y = coord_y(coord, b);
 
@@ -206,7 +206,7 @@ is_middle_ladder(struct board *b, coord_t coord, enum stone lcolor)
 }
 
 bool
-wouldbe_ladder(struct board *b, coord_t escapelib, coord_t chaselib, enum stone lcolor)
+wouldbe_ladder(struct board *b, group_t group, coord_t escapelib, coord_t chaselib, enum stone lcolor)
 {
 	if (DEBUGL(6))
 		fprintf(stderr, "would-be ladder check - does %s %s play out chasing move %s?\n",
diff --git a/tactics/ladder.h b/tactics/ladder.h
index dc5d66a..ad53f80 100644
--- a/tactics/ladder.h
+++ b/tactics/ladder.h
@@ -14,11 +14,11 @@ static bool is_ladder(struct board *b, coord_t coord, group_t laddered, bool tes
 
 /* Check if a 2-lib group of color @lcolor escaping at @escapelib would be
  * caught in a ladder given opponent stone at @chaselib.  */
-bool wouldbe_ladder(struct board *b, coord_t escapelib, coord_t chaselib, enum stone lcolor);
+bool wouldbe_ladder(struct board *b, group_t group, coord_t escapelib, coord_t chaselib, enum stone lcolor);
 
 
 bool is_border_ladder(struct board *b, coord_t coord, enum stone lcolor);
-bool is_middle_ladder(struct board *b, coord_t coord, enum stone lcolor);
+bool is_middle_ladder(struct board *b, coord_t coord, group_t group, enum stone lcolor);
 static inline bool
 is_ladder(struct board *b, coord_t coord, group_t laddered, bool test_middle)
 {
@@ -37,7 +37,7 @@ is_ladder(struct board *b, coord_t coord, group_t laddered, bool test_middle)
 		return l;
 	}
 
-	bool l = test_middle && is_middle_ladder(b, coord, lcolor);
+	bool l = test_middle && is_middle_ladder(b, coord, laddered, lcolor);
 	if (DEBUGL(6)) fprintf(stderr, "middle ladder solution: %d\n", l);
 	return l;
 }
-- 
2.11.4.GIT