From 2d9d1ff9455401157b05b8179e6d1514c6cf3513 Mon Sep 17 00:00:00 2001
From: rtz19970824 <rtz19970824@gmail.com>
Date: Tue, 5 Dec 2017 23:42:18 +0800
Subject: [PATCH] minor fixed

---
 AlphaGo/self-play.py |  13 +++--
 AlphaGo/test.py      | 123 -------------------------------------------
 2 files changed, 9 insertions(+), 127 deletions(-)

diff --git a/AlphaGo/self-play.py b/AlphaGo/self-play.py
index bdbb1c1..4609004 100644
--- a/AlphaGo/self-play.py
+++ b/AlphaGo/self-play.py
@@ -1,5 +1,6 @@
 from game import Game
 from engine import GTPEngine
+import re
 
 g = Game()
 
@@ -12,15 +13,19 @@ black_pass = False
 white_pass = False
 while not (black_pass and white_pass):
     if num % 2 == 0:
-        res=e.run_cmd("genmove BLACK")[0]
+        res = e.run_cmd(str(num) + " genmove BLACK")
         num += 1
         print(res)
-        if res == (0,0):
+        if re.search("pass", res) is not None:
             black_pass = True
+        else:
+            black_pass = False
     else:
-        res = e.run_cmd("genmove WHITE")[0]
+        res = e.run_cmd(str(num) + " genmove WHITE")
         num += 1
         print(res)
-        if res == (0, 0):
+        if re.search("pass", res) is not None:
             white_pass = True
+        else:
+            white_pass = False
     g.show_board()
diff --git a/AlphaGo/test.py b/AlphaGo/test.py
index b916bf8..ceebd83 100644
--- a/AlphaGo/test.py
+++ b/AlphaGo/test.py
@@ -6,129 +6,6 @@ import utils
 
 g = Game()
 e = GTPEngine(game_obj = g)
-res = e.run_cmd('1 protocol_version')
-print(e.known_commands)
-print(res)
-
-res = e.run_cmd('2 name')
-print(res)
-
-res = e.run_cmd('3 known_command quit')
-print(res)
-
-res = e.run_cmd('4 unknown_command quitagain')
-print(res)
-
-res = e.run_cmd('5 list_commands')
-print(res)
-
-res = e.run_cmd('6 komi 6')
-print(res)
-
-res = e.run_cmd('7 play BLACK C3')
-print(res)
-
-res = e.run_cmd('play BLACK C4')
-res = e.run_cmd('play BLACK C5')
-res = e.run_cmd('play BLACK C6')
-res = e.run_cmd('play BLACK D3')
-print(res)
 
 res = e.run_cmd('8 genmove BLACK')
 print(res)
-
-#g.show_board()
-print(g.check_valid((10, 9)))
-print(g.executor._neighbor((1,1)))
-print(g.do_move(utils.WHITE, (4, 6)))
-#g.show_board()
-
-
-res = e.run_cmd('play BLACK L10')
-res = e.run_cmd('play BLACK L11')
-res = e.run_cmd('play BLACK L12')
-res = e.run_cmd('play BLACK L13')
-res = e.run_cmd('play BLACK L14')
-res = e.run_cmd('play BLACK m15')
-res = e.run_cmd('play BLACK m9')
-res = e.run_cmd('play BLACK C9')
-res = e.run_cmd('play BLACK D9')
-res = e.run_cmd('play BLACK E9')
-res = e.run_cmd('play BLACK F9')
-res = e.run_cmd('play BLACK G9')
-res = e.run_cmd('play BLACK H9')
-res = e.run_cmd('play BLACK I9')
-
-res = e.run_cmd('play BLACK N9')
-res = e.run_cmd('play BLACK N15')
-res = e.run_cmd('play BLACK O10')
-res = e.run_cmd('play BLACK O11')
-res = e.run_cmd('play BLACK O12')
-res = e.run_cmd('play BLACK O13')
-res = e.run_cmd('play BLACK O14')
-res = e.run_cmd('play BLACK M12')
-
-res = e.run_cmd('play WHITE M10')
-res = e.run_cmd('play WHITE M11')
-res = e.run_cmd('play WHITE N10')
-res = e.run_cmd('play WHITE N11')
-
-res = e.run_cmd('play WHITE M13')
-res = e.run_cmd('play WHITE M14')
-res = e.run_cmd('play WHITE N13')
-res = e.run_cmd('play WHITE N14')
-print(res)
-
-res = e.run_cmd('play BLACK N12')
-print(res)
-#g.show_board()
-
-res = e.run_cmd('play BLACK P16')
-res = e.run_cmd('play BLACK P17')
-res = e.run_cmd('play BLACK P18')
-res = e.run_cmd('play BLACK P19')
-res = e.run_cmd('play BLACK Q16')
-res = e.run_cmd('play BLACK R16')
-res = e.run_cmd('play BLACK S16')
-
-res = e.run_cmd('play WHITE S18')
-res = e.run_cmd('play WHITE S17')
-res = e.run_cmd('play WHITE Q19')
-res = e.run_cmd('play WHITE Q18')
-res = e.run_cmd('play WHITE Q17')
-res = e.run_cmd('play WHITE R18')
-res = e.run_cmd('play WHITE R17')
-res = e.run_cmd('play BLACK S19')
-print(res)
-#g.show_board()
-
-res = e.run_cmd('play WHITE R19')
-g.show_board()
-
-res = e.run_cmd('play BLACK S19')
-print(res)
-g.show_board()
-
-res = e.run_cmd('play BLACK S19')
-print(res)
-
-
-res = e.run_cmd('play BLACK E17')
-res = e.run_cmd('play BLACK F16')
-res = e.run_cmd('play BLACK F18')
-res = e.run_cmd('play BLACK G17')
-res = e.run_cmd('play WHITE G16')
-res = e.run_cmd('play WHITE G18')
-res = e.run_cmd('play WHITE H17')
-g.show_board()
-
-res = e.run_cmd('play WHITE F17')
-g.show_board()
-
-res = e.run_cmd('play BLACK G17')
-print(res)
-g.show_board()
-
-res = e.run_cmd('play BLACK G19')
-res = e.run_cmd('play BLACK G17')
-g.show_board()
\ No newline at end of file