properly handle any missing test files

stephenjlovell · stephenjlovell · commit 918c2fe188db · 2017-01-31T15:15:04.000-05:00
diff --git a/bitwise_math_test.go b/bitwise_math_test.go
@@ -6,16 +6,20 @@
 package main
 
 import (
+	"fmt"
 	"testing"
 )
 
 var result int // hacks to make sure compiler doesn't eliminate func under test.
 
 func BenchmarkPopCount(b *testing.B) {
 	var bb BB
-	test := loadEpdFile("test_suites/wac_300.epd")
+	test, err := loadEpdFile("test_suites/wac_300.epd")
+	if err != nil {
+		fmt.Print(err)
+		return
+	}
 	b.ResetTimer()
-
 	for _, epd := range test {
 		bb = epd.brd.occupied[WHITE]
 		for i := 0; i < b.N; i++ {
@@ -27,9 +31,12 @@ func BenchmarkPopCount(b *testing.B) {
 
 func BenchmarkLSB(b *testing.B) {
 	var bb BB
-	test := loadEpdFile("test_suites/wac_300.epd")
+	test, err := loadEpdFile("test_suites/wac_300.epd")
+	if err != nil {
+		fmt.Print(err)
+		return
+	}
 	b.ResetTimer()
-
 	for _, epd := range test {
 		bb = epd.brd.occupied[WHITE]
 		for i := 0; i < b.N; i++ {
diff --git a/notation.go b/notation.go
@@ -9,6 +9,7 @@ package main
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"os"
 	"regexp"
@@ -26,25 +27,29 @@ type EPD struct {
 
 func (epd *EPD) Print() {
 	fmt.Println(epd.id)
-	// epd.brd.PrintDetails()
-	// fmt.Println("Best moves:")
-	// fmt.Println(epd.best_moves)
-	// fmt.Println("Avoid moves:")
-	// fmt.Println(epd.avoid_moves)
 }
 
-func loadEpdFile(dir string) []*EPD {
+func (epd *EPD) PrintDetails() {
+	epd.Print()
+	epd.brd.PrintDetails()
+	fmt.Println("Best moves:")
+	fmt.Println(epd.bestMoves)
+	fmt.Println("Avoid moves:")
+	fmt.Println(epd.avoidMoves)
+}
+
+func loadEpdFile(dir string) ([]*EPD, error) {
 	epdFile, err := os.Open(dir)
 	if err != nil {
-		panic(err)
+		return nil, errors.New(fmt.Sprintf("The specified EPD file could not be loaded.:\n%s\n", dir))
 	}
 	var testPositions []*EPD
 	scanner := bufio.NewScanner(epdFile)
 	for scanner.Scan() {
 		epd := ParseEPDString(scanner.Text())
 		testPositions = append(testPositions, epd)
 	}
-	return testPositions
+	return testPositions, err
 }
 
 // 2k4B/bpp1qp2/p1b5/7p/1PN1n1p1/2Pr4/P5PP/R3QR1K b - - bm Ng3+ g3; id "WAC.273";
diff --git a/notation_test.go b/notation_test.go
@@ -6,14 +6,17 @@
 package main
 
 import (
+	"fmt"
 	"testing"
 )
 
 func TestEPDParsing(t *testing.T) {
-	test := loadEpdFile("test_suites/wac_300.epd")
-
+	test, err := loadEpdFile("test_suites/wac_300.epd")
+	if err != nil {
+		fmt.Print(err)
+		return
+	}
 	for _, epd := range test {
 		epd.Print()
 	}
-
 }
diff --git a/search_test.go b/search_test.go
@@ -7,20 +7,8 @@ package main
 
 import "testing"
 
-// func BenchmarkSearch(b *testing.B) {
-// 	setup()
-// 	verbose = false
-// 	depth := MAX_DEPTH
-// 	for n := 0; n < b.N; n++ {
-// 		brd := ParseFENString("rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1")
-// 		Start(brd, depth, 4000)
-// 		fmt.Printf(".")
-// 	}
-// }
-
 func TestPlayingStrength(t *testing.T) {
 	printName()
-	depth := MAX_DEPTH
 	timeout := 2000
-	RunTestSuite("test_suites/wac_300.epd", depth, timeout)
+	RunTestSuite("test_suites/wac_300.epd", MAX_DEPTH, timeout)
 }
diff --git a/utilities.go b/utilities.go
@@ -11,7 +11,11 @@ import (
 )
 
 func RunTestSuite(testSuite string, depth, timeout int) {
-	test := loadEpdFile(testSuite)
+	test, err := loadEpdFile(testSuite)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
 	var moveStr string
 	sum, score := 0, 0
 	var gt *GameTimer
@@ -35,17 +39,9 @@ func RunTestSuite(testSuite string, depth, timeout int) {
 	}
 	secondsElapsed := time.Since(start).Seconds()
 	mNodes := float64(sum) / 1000000.0
-	fmt.Printf("\n%.4fm nodes searched in %.4fs (%.4fm NPS)\n", mNodes, secondsElapsed, mNodes/secondsElapsed)
-
+	fmt.Printf("\n%.4fm nodes searched in %.4fs (%.4fm NPS)\n",
+		mNodes, secondsElapsed, mNodes/secondsElapsed)
 	fmt.Printf("Total score: %d/%d\n", score, len(test))
-
-	// fmt.Printf("Average Branching factor by iteration:\n")
-	// var branching float64
-	// for d := 2; d <= depth; d++ {
-	// 	branching = math.Pow(float64(nodes_per_iteration[d])/float64(nodes_per_iteration[1]), float64(1)/float64(d-1))
-	// 	fmt.Printf("%d ABF: %.4f\n", d, branching)
-	// }
-
 	fmt.Printf("Overhead: %.4fm\n", float64(loadBalancer.Overhead())/1000000.0)
 	fmt.Printf("Timeout: %.1fs\n", float64(timeout)/1000.0)
 	// fmt.Printf("PV Accuracy: %d/%d (%.2f)\n\n", pv_accuracy[1], pv_accuracy[0]+pv_accuracy[1],

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,17 @@`
`6`	`6`	`package main`
`7`	`7`
`8`	`8`	`import (`
	`9`	`+ "fmt"`
`9`	`10`	`"testing"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`func TestEPDParsing(t *testing.T) {`
`13`		`- test := loadEpdFile("test_suites/wac_300.epd")`
`14`		`-`
	`14`	`+ test, err := loadEpdFile("test_suites/wac_300.epd")`
	`15`	`+ if err != nil {`
	`16`	`+ fmt.Print(err)`
	`17`	`+ return`
	`18`	`+ }`
`15`	`19`	`for _, epd := range test {`
`16`	`20`	`epd.Print()`
`17`	`21`	`}`
`18`		`-`
`19`	`22`	`}`