[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnugo-devel] Erasing traces
From: |
Arend Bayer |
Subject: |
[gnugo-devel] Erasing traces |
Date: |
Thu, 31 Mar 2005 12:49:56 +0200 (CEST) |
This is a cosmetic patch to the "Erasing territory..." traces, mostly to make
them appear in view.pike.
Arend
Index: engine/breakin.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/breakin.c,v
retrieving revision 1.17
diff -u -p -r1.17 breakin.c
--- engine/breakin.c 7 Dec 2004 04:50:02 -0000 1.17
+++ engine/breakin.c 31 Mar 2005 10:48:00 -0000
@@ -218,7 +218,7 @@ compute_smaller_goal(int owner, int colo
static int
break_in_goal_from_str(int str, char goal[BOARDMAX],
int *num_non_territory, int non_territory[BOARDMAX],
- int color_to_move)
+ int color_to_move, int info_pos)
{
int move = NO_MOVE;
int saved_move = NO_MOVE;
@@ -256,7 +256,11 @@ break_in_goal_from_str(int str, char goa
int cut_off_distance = FP(3.5);
if (ON_BOARD(move) && goal[move]) {
non_territory[(*num_non_territory)++] = move;
- DEBUG(DEBUG_TERRITORY, "Erasing territory at %1m -a.\n", move);
+ if (info_pos)
+ DEBUG(DEBUG_TERRITORY, "%1m: Erasing territory at %1m -a.\n",
+ info_pos, move);
+ else
+ DEBUG(DEBUG_TERRITORY, "Erasing territory at %1m -a.\n", info_pos,
move);
}
for (k = 0; k < conn.queue_end; k++) {
@@ -267,7 +271,11 @@ break_in_goal_from_str(int str, char goa
&& (!ON_BOARD(conn.coming_from[pos])
|| !goal[conn.coming_from[pos]])) {
non_territory[(*num_non_territory)++] = pos;
- DEBUG(DEBUG_TERRITORY, "Erasing territory at %1m -b.\n", pos);
+ if (info_pos)
+ DEBUG(DEBUG_TERRITORY, "%1m: Erasing territory at %1m -b.\n",
+ info_pos, pos);
+ else
+ DEBUG(DEBUG_TERRITORY, "Erasing territory at %1m -b.\n", pos);
if (conn.distances[pos] < cut_off_distance)
cut_off_distance = conn.distances[pos];
}
@@ -312,7 +320,7 @@ break_in_goal_from_str(int str, char goa
static void
break_in_goal(int color_to_move, int owner, char goal[BOARDMAX],
- struct influence_data *q, int store)
+ struct influence_data *q, int store, int info_pos)
{
struct connection_data conn;
int k;
@@ -373,7 +381,7 @@ break_in_goal(int color_to_move, int own
for (k = 0; k < candidates; k++) {
int move = break_in_goal_from_str(candidate_strings[k], goal,
&num_non_territory, non_territory,
- color_to_move);
+ color_to_move, info_pos);
if (store && ON_BOARD(move) && num_break_ins < MAX_BREAK_INS) {
/* Remember the move as a possible move candidate for later. */
break_in_list[num_break_ins].str = candidate_strings[k];
@@ -396,7 +404,8 @@ break_in_goal(int color_to_move, int own
* later gets used to generate move reasons).
*/
void
-break_territories(int color_to_move, struct influence_data *q, int store)
+break_territories(int color_to_move, struct influence_data *q, int store,
+ int info_pos)
{
struct moyo_data territories;
int k;
@@ -422,7 +431,8 @@ break_territories(int color_to_move, str
if (color_to_move == OTHER_COLOR(territories.owner[k]))
enlarge_goal(goal);
- break_in_goal(color_to_move, territories.owner[k], goal, q, store);
+ break_in_goal(color_to_move, territories.owner[k], goal, q, store,
+ info_pos);
}
}
Index: engine/dragon.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/dragon.c,v
retrieving revision 1.145
diff -u -p -r1.145 dragon.c
--- engine/dragon.c 8 Feb 2005 03:37:09 -0000 1.145
+++ engine/dragon.c 31 Mar 2005 10:48:00 -0000
@@ -1267,12 +1267,12 @@ compute_dragon_influence()
set_strength_data(BLACK, safe_stones, strength);
compute_influence(BLACK, safe_stones, strength, &initial_black_influence,
NO_MOVE, "initial black influence, dragons known");
- break_territories(BLACK, &initial_black_influence, 1);
+ break_territories(BLACK, &initial_black_influence, 1, NO_MOVE);
set_strength_data(WHITE, safe_stones, strength);
compute_influence(WHITE, safe_stones, strength, &initial_white_influence,
NO_MOVE, "initial white influence, dragons known");
- break_territories(WHITE, &initial_white_influence, 1);
+ break_territories(WHITE, &initial_white_influence, 1, NO_MOVE);
}
Index: engine/liberty.h
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/liberty.h,v
retrieving revision 1.236
diff -u -p -r1.236 liberty.h
--- engine/liberty.h 8 Feb 2005 03:37:09 -0000 1.236
+++ engine/liberty.h 31 Mar 2005 10:48:00 -0000
@@ -665,7 +665,7 @@ int influence_considered_lively(const st
void influence_erase_territory(struct influence_data *q, int pos, int color);
void break_territories(int color_to_move, struct influence_data *q,
- int store);
+ int store, int pos);
void clear_break_in_list(void);
void break_in_move_reasons(int color);
Index: engine/value_moves.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/value_moves.c,v
retrieving revision 1.147
diff -u -p -r1.147 value_moves.c
--- engine/value_moves.c 19 Mar 2005 00:03:42 -0000 1.147
+++ engine/value_moves.c 31 Mar 2005 10:48:00 -0000
@@ -2491,7 +2491,7 @@ estimate_territorial_value(int pos, int
compute_influence(OTHER_COLOR(color), safe_stones, strength,
&move_influence, pos, "after move");
increase_depth_values();
- break_territories(OTHER_COLOR(color), &move_influence, 0);
+ break_territories(OTHER_COLOR(color), &move_influence, 0, pos);
decrease_depth_values();
this_value = influence_delta_territory(OPPOSITE_INFLUENCE(color),
&move_influence, color, pos);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnugo-devel] Erasing traces,
Arend Bayer <=