Index: patterns/eyes.db =================================================================== RCS file: /cvsroot/gnugo/gnugo/patterns/eyes.db,v retrieving revision 1.37 diff -u -r1.37 eyes.db --- patterns/eyes.db 4 May 2003 08:36:03 -0000 1.37 +++ patterns/eyes.db 6 May 2003 12:39:45 -0000 @@ -211,13 +211,6 @@ :0000 -Pattern 204 - -!! - -:0000 - - ############################### # 3 elements # ############################### @@ -1028,13 +1021,6 @@ :0111 -Pattern 5124 - -!xxxx - -:1111 - - Pattern 5131 x@.Xx @@ -1198,20 +1184,28 @@ Pattern 5201 x -x..x +x..X -:1222 +:2222 Pattern 5202 x +x... + +:1222 + + +Pattern 5203 + + x xXXX :2222 -Pattern 5203 +Pattern 5204 X XXX. @@ -1219,7 +1213,7 @@ :1112 -Pattern 5204 +Pattern 5205 x xXX. @@ -2051,91 +2045,84 @@ :1222 -Pattern 6025 +Pattern 6026 -!.X... +!.XXXX -:2222 +:0222 -Pattern 6026 +Pattern 6028 !.XxxX -:2222 +:1222 -Pattern 6027 +Pattern 6029 @.X.X. :1122 -Pattern 6028 +Pattern 6030 @.XXX. :0122 -Pattern 6029 +Pattern 6031 @X.XXX :1122 -Pattern 6030 +Pattern 6032 !X.X.X :1222 -Pattern 6031 +Pattern 6033 @X.XX. :0122 -Pattern 6032 +Pattern 6034 @X.xxx :1122 -Pattern 6033 +Pattern 6035 @XX.Xx :0122 -Pattern 6034 +Pattern 6036 @Xx.xx :1122 -Pattern 6035 +Pattern 6037 @XXX.x :0122 -Pattern 6036 - -@Xxx.x - -:1122 - - -Pattern 6037 +Pattern 6038 @XXXXx @@ -2270,145 +2257,166 @@ Pattern 6063 +!x!.Xx + +:0112 + + +Pattern 6064 + !x@XXX :0022 -Pattern 6064 +Pattern 6065 !x@XX. :0012 -Pattern 6065 +Pattern 6066 !.x@.x :0122 -Pattern 6066 +Pattern 6067 !Xx!.x :0112 -Pattern 6067 +Pattern 6068 !Xx@Xx :0012 -Pattern 6068 +Pattern 6069 !.x@Xx :0022 -Pattern 6069 +Pattern 6070 !XX.@x :0012 -Pattern 6070 +Pattern 6071 !xx.@x :0122 -Pattern 6071 +Pattern 6072 !XXX@x :0012 -Pattern 6072 +Pattern 6073 !xxX@x :0022 -Pattern 6073 - -!.xx.! - -:1111 - - Pattern 6074 -!...X! +!....! -:1111 +:1112 Pattern 6075 -@XX>X! +!.X.x! -:0011 +:0112 Pattern 6076 -@XXx.! +!.XX.! -:0011 +:0111 Pattern 6077 -!XXXX! +!x..X! -:0002 +:0112 Pattern 6078 -!xxxx! +@XX>X! -:1111 +:0011 Pattern 6079 +@XXx.! + +:0011 + + +Pattern 6080 + +!XXXX! + +:0002 + + +Pattern 6082 + x@x!.x :1122 -Pattern 6080 +Pattern 6083 x!x!Xx :0112 -Pattern 6081 +Pattern 6084 x@..@x :1122 -Pattern 6082 +Pattern 6085 x@X.!x :0122 -Pattern 6085 +Pattern 6086 + +x!XX!x + +:0112 + + +Pattern 6087 x@x!x! @@ -2468,20 +2476,36 @@ Pattern 6105 x -xXx.! +xX..! -:1111 +:1112 Pattern 6106 + X +XXX.! + +:1112 + + +Pattern 6107 + + x +xXX.! + +:0111 + + +Pattern 6108 + x xX.X@ :0122 -Pattern 6107 +Pattern 6109 x xXXX@ @@ -2760,17 +2784,49 @@ Pattern 6251 x -!x*x! +!.*.! :1122 Pattern 6252 + x +!X*X! + +:0022 + + +Pattern 6253 + + x +!.*X! + +:0122 + + +Pattern 6254 + ! -x..x@ +X...! -:1122 +:1112 + + +Pattern 6255 + + ! +X.X.( :1122 -Pattern 70003 +Pattern 70011 @..>..@ :1122 -Pattern 70004 -# FIXME: This is of course too general. Taken from linear_eye(). +Pattern 70012 -@xxxxx@ +(.x..X@ :1122 -Pattern 70005 -# FIXME: This pattern looks like 1112 to me. "$...<." seems to be -# attackable at '<'. -pp +Pattern 70013 -$.....@ +@..X..@ :1122 -# . -# Topology: ...... -# - -Pattern 70500 +Pattern 70014 - x -!*xxx! +(.X*X.( :1122 -Pattern 70501 +Pattern 70015 - ) -)*x..x +@X.X.X@ -:1122 +:0122 -# . -# Topology: ...... -# +Pattern 70016 -Pattern 71000 +@X.X..! - ! -@.>XxX +:0122 -:1122 +Pattern 70017 -Pattern 71001 -# Defending the other marginal vertex is sometimes incorrect, -# see regression/games/owl27.sgf. +@XXXX.! - @ -!..x.x +:0022 -:1122 +Pattern 70018 -Pattern 71002 -# Defending the other marginal vertex is always incorrect. +@XxxX.( - ! -@x.xXx +:0122 -:1122 +Pattern 70019 -Pattern 71003 -# Defending the other marginal vertex is always incorrect. +!Xx..x! - ! -@X.xxx +:0112 -:1122 +Pattern 70020 -Pattern 71004 +!.XX..! - . @| -!...x| ------+ +:0112 -:1122 +Pattern 70021 -Pattern 71005 +!.XXX.! - x -!x*xx! +:0111 -:1122 +Pattern 70022 -Pattern 71006 +@XXX.x! - ) -..>..@ +:0012 -:1122 +Pattern 70023 -Pattern 71007 +@XX*XX@ - ! -!..x.! +:0011 -:1111 +Pattern 70024 -# . . -# Topology: ..... -# +!XXXXX! +:0002 -Pattern 71500 - . ! -!*..! +Pattern 70030 +# FIXME: This pattern looks like 1112 to me. "$...<." seems to be +# attackable at '<'. -pp + +$.....@ :1122 # . -# Topology: ..... -# . +# Topology: ...... +# -Pattern 72000 +Pattern 70500 x -x*X.! - x +!XXX + +:1122 + + +Pattern 71012 +# Defending the other marginal vertex is sometimes incorrect, +# see regression/games/owl27.sgf. + + ) +(..x.x + +:1122 + + +Pattern 71013 + + ( +@...Xx + +:1122 + + +Pattern 71014 + + ! +)XxX( + +:1122 + + +Pattern 71022 + + . +!.*XX! + +:0122 + + +Pattern 71023 + + . +!X*.x! + +:0122 + + +Pattern 71024 + + x +!X*X.! + +:0122 + + +Pattern 71025 + + x +!x*xx! + +:1122 + + +Pattern 71030 + + ) +..>..@ + +:1122 + + +Pattern 71040 + + ! +!..x.! + +:0112 + + +# . . +# Topology: ..... +# + + +Pattern 71500 + + . ! +!...! + +:0112 + + +# . +# Topology: ..... +# . + +Pattern 72000 + + x +x*X.! + x + +:1122 + + +Pattern 72001 + + x +x..X! + x + +:1222 + + +Pattern 72002 + + X +X...! + X + +:1222 + + +Pattern 72003 + + x +x*..) + x + +:1122 + + +# . +# Topology: ..... +# . + +# Pattern 72500 + +# . +# Topology: ..... +# . + + +# Pattern 73000 + +# . +# Topology: . +# ..... + +Pattern 73500 + + @ + . +x...@ + +:1122 + + +Pattern 73501 + + ! + . +.*X.! + +:1122 + + +# .. +# Topology: ..... +# + +Pattern 74000 +# Bent four in the corner + +|.. +|.*..! ++---- + +:1122 + + +Pattern 74001 + +XX +X*x.! + +:1122 + + +Pattern 74002 + +X. +x.X.! + +:1222 + + +Pattern 74003 + +Xx +x>x.@ + +:1122 # .. @@ -4620,26 +5015,58 @@ Pattern 74511 + .x +....! + +:1222 + + +Pattern 74512 + xx .*x.! :1122 -Pattern 74512 +Pattern 74513 Xx -.Xx.! +.X..! -:1111 +:1112 -Pattern 74513 +Pattern 74514 + + Xx +.XX.! + +:0111 + + +Pattern 74515 + + .x +!...! + +:1112 + + +Pattern 74516 + + xX +!.X.! + +:0111 + + +Pattern 74517 xx !.x.! -:1111 +:0112 # ... @@ -4692,18 +5119,50 @@ Pattern 75004 + XX. +!..X + +:1112 + + +Pattern 75005 + + XXX +(.*X + +:1122 + + +Pattern 75006 + xXx @..x :1122 -Pattern 75005 +Pattern 75007 + + X.( +(.*X + +:1122 + + +Pattern 75008 x.! -!.xx +!..x -:1111 +:0112 + + +Pattern 75009 + + x.! +!.Xx + +:0111 # .. @@ -4739,16 +5198,6 @@ :1122 -Pattern 75503 -# X here gives ko. - -.X -*.X. - x - -:1122 - - Pattern 75504 # X here gives ko. @@ -4768,7 +5217,16 @@ :1122 -Pattern 75506 +Pattern 75506 + +XX +XXX. + X + +:1112 + + +Pattern 75507 xX XXX. @@ -4810,6 +5268,15 @@ Pattern 76003 + XX +XXX. + X + +:1112 + + +Pattern 76004 + Xx xXX. x @@ -4859,6 +5326,15 @@ Pattern 76504 + X +XXX + XX. + +:1112 + + +Pattern 76505 + x xXX XX. @@ -4892,24 +5368,41 @@ Pattern 78000 +.. +XXX + X. + +:1111 + + +Pattern 78001 + .* -xXx +*X* X. :1122 -Pattern 78001 -# This must be matched before 78002 and 78003. +Pattern 78002 + +.. +xXx + X. + +:1112 + + +Pattern 78003 .X x.X X. -:1111 +:1112 -Pattern 78002 +Pattern 78004 .X x*x @@ -4918,7 +5411,7 @@ :1122 -Pattern 78003 +Pattern 78005 .x x*X @@ -4927,7 +5420,7 @@ :1122 -Pattern 78004 +Pattern 78006 .x xX* @@ -4947,11 +5440,20 @@ Pattern 78011 +.X +.XX + XX + +:1111 + + +Pattern 78012 + .x xXX Xx -:1111 +:1112 # ... @@ -5081,13 +5583,45 @@ Pattern 78550 +..X +X..! + +:1222 + + +Pattern 78551 + +X.X +X..! + +:0222 + + +Pattern 78552 + x.x x..@ :1122 -Pattern 78551 +Pattern 78553 + +.XX +...! + +:0112 + + +Pattern 78554 + +.XX +X>*) + +:1122 + + +Pattern 78555 .xx x*.! @@ -5130,6 +5664,16 @@ Pattern 79012 # Big nakade. + X +..x +XX. + +:1222 + + +Pattern 79013 +# Big nakade. + x x*x xX. @@ -5137,27 +5681,27 @@ :1122 -Pattern 79013 +Pattern 79014 # X here may give ko. . X.X -x*. +X.. -:1122 +:1222 -Pattern 79014 -# O here gives ko. +Pattern 79015 +# X here may give ko. - x -X*X -xX. + . +X>X +.*. :1122 -Pattern 79015 +Pattern 79016 # Big nakade. x @@ -5167,7 +5711,17 @@ :1122 -Pattern 79016 +Pattern 79017 +# Big nakade. + + X +XX. +..X + +:1222 + + +Pattern 79018 # Big nakade. x @@ -5177,17 +5731,27 @@ :1122 -Pattern 79017 +Pattern 79019 # Big nakade. - x + X XX* .XX :1122 -Pattern 79018 +Pattern 79020 +# Big nakade. + + . +XX. +.XX + +:1112 + + +Pattern 79021 # Big nakade. X @@ -5197,17 +5761,27 @@ :1122 -Pattern 79019 +Pattern 79022 # Big nakade. - x -xXx + X +.X. .X. -:1111 +:1112 -Pattern 79020 +Pattern 79023 +# Big nakade. + + . +.X. +XX. + +:1112 + + +Pattern 79024 # Big nakade. . @@ -5217,17 +5791,27 @@ :1111 -Pattern 79021 +Pattern 79025 # Big nakade. x -xX. +xXx .X. :1111 -Pattern 79022 +Pattern 79026 +# Big nakade. + + X +XXX +XX. + +:1112 + + +Pattern 79027 # Big nakade. x @@ -5237,7 +5821,7 @@ :1111 -Pattern 79023 +Pattern 79028 # Big nakade. x @@ -5276,7 +5860,7 @@ !... ...! -:1111 +:1112 # . @@ -5285,38 +5869,56 @@ Pattern 80200 - ! - . -!.*..@ + ! + . +!..X.X -:1122 +:2222 Pattern 80201 ! . -!.*Xxx +!..Xxx -:1122 +:1222 Pattern 80202 ! . -!.X*Xx +!.X.XX -:1122 +:1222 Pattern 80203 + @ + . +@.X>X. + +:1122 + + +Pattern 80204 + ! . !.x..x -:2222 +:1222 + + +Pattern 80205 + + ( + . +(.*..( + +:1122 # .. @@ -5356,8 +5958,40 @@ Pattern 80401 + X. +!..X.! + +:1222 + + +Pattern 80402 + + .. +)>>..@ + +:1122 + + +Pattern 80403 + + X. +!*>..@ + +:1122 + + +Pattern 80404 + + XX +)*>X.! + +:1122 + + +Pattern 80405 + xx -!.*x.! +!.*x.@ :1122 @@ -5381,7 +6015,7 @@ Pattern 80501 !.x - x.x.@ + x*x.! :1122 @@ -5390,9 +6024,18 @@ # in some cases this could become seki !.x - xXx.! + xX..! -:1111 +:0112 + + +Pattern 80503 +# in some cases this could become seki + +!.x + xXX.! + +:0111 # . @@ -5523,19 +6166,19 @@ Pattern 90200 ! . -!...*.! +!.....! -:1122 +:1222 Pattern 90300 ! . - .* -!.*.! + .. +!...! -:1122 +:1112 Pattern 90400 @@ -5552,7 +6195,7 @@ .....! !.. -:2222 +:1222 Pattern 90600 @@ -5582,10 +6225,10 @@ Pattern 100100 - ! + @ . - *. -xX. + .. +xX* x. ! @@ -5606,32 +6249,39 @@ ! - .. - .* -!...! + *. + .> +@...@ :1122 Pattern 100400 - ! + ( .. *. -!.x.! +(.X.( :1122 -Pattern 100500 +Pattern 100401 - ! -@.. - . - .* -!.. + ( + .. + >. +@...( :1122 +Pattern 100500 + + ) +@.> + . + .> +)*. +:1122 Index: patterns/mkeyes.c =================================================================== RCS file: /cvsroot/gnugo/gnugo/patterns/mkeyes.c,v retrieving revision 1.15 diff -u -r1.15 mkeyes.c --- patterns/mkeyes.c 22 Feb 2003 10:54:24 -0000 1.15 +++ patterns/mkeyes.c 6 May 2003 12:39:45 -0000 @@ -29,7 +29,7 @@ #define MAXLINE 80 #define MAXDIMEN 20 #define MAXSIZE 20 -#define MAXPATNO 700 +#define MAXPATNO 800 #include #include