Add detailed board information; add captured move

fdomig · fdomig · commit fb90a70e3a73 · 2016-03-17T22:33:56.000+01:00
diff --git a/engine/board.go b/engine/board.go
@@ -250,10 +250,20 @@ 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++ {
-			s += fmt.Sprintf("%s  ", symbol(b.data[square(rank, 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"
@@ -262,6 +272,31 @@ func (b *Board) String() string {
 			}
 			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 := ""
diff --git a/engine/generator.go b/engine/generator.go
@@ -1,5 +1,7 @@
 package engine
 
+import "fmt"
+
 var (
 	nextRank int8 = 16
 	nextFile int8 = 1
@@ -55,6 +57,7 @@ type Generator struct {
 	board                  *Board
 	legalEnding            []bool
 	legalDelta             []int8
+	lastMoveSquare         Square
 	moves                  []Move
 	kingSquare             int8
 	kingUnderCheck         bool
@@ -186,9 +189,14 @@ func (g *Generator) reset() {
 
 	g.legalEnding = make([]bool, boardSize)
 	g.legalDelta = make([]int8, boardSize)
+
+	if len(g.board.history) > 0 {
+		g.lastMoveSquare = g.board.history[len(g.board.history)-1].move.To
+	}
 }
 
 func (g *Generator) sortMoves() {
+	lastCapture := make([]Move, 0, len(g.moves))
 	sorted := make([]Move, 0, len(g.moves))
 	captured := make([]Move, 0, len(g.moves))
 	promotions := make([]Move, 0, len(g.moves))
@@ -197,6 +205,8 @@ func (g *Generator) sortMoves() {
 
 	for _, move := range g.moves {
 		switch {
+		case move.To == g.lastMoveSquare:
+			lastCapture = append(lastCapture, move)
 		case move.Content != Empty:
 			captured = append(captured, move)
 		case move.Special == movePromotion:
@@ -208,7 +218,8 @@ func (g *Generator) sortMoves() {
 		}
 	}
 
-	// TODO 1. last moved piece capture
+	// 1. last moved piece capture
+	sorted = append(sorted, lastCapture...)
 
 	// 2. capture moves
 	sorted = append(sorted, captured...)
@@ -223,6 +234,7 @@ func (g *Generator) sortMoves() {
 	sorted = append(sorted, ordinary...)
 
 	if len(sorted) != len(g.moves) {
+		fmt.Printf("len(g.moves): %d, len(sorted): %d\n", len(g.moves), len(sorted))
 		panic("Sorted moves are missing moves!")
 	}
 
