9 Commits

Author SHA1 Message Date
6e0a1032d1 Figured out that the implementation of turn left
was actually dfs lol
2023-08-13 21:31:47 +02:00
69afaed1bf fixed lil mistake eheh 2023-08-11 14:34:12 +02:00
908e8c14fb Commented out image writer tests cuz i gotta think
of a good way to do them :)
2023-08-11 14:31:51 +02:00
954d44085c Fixed workflows 2023-08-11 14:29:35 +02:00
8a6543cc1e Updated the github workflows 2023-08-11 14:27:24 +02:00
485efeebaf Does this one work? 2023-08-11 14:18:52 +02:00
f803dc7771 Fixed github workflow (hopefully) 2023-08-11 14:10:35 +02:00
46c42cb67d Refactored main.go to make the entry point clearer 2023-08-11 14:09:31 +02:00
32f7720069 Added github workflow for auto-generating
pre-resleases
2023-08-11 14:05:55 +02:00
6 changed files with 159 additions and 86 deletions

View 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
View 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

View File

@ -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
View File

@ -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
}

View File

@ -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
}

View File

@ -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))
}