Add formatBoard; remove String representation for Board

fdomig · fdomig · commit bc724bda6a9e · 2016-04-02T00:05:39.000+02:00
diff --git a/engine/board.go b/engine/board.go
@@ -323,80 +323,3 @@ func (b *Board) generateHash() int64 {
 
 	return key
 }
-
-func (b *Board) String() string {
-	files := "   a  b  c  d  e  f  g  h"
-	str := fmt.Sprintf("%s\n", files)
-
-	lastMoveSquare := Invalid
-
-	if len(b.history) > 0 {
-		lastMoveSquare = b.history[len(b.history)-1].move.To
-	}
-
-	for rank := int8(7); rank >= 0; rank-- {
-		var s = fmt.Sprintf("%d  ", rank+1)
-		for file := int8(0); file < 8; file++ {
-			moved := " "
-			if square(rank, file) == int8(lastMoveSquare) {
-				moved = "*"
-			}
-			s += fmt.Sprintf("%s%s ", symbol(b.data[square(rank, file)]), moved)
-		}
-		if rank == 4 {
-			color := "white"
-			if b.sideToMove == Black {
-				color = "black"
-			}
-			s += fmt.Sprintf("\t(%d) %s's move", b.fullMoves, color)
-		}
-		if rank == 3 {
-			c := ""
-			if b.whiteCastle&castleShort != 0 {
-				c += "K"
-			}
-			if b.whiteCastle&castleLong != 0 {
-				c += "Q"
-			}
-			if b.blackCastle&castleShort != 0 {
-				c += "k"
-			}
-			if b.blackCastle&castleLong != 0 {
-				c += "q"
-			}
-			if len(c) == 0 {
-				c = "-"
-			}
-			s += fmt.Sprintf("\tCasteling: %s", c)
-		}
-		if rank == 2 {
-			gen := NewGenerator(b)
-			if gen.CheckSimple() {
-				s += fmt.Sprintf("\tCheck!")
-			}
-		}
-		str += fmt.Sprintf("%s\n", s)
-	}
-	lastMove := ""
-	if len(b.history) > 0 {
-		lastMove = b.history[len(b.history)-1].move.String()
-	}
-	str += fmt.Sprintf("%s\t%s\t", files, lastMove)
-
-	switch b.status {
-	case statusCheck:
-		str += "Check!"
-	case statusDraw:
-		str += "Draw!"
-	case statusWhiteMates:
-		str += "Mate! White wins."
-	case statusBlackMates:
-		str += "Mate! Black wins."
-	case statusStaleMate:
-		str += "Stale mate!"
-	}
-
-	str += "\n"
-
-	return str
-}
diff --git a/engine/game.go b/engine/game.go
@@ -56,22 +56,22 @@ func (g *Game) Run() {
 			g.board = NewBoard(in[4:])
 
 		} else if in == "print" || in == "p" {
-			fmt.Printf("%s\n", g.board.String())
+			fmt.Printf("%s\n", formatBoard(g.board))
 
 		} else if in == "search" || in == "s" {
 			Search(g.board)
 
 		} else if in == "do" || in == "d" {
 			g.board.MakeMove(Search(g.board))
-			fmt.Printf("%s\n", g.board.String())
+			fmt.Printf("%s\n", formatBoard(g.board))
 
 		} else if in == "eval" || in == "e" {
 			fmt.Printf("Score: %d\n", Evaluate(g.board))
 
 		} else if in == "auto" || in == "a" {
 			for g.board.status == statusNormal {
 				g.board.MakeMove(Search(g.board))
-				fmt.Printf("%s\n", g.board.String())
+				fmt.Printf("%s\n", formatBoard(g.board))
 			}
 
 		} else if m, err := createMove(in); err == nil {
diff --git a/engine/search.go b/engine/search.go
@@ -1,9 +1,6 @@
 package engine
 
-import (
-	"fmt"
-	"time"
-)
+import "time"
 
 var (
 	searchVerbose = true
@@ -98,7 +95,6 @@ func (pv *pvSearch) alphaBeta(depth, alpha, beta int) int {
 
 	// TODO: index out of range
 	if len(pv.pathLength) <= pv.board.ply {
-		fmt.Printf("len(pv.PathLength): %d, pv.board.ply: %d\n", len(pv.pathLength), pv.board.ply)
 		return 0
 	}
 	pv.pathLength[pv.board.ply] = pv.board.ply
@@ -184,12 +180,6 @@ func (pv *pvSearch) quiescence(alpha, beta int) int {
 		}
 	}
 
-	if pv.board.ply >= len(pv.pathLength) {
-		fmt.Printf("%s\n\nalpha: %d, beta: %d\n", pv.board.String(), alpha, beta)
-
-		return 0
-	}
-
 	pv.pathLength[pv.board.ply] = pv.board.ply
 
 	eval := Evaluate(pv.board)
diff --git a/engine/util.go b/engine/util.go
@@ -121,6 +121,83 @@ func formatNodesCount(nodes int64) string {
 	return fmt.Sprintf("%.2fM", float64(nodes)/1000000)
 }
 
+func formatBoard(b *Board) string {
+	files := "   a  b  c  d  e  f  g  h"
+	str := fmt.Sprintf("%s\n", files)
+
+	lastMoveSquare := Invalid
+
+	if len(b.history) > 0 {
+		lastMoveSquare = b.history[len(b.history)-1].move.To
+	}
+
+	for rank := int8(7); rank >= 0; rank-- {
+		var s = fmt.Sprintf("%d  ", rank+1)
+		for file := int8(0); file < 8; file++ {
+			moved := " "
+			if square(rank, file) == int8(lastMoveSquare) {
+				moved = "*"
+			}
+			s += fmt.Sprintf("%s%s ", symbol(b.data[square(rank, file)]), moved)
+		}
+		if rank == 4 {
+			color := "white"
+			if b.sideToMove == Black {
+				color = "black"
+			}
+			s += fmt.Sprintf("\t(%d) %s's move", b.fullMoves, color)
+		}
+		if rank == 3 {
+			c := ""
+			if b.whiteCastle&castleShort != 0 {
+				c += "K"
+			}
+			if b.whiteCastle&castleLong != 0 {
+				c += "Q"
+			}
+			if b.blackCastle&castleShort != 0 {
+				c += "k"
+			}
+			if b.blackCastle&castleLong != 0 {
+				c += "q"
+			}
+			if len(c) == 0 {
+				c = "-"
+			}
+			s += fmt.Sprintf("\tCasteling: %s", c)
+		}
+		if rank == 2 {
+			gen := NewGenerator(b)
+			if gen.CheckSimple() {
+				s += fmt.Sprintf("\tCheck!")
+			}
+		}
+		str += fmt.Sprintf("%s\n", s)
+	}
+	lastMove := ""
+	if len(b.history) > 0 {
+		lastMove = b.history[len(b.history)-1].move.String()
+	}
+	str += fmt.Sprintf("%s\t%s\t", files, lastMove)
+
+	switch b.status {
+	case statusCheck:
+		str += "Check!"
+	case statusDraw:
+		str += "Draw!"
+	case statusWhiteMates:
+		str += "Mate! White wins."
+	case statusBlackMates:
+		str += "Mate! Black wins."
+	case statusStaleMate:
+		str += "Stale mate!"
+	}
+
+	str += "\n"
+
+	return str
+}
+
 func abs(v int8) int8 {
 	if v >= 0 {
 		return v
