Compare commits
5 Commits
6e0a1032d1
...
4f79d6f1ed
Author | SHA1 | Date | |
---|---|---|---|
|
4f79d6f1ed | ||
|
346cfe9705 | ||
|
94af003adc | ||
|
aec655610a | ||
|
2423645f3a |
2
.gitignore
vendored
@ -20,3 +20,5 @@
|
||||
# Go workspace file
|
||||
go.work
|
||||
/Session.vim
|
||||
/maze.png
|
||||
/maze_sol.png
|
||||
|
BIN
assets/real.png
Normal file
After Width: | Height: | Size: 151 KiB |
BIN
assets/solved/normal.png
Normal file
After Width: | Height: | Size: 987 B |
BIN
assets/solved/normal2.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
assets/solved/real.png
Normal file
After Width: | Height: | Size: 316 KiB |
BIN
assets/solved/trivial-bigger-staggered.png
Normal file
After Width: | Height: | Size: 424 B |
BIN
assets/solved/trivial-bigger.png
Normal file
After Width: | Height: | Size: 423 B |
BIN
assets/solved/trivial.png
Normal file
After Width: | Height: | Size: 286 B |
@ -1,71 +1,122 @@
|
||||
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)
|
||||
// }
|
||||
//
|
||||
// tests := []struct {
|
||||
// name string
|
||||
// filename string
|
||||
// m *maze.SolvedMaze
|
||||
// CellWidth, cellHeight int
|
||||
// pathColor, wallColor color.Color
|
||||
// gradient colorgrad.Gradient
|
||||
// }{
|
||||
// {
|
||||
// "Trivial",
|
||||
// "../../out/trivial_sol.png",
|
||||
// trivial(),
|
||||
// 40, 40,
|
||||
// color.White, color.Black,
|
||||
// colorgrad.Warm(),
|
||||
// },
|
||||
// {
|
||||
// "Bigger",
|
||||
// "../../out/bigger_sol.png",
|
||||
// bigger(),
|
||||
// 40, 40,
|
||||
// color.White, color.Black,
|
||||
// colorgrad.Warm(),
|
||||
// },
|
||||
// {
|
||||
// "Bigger Staggered",
|
||||
// "../../out/bigger_staggered_sol.png",
|
||||
// bigger_staggered(),
|
||||
// 40, 40,
|
||||
// color.White, color.Black,
|
||||
// pathGradient,
|
||||
// },
|
||||
// {
|
||||
// "Normal",
|
||||
// "../../out/normal_sol.png",
|
||||
// normal(),
|
||||
// 40, 40,
|
||||
// color.White, color.Black,
|
||||
// colorgrad.Warm(),
|
||||
// },
|
||||
// }
|
||||
//
|
||||
// for _, test := range tests {
|
||||
// writer := ImageWriter{
|
||||
// Filename: test.filename,
|
||||
// Maze: test.m,
|
||||
// CellWidth: test.CellWidth,
|
||||
// CellHeight: test.cellHeight,
|
||||
// WallColor: test.wallColor,
|
||||
// PathColor: test.pathColor,
|
||||
// SolutionGradient: test.gradient,
|
||||
// }
|
||||
//
|
||||
// err := writer.Write()
|
||||
// if err != nil {
|
||||
// t.Fatalf("%s: couldn't write solution, got following error\n%v", test.name, err)
|
||||
// }
|
||||
// }
|
||||
if _, err := os.Stat(OUT_DIR); os.IsNotExist(err) {
|
||||
os.Mkdir(OUT_DIR, 0700)
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
filename string
|
||||
m *maze.SolvedMaze
|
||||
CellWidth, cellHeight int
|
||||
pathColor, wallColor color.Color
|
||||
gradient colorgrad.Gradient
|
||||
}{
|
||||
{
|
||||
"Trivial",
|
||||
"trivial.png",
|
||||
trivial(),
|
||||
20, 20,
|
||||
color.White, color.Black,
|
||||
colorgrad.Warm(),
|
||||
},
|
||||
{
|
||||
"Trivial Bigger",
|
||||
"trivial-bigger.png",
|
||||
bigger(),
|
||||
20, 20,
|
||||
color.White, color.Black,
|
||||
colorgrad.Warm(),
|
||||
},
|
||||
{
|
||||
"Trivial Bigger Staggered",
|
||||
"trivial-bigger-staggered.png",
|
||||
bigger_staggered(),
|
||||
20, 20,
|
||||
color.White, color.Black,
|
||||
colorgrad.Warm(),
|
||||
},
|
||||
{
|
||||
"Normal",
|
||||
"normal.png",
|
||||
normal(),
|
||||
20, 20,
|
||||
color.White, color.Black,
|
||||
colorgrad.Warm(),
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
writer := ImageWriter{
|
||||
Filename: OUT_DIR + "/" + test.filename,
|
||||
Maze: test.m,
|
||||
CellWidth: test.CellWidth,
|
||||
CellHeight: test.cellHeight,
|
||||
WallColor: test.wallColor,
|
||||
PathColor: test.pathColor,
|
||||
SolutionGradient: test.gradient,
|
||||
}
|
||||
|
||||
err := writer.Write()
|
||||
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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -1,7 +1,6 @@
|
||||
package solver
|
||||
|
||||
import (
|
||||
"log"
|
||||
"maze-solver/maze"
|
||||
"maze-solver/utils"
|
||||
)
|
||||
@ -13,9 +12,6 @@ type DFSSolver struct {
|
||||
func (s *DFSSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
||||
defer utils.Timer("Turn left algorithm", 2)()
|
||||
|
||||
log.Println("Starting dfs")
|
||||
log.Printf("m.Nodes: %v\n", len(m.Nodes))
|
||||
|
||||
current, end := m.Nodes[0], m.Nodes[len(m.Nodes)-1]
|
||||
s.visited = make(map[*maze.Node]bool, len(m.Nodes))
|
||||
|
||||
|