carokanns
diff --git a/‎.vscode/settings.json‎
Lines changed: 2 additions & 0 deletions b/‎.vscode/settings.json‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎castlings.go‎
Lines changed: 18 additions & 7 deletions b/‎castlings.go‎
Lines changed: 18 additions & 7 deletions
diff --git a/‎magic.go‎
Lines changed: 7 additions & 8 deletions b/‎magic.go‎
Lines changed: 7 additions & 8 deletions
diff --git a/‎main.go‎
Lines changed: 1 addition & 0 deletions b/‎main.go‎
Lines changed: 1 addition & 0 deletions
@@ -12,6 +12,8 @@
     "See_c": true,
     "_config.yml": true,
     "diverese": true,
+    "pm.txt": true,
+    "engine-interface.txt": true,
     ".gitignore": true
   },
   "cSpell.words": [
 
@@ -9,18 +9,29 @@ const (
 	longW  = uint(0x2) // white can castle long
 	shortB = uint(0x4) // black can castle short
 	longB  = uint(0x8) // black can castle short
+
+	// squares between rook and king
+	betweenWSh = bitBoard(uint64(1)<<G1) | bitBoard(uint64(1)<<F1)
+	betweenWL  = bitBoard(uint64(1)<<B1) | bitBoard(uint64(1)<<C1) | bitBoard(uint64(1)<<D1)
+	betweenBSh = bitBoard(uint64(1)<<G8) | bitBoard(uint64(1)<<F8)
+	betweenBL  = bitBoard(uint64(1)<<B8) | bitBoard(uint64(1)<<C8) | bitBoard(uint64(1)<<D8)
 )
 
 type castlOptions struct {
-	short    uint
-	long     uint
-	rook	int
-	king    int
-	rookSh   uint
-	rookLong uint
+	short     uint
+	long      uint
+	rook      int
+	king      int
+	rookPosSh uint
+	rookPosL  uint
+	betweenSh bitBoard
+	betweenL  bitBoard
 }
 
-var castl = [2]castlOptions{{shortW, longW, wR,E1, H1, A1}, {shortB, longB,bR, E8, H8, A8}}
+var castl = [2]castlOptions{
+	{shortW, longW, wR, E1, H1, A1, betweenWSh, betweenWL},
+	{shortB, longB, bR, E8, H8, A8, betweenBSh, betweenBL},
+}
 
 // only castling privileges (not if it is legal on board)
 func (c castlings) canCastle(sd color) bool {
 
@@ -14,14 +14,14 @@ var mRookTab [64]sMagic
 
 // all attacks from current square
 func (m *sMagic) atks(b *boardStruct) bitBoard {
-	return m.toSqBB[int(((b.allBB() & m.innerBB)*bitBoard(m.magic)) >>m.shift)]
+	return m.toSqBB[int(((b.allBB()&m.innerBB)*bitBoard(m.magic))>>m.shift)]
 }
 
 func initMagic() {
 	fmt.Println("starting init() for magic.go")
 
 	// bishops
-	fillOptimalMagicsB()
+	//fillOptimalMagicsB()
 	for sq := A1; sq <= H8; sq++ {
 		mBishopTab[sq].shift = uint(64 - nBBits[sq])
 		mBishopTab[sq].innerBB = bitBoard(innerBAtks(sq))
@@ -59,7 +59,7 @@ func prepareMagicB() {
 		// all bit combinations for fr and all possible blockers
 		cnt := bitCombs(0x0, fr, fr, 0, &maxM, &mBishopTab[fr], dirsB)
 		_ = cnt
-//		fmt.Println("bishop on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)
+		//		fmt.Println("bishop on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)
 	}
 }
 
@@ -71,7 +71,7 @@ func prepareMagicR() {
 		// all bit combinations for fr and all possible moves (toSqBB)
 		cnt := bitCombs(0x0, fr, fr, 0, &maxM, &mRookTab[fr], dirsR)
 		_ = cnt
-//		fmt.Println("rook on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)
+		//		fmt.Println("rook on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)
 	}
 }
 
@@ -96,7 +96,7 @@ func bitCombs(wBits bitBoard, fr, currSq, currIx int, maxM *int, mTabEntry *sMag
 		}
 		toBB := bitBoard(computeAtks(fr, dirs, uint64(wBits)))
 
-		if (*toSqBB)[int(m)] != 0x0 && (*toSqBB)[int(m)] != toBB && fr == F8 { // for bishop
+		if (*toSqBB)[int(m)] != 0x0 && (*toSqBB)[int(m)] != toBB { // for bishop
 			fmt.Println("we have problem", sq2Fen[fr], "with ix", int(m), "wBits:\n", bitBoard(wBits).Stringln())
 			fmt.Println((*toSqBB)[int(m)].Stringln())
 			fmt.Printf("%X\n", uint64((*toSqBB)[int(m)]))
@@ -251,7 +251,6 @@ func innerBAtks(sq int) uint64 {
 		r--
 		f++
 	}
-
 	return atkBB
 }
 
@@ -418,7 +417,7 @@ var nBBits = [64]int{
 // Thanks to Tord Romstad code from:
 // https://chessprogramming.wikispaces.com/Looking+for+Magics
 // This site will soon be closed down and moved somewhere else
-// Search for "Feeding in randoms Tord Romstad" 
+// Search for "Feeding in randoms Tord Romstad"
 
 var magicB = [64]uint64{
 	0xc085080200420200,
@@ -573,4 +572,4 @@ func findDuplicates(toBBTab []bitBoard, fr int, magic uint64) int {
 	}
 	return cntDup
 }
-*/
+*/
@@ -13,4 +13,5 @@ func init(){
 	initMagic()
 	initAtksKings()
 	initAtksKnights()
+	board.newGame()
 }
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ var mRookTab [64]sMagic`
`14`	`14`
`15`	`15`	`// all attacks from current square`
`16`	`16`	`func (m sMagic) atks(b boardStruct) bitBoard {`
`17`		`- return m.toSqBB[int(((b.allBB() & m.innerBB)*bitBoard(m.magic)) >>m.shift)]`
	`17`	`+ return m.toSqBB[int(((b.allBB()&m.innerBB)*bitBoard(m.magic))>>m.shift)]`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func initMagic() {`
`21`	`21`	`fmt.Println("starting init() for magic.go")`
`22`	`22`
`23`	`23`	`// bishops`
`24`		`- fillOptimalMagicsB()`
	`24`	`+ //fillOptimalMagicsB()`
`25`	`25`	`for sq := A1; sq <= H8; sq++ {`
`26`	`26`	`mBishopTab[sq].shift = uint(64 - nBBits[sq])`
`27`	`27`	`mBishopTab[sq].innerBB = bitBoard(innerBAtks(sq))`
`@@ -59,7 +59,7 @@ func prepareMagicB() {`
`59`	`59`	`// all bit combinations for fr and all possible blockers`
`60`	`60`	`cnt := bitCombs(0x0, fr, fr, 0, &maxM, &mBishopTab[fr], dirsB)`
`61`	`61`	`_ = cnt`
`62`		`-// fmt.Println("bishop on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)`
	`62`	`+ // fmt.Println("bishop on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`@@ -71,7 +71,7 @@ func prepareMagicR() {`
`71`	`71`	`// all bit combinations for fr and all possible moves (toSqBB)`
`72`	`72`	`cnt := bitCombs(0x0, fr, fr, 0, &maxM, &mRookTab[fr], dirsR)`
`73`	`73`	`_ = cnt`
`74`		`-// fmt.Println("rook on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)`
	`74`	`+ // fmt.Println("rook on", sq2Fen[fr], "#of combinations", cnt, "maxIx", maxM)`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`@@ -96,7 +96,7 @@ func bitCombs(wBits bitBoard, fr, currSq, currIx int, maxM int, mTabEntry sMag`
`96`	`96`	`}`
`97`	`97`	`toBB := bitBoard(computeAtks(fr, dirs, uint64(wBits)))`
`98`	`98`
`99`		`- if (toSqBB)[int(m)] != 0x0 && (toSqBB)[int(m)] != toBB && fr == F8 { // for bishop`
	`99`	`+ if (toSqBB)[int(m)] != 0x0 && (toSqBB)[int(m)] != toBB { // for bishop`
`100`	`100`	`fmt.Println("we have problem", sq2Fen[fr], "with ix", int(m), "wBits:\n", bitBoard(wBits).Stringln())`
`101`	`101`	`fmt.Println((*toSqBB)[int(m)].Stringln())`
`102`	`102`	`fmt.Printf("%X\n", uint64((*toSqBB)[int(m)]))`
`@@ -251,7 +251,6 @@ func innerBAtks(sq int) uint64 {`
`251`	`251`	`r--`
`252`	`252`	`f++`
`253`	`253`	`}`
`254`		`-`
`255`	`254`	`return atkBB`
`256`	`255`	`}`
`257`	`256`
`@@ -418,7 +417,7 @@ var nBBits = [64]int{`
`418`	`417`	`// Thanks to Tord Romstad code from:`
`419`	`418`	`// https://chessprogramming.wikispaces.com/Looking+for+Magics`
`420`	`419`	`// This site will soon be closed down and moved somewhere else`
`421`		`-// Search for "Feeding in randoms Tord Romstad"`
	`420`	`+// Search for "Feeding in randoms Tord Romstad"`
`422`	`421`
`423`	`422`	`var magicB = [64]uint64{`
`424`	`423`	`0xc085080200420200,`
`@@ -573,4 +572,4 @@ func findDuplicates(toBBTab []bitBoard, fr int, magic uint64) int {`
`573`	`572`	`}`
`574`	`573`	`return cntDup`
`575`	`574`	`}`
`576`		`-*/`
	`575`	`+*/`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,5 @@ func init(){`
`13`	`13`	`initMagic()`
`14`	`14`	`initAtksKings()`
`15`	`15`	`initAtksKnights()`
	`16`	`+ board.newGame()`
`16`	`17`	`}`