Version 1.4.0 (#8)

* changing from a hard move limit to a limit of 40 moves without a capture

* adding test instructions to readme

* personalizing our mit license

* formatting

* version bump

Author: janhartigan

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2018 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2018 ImparaAI https://impara.ai
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

checkers/board.py

@@ -13,6 +13,7 @@ def __init__(self):
 		self.rows_per_user_with_pieces = 3
 		self.position_layout = {}
 		self.piece_requiring_further_capture_moves = None
+		self.previous_move_was_capture = False
 		self.searcher = BoardSearcher()
 		BoardInitializer(self).initialize()
 
@@ -44,6 +45,7 @@ def create_new_board_from_move(self, move):
 		return new_board
 
 	def perform_capture_move(self, move):
+		self.previous_move_was_capture = True
 		piece = self.searcher.get_piece_by_position(move[0])
 		originally_was_king = piece.king
 		enemy_piece = piece.capture_move_enemies[move[1]]
@@ -58,6 +60,7 @@ def perform_capture_move(self, move):
 			self.switch_turn()
 
 	def perform_positional_move(self, move):
+		self.previous_move_was_capture = False
 		self.move_piece(move)
 		self.switch_turn()
 

checkers/game.py

@@ -5,19 +5,21 @@ class Game:
 	def __init__(self):
 		self.board = Board()
 		self.moves = []
-		self.move_limit = 50
+		self.consecutive_noncapture_move_limit = 40
+		self.moves_since_last_capture = 0
 
 	def move(self, move):
 		if move not in self.get_possible_moves():
 			raise ValueError('The provided move is not possible')
 
 		self.board = self.board.create_new_board_from_move(move)
 		self.moves.append(move)
+		self.moves_since_last_capture = 0 if self.board.previous_move_was_capture else self.moves_since_last_capture + 1
 
 		return self
 
 	def move_limit_reached(self):
-		return len(self.moves) >= self.move_limit
+		return self.moves_since_last_capture >= self.consecutive_noncapture_move_limit
 
 	def is_over(self):
 		return self.move_limit_reached() or not self.get_possible_moves()

readme.md

@@ -1,6 +1,6 @@
 A Python3 library that you can use to play a game of checkers/draughts. This is just a set of classes that you can use in your code, it's not an interactive shell checkersgame.
 
-- **Version:** 1.3.0
+- **Version:** 1.4.0
 
 [![Build Status](https://travis-ci.org/ImparaAI/checkers.png?branch=master)](https://travis-ci.org/ImparaAI/checkers)
 
@@ -58,11 +58,10 @@ Review the move history:
 game.moves #[[int, int], [int, int], ...]
 ```
 
-Set a move limit and see if it's overrun:
+Change the consecutive noncapture move limit (default `40` according to the [rules](http://www.usacheckers.com/rulesofcheckers.php)):
 
 ```python
-game = Game()
-game.move_limit = 100
+game.consecutive_noncapture_move_limit = 20
 game.move_limit_reached() #True or False
 ```
 
@@ -77,4 +76,8 @@ for piece in game.board.pieces:
 	piece.position #1-32
 	piece.get_possible_capture_moves() #[[int, int], [int, int], ...]
 	piece.get_possible_positional_moves() #[[int, int], [int, int], ...]
-```
+```
+
+# Testing
+
+Run `python3 -m unittest discover` from the root.

setup.py

@@ -4,17 +4,17 @@
     long_description = fh.read()
 
 setuptools.setup(
-    name="imparaai-checkers",
-    version="1.3.0",
-    license='MIT',
-    author="ImparaAI",
-    author_email="author@example.com",
-    description="Library for playing a standard game of checkers/draughts",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/ImparaAI/checkers",
-    packages=setuptools.find_packages(),
-    classifiers=[
+    name = "imparaai-checkers",
+    version = "1.4.0",
+    license = 'MIT',
+    author = "ImparaAI",
+    author_email = "author@example.com",
+    description = "Library for playing a standard game of checkers/draughts",
+    long_description = long_description,
+    long_description_content_type = "text/markdown",
+    url = "https://github.com/ImparaAI/checkers",
+    packages = setuptools.find_packages(),
+    classifiers = [
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",

test/test_game_over.py

@@ -12,27 +12,31 @@ def test_new_game_not_over(self):
 		self.expect(False)
 
 	def test_win_by_capture(self):
-		self.make_non_winning_moves([[10, 14], [23, 18], [14, 23], [26, 19], [11, 15], [19, 10], [6, 15], [22, 18], [15, 22], [25, 18], [9, 13], [21, 17], [13, 22],
+		self.make_non_final_moves([[10, 14], [23, 18], [14, 23], [26, 19], [11, 15], [19, 10], [6, 15], [22, 18], [15, 22], [25, 18], [9, 13], [21, 17], [13, 22],
 			[31, 26], [22, 31], [24, 19], [31, 24], [24, 15], [15, 22], [29, 25], [22, 29], [30, 25], [29, 22], [28, 24], [12, 16], [32, 27], [16, 20], [27, 23],
 			[20, 27], [23, 18]])
 
 		self.move([22, 15]).expect(True)
 
 	def test_win_by_no_legal_moves(self):
-		self.make_non_winning_moves([[11, 15], [22, 18], [15, 22], [25, 18], [12, 16], [18, 14], [9, 18], [23, 14], [10, 17], [21, 14], [5, 9], [14, 5], [6, 9],
+		self.make_non_final_moves([[11, 15], [22, 18], [15, 22], [25, 18], [12, 16], [18, 14], [9, 18], [23, 14], [10, 17], [21, 14], [5, 9], [14, 5], [6, 9],
 			[29, 25], [9, 13], [25, 22], [2, 6], [22, 18], [13, 17], [27, 23], [17, 21], [24, 19], [8, 12], [30, 25], [21, 30], [28, 24], [4, 8], [18, 14], [6, 10],
 			[32, 27], [10, 17], [23, 18], [16, 23], [23, 32], [24, 19], [30, 23], [23, 14], [31, 27], [32, 23]])
 
 		self.move([23, 16]).expect(True)
 
 	def test_move_limit_draw(self):
-		self.game.move_limit = 15
-		self.make_non_winning_moves([[9, 13], [22, 17], [13, 22], [26, 17], [10, 14], [17, 10], [7, 14], [23, 18], [14, 23], [27, 18], [12, 16], [18, 15], [11, 18],
-			[25, 22]])
+		self.make_non_final_moves([[10, 14], [22, 17], [9, 13], [17, 10], [7, 14], [25, 22], [6, 10], [29, 25], [1, 6], [22, 18], [6, 9], [24, 19], [2, 6], [28, 24],
+			[11, 16], [24, 20], [8, 11], [32, 28], [4, 8], [27, 24], [3, 7], [31, 27], [13, 17], [25, 22], [9, 13], [18, 9], [9, 2], [10, 14], [22, 18], [5, 9], [19, 15],
+			[16, 19], [23, 16], [12, 19], [30, 25], [14, 23], [23, 32], [21, 14], [14, 5], [11, 18], [2, 11], [11, 4], [19, 23], [26, 19], [13, 17], [25, 21], [17, 22],
+			[21, 17], [22, 25], [17, 14], [18, 22], [5, 1], [22, 26], [4, 8], [26, 31], [19, 15], [25, 30], [8, 11], [31, 26], [1, 6], [26, 23], [24, 19], [23, 16],
+			[16, 7], [14, 10], [7, 14], [15, 10], [14, 7], [28, 24], [32, 28], [20, 16], [28, 19], [19, 12], [6, 9], [7, 10], [9, 13], [10, 7], [13, 9], [7, 3], [9, 6],
+			[3, 7], [6, 1], [7, 11], [1, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11],
+			[9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6]])
 
-		self.move([18, 25]).expect(True)
+		self.move([11, 8]).expect(True)
 
-	def make_non_winning_moves(self, moves):
+	def make_non_final_moves(self, moves):
 		for move in moves:
 			self.move(move).expect(False)
 

test/test_winner.py

@@ -29,9 +29,13 @@ def test_win_by_no_legal_moves(self):
 		self.move([23, 16]).expect(1)
 
 	def test_draw(self):
-		self.game.move_limit = 15
-		self.make_non_winning_moves([[9, 13], [22, 17], [13, 22], [26, 17], [10, 14], [17, 10], [7, 14], [23, 18], [14, 23], [27, 18], [12, 16], [18, 15], [11, 18],
-			[25, 22], [18, 25]])
+		self.make_non_winning_moves([[10, 14], [22, 17], [9, 13], [17, 10], [7, 14], [25, 22], [6, 10], [29, 25], [1, 6], [22, 18], [6, 9], [24, 19], [2, 6], [28, 24],
+			[11, 16], [24, 20], [8, 11], [32, 28], [4, 8], [27, 24], [3, 7], [31, 27], [13, 17], [25, 22], [9, 13], [18, 9], [9, 2], [10, 14], [22, 18], [5, 9], [19, 15],
+			[16, 19], [23, 16], [12, 19], [30, 25], [14, 23], [23, 32], [21, 14], [14, 5], [11, 18], [2, 11], [11, 4], [19, 23], [26, 19], [13, 17], [25, 21], [17, 22],
+			[21, 17], [22, 25], [17, 14], [18, 22], [5, 1], [22, 26], [4, 8], [26, 31], [19, 15], [25, 30], [8, 11], [31, 26], [1, 6], [26, 23], [24, 19], [23, 16],
+			[16, 7], [14, 10], [7, 14], [15, 10], [14, 7], [28, 24], [32, 28], [20, 16], [28, 19], [19, 12], [6, 9], [7, 10], [9, 13], [10, 7], [13, 9], [7, 3], [9, 6],
+			[3, 7], [6, 1], [7, 11], [1, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11],
+			[9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8], [6, 9], [8, 11], [9, 6], [11, 8]])
 
 	def make_non_winning_moves(self, moves):
 		for move in moves: