Implemented bfs

was actually dfs lol

.github/workflows/automatic-prerelease.yml

@@ -12,10 +12,18 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      # ...
-      - name: "Build & test"
-        run: |
-          echo "done!"
+      - uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+
+      - name: Build
+        run: go build -v ./...
+
+      - name: Test
+        run: go test -v ./...
 
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
@@ -23,6 +31,3 @@ jobs:
           automatic_release_tag: "latest"
           prerelease: true
           title: "Development Build"
-          files: |
-            LICENSE.txt
-            *.jar

.github/workflows/tagged-release.yml

@@ -12,15 +12,20 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      # ...
-      - name: "Build & test"
-        run: |
-          echo "done!"
+      - uses: actions/checkout@v3
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+
+      - name: Build
+        run: go build -v ./...
+
+      - name: Test
+        run: go test -v ./...
 
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
-          files: |
-            LICENSE.txt
-            *.jar

.gitignore

@@ -20,3 +20,5 @@
 # Go workspace file
 go.work
 /Session.vim
+/maze.png
+/maze_sol.png

io/writer/image_test.go

@@ -1,17 +1,24 @@
 package writer
 
 import (
+	"bytes"
 	"image/color"
+	"io"
 	"maze-solver/maze"
+	"os"
 	"testing"
 
 	"github.com/mazznoer/colorgrad"
 )
 
+const (
+	OUT_DIR      = "./out"
+	EXPECTED_DIR = "../../assets/solved"
+)
+
 func TestImageWriter(t *testing.T) {
-	pathGradient, err := colorgrad.NewGradient().Colors(color.White).Build()
-	if err != nil {
-		panic(err)
+	if _, err := os.Stat(OUT_DIR); os.IsNotExist(err) {
+		os.Mkdir(OUT_DIR, 0700)
 	}
 
 	tests := []struct {
@@ -24,33 +31,33 @@ func TestImageWriter(t *testing.T) {
 	}{
 		{
 			"Trivial",
-			"../../out/trivial_sol.png",
+			"trivial.png",
 			trivial(),
-			40, 40,
+			20, 20,
 			color.White, color.Black,
 			colorgrad.Warm(),
 		},
 		{
-			"Bigger",
-			"../../out/bigger_sol.png",
+			"Trivial Bigger",
+			"trivial-bigger.png",
 			bigger(),
-			40, 40,
+			20, 20,
 			color.White, color.Black,
 			colorgrad.Warm(),
 		},
 		{
-			"Bigger Staggered",
-			"../../out/bigger_staggered_sol.png",
+			"Trivial Bigger Staggered",
+			"trivial-bigger-staggered.png",
 			bigger_staggered(),
-			40, 40,
+			20, 20,
 			color.White, color.Black,
-			pathGradient,
+			colorgrad.Warm(),
 		},
 		{
 			"Normal",
-			"../../out/normal_sol.png",
+			"normal.png",
 			normal(),
-			40, 40,
+			20, 20,
 			color.White, color.Black,
 			colorgrad.Warm(),
 		},
@@ -58,7 +65,7 @@ func TestImageWriter(t *testing.T) {
 
 	for _, test := range tests {
 		writer := ImageWriter{
-			Filename:         test.filename,
+			Filename:         OUT_DIR + "/" + test.filename,
 			Maze:             test.m,
 			CellWidth:        test.CellWidth,
 			CellHeight:       test.cellHeight,
@@ -71,5 +78,45 @@ func TestImageWriter(t *testing.T) {
 		if err != nil {
 			t.Fatalf("%s: couldn't write solution, got following error\n%v", test.name, err)
 		}
+
+		assertEqualFile(t, EXPECTED_DIR+"/"+test.filename, OUT_DIR+"/"+test.filename, test.name)
+		os.Remove(writer.Filename)
+	}
+	os.Remove(OUT_DIR)
+}
+
+const chunkSize = 64000
+
+func assertEqualFile(t *testing.T, file1, file2, name string) {
+	f1, err := os.Open(file1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f1.Close()
+
+	f2, err := os.Open(file2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f2.Close()
+
+	for {
+		b1 := make([]byte, chunkSize)
+		_, err1 := f1.Read(b1)
+
+		b2 := make([]byte, chunkSize)
+		_, err2 := f2.Read(b2)
+
+		if err1 != nil || err2 != nil {
+			if err1 == io.EOF && err2 == io.EOF {
+				return
+			} else if err1 == io.EOF || err2 == io.EOF {
+				t.Fatalf("%s: files are not equal. Got %q, wanted %q", name, file1, file2)
+			}
+		}
+
+		if !bytes.Equal(b1, b2) {
+			t.Fatalf("%s: files are not equal. Got %q, wanted %q", name, file1, file2)
+		}
 	}
 }

io/writer/strings_test.go

@@ -1,7 +1,6 @@
 package writer
 
 import (
-	"fmt"
 	"maze-solver/maze"
 	"maze-solver/utils"
 	"testing"
@@ -69,7 +68,6 @@ func TestStringsWriter(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		fmt.Printf("----------- %s -----------\n", test.name)
 		writer := StringsWriter{
 			PathChar:     test.pathChar,
 			WallChar:     test.wallChar,

main.go

@@ -131,12 +131,12 @@ func parse_arguments() (*reader.ReaderFactory, *writer.WriterFactory, *solver.So
 
 	cellSizeIn := argparser.Int("", "cell-size-in", &argparse.Options{
 		Help:    "Size of a cell (in pixels) for input file of image type",
-		Default: 20,
+		Default: 3,
 	})
 
 	cellSizeOut := argparser.Int("", "cell-size-out", &argparse.Options{
 		Help:    "Size of a cell (in pixels) for output file of image type",
-		Default: 20,
+		Default: 3,
 	})
 
 	solverFactory.Type = argparser.Selector("a", "algo", solver.TYPES, &argparse.Options{

solver/bfs.go

@@ -1,9 +1,129 @@
 package solver
 
-import "maze-solver/maze"
+import (
+	"errors"
+	"fmt"
+	"maze-solver/maze"
+	"maze-solver/utils"
+	"strings"
+)
 
-type Bfs struct{}
-
-func (*Bfs) Solve(maze *maze.Maze) *maze.SolvedMaze {
-	return nil
+type BFSSolver struct {
+	solver
+	queue *Queue
+}
+
+type Queue struct {
+	head, tail *Element
+}
+
+type Element struct {
+	prev, next *Element
+	value      []*maze.Node
+}
+
+func (q *Queue) enqueue(v []*maze.Node) {
+	prev_last := q.tail
+	new_elem := &Element{
+		prev:  prev_last,
+		next:  nil,
+		value: v,
+	}
+	if prev_last != nil {
+		prev_last.next = new_elem
+	}
+
+	q.tail = new_elem
+
+	if q.head == nil {
+		q.head = new_elem
+	}
+}
+
+func (q *Queue) dequeue() ([]*maze.Node, error) {
+	if q.head == nil {
+		return nil, errors.New("Can't dequeue and empty queue")
+	}
+	ret := q.head.value
+	q.head = q.head.next
+	if q.head != nil {
+		q.head.prev = nil
+	} else {
+		q.tail = nil
+	}
+
+	return ret, nil
+}
+
+func (q Queue) String() string {
+	var ret strings.Builder
+	i := 0
+	for history := q.head; history != nil; history = history.next {
+		ret.WriteString(fmt.Sprintf("%v: %v\n", i, history_str(history.value)))
+		i++
+	}
+	return ret.String()
+}
+
+func history_str(history []*maze.Node) string {
+	var ret strings.Builder
+	for _, node := range history {
+		ret.WriteString(fmt.Sprintf("%v ", node.Coords))
+	}
+	return ret.String()
+}
+
+func (s *BFSSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
+	defer utils.Timer("BFS algorithm", 2)()
+
+	s.initVisited(m)
+
+	current, end := m.Nodes[0], m.Nodes[len(m.Nodes)-1]
+	s.queue = &Queue{
+		head: nil,
+		tail: nil,
+	}
+
+	current_history := make([]*maze.Node, 0, len(m.Nodes))
+	current_history = append(current_history, current)
+
+	// fmt.Printf("end.Coords: %v\n", end.Coords)
+	var err error
+	for current != end {
+		// fmt.Printf("current.Coords: %v\n", current.Coords)
+
+		s.visited[current] = true
+
+		s.addIfNotVisited(current.Down, current_history)
+		s.addIfNotVisited(current.Left, current_history)
+		s.addIfNotVisited(current.Right, current_history)
+		s.addIfNotVisited(current.Up, current_history)
+
+		// fmt.Println(s.queue)
+
+		current_history, err = s.queue.dequeue()
+		if err != nil {
+			panic(err)
+		}
+		current = current_history[len(current_history)-1]
+	}
+
+	// for i, node := range current_history {
+	// 	fmt.Printf("%v: %v\n", i, node.Coords)
+	// }
+
+	return &maze.SolvedMaze{
+		Maze:     m,
+		Solution: current_history,
+	}
+}
+
+func (s *BFSSolver) addIfNotVisited(node *maze.Node, current_history []*maze.Node) {
+	if !s.wasVisited(node) {
+		new_history := make([]*maze.Node, len(current_history)+1)
+		copy(new_history, current_history)
+		new_history[len(current_history)] = node
+
+		s.queue.enqueue(new_history)
+	}
 }

solver/dfs.go

@@ -5,19 +5,15 @@ import (
 	"maze-solver/utils"
 )
 
-type TurnLeftSolver struct {
-	visited map[*maze.Node]bool
+type DFSSolver struct {
+	solver
 }
 
-func (s *TurnLeftSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
-	defer utils.Timer("Turn left algorithm", 2)()
+func (s *DFSSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
+	defer utils.Timer("DFS algorithm", 2)()
 
+	s.initVisited(m)
 	current, end := m.Nodes[0], m.Nodes[len(m.Nodes)-1]
-	s.visited = make(map[*maze.Node]bool, len(m.Nodes))
-
-	for _, node := range m.Nodes {
-		s.visited[node] = false
-	}
 
 	stack := make([]*maze.Node, 0, len(m.Nodes))
 	stack = append(stack, current)
@@ -53,11 +49,3 @@ func (s *TurnLeftSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
 	}
 	return ret
 }
-
-func (s *TurnLeftSolver) wasVisited(node *maze.Node) bool {
-	if node == nil {
-		return true
-	}
-	visited, _ := s.visited[node]
-	return visited
-}

solver/solver.go

@@ -9,22 +9,46 @@ type Solver interface {
 	Solve(*maze.Maze) *maze.SolvedMaze
 }
 
+type solver struct {
+	visited map[*maze.Node]bool
+}
+
 type SolverFactory struct {
 	Type *string
 }
 
 const (
-	_TURN_LEFT = "turn-left"
+	_DFS = "dfs"
+	_BFS = "bfs"
 )
 
 var TYPES = []string{
-	_TURN_LEFT,
+	_DFS,
+	_BFS,
 }
 
 func (f *SolverFactory) Get() Solver {
 	switch *f.Type {
-	case _TURN_LEFT:
-		return &TurnLeftSolver{}
+	case _DFS:
+		return &DFSSolver{}
+	case _BFS:
+		return &BFSSolver{}
 	}
 	panic(fmt.Sprintf("Unrecognized solver type %q", *f.Type))
 }
+
+func (s *solver) wasVisited(node *maze.Node) bool {
+	if node == nil {
+		return true
+	}
+	visited, _ := s.visited[node]
+	return visited
+}
+
+func (s *solver) initVisited(m *maze.Maze) {
+	s.visited = make(map[*maze.Node]bool, len(m.Nodes))
+
+	for _, node := range m.Nodes {
+		s.visited[node] = false
+	}
+}