Ticket #48: gunnar_7_8.7

File gunnar_7_8.7, 13.6 kB (added by gunnar, 3 years ago)

Fixes for arb, arion, ego, nicklas1, nicklas5, niki, strategy2, and viking.

Line 
1Index: regression/arb.tst
2===================================================================
3RCS file: /cvsroot/gnugo/gnugo/regression/arb.tst,v
4retrieving revision 1.30
5diff -u -r1.30 arb.tst
6--- regression/arb.tst  20 Jan 2005 19:04:34 -0000      1.30
7+++ regression/arb.tst  20 Oct 2005 20:20:09 -0000
8@@ -41,8 +41,8 @@
9 #? [H13]
10 
11 loadsgf games/arb/dumonteil-2.sgf 251
12-202 reg_genmove black
13-#? [!(B19|D15)]
14+202 restricted_genmove black B19 D15 F19 F16
15+#? [F19|F16]
16 
17 loadsgf games/arb/dumonteil-3.sgf 193
18 203 reg_genmove black
19@@ -65,15 +65,16 @@
20 # Ko mistake observed in gnugo-2.7.231 --level 8 -M 32
21 loadsgf games/arb/dumonteil-5.sgf 125
22 221 reg_genmove black
23-#? [!H1]
24+#? [J9]
25 
26 loadsgf games/arb/dumonteil-6.sgf 33
27 231 reg_genmove black
28 #? [F5]*
29 
30+# Defend against a combination attack.
31 loadsgf games/arb/game03.sgf 109
32 232 reg_genmove black
33-#? [!PASS]
34+#? [M9|M10|L10|L11]
35 
36 loadsgf games/arb/game04.sgf 43
37 233 reg_genmove black
38Index: regression/arion.tst
39===================================================================
40RCS file: /cvsroot/gnugo/gnugo/regression/arion.tst,v
41retrieving revision 1.13
42diff -u -r1.13 arion.tst
43--- regression/arion.tst        28 May 2004 03:09:14 -0000      1.13
44+++ regression/arion.tst        20 Oct 2005 20:20:09 -0000
45@@ -8,17 +8,24 @@
46 2 reg_genmove black
47 #? [Q18|S16]
48 
49+# J3 is maybe not the largest move on the board but it is very clearly
50+# sounder than a move near P6.
51 loadsgf games/arion.sgf 69
52-3 reg_genmove black
53-#? [!O6]
54+3 restricted_genmove black J3 O6 P7 O5 O7 N6
55+#? [J3]
56 
57 loadsgf games/arion.sgf 139
58 4 reg_genmove black
59 #? [F9]
60 
61+# F15 is a blunder, leading to shortage of liberties and a combination
62+# attack. To make this clearer, first fill out the remaining dame points.
63 loadsgf games/arion.sgf 213
64+play black P13
65+play white D13
66+play black E4
67 5 reg_genmove black
68-#? [!F15]
69+#? [D17|E17|F17|H17|J17|K17|D18|E18|F18|G18|H18|J18|K18]
70 
71 # F19 seems to be best way to live from a yose perspective.
72 loadsgf games/arion.sgf 225
73Index: regression/ego.tst
74===================================================================
75RCS file: /cvsroot/gnugo/gnugo/regression/ego.tst,v
76retrieving revision 1.23
77diff -u -r1.23 ego.tst
78--- regression/ego.tst  13 Jun 2005 03:35:08 -0000      1.23
79+++ regression/ego.tst  20 Oct 2005 20:20:09 -0000
80@@ -10,8 +10,8 @@
81 # G3 looks good here but is maybe not the only move. E5 is clearly
82 # suboptimal, however.
83 loadsgf games/ego.sgf 30
84-2 reg_genmove white
85-#? [!E5]
86+2 restricted_genmove white E5 G3
87+#? [G3]
88 
89 #CATEGORY=PATTERN_TUNING
90 #DESCRIPTION=K17 misses H18 threat.
91@@ -27,8 +27,8 @@
92 # The descent at G19 is bad shape because it leaves much aji around
93 # E18 and gives black an endgame sente move at H19.
94 loadsgf games/ego.sgf 54
95-4 reg_genmove white
96-#? [!(G19|H19|K17)]*
97+4 restricted_genmove white G19 H19 K17 F18
98+#? [F18]*
99 
100 #CATEGORY=
101 #DESCRIPTION=Why is B15 so bad?  -Trevor
102@@ -39,13 +39,13 @@
103 #? [!B15]
104 
105 loadsgf games/ego.sgf 86
106-6 reg_genmove white
107-#? [!N5]
108+6 restricted_genmove white M5 N5
109+#? [M5]
110 
111 # Unreasonable monkey jump
112 loadsgf games/ego.sgf 96
113-7 reg_genmove white
114-#? [!Q1]
115+7 restricted_genmove white Q1 P2
116+#? [P2]
117 
118 #CATEGORY=BORDER_PROTECTION
119 #DESCRIPTION=Tough moyo protection.
120Index: regression/nicklas1.tst
121===================================================================
122RCS file: /cvsroot/gnugo/gnugo/regression/nicklas1.tst,v
123retrieving revision 1.56
124diff -u -r1.56 nicklas1.tst
125--- regression/nicklas1.tst     20 Sep 2005 20:12:13 -0000      1.56
126+++ regression/nicklas1.tst     20 Oct 2005 20:20:09 -0000
127@@ -1,6 +1,10 @@
128 # =============================
129 # Private test set nicklas1.tst
130 # All of these tests passes with version 2.7.222.
131+#
132+# Note: This is one of the oldest test files in GNU Go. Some of the
133+#       negative tests have been removed because a modern GNU Go
134+#       would never consider those moves.
135 # =============================
136 
137 # Reset applicable counters
138@@ -9,17 +13,20 @@
139 reset_reading_node_counter
140 reset_trymove_counter
141 
142-loadsgf games/nicklas/nicklas1.sgf 9
143-101 reg_genmove black
144-#? [!D9]
145-
146-loadsgf games/nicklas/nicklas2.sgf 5
147-201 reg_genmove black
148-#? [!G8|D8|F8]
149-
150-loadsgf games/nicklas/nicklas2.sgf 9
151-202 reg_genmove black
152-#? [!H8]
153+# # D9 is too weird to be considered anymore. Removed.
154+# loadsgf games/nicklas/nicklas1.sgf 9
155+# 101 reg_genmove black
156+# #? [!D9]
157+
158+# # No longer interesting.
159+# loadsgf games/nicklas/nicklas2.sgf 5
160+# 201 reg_genmove black
161+# #? [!G8|D8|F8]
162+
163+# # H8 is too weird to be considered anymore. Removed.
164+# loadsgf games/nicklas/nicklas2.sgf 9
165+# 202 reg_genmove black
166+# #? [!H8]
167 
168 #CATEGORY=OWL_TUNING
169 #DESCRIPTION=Combination threat to live / connect.
170@@ -64,21 +71,22 @@
171 801 reg_genmove black
172 #? [P16]
173 
174+# G2 destroys eyeshape but the semeai can't be won.
175 loadsgf games/nicklas/nicklas8.sgf 162
176-806 reg_genmove black
177-#? [!G2]
178+806 restricted_genmove black G2 D8
179+#? [D8]
180 
181 loadsgf games/nicklas/nicklas8.sgf 164
182-807 reg_genmove black
183-#? [!H1]
184+807 restricted_genmove black H1 J2
185+#? [J2]
186 
187 loadsgf games/nicklas/nicklas8.sgf 180
188-808 reg_genmove black
189-#? [!L2]
190+808 restricted_genmove black L2 N6
191+#? [N6]
192 
193 loadsgf games/nicklas/nicklas8.sgf 224
194-810 reg_genmove black
195-#? [!C19]
196+810 restricted_genmove black O7 C19
197+#? [O7]
198 
199 # Moved K15 to K14. /gf ; Added back K14 - both work.
200 #SEVERITY=7
201@@ -90,7 +98,7 @@
202 
203 loadsgf games/nicklas/nicklas9.sgf 28
204 901 reg_genmove black
205-#? [!PASS]
206+#? [H8]
207 
208 loadsgf games/nicklas/nicklas10.sgf 30
209 1002 reg_genmove black
210@@ -98,31 +106,32 @@
211 
212 loadsgf games/nicklas/nicklas10.sgf 56
213 1003 reg_genmove black
214-#? [!J6]
215+#? [B1]
216 
217+# A ko threat would have been appropriate, but none exists.
218 loadsgf games/nicklas/nicklas10.sgf 64
219 1004 reg_genmove black
220-#? [!J9]
221+#? [PASS]
222 
223 loadsgf games/nicklas/nicklas10.sgf 66
224 1005 reg_genmove black
225-#? [!H7]
226+#? [PASS]
227 
228 loadsgf games/nicklas/nicklas10.sgf 68
229 1006 reg_genmove black
230-#? [!J7]
231+#? [PASS]
232 
233 loadsgf games/nicklas/nicklas11.sgf 16
234-1101 reg_genmove black
235-#? [!D11]
236+1101 restricted_genmove black D11 C8
237+#? [C8]
238 
239 loadsgf games/nicklas/nicklas11.sgf 174
240-1104 reg_genmove black
241-#? [!A15]
242+1104 restricted_genmove black A15 C1
243+#? [C1]
244 
245 loadsgf games/nicklas/nicklas11.sgf 180
246-1105 reg_genmove black
247-#? [!H14]
248+1105 restricted_genmove black F2 H14
249+#? [F2]
250 
251 # Q6 seems largest but we may want to accept some more moves. The
252 # original formulation !F6 isn't very good since a one point reverse
253@@ -138,21 +147,19 @@
254 1107 reg_genmove black
255 #? [N2]*
256 
257-# Q18 is the proper move to finally settle the position, but not
258-# really necessary. Let's just make sure T18 isn't played. /gf
259+# Thrashing dragon. Q18 is cleanest but R18 and pass are also acceptable.
260 loadsgf games/nicklas/nicklas11.sgf 258
261 1108 reg_genmove black
262-#? [!T18]
263+#? [Q18|R18|PASS]
264 
265 loadsgf games/nicklas/nicklas11.sgf 260
266 1109 reg_genmove black
267-#? [!T13]
268+#? [Q18]
269 
270-# O18 is the proper move to finally settle the position, but not
271-# really necessary. Let's just make sure T15 isn't played. /gf
272+# Thrashing dragon. O18 is the only interesting restraining move.
273 loadsgf games/nicklas/nicklas11.sgf 268
274 1110 reg_genmove black
275-#? [!T15]
276+#? [O18|PASS]
277 
278 loadsgf games/nicklas/nicklas11.sgf 270
279 1111 reg_genmove black
280@@ -178,9 +185,10 @@
281 1208 reg_genmove black
282 #? [E19]
283 
284+# L19 isn't even close to living.
285 loadsgf games/nicklas/nicklas12.sgf 121
286-1209 reg_genmove black
287-#? [!L19]
288+1209 restricted_genmove black L19 B14
289+#? [B14]
290 
291 loadsgf games/nicklas/nicklas12.sgf 123
292 1210 dragon_status D18
293@@ -205,7 +213,7 @@
294 
295 loadsgf games/nicklas/nicklas13.sgf 57
296 1302 reg_genmove black
297-#? [!G8]
298+#? [J3]
299 
300 loadsgf games/nicklas/nicklas13.sgf 58
301 1303 dragon_status G8
302@@ -213,7 +221,7 @@
303 
304 loadsgf games/nicklas/nicklas13.sgf 73
305 1304 reg_genmove black
306-#? [!J8]
307+#? [PASS]
308 
309 loadsgf games/nicklas/nicklas14.sgf 51
310 1404 reg_genmove black
311@@ -230,35 +238,37 @@
312 
313 loadsgf games/nicklas/nicklas14.sgf 61
314 1408 dragon_status A8
315-#? [!dead]
316+#? [alive]
317 
318 loadsgf games/nicklas/nicklas15.sgf 196
319 1502 reg_genmove black
320 #? [D14]
321 
322 loadsgf games/nicklas/nicklas15.sgf 208
323-1504 reg_genmove black
324-#? [!F16]
325+1504 restricted_genmove black F16 D15
326+#? [D15]
327 
328 loadsgf games/nicklas/nicklas15.sgf 212
329 1505 reg_genmove black
330-#? [!O11]
331+#? [T14]
332 
333 loadsgf games/nicklas/nicklas15.sgf 224
334 1506 reg_genmove black
335 #? [S4]
336 
337-loadsgf games/nicklas/nicklas15.sgf 228
338-1507 reg_genmove black
339-#? [!T1]
340-
341-loadsgf games/nicklas/nicklas15.sgf 232
342-1508 reg_genmove black
343-#? [!F15]
344+# # This is virtually identical with 1506, let's skip it.
345+# loadsgf games/nicklas/nicklas15.sgf 228
346+# 1507 reg_genmove black
347+# #? [!T1]
348+
349+# # This one too.
350+# loadsgf games/nicklas/nicklas15.sgf 232
351+# 1508 reg_genmove black
352+# #? [!F15]
353 
354 loadsgf games/nicklas/nicklas15.sgf 258
355 1509 reg_genmove black
356-#? [!L1]
357+#? [T14]
358 
359 loadsgf games/nicklas/nicklas15.sgf 284
360 1510 reg_genmove black
361@@ -266,19 +276,19 @@
362 
363 loadsgf games/nicklas/nicklas15.sgf 296
364 1511 reg_genmove black
365-#? [!J1]
366+#? [PASS]
367 
368 loadsgf games/nicklas/nicklas15.sgf 298
369 1512 reg_genmove black
370-#? [!A1]
371+#? [PASS]
372 
373 loadsgf games/nicklas/nicklas16.sgf 22
374-1601 reg_genmove black
375-#? [!D9]
376+1601 restricted_genmove black D9 D7
377+#? [D7]
378 
379 loadsgf games/nicklas/nicklas16.sgf 28
380-1602 reg_genmove black
381-#? [!H8]
382+1602 restricted_genmove black H8 B8
383+#? [B8]
384 
385 # Missed connection. See also connection:26,27
386 loadsgf games/nicklas/nicklas16.sgf 38
387@@ -307,7 +317,7 @@
388 
389 loadsgf games/nicklas/nicklas19.sgf 46
390 1902 reg_genmove black
391-#? [!H4]
392+#? [B7]
393 
394 loadsgf games/nicklas/nicklas19.sgf 52
395 1903 reg_genmove black
396@@ -321,14 +331,15 @@
397 2001 reg_genmove black
398 #? [G5]
399 
400+# Is there any way to live in the upper right? If so that's probably better.
401 loadsgf games/nicklas/nicklas20.sgf 41
402 2002 reg_genmove black
403-#? [!H9]
404+#? [J5]
405 
406-# A slow move
407+# White is thrashing but E1 is not a very meaningful move.
408 loadsgf games/nicklas/nicklas21.sgf 52
409 2101 reg_genmove black
410-#? [!E1]
411+#? [PASS|A7|A5|D1|A6|G1]
412 
413 loadsgf games/nicklas/nicklas23.sgf 26
414 2301 reg_genmove black
415Index: regression/nicklas5.tst
416===================================================================
417RCS file: /cvsroot/gnugo/gnugo/regression/nicklas5.tst,v
418retrieving revision 1.30
419diff -u -r1.30 nicklas5.tst
420--- regression/nicklas5.tst     5 Nov 2003 19:05:17 -0000       1.30
421+++ regression/nicklas5.tst     20 Oct 2005 20:20:09 -0000
422@@ -26,8 +26,8 @@
423 
424 # Locally K18 is superior to L17.
425 loadsgf games/nicklas/nicklas12.sgf 69
426-1202 reg_genmove black
427-#? [!L17]
428+1202 restricted_genmove black K18 L17
429+#? [K18]
430 
431 # I guess K18, giving up the O17 stones and attacking H17 in exchange,
432 # is playable. /ab
433Index: regression/niki.tst
434===================================================================
435RCS file: /cvsroot/gnugo/gnugo/regression/niki.tst,v
436retrieving revision 1.23
437diff -u -r1.23 niki.tst
438--- regression/niki.tst 5 Nov 2003 19:05:17 -0000       1.23
439+++ regression/niki.tst 20 Oct 2005 20:20:09 -0000
440@@ -35,8 +35,8 @@
441 #? [S9|S10]*
442 
443 loadsgf games/niki.sgf 106
444-6 reg_genmove white
445-#? [!S18]
446+6 restricted_genmove white S18 P18
447+#? [P18]
448 
449 
450 #CATEGORY=PATTERN_TUNING
451Index: regression/strategy2.tst
452===================================================================
453RCS file: /cvsroot/gnugo/gnugo/regression/strategy2.tst,v
454retrieving revision 1.66
455diff -u -r1.66 strategy2.tst
456--- regression/strategy2.tst    20 Sep 2005 20:12:13 -0000      1.66
457+++ regression/strategy2.tst    20 Oct 2005 20:20:09 -0000
458@@ -29,8 +29,8 @@
459 #? [C12]*
460 
461 loadsgf games/strategy14.sgf 211
462-56 reg_genmove white
463-#? [!C9]
464+56 restricted_genmove white C9 A7
465+#? [A7]
466 
467 loadsgf games/strategy15.sgf 2
468 57 reg_genmove black
469@@ -58,14 +58,16 @@
470 #? [M2]
471 
472 # incident 169 (from the disastrous Indigo game)
473+# D6 is unreasonable. Test it against an arbitrary reasonable move.
474 loadsgf games/incident169.sgf 18
475-62 reg_genmove white
476-#? [!D6]
477+62 restricted_genmove white D6 H3
478+#? [H3]
479 
480 # incident 170 (from the disastrous Indigo game)
481+# E6 is unreasonable. Test it against an arbitrary reasonable move.
482 loadsgf games/incident169.sgf 32
483-63 reg_genmove white
484-#? [!E6]
485+63 restricted_genmove white E6 L6
486+#? [L6]
487 
488 # incident 171 (from the disastrous Indigo game)
489 loadsgf games/incident169.sgf 60
490@@ -249,21 +251,21 @@
491 
492 # The game move at P13 is a suicidal blunder.
493 loadsgf games/strategy25.sgf 249
494-95 reg_genmove black
495-#? [!P13]
496+95 restricted_genmove black P13 O15
497+#? [O15]
498 
499 loadsgf games/strategy26.sgf 195
500-96 reg_genmove black
501-#? [!(O1)]
502+96 restricted_genmove black J5 O1
503+#? [J5]
504 
505 loadsgf games/strategy26.sgf 209
506 97 reg_genmove black
507-#? [!(Q1|P2)]
508+#? [T8]
509 
510 # Under no circumstances play the snapback at Q1!
511 loadsgf games/strategy26.sgf 237
512-98 reg_genmove black
513-#? [!(Q1|S1|L5|N7)]
514+98 restricted_genmove black T6 Q1 S1 L5 N7
515+#? [T6]
516 
517 # It's pointless to play L5 in order to tactically save Q2. We need to
518 # classify the Q2 dragon as inessential.
519Index: regression/viking.tst
520===================================================================
521RCS file: /cvsroot/gnugo/gnugo/regression/viking.tst,v
522retrieving revision 1.32
523diff -u -r1.32 viking.tst
524--- regression/viking.tst       20 Jan 2005 19:04:34 -0000      1.32
525+++ regression/viking.tst       20 Oct 2005 20:20:09 -0000
526@@ -27,13 +27,13 @@
527 
528 # Locally S5 is the only move.
529 loadsgf games/viking3.sgf 79
530-7 reg_genmove white
531-#? [!T7]
532+7 restricted_genmove white T8 T7 S7 R7 T6 T5 S5 T4 T3 T2 T1 S1
533+#? [S5]
534 
535 # A1 is of course inferior to B3
536 loadsgf games/viking3.sgf 93
537-8 reg_genmove white
538-#? [!A1]
539+8 restricted_genmove white B3 A1
540+#? [B3]
541 
542 # The position cries out for a move at J13.
543 loadsgf games/viking3.sgf 103
544@@ -45,9 +45,10 @@
545 10 reg_genmove white
546 #? [K16]
547 
548+# G19 is a very odd move.
549 loadsgf games/viking3.sgf 113
550-11 reg_genmove white
551-#? [!G19]
552+11 restricted_genmove white G19 J17
553+#? [J17]
554 
555 loadsgf games/viking3.sgf 137
556 12 reg_genmove white