Index: engine/genmove.c =================================================================== RCS file: /cvsroot/gnugo/gnugo/engine/genmove.c,v retrieving revision 1.59 diff -u -r1.59 genmove.c --- engine/genmove.c 21 Dec 2002 18:25:51 -0000 1.59 +++ engine/genmove.c 22 Dec 2002 17:51:51 -0000 @@ -689,7 +689,7 @@ set_strength_data(OTHER_COLOR(color), safe_stones, strength); compute_influence(OTHER_COLOR(color), safe_stones, strength, - &OPPOSITE_INFLUENCE(color), + OPPOSITE_INFLUENCE(color), NO_MOVE, "revised thrashing dragon"); compute_refined_dragon_weaknesses(); Index: engine/liberty.h =================================================================== RCS file: /cvsroot/gnugo/gnugo/engine/liberty.h,v retrieving revision 1.143 diff -u -r1.143 liberty.h --- engine/liberty.h 21 Dec 2002 18:25:51 -0000 1.143 +++ engine/liberty.h 22 Dec 2002 17:51:52 -0000 @@ -631,8 +631,9 @@ extern struct influence_data move_influence; extern struct influence_data followup_influence; -#define INITIAL_INFLUENCE(color) ((color) == WHITE ? initial_white_influence \ - : initial_black_influence) +#define INITIAL_INFLUENCE(color) ((color) == WHITE ? \ + &initial_white_influence \ + : &initial_black_influence) #define OPPOSITE_INFLUENCE(color) (INITIAL_INFLUENCE(OTHER_COLOR(color))) #define DEFAULT_STRENGTH 100.0 Index: engine/value_moves.c =================================================================== RCS file: /cvsroot/gnugo/gnugo/engine/value_moves.c,v retrieving revision 1.72 diff -u -r1.72 value_moves.c --- engine/value_moves.c 21 Dec 2002 18:25:52 -0000 1.72 +++ engine/value_moves.c 22 Dec 2002 17:51:56 -0000 @@ -1178,10 +1178,10 @@ */ for (k = 0; k < 4; k++) if (board[pos + delta[k]] == EMPTY - && whose_area(&OPPOSITE_INFLUENCE(color), pos + delta[k]) + && whose_area(OPPOSITE_INFLUENCE(color), pos + delta[k]) != OTHER_COLOR(color)) return 0.0; - if (whose_area(&OPPOSITE_INFLUENCE(color), pos) != OTHER_COLOR(color)) + if (whose_area(OPPOSITE_INFLUENCE(color), pos) != OTHER_COLOR(color)) return 0.0; for (k = 0; k < MAX_REASONS; k++) { @@ -1272,7 +1272,7 @@ * is dominated by the opponent. The territorial valuation is a * good try here. */ - ret_val = influence_territory(&INITIAL_INFLUENCE(OTHER_COLOR(color)), + ret_val = influence_territory(INITIAL_INFLUENCE(OTHER_COLOR(color)), pos, OTHER_COLOR(color)); ret_val *= 12.0; ret_val = gg_max(0.0, ret_val); @@ -1877,7 +1877,7 @@ &move_influence, pos, "after move"); compute_followup_influence(&move_influence, &followup_influence, pos, "followup"); - this_value = influence_delta_territory(&OPPOSITE_INFLUENCE(color), + this_value = influence_delta_territory(OPPOSITE_INFLUENCE(color), &move_influence, color, pos); move[pos].influence_followup_value = influence_delta_territory(&move_influence, &followup_influence, Index: interface/play_gtp.c =================================================================== RCS file: /cvsroot/gnugo/gnugo/interface/play_gtp.c,v retrieving revision 1.106 diff -u -r1.106 play_gtp.c --- interface/play_gtp.c 21 Dec 2002 18:25:53 -0000 1.106 +++ interface/play_gtp.c 22 Dec 2002 17:51:59 -0000 @@ -3048,7 +3048,7 @@ silent_examine_position(color, EXAMINE_ALL); gtp_start_response(GTP_SUCCESS); - get_influence(&OPPOSITE_INFLUENCE(color), white_influence, + get_influence(OPPOSITE_INFLUENCE(color), white_influence, black_influence, influence_regions); print_influence(white_influence, black_influence, influence_regions); /* We already have one newline and thus can't use gtp_finish_response(). */ Index: patterns/helpers.c =================================================================== RCS file: /cvsroot/gnugo/gnugo/patterns/helpers.c,v retrieving revision 1.43 diff -u -r1.43 helpers.c --- patterns/helpers.c 21 Dec 2002 18:25:53 -0000 1.43 +++ patterns/helpers.c 22 Dec 2002 17:52:00 -0000 @@ -112,7 +112,7 @@ else own_eyespace = (black_eye[move].color == BLACK_BORDER); - if (whose_area(&OPPOSITE_INFLUENCE(color), move) != color && !own_eyespace) + if (whose_area(OPPOSITE_INFLUENCE(color), move) != color && !own_eyespace) return 1; else return 0; @@ -127,7 +127,7 @@ int jump_out_far_helper(ARGS) { - if (whose_area(&OPPOSITE_INFLUENCE(color), move) != OTHER_COLOR(color)) + if (whose_area(OPPOSITE_INFLUENCE(color), move) != OTHER_COLOR(color)) return jump_out_helper(pattern, trans, move, color); else return 0; Index: patterns/mkpat.c =================================================================== RCS file: /cvsroot/gnugo/gnugo/patterns/mkpat.c,v retrieving revision 1.98 diff -u -r1.98 mkpat.c --- patterns/mkpat.c 21 Dec 2002 18:25:53 -0000 1.98 +++ patterns/mkpat.c 22 Dec 2002 17:52:03 -0000 @@ -232,21 +232,21 @@ "somewhere(OTHER_COLOR(color), 0, %d"}, {"o_somewhere", 0, 1, 0.01, "somewhere(color, 0, %d"}, {"xmoyo_opposite", 1, 0, 0.01, - "(whose_moyo(&INITIAL_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, + "(whose_moyo(INITIAL_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, {"omoyo_opposite", 1, 0, 0.01, - "(whose_moyo(&INITIAL_INFLUENCE(color), %s) == color)"}, + "(whose_moyo(INITIAL_INFLUENCE(color), %s) == color)"}, {"xmoyo", 1, 0, 0.01, - "(whose_moyo(&OPPOSITE_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, + "(whose_moyo(OPPOSITE_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, {"omoyo", 1, 0, 0.01, - "(whose_moyo(&OPPOSITE_INFLUENCE(color), %s) == color)"}, + "(whose_moyo(OPPOSITE_INFLUENCE(color), %s) == color)"}, {"xarea", 1, 0, 0.01, - "(whose_area(&OPPOSITE_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, + "(whose_area(OPPOSITE_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, {"oarea", 1, 0, 0.01, - "(whose_area(&OPPOSITE_INFLUENCE(color), %s) == color)"}, + "(whose_area(OPPOSITE_INFLUENCE(color), %s) == color)"}, {"xterri", 1, 0, 0.01, - "(whose_territory(&OPPOSITE_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, + "(whose_territory(OPPOSITE_INFLUENCE(color), %s) == OTHER_COLOR(color))"}, {"oterri", 1, 0, 0.01, - "(whose_territory(&OPPOSITE_INFLUENCE(color), %s) == color)"}, + "(whose_territory(OPPOSITE_INFLUENCE(color), %s) == color)"}, {"genus", 1, 0, 0.01, "dragon[%s].genus"}, {"approx_xlib", 1, 0, 0.03, "approxlib(%s, OTHER_COLOR(color), MAX_LIBERTIES, NULL)"},