From 7235cd906f0d3e30c1935392bce8418c9855773d Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 24 Feb 2021 21:45:33 -0500 Subject: [PATCH] Rename valid_position() -> position_valid(). --- src/pegp/board.d | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/pegp/board.d b/src/pegp/board.d index 87f7789..97031a9 100644 --- a/src/pegp/board.d +++ b/src/pegp/board.d @@ -55,14 +55,14 @@ class Board return (row * (row + 1)) / 2 + col; } - bool valid_position(int row, int col) + bool position_valid(int row, int col) { return (row >= 0) && (row < m_size) && (col >= 0) && (col <= row); } - bool valid_position(Position p) + bool position_valid(Position p) { - return valid_position(p.row, p.col); + return position_valid(p.row, p.col); } bool peg_present(int row, int col) @@ -78,18 +78,18 @@ class Board unittest { Board b = new Board(5); - assert(b.valid_position(Position(0, 0))); - assert(b.valid_position(4, 0)); - assert(b.valid_position(4, 4)); - assert(b.valid_position(2, 2)); - assert(b.valid_position(3, 1)); - assert(!b.valid_position(0, 1)); - assert(!b.valid_position(0, -1)); - assert(!b.valid_position(5, 0)); - assert(!b.valid_position(5, 4)); - assert(!b.valid_position(4, 5)); - assert(!b.valid_position(2, 3)); - assert(!b.valid_position(0, 4)); + assert(b.position_valid(Position(0, 0))); + assert(b.position_valid(4, 0)); + assert(b.position_valid(4, 4)); + assert(b.position_valid(2, 2)); + assert(b.position_valid(3, 1)); + assert(!b.position_valid(0, 1)); + assert(!b.position_valid(0, -1)); + assert(!b.position_valid(5, 0)); + assert(!b.position_valid(5, 4)); + assert(!b.position_valid(4, 5)); + assert(!b.position_valid(2, 3)); + assert(!b.position_valid(0, 4)); assert(b.peg_present(1, 0)); assert(b.peg_present(Position(1, 1))); @@ -109,17 +109,17 @@ class Board assert(s.move(Direction.E, 2) == Position(2, 3)); assert(s.move(Direction.SW, 2) == Position(4, 1)); assert(s.move(Direction.SE, 2) == Position(4, 3)); - assert(b.valid_position(s.move(Direction.NW))); - assert(b.valid_position(s.move(Direction.NE))); - assert(b.valid_position(s.move(Direction.W))); - assert(b.valid_position(s.move(Direction.E))); - assert(b.valid_position(s.move(Direction.SW))); - assert(b.valid_position(s.move(Direction.SE))); - assert(!b.valid_position(s.move(Direction.NW, 2))); - assert(!b.valid_position(s.move(Direction.NE, 2))); - assert(!b.valid_position(s.move(Direction.W, 2))); - assert(!b.valid_position(s.move(Direction.E, 2))); - assert(b.valid_position(s.move(Direction.SW, 2))); - assert(b.valid_position(s.move(Direction.SE, 2))); + assert(b.position_valid(s.move(Direction.NW))); + assert(b.position_valid(s.move(Direction.NE))); + assert(b.position_valid(s.move(Direction.W))); + assert(b.position_valid(s.move(Direction.E))); + assert(b.position_valid(s.move(Direction.SW))); + assert(b.position_valid(s.move(Direction.SE))); + assert(!b.position_valid(s.move(Direction.NW, 2))); + assert(!b.position_valid(s.move(Direction.NE, 2))); + assert(!b.position_valid(s.move(Direction.W, 2))); + assert(!b.position_valid(s.move(Direction.E, 2))); + assert(b.position_valid(s.move(Direction.SW, 2))); + assert(b.position_valid(s.move(Direction.SE, 2))); } }