newDancer

Author: sjnam

dance.go

@@ -178,7 +178,7 @@ func (m *MCC) untweak(c, x, unblock int) {
 }
 
 // Dance generates all exact covers
-func (m *MCC) Dance(rd io.Reader) Result {
+func (m *MCC) Dance(rd io.Reader) *Result {
 	if err := m.inputMatrix(rd); err != nil {
 		panic(err)
 	}
@@ -407,7 +407,7 @@ func (m *MCC) Dance(rd io.Reader) Result {
 		}
 	}()
 
-	return Result{
+	return &Result{
 		Solutions: solStream,
 		Heartbeat: heartbeat,
 	}

examples/filomino/main.go

@@ -40,7 +40,7 @@ func main() {
 	nr, _ := strconv.Atoi(dimen[0])
 	nc, _ := strconv.Atoi(dimen[1])
 
-	xc := dlx.NewMCC()
+	xc := dlx.NewDancer()
 	res := xc.Dance(fd)
 
 	box := make([][]int, nr)

examples/langford/main.go

@@ -44,7 +44,7 @@ func main() {
 	}
 	n, _ := strconv.Atoi(os.Args[1])
 
-	xc := dlx.NewMCC()
+	xc := dlx.NewDancer()
 	res := xc.Dance(langfordDLX(n))
 
 	s := make([]int, 2*n)

examples/partridge/main.go

@@ -81,7 +81,7 @@ func main() {
 	ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Minute)
 	defer cancel()
 
-	mcc := dlx.NewMCC()
+	mcc := dlx.NewDancer()
 	mcc.PulseInterval = 30 * time.Second
 	mcc = mcc.WithContext(ctx)
 	res := mcc.Dance(patridgeDLX(8))

examples/pentominoes/main.go

@@ -46,7 +46,7 @@ func main() {
 	nr, _ := strconv.Atoi(dimen[0])
 	nc, _ := strconv.Atoi(dimen[1])
 
-	xc := dlx.NewMCC()
+	xc := dlx.NewDancer()
 	res := xc.Dance(fd)
 
 	box := make([][]string, nr)

examples/queen/main.go

@@ -72,7 +72,7 @@ func main() {
 	}
 	n, _ := strconv.Atoi(os.Args[1])
 
-	xc := dlx.NewMCC()
+	xc := dlx.NewDancer()
 	res := xc.Dance(queenDLX(n))
 
 	i := 0

examples/sudoku/main.go

@@ -110,7 +110,7 @@ func sudokuSolver(stream <-chan string) <-chan [][]byte {
 			outCh := make(chan [][]byte)
 			outChCh <- outCh
 
-			xc := dlx.NewMCC()
+			xc := dlx.NewDancer()
 			go func(line string) {
 				res := xc.Dance(sudokuDLX(strings.NewReader(line)))
 				ans := []byte(line)

examples/wordsearch/main.go

@@ -153,7 +153,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	xcc := dlx.NewMCC()
+	xcc := dlx.NewDancer()
 	res := xcc.Dance(
 		wordSearchDLX(strings.Fields(string(buf)), wd, ht))
 

examples/zebra/main.go

@@ -109,7 +109,7 @@ const xccInput = `
 `
 
 func main() {
-	xcc := dlx.NewMCC()
+	xcc := dlx.NewDancer()
 	res := xcc.Dance(strings.NewReader(xccInput))
 
 	answer := map[byte][]string{

mcc.go

@@ -2,7 +2,6 @@ package dlx
 
 import (
 	"context"
-	"io"
 	"time"
 )
 
@@ -26,10 +25,6 @@ type Result struct {
 	Heartbeat <-chan string
 }
 
-type Dancer interface {
-	Dance(reader io.Reader) Result
-}
-
 type node struct {
 	up, down  int    // predecessor and successor in item list
 	itm       int    // the item containing this node
@@ -59,7 +54,7 @@ type MCC struct {
 }
 
 // NewMCC Wake me up before you Go Go
-func NewMCC() *MCC {
+func NewDancer() *MCC {
 	return &MCC{
 		nd:            make([]node, chunkSize),
 		cl:            make([]item, chunkSize),

mcc_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func solve(matrix string) {
-	d := NewMCC()
+	d := NewDancer()
 	d.Debug = true
 	d = d.WithContext(context.TODO())
 	res := d.Dance(strings.NewReader(matrix))