[gnugo-devel] scoring tweaks

[Gunnar Farnebäck]

This patch makes some tweaks to the scoring code.

- give less bonus to connection moves when scoring

/Gunnar

Index: engine/value_moves.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/value_moves.c,v
retrieving revision 1.131
diff -u -r1.131 value_moves.c
--- engine/value_moves.c        13 Sep 2004 10:45:11 -0000      1.131
+++ engine/value_moves.c        22 Sep 2004 15:39:55 -0000
@@ -1407,16 +1414,13 @@
   if (margin > 20.0)
     margin = 20.0;
 
-  /* When scoring, we want to be restrictive with reinforcement moves
-   * inside own territory. Thus if both dragons are weakly_alive,
-   * alive, strongly alive, or invincible, no bonus is awarded.
-   *
-   * Notice that this requires that the territorial value is computed
-   * before the strategical value.
+  /* When scoring, we want to be restrictive with reinforcement moves.
+   * Thus if both dragons are alive, strongly alive, or invincible, no
+   * bonus is awarded.
    *
    * FIXME: Shouldn't it be sufficient to check this for dragon a?
    */
-  if (doing_scoring && terr_val < 0.0) {
+  if (doing_scoring) {
     if ((safetya == ALIVE
         || safetya == STRONGLY_ALIVE
         || safetya == INVINCIBLE)
Index: patterns/patterns.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns.db,v
retrieving revision 1.131
diff -u -r1.131 patterns.db
--- patterns/patterns.db        13 Sep 2004 10:45:12 -0000      1.131
+++ patterns/patterns.db        22 Sep 2004 15:39:56 -0000
@@ -11321,6 +11321,7 @@
 
 Pattern CD82
 # Hard to value accurately. Wild guess that it may be worth 20 points.
+# gf Inappropriate when scoring, disabled in that case. (3.7.2)
 
 ?xxxx       capture ladder to eliminate aji
 ?xxxx
@@ -11336,7 +11337,7 @@
 aCb.?
 ?O???
 
-;!same_dragon(a,b) || potential_cutstone(C)
+;!doing_scoring && (!same_dragon(a,b) || potential_cutstone(C))
 
 
 Pattern CD83