Merge pull request niklasf#165 from Mk-Chan/master

niklasf · web-flow · commit d681e2eeb80d · 2017-09-12T18:06:09.000+02:00
Added stop() command and removed buggy option testing
diff --git a/.travis.yml b/.travis.yml
@@ -37,12 +37,6 @@ before_install:
  - make unix-gcc
  - export PATH="`pwd`:${PATH}"
  - cd ..
- - # WyldChess
- - git clone https://github.com/Mk-Chan/WyldChess
- - cd WyldChess/src
- - make
- - export PATH="`pwd`:${PATH}"
- - cd ../..
  - # Gaviota libgtb
  - git clone https://github.com/michiguel/Gaviota-Tablebases.git --depth 1
  - cd Gaviota-Tablebases
diff --git a/chess/xboard.py b/chess/xboard.py
@@ -875,6 +875,36 @@ def command():
 
         return self._queue_command(command, async_callback)
 
+    def stop(self, async_callback=None):
+        """
+        Stop calculating as soon as possible. The actual XBoard command is `?`.
+
+        :return: Nothing.
+        """
+        # Only send stop when the engine is actually searching.
+        def command():
+            with self.semaphore:
+                with self.state_changed:
+                    if not self.idle:
+                        self.search_started.wait()
+
+                    backoff = 0.5
+                    while not self.move_received.is_set() and not self.terminated.is_set():
+                        if self.idle:
+                            break
+                        else:
+                            self.send_line("?")
+                        self.move_received.wait(backoff)
+                        backoff *= 2
+
+                    self.idle = True
+                    self.state_changed.notify_all()
+
+                if self.terminated.is_set():
+                    raise EngineTerminatedException()
+
+        return self._queue_command(command, async_callback)
+
     def usermove(self, move, async_callback=None):
         """
         Tell the XBoard engine to make a move on it's internal
diff --git a/test.py b/test.py
@@ -2148,30 +2148,6 @@ def test_wierd_header(self):
         self.assertEqual(game.headers["Black"], "[=0040.34h5a4]")
 
 
-class WyldTestCase(unittest.TestCase):
-
-    def setUp(self):
-        try:
-            self.engine = chess.xboard.popen_engine("wyldchess")
-        except OSError:
-            self.skipTest("need wyldchess")
-
-        self.engine.xboard()
-
-    def tearDown(self):
-        self.engine.quit()
-
-    def test_options(self):
-        self.engine.new()
-        self.engine.st(2)
-        self.engine.sd(100)
-        option_dict = { "MoveOverhead" : 1900 };
-        self.engine.option(option_dict)
-        self.engine.go(async_callback=True)
-        time.sleep(0.2)
-        self.assertTrue(self.engine.idle, True)
-
-
 class CraftyTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -2191,6 +2167,13 @@ def test_level(self):
         self.engine.level(1, 0, 1, 0)
         self.engine.go()
 
+    def test_stop(self):
+        self.engine.new()
+        self.engine.time(1000000)
+        self.engine.go(async_callback=True)
+        time.sleep(0.1)
+        self.engine.stop()
+
     def test_time(self):
         self.engine.new()
         self.engine.level(0, 1, 0, 0)
