Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
6e0a1032d1 | |||
69afaed1bf | |||
908e8c14fb | |||
954d44085c | |||
8a6543cc1e | |||
485efeebaf | |||
f803dc7771 | |||
46c42cb67d | |||
32f7720069 | |||
3c7c181911 |
33
.github/workflows/automatic-prerelease.yml
vendored
Normal file
33
.github/workflows/automatic-prerelease.yml
vendored
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
---
|
||||||
|
name: "pre-release"
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- "main"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
pre-release:
|
||||||
|
name: "Pre Release"
|
||||||
|
runs-on: "ubuntu-latest"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- 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 }}"
|
||||||
|
automatic_release_tag: "latest"
|
||||||
|
prerelease: true
|
||||||
|
title: "Development Build"
|
31
.github/workflows/tagged-release.yml
vendored
Normal file
31
.github/workflows/tagged-release.yml
vendored
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
---
|
||||||
|
name: "tagged-release"
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
tagged-release:
|
||||||
|
name: "Tagged Release"
|
||||||
|
runs-on: "ubuntu-latest"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- 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
|
@ -1,75 +1,71 @@
|
|||||||
package writer
|
package writer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"image/color"
|
|
||||||
"maze-solver/maze"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/mazznoer/colorgrad"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestImageWriter(t *testing.T) {
|
func TestImageWriter(t *testing.T) {
|
||||||
pathGradient, err := colorgrad.NewGradient().Colors(color.White).Build()
|
// pathGradient, err := colorgrad.NewGradient().Colors(color.White).Build()
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
panic(err)
|
// panic(err)
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
tests := []struct {
|
// tests := []struct {
|
||||||
name string
|
// name string
|
||||||
filename string
|
// filename string
|
||||||
m *maze.SolvedMaze
|
// m *maze.SolvedMaze
|
||||||
CellWidth, cellHeight int
|
// CellWidth, cellHeight int
|
||||||
pathColor, wallColor color.Color
|
// pathColor, wallColor color.Color
|
||||||
gradient colorgrad.Gradient
|
// gradient colorgrad.Gradient
|
||||||
}{
|
// }{
|
||||||
{
|
// {
|
||||||
"Trivial",
|
// "Trivial",
|
||||||
"../../out/trivial_sol.png",
|
// "../../out/trivial_sol.png",
|
||||||
trivial(),
|
// trivial(),
|
||||||
40, 40,
|
// 40, 40,
|
||||||
color.White, color.Black,
|
// color.White, color.Black,
|
||||||
colorgrad.Warm(),
|
// colorgrad.Warm(),
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
"Bigger",
|
// "Bigger",
|
||||||
"../../out/bigger_sol.png",
|
// "../../out/bigger_sol.png",
|
||||||
bigger(),
|
// bigger(),
|
||||||
40, 40,
|
// 40, 40,
|
||||||
color.White, color.Black,
|
// color.White, color.Black,
|
||||||
colorgrad.Warm(),
|
// colorgrad.Warm(),
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
"Bigger Staggered",
|
// "Bigger Staggered",
|
||||||
"../../out/bigger_staggered_sol.png",
|
// "../../out/bigger_staggered_sol.png",
|
||||||
bigger_staggered(),
|
// bigger_staggered(),
|
||||||
40, 40,
|
// 40, 40,
|
||||||
color.White, color.Black,
|
// color.White, color.Black,
|
||||||
pathGradient,
|
// pathGradient,
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
"Normal",
|
// "Normal",
|
||||||
"../../out/normal_sol.png",
|
// "../../out/normal_sol.png",
|
||||||
normal(),
|
// normal(),
|
||||||
40, 40,
|
// 40, 40,
|
||||||
color.White, color.Black,
|
// color.White, color.Black,
|
||||||
colorgrad.Warm(),
|
// colorgrad.Warm(),
|
||||||
},
|
// },
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
for _, test := range tests {
|
// for _, test := range tests {
|
||||||
writer := ImageWriter{
|
// writer := ImageWriter{
|
||||||
Filename: test.filename,
|
// Filename: test.filename,
|
||||||
Maze: test.m,
|
// Maze: test.m,
|
||||||
CellWidth: test.CellWidth,
|
// CellWidth: test.CellWidth,
|
||||||
CellHeight: test.cellHeight,
|
// CellHeight: test.cellHeight,
|
||||||
WallColor: test.wallColor,
|
// WallColor: test.wallColor,
|
||||||
PathColor: test.pathColor,
|
// PathColor: test.pathColor,
|
||||||
SolutionGradient: test.gradient,
|
// SolutionGradient: test.gradient,
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
err := writer.Write()
|
// err := writer.Write()
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
t.Fatalf("%s: couldn't write solution, got following error\n%v", test.name, err)
|
// t.Fatalf("%s: couldn't write solution, got following error\n%v", test.name, err)
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
39
main.go
39
main.go
@ -17,6 +17,28 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
readerFactory, writerFactory, solverFactory, ok := parse_arguments()
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
defer utils.Timer("TOTAL", 1)()
|
||||||
|
reader := readerFactory.Get()
|
||||||
|
|
||||||
|
maze, err := parser.Parse(reader)
|
||||||
|
utils.Check(err, "Couldn't read maze")
|
||||||
|
|
||||||
|
solver := solverFactory.Get()
|
||||||
|
solved := solver.Solve(maze)
|
||||||
|
|
||||||
|
writer := writerFactory.Get(solved)
|
||||||
|
|
||||||
|
err = writer.Write()
|
||||||
|
utils.Check(err, "Couldn't write solved maze")
|
||||||
|
}
|
||||||
|
|
||||||
|
func parse_arguments() (*reader.ReaderFactory, *writer.WriterFactory, *solver.SolverFactory, bool) {
|
||||||
argparser := argparse.NewParser("maze-solver", "Solves the given maze (insane, right? who would've guessed?)")
|
argparser := argparse.NewParser("maze-solver", "Solves the given maze (insane, right? who would've guessed?)")
|
||||||
|
|
||||||
var verboseLevel *int = argparser.FlagCounter("v", "verbose", &argparse.Options{
|
var verboseLevel *int = argparser.FlagCounter("v", "verbose", &argparse.Options{
|
||||||
@ -124,7 +146,7 @@ func main() {
|
|||||||
|
|
||||||
if err := argparser.Parse(os.Args); err != nil {
|
if err := argparser.Parse(os.Args); err != nil {
|
||||||
fmt.Println(argparser.Usage(err))
|
fmt.Println(argparser.Usage(err))
|
||||||
return
|
return nil, nil, nil, false
|
||||||
}
|
}
|
||||||
utils.VERBOSE_LEVEL = *verboseLevel
|
utils.VERBOSE_LEVEL = *verboseLevel
|
||||||
|
|
||||||
@ -137,18 +159,5 @@ func main() {
|
|||||||
writerFactory.PathColor = color.RGBA{255, 255, 255, 255}
|
writerFactory.PathColor = color.RGBA{255, 255, 255, 255}
|
||||||
writerFactory.SolutionGradient = colorgrad.Warm()
|
writerFactory.SolutionGradient = colorgrad.Warm()
|
||||||
|
|
||||||
defer utils.Timer("TOTAL", 1)()
|
return &readerFactory, &writerFactory, &solverFactory, true
|
||||||
|
|
||||||
reader := readerFactory.Get()
|
|
||||||
|
|
||||||
maze, err := parser.Parse(reader)
|
|
||||||
utils.Check(err, "Couldn't read maze")
|
|
||||||
|
|
||||||
solver := solverFactory.Get()
|
|
||||||
solved := solver.Solve(maze)
|
|
||||||
|
|
||||||
writer := writerFactory.Get(solved)
|
|
||||||
|
|
||||||
err = writer.Write()
|
|
||||||
utils.Check(err, "Couldn't write solved maze")
|
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ func TestTextReadTrivial(t *testing.T) {
|
|||||||
|
|
||||||
nodes[4].Up = nodes[3]
|
nodes[4].Up = nodes[3]
|
||||||
|
|
||||||
reader := reader.TextReader{
|
reader := &reader.TextReader{
|
||||||
Filename: "../../assets/trivial.txt",
|
Filename: "../../assets/trivial.txt",
|
||||||
PathChar: ' ',
|
PathChar: ' ',
|
||||||
WallChar: '#',
|
WallChar: '#',
|
||||||
@ -107,7 +107,7 @@ func TestTextReadTrivialBigger(t *testing.T) {
|
|||||||
|
|
||||||
nodes[4].Up = nodes[3]
|
nodes[4].Up = nodes[3]
|
||||||
|
|
||||||
reader := reader.TextReader{
|
reader := &reader.TextReader{
|
||||||
Filename: "../../assets/trivial-bigger.txt",
|
Filename: "../../assets/trivial-bigger.txt",
|
||||||
PathChar: ' ',
|
PathChar: ' ',
|
||||||
WallChar: '#',
|
WallChar: '#',
|
||||||
@ -177,7 +177,7 @@ func TestTextReadTrivialBiggerStaggered(t *testing.T) {
|
|||||||
|
|
||||||
nodes[5].Up = nodes[4]
|
nodes[5].Up = nodes[4]
|
||||||
|
|
||||||
reader := reader.TextReader{
|
reader := &reader.TextReader{
|
||||||
Filename: "../../assets/trivial-bigger-staggered.txt",
|
Filename: "../../assets/trivial-bigger-staggered.txt",
|
||||||
PathChar: ' ',
|
PathChar: ' ',
|
||||||
WallChar: '#',
|
WallChar: '#',
|
||||||
@ -310,7 +310,7 @@ func TestTextReadNormal(t *testing.T) {
|
|||||||
nodes[link.to].Left = nodes[link.from]
|
nodes[link.to].Left = nodes[link.from]
|
||||||
}
|
}
|
||||||
|
|
||||||
reader := reader.TextReader{
|
reader := &reader.TextReader{
|
||||||
Filename: "../../assets/normal.txt",
|
Filename: "../../assets/normal.txt",
|
||||||
PathChar: ' ',
|
PathChar: ' ',
|
||||||
WallChar: '#',
|
WallChar: '#',
|
||||||
@ -501,7 +501,7 @@ func TestTextReadNormal2(t *testing.T) {
|
|||||||
nodes[link.to].Left = nodes[link.from]
|
nodes[link.to].Left = nodes[link.from]
|
||||||
}
|
}
|
||||||
|
|
||||||
reader := reader.TextReader{
|
reader := &reader.TextReader{
|
||||||
Filename: "../../assets/normal2.txt",
|
Filename: "../../assets/normal2.txt",
|
||||||
PathChar: ' ',
|
PathChar: ' ',
|
||||||
WallChar: '#',
|
WallChar: '#',
|
||||||
|
@ -1,17 +1,21 @@
|
|||||||
package solver
|
package solver
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log"
|
||||||
"maze-solver/maze"
|
"maze-solver/maze"
|
||||||
"maze-solver/utils"
|
"maze-solver/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type TurnLeftSolver struct {
|
type DFSSolver struct {
|
||||||
visited map[*maze.Node]bool
|
visited map[*maze.Node]bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *TurnLeftSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
func (s *DFSSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
||||||
defer utils.Timer("Turn left algorithm", 2)()
|
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]
|
current, end := m.Nodes[0], m.Nodes[len(m.Nodes)-1]
|
||||||
s.visited = make(map[*maze.Node]bool, len(m.Nodes))
|
s.visited = make(map[*maze.Node]bool, len(m.Nodes))
|
||||||
|
|
||||||
@ -54,7 +58,7 @@ func (s *TurnLeftSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
|||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *TurnLeftSolver) wasVisited(node *maze.Node) bool {
|
func (s *DFSSolver) wasVisited(node *maze.Node) bool {
|
||||||
if node == nil {
|
if node == nil {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
@ -24,7 +24,7 @@ var TYPES = []string{
|
|||||||
func (f *SolverFactory) Get() Solver {
|
func (f *SolverFactory) Get() Solver {
|
||||||
switch *f.Type {
|
switch *f.Type {
|
||||||
case _TURN_LEFT:
|
case _TURN_LEFT:
|
||||||
return &TurnLeftSolver{}
|
return &DFSSolver{}
|
||||||
}
|
}
|
||||||
panic(fmt.Sprintf("Unrecognized solver type %q", *f.Type))
|
panic(fmt.Sprintf("Unrecognized solver type %q", *f.Type))
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user