Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
6e0a1032d1 | |||
69afaed1bf | |||
908e8c14fb | |||
954d44085c | |||
8a6543cc1e | |||
485efeebaf | |||
f803dc7771 | |||
46c42cb67d | |||
32f7720069 |
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
|
||||
|
||||
import (
|
||||
"image/color"
|
||||
"maze-solver/maze"
|
||||
"testing"
|
||||
|
||||
"github.com/mazznoer/colorgrad"
|
||||
)
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
// 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)
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
39
main.go
39
main.go
@ -17,6 +17,28 @@ import (
|
||||
)
|
||||
|
||||
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?)")
|
||||
|
||||
var verboseLevel *int = argparser.FlagCounter("v", "verbose", &argparse.Options{
|
||||
@ -124,7 +146,7 @@ func main() {
|
||||
|
||||
if err := argparser.Parse(os.Args); err != nil {
|
||||
fmt.Println(argparser.Usage(err))
|
||||
return
|
||||
return nil, nil, nil, false
|
||||
}
|
||||
utils.VERBOSE_LEVEL = *verboseLevel
|
||||
|
||||
@ -137,18 +159,5 @@ func main() {
|
||||
writerFactory.PathColor = color.RGBA{255, 255, 255, 255}
|
||||
writerFactory.SolutionGradient = colorgrad.Warm()
|
||||
|
||||
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")
|
||||
return &readerFactory, &writerFactory, &solverFactory, true
|
||||
}
|
||||
|
@ -1,17 +1,21 @@
|
||||
package solver
|
||||
|
||||
import (
|
||||
"log"
|
||||
"maze-solver/maze"
|
||||
"maze-solver/utils"
|
||||
)
|
||||
|
||||
type TurnLeftSolver struct {
|
||||
type DFSSolver struct {
|
||||
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)()
|
||||
|
||||
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))
|
||||
|
||||
@ -54,7 +58,7 @@ func (s *TurnLeftSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
||||
return ret
|
||||
}
|
||||
|
||||
func (s *TurnLeftSolver) wasVisited(node *maze.Node) bool {
|
||||
func (s *DFSSolver) wasVisited(node *maze.Node) bool {
|
||||
if node == nil {
|
||||
return true
|
||||
}
|
@ -24,7 +24,7 @@ var TYPES = []string{
|
||||
func (f *SolverFactory) Get() Solver {
|
||||
switch *f.Type {
|
||||
case _TURN_LEFT:
|
||||
return &TurnLeftSolver{}
|
||||
return &DFSSolver{}
|
||||
}
|
||||
panic(fmt.Sprintf("Unrecognized solver type %q", *f.Type))
|
||||
}
|
||||
|
Reference in New Issue
Block a user