Compare commits
31 Commits
99fc6ba48a
...
v1.5.0
Author | SHA1 | Date | |
---|---|---|---|
f9d052d649 | |||
5a0bac6b90 | |||
e40c41ddfb | |||
966387ffcd | |||
3cccdc7eb8 | |||
ab902e64b9 | |||
120bd29d86 | |||
27cb446573 | |||
7cb4fa99bc | |||
e53dac17d5 | |||
4f79d6f1ed | |||
346cfe9705 | |||
94af003adc | |||
aec655610a | |||
2423645f3a | |||
6e0a1032d1 | |||
69afaed1bf | |||
908e8c14fb | |||
954d44085c | |||
8a6543cc1e | |||
485efeebaf | |||
f803dc7771 | |||
46c42cb67d | |||
32f7720069 | |||
3c7c181911 | |||
a7dd3e1a81 | |||
5500007fb4 | |||
a80e2c9cc3 | |||
fb59c890ca | |||
18f37e65ed | |||
0f05998295 |
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
@ -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
|
2
.gitignore
vendored
@ -20,3 +20,5 @@
|
|||||||
# Go workspace file
|
# Go workspace file
|
||||||
go.work
|
go.work
|
||||||
/Session.vim
|
/Session.vim
|
||||||
|
/maze.png
|
||||||
|
/maze_sol.png
|
||||||
|
BIN
assets/normal2.png
Normal file
After Width: | Height: | Size: 4.5 KiB |
15
assets/normal2.txt
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
####### #######
|
||||||
|
# # # #
|
||||||
|
### # ##### # #
|
||||||
|
# # # #
|
||||||
|
# ########### #
|
||||||
|
# # # #
|
||||||
|
### # # ##### #
|
||||||
|
# # # # #
|
||||||
|
# ### ### # # #
|
||||||
|
# # # # #
|
||||||
|
# ### # #######
|
||||||
|
# # # # #
|
||||||
|
# # ### ### # #
|
||||||
|
# # # #
|
||||||
|
####### #######
|
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 |
20
go.mod
@ -3,10 +3,30 @@ module maze-solver
|
|||||||
go 1.21
|
go 1.21
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
fyne.io/fyne v1.4.3
|
||||||
|
github.com/akamensky/argparse v1.4.0
|
||||||
github.com/mazznoer/colorgrad v0.9.1
|
github.com/mazznoer/colorgrad v0.9.1
|
||||||
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
|
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
|
||||||
)
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
|
github.com/fsnotify/fsnotify v1.5.4 // indirect
|
||||||
|
github.com/fyne-io/mobile v0.1.2 // indirect
|
||||||
|
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
|
||||||
|
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
||||||
|
github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
|
github.com/srwiley/oksvg v0.0.0-20220731023508-a61f04f16b76 // indirect
|
||||||
|
github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 // indirect
|
||||||
|
github.com/stretchr/testify v1.8.0 // indirect
|
||||||
|
golang.org/x/net v0.6.0 // indirect
|
||||||
|
golang.org/x/sys v0.5.0 // indirect
|
||||||
|
golang.org/x/text v0.12.0 // indirect
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||||
github.com/mazznoer/csscolorparser v0.1.2 // indirect
|
github.com/mazznoer/csscolorparser v0.1.2 // indirect
|
||||||
|
83
go.sum
@ -1,41 +1,124 @@
|
|||||||
|
fyne.io/fyne v1.4.3 h1:356CnXCiYrrfaLGsB7qLK3c6ktzyh8WR05v/2RBu51I=
|
||||||
|
fyne.io/fyne v1.4.3/go.mod h1:8kiPBNSDmuplxs9WnKCkaWYqbcXFy0DeAzwa6PBO9Z8=
|
||||||
|
github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
|
||||||
|
github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
|
||||||
|
github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
|
||||||
|
github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
|
||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||||
|
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
|
||||||
|
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
|
||||||
|
github.com/fyne-io/mobile v0.1.2 h1:0HaXDtOOwyOTn3Umi0uKVCOgJtfX73c6unC4U8i5VZU=
|
||||||
|
github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
|
||||||
|
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
|
||||||
|
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk=
|
||||||
|
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
|
||||||
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
|
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
|
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
|
||||||
|
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
|
github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
|
||||||
|
github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c h1:JGCm/+tJ9gC6THUxooTldS+CUDsba0qvkvU3DHklqW8=
|
||||||
|
github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
|
||||||
|
github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc=
|
||||||
|
github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
|
||||||
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||||
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||||
|
github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a/go.mod h1:ORP3/rB5IsulLEBwQZCJyyV6niqmI7P4EWSmkug+1Ng=
|
||||||
github.com/mazznoer/colorgrad v0.9.1 h1:MB80JYVndKWSMEM1beNqnuOowWGhoQc3DXWXkFp6JlM=
|
github.com/mazznoer/colorgrad v0.9.1 h1:MB80JYVndKWSMEM1beNqnuOowWGhoQc3DXWXkFp6JlM=
|
||||||
github.com/mazznoer/colorgrad v0.9.1/go.mod h1:WX2R9wt9B47+txJZVVpM9LY+LAGIdi4lTI5wIyreDH4=
|
github.com/mazznoer/colorgrad v0.9.1/go.mod h1:WX2R9wt9B47+txJZVVpM9LY+LAGIdi4lTI5wIyreDH4=
|
||||||
github.com/mazznoer/csscolorparser v0.1.2 h1:/UBHuQg792ePmGFzTQAC9u+XbFr7/HzP/Gj70Phyz2A=
|
github.com/mazznoer/csscolorparser v0.1.2 h1:/UBHuQg792ePmGFzTQAC9u+XbFr7/HzP/Gj70Phyz2A=
|
||||||
github.com/mazznoer/csscolorparser v0.1.2/go.mod h1:Aj22+L/rYN/Y6bj3bYqO3N6g1dtdHtGfQ32xZ5PJQic=
|
github.com/mazznoer/csscolorparser v0.1.2/go.mod h1:Aj22+L/rYN/Y6bj3bYqO3N6g1dtdHtGfQ32xZ5PJQic=
|
||||||
|
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
|
||||||
|
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
|
||||||
|
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
|
||||||
|
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||||
|
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||||
|
github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4=
|
||||||
|
github.com/srwiley/oksvg v0.0.0-20220731023508-a61f04f16b76 h1:Ga2uagHhDeGysCixLAzH0mS2TU+CrbQavmsHUNkEEVA=
|
||||||
|
github.com/srwiley/oksvg v0.0.0-20220731023508-a61f04f16b76/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
|
||||||
|
github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU=
|
||||||
|
github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 h1:oDMiXaTMyBEuZMU53atpxqYsSB3U1CHkeAu2zr6wTeY=
|
||||||
|
github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||||
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
|
||||||
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
|
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
|
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
|
||||||
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
|
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
|
||||||
|
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
|
golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo=
|
golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo=
|
||||||
golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8=
|
golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8=
|
||||||
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
|
golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
|
||||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
|
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
|
||||||
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.0.0-20190808195139-e713427fea3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
|
golang.org/x/tools v0.0.0-20200328031815-3db5fc6bac03/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"image"
|
"image"
|
||||||
"image/color"
|
"image/color"
|
||||||
"image/png"
|
"image/png"
|
||||||
|
"maze-solver/utils"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"golang.org/x/image/draw"
|
"golang.org/x/image/draw"
|
||||||
@ -16,6 +17,7 @@ type ImageReader struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *ImageReader) Read() (*RawMaze, error) {
|
func (r *ImageReader) Read() (*RawMaze, error) {
|
||||||
|
defer utils.Timer("Image reader", 3)()
|
||||||
image, err := r.getShrunkImage()
|
image, err := r.getShrunkImage()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -78,6 +78,30 @@ func TestImageReader(t *testing.T) {
|
|||||||
{0b_00000100, 0b000_00000},
|
{0b_00000100, 0b000_00000},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Normal2",
|
||||||
|
15, 15,
|
||||||
|
20, 20,
|
||||||
|
white, black,
|
||||||
|
"../../assets/normal2.png",
|
||||||
|
[][]byte{
|
||||||
|
{0b00000001, 0b0000000_0},
|
||||||
|
{0b01110111, 0b1111010_0},
|
||||||
|
{0b00010100, 0b0001010_0},
|
||||||
|
{0b01110111, 0b1101110_0},
|
||||||
|
{0b01000000, 0b0000010_0},
|
||||||
|
{0b01111101, 0b1111010_0},
|
||||||
|
{0b00010101, 0b0000010_0},
|
||||||
|
{0b01110111, 0b0111010_0},
|
||||||
|
{0b01000100, 0b0101010_0},
|
||||||
|
{0b01011101, 0b1101110_0},
|
||||||
|
{0b01000101, 0b0000000_0},
|
||||||
|
{0b01110101, 0b0111110_0},
|
||||||
|
{0b01010001, 0b0001010_0},
|
||||||
|
{0b01011111, 0b1111010_0},
|
||||||
|
{0b00000001, 0b0000000_0},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
|
@ -1,5 +1,48 @@
|
|||||||
package reader
|
package reader
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"image/color"
|
||||||
|
)
|
||||||
|
|
||||||
type Reader interface {
|
type Reader interface {
|
||||||
Read() (*RawMaze, error)
|
Read() (*RawMaze, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ReaderFactory struct {
|
||||||
|
Type string
|
||||||
|
Filename *string
|
||||||
|
PathChar, WallChar, SolutionChar *string
|
||||||
|
CellWidth, CellHeight *int
|
||||||
|
WallColor, PathColor color.Color
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
_IMAGE = "image"
|
||||||
|
_TEXT = "text"
|
||||||
|
)
|
||||||
|
|
||||||
|
var TYPES = map[string]string{
|
||||||
|
".png": _IMAGE,
|
||||||
|
".txt": _TEXT,
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *ReaderFactory) Get() Reader {
|
||||||
|
switch f.Type {
|
||||||
|
case _TEXT:
|
||||||
|
return &TextReader{
|
||||||
|
Filename: *f.Filename,
|
||||||
|
PathChar: byte((*f.PathChar)[0]),
|
||||||
|
WallChar: byte((*f.WallChar)[0]),
|
||||||
|
}
|
||||||
|
case _IMAGE:
|
||||||
|
return &ImageReader{
|
||||||
|
Filename: *f.Filename,
|
||||||
|
CellWidth: *f.CellWidth,
|
||||||
|
CellHeight: *f.CellHeight,
|
||||||
|
WallColor: f.WallColor,
|
||||||
|
PathColor: f.PathColor,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
panic(fmt.Sprintf("Unrecognized reader type %q", f.Type))
|
||||||
|
}
|
||||||
|
@ -11,6 +11,7 @@ type StringsReader struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *StringsReader) Read() (*RawMaze, error) {
|
func (r *StringsReader) Read() (*RawMaze, error) {
|
||||||
|
defer utils.Timer("Strings Reader", 3)()
|
||||||
width, height := len((*r.Lines)[0]), len(*r.Lines)
|
width, height := len((*r.Lines)[0]), len(*r.Lines)
|
||||||
ret := &RawMaze{
|
ret := &RawMaze{
|
||||||
Width: width,
|
Width: width,
|
||||||
|
@ -2,6 +2,7 @@ package reader
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"maze-solver/utils"
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -10,7 +11,8 @@ type TextReader struct {
|
|||||||
PathChar, WallChar byte
|
PathChar, WallChar byte
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r TextReader) Read() (*RawMaze, error) {
|
func (r *TextReader) Read() (*RawMaze, error) {
|
||||||
|
defer utils.Timer("Text Reader", 3)()
|
||||||
lines, err := getLines(r.Filename)
|
lines, err := getLines(r.Filename)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -7,6 +7,7 @@ import (
|
|||||||
"image/draw"
|
"image/draw"
|
||||||
"image/png"
|
"image/png"
|
||||||
"maze-solver/maze"
|
"maze-solver/maze"
|
||||||
|
"maze-solver/utils"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/mazznoer/colorgrad"
|
"github.com/mazznoer/colorgrad"
|
||||||
@ -22,10 +23,23 @@ type ImageWriter struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (w *ImageWriter) Write() error {
|
func (w *ImageWriter) Write() error {
|
||||||
|
defer utils.Timer("Image writer", 3)()
|
||||||
if w.Filename[len(w.Filename)-4:] != ".png" {
|
if w.Filename[len(w.Filename)-4:] != ".png" {
|
||||||
return errors.New("Filename of ImageWriter doesn't have .png extension. The only suppported image type is png")
|
return errors.New("Filename of ImageWriter doesn't have .png extension. The only suppported image type is png")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
w.GenerateImage()
|
||||||
|
|
||||||
|
f, err := os.Create(w.Filename)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
png.Encode(f, w.img)
|
||||||
|
f.Close()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *ImageWriter) GenerateImage() *image.RGBA {
|
||||||
w.img = image.NewRGBA(image.Rect(0, 0, w.Maze.Width*w.CellWidth, w.Maze.Height*w.CellHeight))
|
w.img = image.NewRGBA(image.Rect(0, 0, w.Maze.Width*w.CellWidth, w.Maze.Height*w.CellHeight))
|
||||||
|
|
||||||
// Fill the image with walls
|
// Fill the image with walls
|
||||||
@ -48,6 +62,9 @@ func (w *ImageWriter) Write() error {
|
|||||||
w.draw(x0, y0, width, height, w.PathColor)
|
w.draw(x0, y0, width, height, w.PathColor)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if len(w.Maze.Solution) == 0 {
|
||||||
|
return w.img
|
||||||
|
}
|
||||||
|
|
||||||
// Fill in the solution
|
// Fill in the solution
|
||||||
total_len := w.getSolutionLength()
|
total_len := w.getSolutionLength()
|
||||||
@ -56,17 +73,28 @@ func (w *ImageWriter) Write() error {
|
|||||||
width, height = w.CellWidth, w.CellHeight
|
width, height = w.CellWidth, w.CellHeight
|
||||||
for i, from := range w.Maze.Solution[:len(w.Maze.Solution)-1] {
|
for i, from := range w.Maze.Solution[:len(w.Maze.Solution)-1] {
|
||||||
to := w.Maze.Solution[i+1]
|
to := w.Maze.Solution[i+1]
|
||||||
|
|
||||||
if from.Coords.X == to.Coords.X {
|
if from.Coords.X == to.Coords.X {
|
||||||
|
// Fill verticallly
|
||||||
x0 = from.Coords.X * w.CellWidth
|
x0 = from.Coords.X * w.CellWidth
|
||||||
|
|
||||||
|
if from.Coords.Y < to.Coords.Y {
|
||||||
for y := from.Coords.Y; y < to.Coords.Y; y++ {
|
for y := from.Coords.Y; y < to.Coords.Y; y++ {
|
||||||
y0 = y * w.CellHeight
|
y0 = y * w.CellHeight
|
||||||
w.draw(x0, y0, width, height, colors[c])
|
w.draw(x0, y0, width, height, colors[c])
|
||||||
c++
|
c++
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
for y := from.Coords.Y; y > to.Coords.Y; y-- {
|
||||||
|
y0 = y * w.CellHeight
|
||||||
|
w.draw(x0, y0, width, height, colors[c])
|
||||||
|
c++
|
||||||
|
}
|
||||||
|
}
|
||||||
y0 = to.Coords.Y * w.CellHeight
|
y0 = to.Coords.Y * w.CellHeight
|
||||||
w.draw(x0, y0, width, height, colors[c])
|
w.draw(x0, y0, width, height, colors[c])
|
||||||
} else {
|
} else {
|
||||||
|
// Fill horizontally
|
||||||
y0 = from.Coords.Y * w.CellHeight
|
y0 = from.Coords.Y * w.CellHeight
|
||||||
|
|
||||||
if from.Coords.X < to.Coords.X {
|
if from.Coords.X < to.Coords.X {
|
||||||
@ -86,14 +114,7 @@ func (w *ImageWriter) Write() error {
|
|||||||
w.draw(x0, y0, width, height, colors[c])
|
w.draw(x0, y0, width, height, colors[c])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return w.img
|
||||||
f, err := os.Create(w.Filename)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
png.Encode(f, w.img)
|
|
||||||
f.Close()
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *ImageWriter) getSolutionLength() int {
|
func (w *ImageWriter) getSolutionLength() int {
|
||||||
|
122
io/writer/image_test.go
Normal file
@ -0,0 +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) {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -4,6 +4,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"maze-solver/maze"
|
"maze-solver/maze"
|
||||||
|
"maze-solver/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type StringsWriter struct {
|
type StringsWriter struct {
|
||||||
@ -14,6 +15,7 @@ type StringsWriter struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (w *StringsWriter) Write() error {
|
func (w *StringsWriter) Write() error {
|
||||||
|
defer utils.Timer("Strings writer", 3)()
|
||||||
w.lines = make([][]byte, w.Maze.Height)
|
w.lines = make([][]byte, w.Maze.Height)
|
||||||
|
|
||||||
// Fill the lines with walls
|
// Fill the lines with walls
|
||||||
@ -58,6 +60,9 @@ func (w *StringsWriter) fillHorizontally(from maze.Coordinates, to maze.Coordina
|
|||||||
|
|
||||||
func (w *StringsWriter) fillVertically(from maze.Coordinates, to maze.Coordinates, char byte) {
|
func (w *StringsWriter) fillVertically(from maze.Coordinates, to maze.Coordinates, char byte) {
|
||||||
x := from.X
|
x := from.X
|
||||||
|
if from.Y > to.Y {
|
||||||
|
from, to = to, from
|
||||||
|
}
|
||||||
for y := from.Y; y <= to.Y; y++ {
|
for y := from.Y; y <= to.Y; y++ {
|
||||||
w.lines[y][x] = char
|
w.lines[y][x] = char
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package writer
|
package writer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"maze-solver/maze"
|
"maze-solver/maze"
|
||||||
"maze-solver/utils"
|
"maze-solver/utils"
|
||||||
"testing"
|
"testing"
|
||||||
@ -69,7 +68,6 @@ func TestStringsWriter(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
fmt.Printf("----------- %s -----------\n", test.name)
|
|
||||||
writer := StringsWriter{
|
writer := StringsWriter{
|
||||||
PathChar: test.pathChar,
|
PathChar: test.pathChar,
|
||||||
WallChar: test.wallChar,
|
WallChar: test.wallChar,
|
||||||
|
@ -13,7 +13,6 @@ func trivial() *maze.SolvedMaze {
|
|||||||
#123#
|
#123#
|
||||||
###4#
|
###4#
|
||||||
*/
|
*/
|
||||||
ret := &maze.SolvedMaze{}
|
|
||||||
nodes := make([]*maze.Node, 5)
|
nodes := make([]*maze.Node, 5)
|
||||||
|
|
||||||
nodes[0] = maze.NewNode(maze.Coordinates{X: 2, Y: 0})
|
nodes[0] = maze.NewNode(maze.Coordinates{X: 2, Y: 0})
|
||||||
@ -37,16 +36,17 @@ func trivial() *maze.SolvedMaze {
|
|||||||
|
|
||||||
nodes[4].Up = nodes[3]
|
nodes[4].Up = nodes[3]
|
||||||
|
|
||||||
solution := []*maze.Node{
|
ret := &maze.SolvedMaze{
|
||||||
|
Maze: &maze.Maze{
|
||||||
|
Width: 5,
|
||||||
|
Height: 3,
|
||||||
|
Nodes: nodes,
|
||||||
|
},
|
||||||
|
Solution: []*maze.Node{
|
||||||
nodes[0], nodes[2], nodes[3], nodes[4],
|
nodes[0], nodes[2], nodes[3], nodes[4],
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
ret.Nodes = nodes
|
|
||||||
ret.Width = 5
|
|
||||||
ret.Height = 3
|
|
||||||
|
|
||||||
ret.Solution = solution
|
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,7 +89,7 @@ func bigger() *maze.SolvedMaze {
|
|||||||
nodes[4].Up = nodes[3]
|
nodes[4].Up = nodes[3]
|
||||||
|
|
||||||
ret := &maze.SolvedMaze{
|
ret := &maze.SolvedMaze{
|
||||||
Maze: maze.Maze{
|
Maze: &maze.Maze{
|
||||||
Width: 7,
|
Width: 7,
|
||||||
Height: 5,
|
Height: 5,
|
||||||
Nodes: nodes,
|
Nodes: nodes,
|
||||||
@ -146,7 +146,7 @@ func bigger_staggered() *maze.SolvedMaze {
|
|||||||
nodes[5].Up = nodes[4]
|
nodes[5].Up = nodes[4]
|
||||||
|
|
||||||
ret := &maze.SolvedMaze{
|
ret := &maze.SolvedMaze{
|
||||||
Maze: maze.Maze{
|
Maze: &maze.Maze{
|
||||||
Width: 7,
|
Width: 7,
|
||||||
Height: 5,
|
Height: 5,
|
||||||
Nodes: nodes,
|
Nodes: nodes,
|
||||||
@ -266,7 +266,7 @@ func normal() *maze.SolvedMaze {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ret := &maze.SolvedMaze{
|
ret := &maze.SolvedMaze{
|
||||||
Maze: maze.Maze{
|
Maze: &maze.Maze{
|
||||||
Width: 11,
|
Width: 11,
|
||||||
Height: 11,
|
Height: 11,
|
||||||
Nodes: nodes,
|
Nodes: nodes,
|
||||||
|
@ -1,5 +1,46 @@
|
|||||||
package writer
|
package writer
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"image/color"
|
||||||
|
"maze-solver/maze"
|
||||||
|
|
||||||
|
"github.com/mazznoer/colorgrad"
|
||||||
|
)
|
||||||
|
|
||||||
type Writer interface {
|
type Writer interface {
|
||||||
Write() error
|
Write() error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type WriterFactory struct {
|
||||||
|
Type string
|
||||||
|
Filename *string
|
||||||
|
PathChar, WallChar, SolutionChar *string
|
||||||
|
CellWidth, CellHeight *int
|
||||||
|
WallColor, PathColor color.Color
|
||||||
|
SolutionGradient colorgrad.Gradient
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
_IMAGE = "image"
|
||||||
|
)
|
||||||
|
|
||||||
|
var TYPES = map[string]string{
|
||||||
|
".png": _IMAGE,
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *WriterFactory) Get(m *maze.SolvedMaze) Writer {
|
||||||
|
switch f.Type {
|
||||||
|
case _IMAGE:
|
||||||
|
return &ImageWriter{
|
||||||
|
Filename: *f.Filename,
|
||||||
|
Maze: m,
|
||||||
|
CellWidth: *f.CellWidth,
|
||||||
|
CellHeight: *f.CellHeight,
|
||||||
|
WallColor: f.WallColor,
|
||||||
|
PathColor: f.PathColor,
|
||||||
|
SolutionGradient: f.SolutionGradient,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
panic(fmt.Sprintf("Unrecognized writer type %q", f.Type))
|
||||||
|
}
|
||||||
|
205
main.go
@ -1,25 +1,212 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"image/color"
|
||||||
"maze-solver/io/reader"
|
"maze-solver/io/reader"
|
||||||
"maze-solver/io/writer"
|
"maze-solver/io/writer"
|
||||||
|
"maze-solver/maze"
|
||||||
"maze-solver/maze/parser"
|
"maze-solver/maze/parser"
|
||||||
"maze-solver/solver"
|
"maze-solver/solver"
|
||||||
"maze-solver/utils"
|
"maze-solver/utils"
|
||||||
|
"maze-solver/visualizer"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/akamensky/argparse"
|
||||||
|
"github.com/mazznoer/colorgrad"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
output := "filename"
|
readerFactory, writerFactory, solverFactory, visFactory, ok := parse_arguments()
|
||||||
|
|
||||||
reader := &reader.TextReader{Filename: "filename", PathChar: ' ', WallChar: '#'}
|
if !ok {
|
||||||
writer := &writer.ImageWriter{}
|
return
|
||||||
|
}
|
||||||
|
|
||||||
solver := &solver.Bfs{}
|
defer utils.Timer("TOTAL", 1)()
|
||||||
|
reader := readerFactory.Get()
|
||||||
|
|
||||||
maze, err := parser.Parse(reader)
|
m, err := parser.Parse(reader)
|
||||||
utils.Check(err, "Couldn't read maze from %q", reader.Filename)
|
utils.Check(err, "Couldn't read maze")
|
||||||
|
|
||||||
solved := solver.Solve(maze)
|
var solved *maze.SolvedMaze
|
||||||
err = writer.Write(output, solved)
|
if *visFactory.Type != "" {
|
||||||
utils.Check(err, "Couldn't write solved maze to %q", output)
|
solved_chan := make(chan *maze.SolvedMaze, 3)
|
||||||
|
solver := solverFactory.Get(solved_chan)
|
||||||
|
vis := visFactory.Get()
|
||||||
|
|
||||||
|
vis.Init(m)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(2)
|
||||||
|
|
||||||
|
lets_go := make(chan bool, 1)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
if <-lets_go {
|
||||||
|
solved = solver.Solve(m)
|
||||||
|
}
|
||||||
|
close(solved_chan)
|
||||||
|
wg.Done()
|
||||||
|
}()
|
||||||
|
go func() {
|
||||||
|
vis.Visualize(solved_chan)
|
||||||
|
wg.Done()
|
||||||
|
}()
|
||||||
|
vis.Run(lets_go)
|
||||||
|
wg.Wait()
|
||||||
|
} else {
|
||||||
|
solver := solverFactory.Get(nil)
|
||||||
|
solved = solver.Solve(m)
|
||||||
|
}
|
||||||
|
if solved == nil { // cuz maybe with the window visualization, the user pressed "no"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writer := writerFactory.Get(solved)
|
||||||
|
|
||||||
|
err = writer.Write()
|
||||||
|
utils.Check(err, "Couldn't write solved maze")
|
||||||
|
}
|
||||||
|
|
||||||
|
func parse_arguments() (*reader.ReaderFactory, *writer.WriterFactory, *solver.SolverFactory, *visualizer.VisualizerFactory, 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{
|
||||||
|
Help: `Verbose level of the solver
|
||||||
|
0: nothing printed to stdout
|
||||||
|
1: print the total time taken by the solver (time of the main() function)
|
||||||
|
2: prints the time the solving algorithm took to run
|
||||||
|
3: prints the time taken by each section (reader, solving algorithm, writer)`,
|
||||||
|
})
|
||||||
|
|
||||||
|
readerFactory := reader.ReaderFactory{}
|
||||||
|
writerFactory := writer.WriterFactory{}
|
||||||
|
solverFactory := solver.SolverFactory{}
|
||||||
|
visFactory := visualizer.VisualizerFactory{}
|
||||||
|
|
||||||
|
readerFactory.Type = reader.TYPES[".png"]
|
||||||
|
readerFactory.Filename = argparser.String("i", "input", &argparse.Options{
|
||||||
|
Help: "Input file",
|
||||||
|
Default: "maze.png",
|
||||||
|
Validate: func(args []string) error {
|
||||||
|
var ok bool
|
||||||
|
extension := args[0][len(args[0])-4:]
|
||||||
|
readerFactory.Type, ok = reader.TYPES[extension]
|
||||||
|
if ok {
|
||||||
|
return nil
|
||||||
|
} else {
|
||||||
|
return errors.New(fmt.Sprintf("Filetype not recognized %q", extension))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
writerFactory.Type = writer.TYPES[".png"]
|
||||||
|
writerFactory.Filename = argparser.String("o", "output", &argparse.Options{
|
||||||
|
Help: "Input file",
|
||||||
|
Default: "maze_sol.png",
|
||||||
|
Validate: func(args []string) error {
|
||||||
|
var ok bool
|
||||||
|
extension := args[0][len(args[0])-4:]
|
||||||
|
writerFactory.Type, ok = writer.TYPES[extension]
|
||||||
|
if ok {
|
||||||
|
return nil
|
||||||
|
} else {
|
||||||
|
return errors.New(fmt.Sprintf("Filetype not recognized %q", extension))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
readerFactory.PathChar = argparser.String("", "path-char-in", &argparse.Options{
|
||||||
|
Help: "Character to represent the path in a input text file",
|
||||||
|
Default: " ",
|
||||||
|
Validate: func(args []string) error {
|
||||||
|
if len(args[0]) > 1 {
|
||||||
|
return errors.New("Character must a string of length 1")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
readerFactory.WallChar = argparser.String("", "wall-char-in", &argparse.Options{
|
||||||
|
Help: "Character to represent the wall in a input text file",
|
||||||
|
Default: "#",
|
||||||
|
Validate: func(args []string) error {
|
||||||
|
if len(args[0]) > 1 {
|
||||||
|
return errors.New("Character must a string of length 1")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
writerFactory.PathChar = argparser.String("", "path-char-out", &argparse.Options{
|
||||||
|
Help: "Character to represent the path in a output text file",
|
||||||
|
Default: " ",
|
||||||
|
Validate: func(args []string) error {
|
||||||
|
if len(args[0]) > 1 {
|
||||||
|
return errors.New("Character must a string of length 1")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
writerFactory.WallChar = argparser.String("", "wall-char-out", &argparse.Options{
|
||||||
|
Help: "Character to represent the wall in a output text file",
|
||||||
|
Default: "#",
|
||||||
|
Validate: func(args []string) error {
|
||||||
|
if len(args[0]) > 1 {
|
||||||
|
return errors.New("Character must a string of length 1")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
cellSizeIn := argparser.Int("", "cell-size-in", &argparse.Options{
|
||||||
|
Help: "Size of a cell (in pixels) for input file of image type",
|
||||||
|
Default: 3,
|
||||||
|
})
|
||||||
|
|
||||||
|
cellSizeOut := argparser.Int("", "cell-size-out", &argparse.Options{
|
||||||
|
Help: "Size of a cell (in pixels) for output file of image type",
|
||||||
|
Default: 3,
|
||||||
|
})
|
||||||
|
|
||||||
|
solverFactory.Type = argparser.Selector("a", "algo", solver.TYPES, &argparse.Options{
|
||||||
|
Help: fmt.Sprintf("Algorithm to solve the maze, avaiable options: %s", strings.Join(solver.TYPES, ", ")),
|
||||||
|
Default: solver.TYPES[0],
|
||||||
|
})
|
||||||
|
|
||||||
|
visFactory.Type = argparser.Selector("", "visualize", visualizer.VIZ_METHODS, &argparse.Options{
|
||||||
|
Help: fmt.Sprintf("Visualizer the progress of the solver, avaiable options: %s. Window will give a live feed of the solver, whereas video creates a video --output with mp4 extension", strings.Join(visualizer.VIZ_METHODS, ", ")),
|
||||||
|
Default: "",
|
||||||
|
})
|
||||||
|
|
||||||
|
visFactory.Filename = argparser.String("", "video-name", &argparse.Options{
|
||||||
|
Help: "Name of the output file if --visualize is set to 'video'",
|
||||||
|
Default: "maze_sol.mp4",
|
||||||
|
})
|
||||||
|
|
||||||
|
visFactory.Framerate = argparser.Float("", "video-framerate", &argparse.Options{
|
||||||
|
Help: "Framerate of the video if --visualize is set to 'video'",
|
||||||
|
Default: 60.,
|
||||||
|
})
|
||||||
|
|
||||||
|
if err := argparser.Parse(os.Args); err != nil {
|
||||||
|
fmt.Println(argparser.Usage(err))
|
||||||
|
return nil, nil, nil, nil, false
|
||||||
|
}
|
||||||
|
utils.VERBOSE_LEVEL = *verboseLevel
|
||||||
|
|
||||||
|
readerFactory.CellHeight, readerFactory.CellWidth = cellSizeIn, cellSizeIn
|
||||||
|
readerFactory.WallColor = color.RGBA{0, 0, 0, 255}
|
||||||
|
readerFactory.PathColor = color.RGBA{255, 255, 255, 255}
|
||||||
|
|
||||||
|
writerFactory.CellHeight, writerFactory.CellWidth = cellSizeOut, cellSizeOut
|
||||||
|
writerFactory.WallColor = color.RGBA{0, 0, 0, 255}
|
||||||
|
writerFactory.PathColor = color.RGBA{255, 255, 255, 255}
|
||||||
|
writerFactory.SolutionGradient = colorgrad.Warm()
|
||||||
|
|
||||||
|
return &readerFactory, &writerFactory, &solverFactory, &visFactory, true
|
||||||
}
|
}
|
||||||
|
@ -30,6 +30,7 @@ type Node struct {
|
|||||||
Coords Coordinates
|
Coords Coordinates
|
||||||
Up, Down *Node
|
Up, Down *Node
|
||||||
Left, Right *Node
|
Left, Right *Node
|
||||||
|
Visited bool `default:"false"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewNode(coords Coordinates) *Node {
|
func NewNode(coords Coordinates) *Node {
|
||||||
@ -48,6 +49,6 @@ type Maze struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SolvedMaze struct {
|
type SolvedMaze struct {
|
||||||
Maze
|
*Maze
|
||||||
Solution []*Node
|
Solution []*Node
|
||||||
}
|
}
|
||||||
|
@ -85,7 +85,7 @@ func lookupNeighbourAbove(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoor
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if y > 0 && raw_maze.IsWall(node.Coords.X, y) {
|
if y >= 0 && raw_maze.IsWall(node.Coords.X, y) {
|
||||||
y++
|
y++
|
||||||
if y == node.Coords.Y {
|
if y == node.Coords.Y {
|
||||||
break
|
break
|
||||||
@ -107,6 +107,10 @@ func lookupNeighbourAbove(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoor
|
|||||||
|
|
||||||
func lookupNeighbourLeft(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node) {
|
func lookupNeighbourLeft(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node) {
|
||||||
for x := node.Coords.X - 1; x > 0; x-- {
|
for x := node.Coords.X - 1; x > 0; x-- {
|
||||||
|
if raw_maze.IsWall(x, node.Coords.Y) && x == node.Coords.X-1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if raw_maze.IsWall(x, node.Coords.Y) && x < node.Coords.X-1 {
|
if raw_maze.IsWall(x, node.Coords.Y) && x < node.Coords.X-1 {
|
||||||
panic(fmt.Sprintf("Found no node before wall while looking to the left at neighbours of node %v (arrived at x=%v before hitting a wall)", node, x))
|
panic(fmt.Sprintf("Found no node before wall while looking to the left at neighbours of node %v (arrived at x=%v before hitting a wall)", node, x))
|
||||||
}
|
}
|
||||||
@ -122,7 +126,11 @@ func lookupNeighbourLeft(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoord
|
|||||||
|
|
||||||
func lookupNeighbourRight(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node) {
|
func lookupNeighbourRight(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node) {
|
||||||
for x := node.Coords.X + 1; x < raw_maze.Width; x++ {
|
for x := node.Coords.X + 1; x < raw_maze.Width; x++ {
|
||||||
if raw_maze.IsWall(x, node.Coords.Y) {
|
if raw_maze.IsWall(x, node.Coords.Y) && x == node.Coords.X+1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if raw_maze.IsWall(x, node.Coords.Y) && x > node.Coords.X+1 {
|
||||||
panic(fmt.Sprintf("Found no node before wall while looking to the right at neighbours of node %v", node))
|
panic(fmt.Sprintf("Found no node before wall while looking to the right at neighbours of node %v", node))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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: '#',
|
||||||
@ -340,12 +340,207 @@ func TestTextReadNormal(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestTextReadNormal2(t *testing.T) {
|
||||||
|
/* normal2.txt
|
||||||
|
####### #######
|
||||||
|
# # # #
|
||||||
|
### # ##### # #
|
||||||
|
# # # #
|
||||||
|
# ########### #
|
||||||
|
# # # #
|
||||||
|
### # # ##### #
|
||||||
|
# # # # #
|
||||||
|
# ### ### # # #
|
||||||
|
# # # # #
|
||||||
|
# ### # #######
|
||||||
|
# # # # #
|
||||||
|
# # ### ### # #
|
||||||
|
# # # #
|
||||||
|
####### #######
|
||||||
|
|
||||||
|
Nodes are
|
||||||
|
#######0#######
|
||||||
|
#1 2#3 4 5#B#
|
||||||
|
### # ##### # #
|
||||||
|
#6 7#8 9#A C#
|
||||||
|
# ########### #
|
||||||
|
#D I E#F G# #
|
||||||
|
### # # ##### #
|
||||||
|
#H J#K L#M N# #
|
||||||
|
# ### ### # # #
|
||||||
|
# #O P#Q R#S T#
|
||||||
|
# ### # #######
|
||||||
|
#U V#W# #X C Y#
|
||||||
|
# # ### ### # #
|
||||||
|
#Z#A B D#E#
|
||||||
|
#######F#######
|
||||||
|
*/
|
||||||
|
nodes := make([]*maze.Node, 42)
|
||||||
|
|
||||||
|
// ---- Node creation ----
|
||||||
|
coords := []struct{ x, y int }{
|
||||||
|
{7, 0}, // 0
|
||||||
|
|
||||||
|
{1, 1}, // 1
|
||||||
|
{3, 1}, // 2
|
||||||
|
{5, 1}, // 3
|
||||||
|
{7, 1}, // 4
|
||||||
|
{11, 1}, // 5
|
||||||
|
|
||||||
|
{1, 3}, // 6
|
||||||
|
{3, 3}, // 7
|
||||||
|
{5, 3}, // 8
|
||||||
|
{9, 3}, // 9
|
||||||
|
{11, 3}, // 10 (A)
|
||||||
|
{13, 1}, // 11 (B)
|
||||||
|
{13, 3}, // 12 (C)
|
||||||
|
|
||||||
|
{1, 5}, // 13 (D)
|
||||||
|
{5, 5}, // 14 (E)
|
||||||
|
{7, 5}, // 15 (F)
|
||||||
|
{11, 5}, // 16 (G)
|
||||||
|
|
||||||
|
{1, 7}, // 17 (H)
|
||||||
|
{3, 5}, // 18 (I)
|
||||||
|
{3, 7}, // 19 (J)
|
||||||
|
{5, 7}, // 20 (K)
|
||||||
|
{7, 7}, // 21 (L)
|
||||||
|
{9, 7}, // 22 (M)
|
||||||
|
{11, 7}, // 23 (N)
|
||||||
|
|
||||||
|
{3, 9}, // 24 (O)
|
||||||
|
{5, 9}, // 25 (P)
|
||||||
|
{7, 9}, // 26 (Q)
|
||||||
|
{9, 9}, // 27 (R)
|
||||||
|
{11, 9}, // 28 (S)
|
||||||
|
{13, 9}, // 29 (T)
|
||||||
|
|
||||||
|
{1, 11}, // 30 (U)
|
||||||
|
{3, 11}, // 31 (V)
|
||||||
|
{5, 11}, // 32 (W)
|
||||||
|
{9, 11}, // 33 (X)
|
||||||
|
{13, 11}, // 34 (Y)
|
||||||
|
|
||||||
|
{1, 13}, // 35 (Z)
|
||||||
|
{3, 13}, // 36 (AA)
|
||||||
|
{7, 13}, // 37 (AB)
|
||||||
|
{11, 11}, // 38 (AC)
|
||||||
|
{11, 13}, // 39 (AD)
|
||||||
|
{13, 13}, // 40 (AE)
|
||||||
|
|
||||||
|
{7, 14}, // 42 (AF)
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, coord := range coords {
|
||||||
|
nodes[i] = maze.NewNode(maze.Coordinates{X: coord.x, Y: coord.y})
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Node linking ----
|
||||||
|
// Vertical
|
||||||
|
links := []struct {
|
||||||
|
from, to int
|
||||||
|
}{
|
||||||
|
{0, 4},
|
||||||
|
{2, 7},
|
||||||
|
{3, 8},
|
||||||
|
{5, 10},
|
||||||
|
{11, 12},
|
||||||
|
{6, 13},
|
||||||
|
{12, 29},
|
||||||
|
{18, 19},
|
||||||
|
{14, 20},
|
||||||
|
{15, 21},
|
||||||
|
{17, 30},
|
||||||
|
{20, 25},
|
||||||
|
{22, 27},
|
||||||
|
{23, 28},
|
||||||
|
{25, 32},
|
||||||
|
{26, 37},
|
||||||
|
{30, 35},
|
||||||
|
{31, 36},
|
||||||
|
{38, 39},
|
||||||
|
{34, 40},
|
||||||
|
{37, 41},
|
||||||
|
}
|
||||||
|
for _, link := range links {
|
||||||
|
nodes[link.from].Down = nodes[link.to]
|
||||||
|
nodes[link.to].Up = nodes[link.from]
|
||||||
|
}
|
||||||
|
|
||||||
|
links = []struct {
|
||||||
|
from, to int
|
||||||
|
}{
|
||||||
|
{1, 2},
|
||||||
|
{3, 4},
|
||||||
|
{4, 5},
|
||||||
|
|
||||||
|
{6, 7},
|
||||||
|
{8, 9},
|
||||||
|
{10, 12},
|
||||||
|
|
||||||
|
{13, 18},
|
||||||
|
{18, 14},
|
||||||
|
{15, 16},
|
||||||
|
|
||||||
|
{17, 19},
|
||||||
|
{20, 21},
|
||||||
|
{22, 23},
|
||||||
|
|
||||||
|
{24, 25},
|
||||||
|
{26, 27},
|
||||||
|
{28, 29},
|
||||||
|
|
||||||
|
{30, 31},
|
||||||
|
{33, 38},
|
||||||
|
{38, 34},
|
||||||
|
{36, 37},
|
||||||
|
{37, 39},
|
||||||
|
}
|
||||||
|
for _, link := range links {
|
||||||
|
nodes[link.from].Right = nodes[link.to]
|
||||||
|
nodes[link.to].Left = nodes[link.from]
|
||||||
|
}
|
||||||
|
|
||||||
|
reader := &reader.TextReader{
|
||||||
|
Filename: "../../assets/normal2.txt",
|
||||||
|
PathChar: ' ',
|
||||||
|
WallChar: '#',
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := Parse(reader)
|
||||||
|
utils.Check(err, "Couldn't create maze from %q", reader.Filename)
|
||||||
|
|
||||||
|
utils.AssertEqual(t, got.Width, 15, "Normal 2: width differ")
|
||||||
|
utils.AssertEqual(t, got.Height, 15, "Normal 2: height differ")
|
||||||
|
|
||||||
|
if len(nodes) != len(got.Nodes) {
|
||||||
|
for i, node := range got.Nodes {
|
||||||
|
fmt.Printf("%v: %v\n", i, node)
|
||||||
|
}
|
||||||
|
t.Fatalf("Didn't get the same size of nodes: %v, want %v", len(got.Nodes), len(nodes))
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, got := range got.Nodes {
|
||||||
|
expected := nodes[i]
|
||||||
|
|
||||||
|
checkNode(t, i, got, expected, "")
|
||||||
|
checkNode(t, i, got.Left, expected.Left, "left")
|
||||||
|
checkNode(t, i, got.Right, expected.Right, "Right")
|
||||||
|
checkNode(t, i, got.Up, expected.Up, "Up")
|
||||||
|
checkNode(t, i, got.Down, expected.Down, "Down")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func checkNode(t *testing.T, i int, got *maze.Node, expected *maze.Node, side string) {
|
func checkNode(t *testing.T, i int, got *maze.Node, expected *maze.Node, side string) {
|
||||||
if expected == nil {
|
if expected == nil && got != nil {
|
||||||
|
t.Fatalf("Somehow there is a node %s of %v, didn't want any", side, i)
|
||||||
|
}
|
||||||
|
|
||||||
|
if expected == nil && got == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if got == nil {
|
if expected != nil && got == nil {
|
||||||
t.Fatalf("No %s node of %v, want %v", side, i, expected.Coords)
|
t.Fatalf("No %s node of %v, want %v", side, i, expected.Coords)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
75
solver/a-star.go
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
package solver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"maze-solver/maze"
|
||||||
|
"maze-solver/utils"
|
||||||
|
"sort"
|
||||||
|
)
|
||||||
|
|
||||||
|
type AStarSolver struct {
|
||||||
|
solved_chan chan<- *maze.SolvedMaze
|
||||||
|
dist_from_start map[*maze.Node]int
|
||||||
|
dist_from_end map[*maze.Node]int
|
||||||
|
parent map[*maze.Node]*maze.Node
|
||||||
|
stack sorted_stack
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AStarSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
||||||
|
defer utils.Timer("A* algorithm", 2)()
|
||||||
|
s.dist_from_start = make(map[*maze.Node]int, len(m.Nodes))
|
||||||
|
s.dist_from_end = make(map[*maze.Node]int, len(m.Nodes))
|
||||||
|
s.parent = make(map[*maze.Node]*maze.Node, len(m.Nodes))
|
||||||
|
|
||||||
|
current, end := m.Nodes[0], m.Nodes[len(m.Nodes)-1]
|
||||||
|
|
||||||
|
for _, node := range m.Nodes {
|
||||||
|
s.dist_from_start[node] = 0
|
||||||
|
s.dist_from_end[node] = int(node.Coords.Distance(end.Coords))
|
||||||
|
}
|
||||||
|
|
||||||
|
for current != end {
|
||||||
|
current.Visited = true
|
||||||
|
if s.solved_chan != nil {
|
||||||
|
s.solved_chan <- &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: s.generateSolution(current, m),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, child := range []*maze.Node{current.Left, current.Right, current.Up, current.Down} {
|
||||||
|
if child != nil {
|
||||||
|
dist := s.dist_from_start[current] + int(current.Coords.Distance(child.Coords))
|
||||||
|
if !child.Visited {
|
||||||
|
s.parent[child] = current
|
||||||
|
s.dist_from_start[child] = dist
|
||||||
|
s.stack.insert(child, &s.dist_from_end)
|
||||||
|
} else if s.dist_from_start[child] > dist {
|
||||||
|
s.parent[child] = current
|
||||||
|
s.dist_from_start[child] = dist
|
||||||
|
sort.Slice(s.stack, func(i, j int) bool {
|
||||||
|
return s.dist_from_end[s.stack[i]] < s.dist_from_end[s.stack[j]]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
current = s.stack.pop()
|
||||||
|
}
|
||||||
|
|
||||||
|
return &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: s.generateSolution(current, m),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *AStarSolver) generateSolution(current *maze.Node, m *maze.Maze) []*maze.Node {
|
||||||
|
solution := make([]*maze.Node, 0, len(m.Nodes))
|
||||||
|
for current != m.Nodes[0] {
|
||||||
|
solution = append(solution, current)
|
||||||
|
current = s.parent[current]
|
||||||
|
}
|
||||||
|
solution = append(solution, m.Nodes[0])
|
||||||
|
for i, j := 0, len(solution)-1; i < j; i, j = i+1, j-1 {
|
||||||
|
solution[i], solution[j] = solution[j], solution[i]
|
||||||
|
}
|
||||||
|
return solution
|
||||||
|
}
|
131
solver/bfs.go
@ -1,9 +1,130 @@
|
|||||||
package solver
|
package solver
|
||||||
|
|
||||||
import "maze-solver/maze"
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"maze-solver/maze"
|
||||||
|
"maze-solver/utils"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
type Bfs struct{}
|
type BFSSolver struct {
|
||||||
|
solved_chan chan<- *maze.SolvedMaze
|
||||||
func (*Bfs) Solve(maze *maze.Maze) *maze.SolvedMaze {
|
queue *Queue
|
||||||
return nil
|
}
|
||||||
|
|
||||||
|
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)()
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
var err error
|
||||||
|
for current != end {
|
||||||
|
current.Visited = true
|
||||||
|
if s.solved_chan != nil {
|
||||||
|
s.solved_chan <- &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: current_history,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
s.addIfNotVisited(current.Down, current_history)
|
||||||
|
s.addIfNotVisited(current.Left, current_history)
|
||||||
|
s.addIfNotVisited(current.Right, current_history)
|
||||||
|
s.addIfNotVisited(current.Up, current_history)
|
||||||
|
|
||||||
|
current_history, err = s.queue.dequeue()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
current = current_history[len(current_history)-1]
|
||||||
|
}
|
||||||
|
if s.solved_chan != nil {
|
||||||
|
s.solved_chan <- &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: current_history,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: current_history,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *BFSSolver) addIfNotVisited(node *maze.Node, current_history []*maze.Node) {
|
||||||
|
if !visited(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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
56
solver/dfs.go
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
package solver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"maze-solver/maze"
|
||||||
|
"maze-solver/utils"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DFSSolver struct {
|
||||||
|
solved_chan chan<- *maze.SolvedMaze
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DFSSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
||||||
|
defer utils.Timer("DFS algorithm", 2)()
|
||||||
|
|
||||||
|
current, end := m.Nodes[0], m.Nodes[len(m.Nodes)-1]
|
||||||
|
|
||||||
|
stack := make([]*maze.Node, 0, len(m.Nodes))
|
||||||
|
stack = append(stack, current)
|
||||||
|
|
||||||
|
for current != end {
|
||||||
|
current.Visited = true
|
||||||
|
if s.solved_chan != nil {
|
||||||
|
s.solved_chan <- &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: stack,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
left_visited, right_visited, up_visited, down_visited := visited(current.Left), visited(current.Right), visited(current.Up), visited(current.Down)
|
||||||
|
|
||||||
|
if left_visited && right_visited && up_visited && down_visited {
|
||||||
|
// dead end or no more visited nodes
|
||||||
|
stack = stack[:len(stack)-1]
|
||||||
|
current = stack[len(stack)-1]
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if !left_visited {
|
||||||
|
current = current.Left
|
||||||
|
} else if !down_visited {
|
||||||
|
current = current.Down
|
||||||
|
} else if !right_visited {
|
||||||
|
current = current.Right
|
||||||
|
} else if !up_visited {
|
||||||
|
current = current.Up
|
||||||
|
}
|
||||||
|
|
||||||
|
stack = append(stack, current)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ret := &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: stack,
|
||||||
|
}
|
||||||
|
return ret
|
||||||
|
}
|
72
solver/dijkstra.go
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
package solver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"maze-solver/maze"
|
||||||
|
"maze-solver/utils"
|
||||||
|
"sort"
|
||||||
|
)
|
||||||
|
|
||||||
|
type DijkstraSolver struct {
|
||||||
|
solved_chan chan<- *maze.SolvedMaze
|
||||||
|
dist_from_start map[*maze.Node]int
|
||||||
|
parent map[*maze.Node]*maze.Node
|
||||||
|
stack sorted_stack
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DijkstraSolver) Solve(m *maze.Maze) *maze.SolvedMaze {
|
||||||
|
defer utils.Timer("Dijkstra algorithm", 2)()
|
||||||
|
s.dist_from_start = make(map[*maze.Node]int, len(m.Nodes))
|
||||||
|
s.parent = make(map[*maze.Node]*maze.Node, len(m.Nodes))
|
||||||
|
|
||||||
|
for _, node := range m.Nodes {
|
||||||
|
s.dist_from_start[node] = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
current, end := m.Nodes[0], m.Nodes[len(m.Nodes)-1]
|
||||||
|
|
||||||
|
for current != end {
|
||||||
|
current.Visited = true
|
||||||
|
for _, child := range []*maze.Node{current.Left, current.Right, current.Up, current.Down} {
|
||||||
|
if child != nil {
|
||||||
|
dist := s.dist_from_start[current] + int(current.Coords.Distance(child.Coords))
|
||||||
|
if !child.Visited {
|
||||||
|
s.parent[child] = current
|
||||||
|
s.dist_from_start[child] = dist
|
||||||
|
s.stack.insert(child, &s.dist_from_start)
|
||||||
|
} else if s.dist_from_start[child] > dist {
|
||||||
|
s.parent[child] = current
|
||||||
|
s.dist_from_start[child] = dist
|
||||||
|
sort.Slice(s.stack, func(i, j int) bool {
|
||||||
|
return s.dist_from_start[s.stack[i]] < s.dist_from_start[s.stack[j]]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
current = s.stack.pop()
|
||||||
|
if s.solved_chan != nil {
|
||||||
|
s.solved_chan <- &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: s.generateSolution(current, m),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: s.generateSolution(current, m),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DijkstraSolver) generateSolution(current *maze.Node, m *maze.Maze) []*maze.Node {
|
||||||
|
solution := make([]*maze.Node, 0, len(m.Nodes))
|
||||||
|
for current != m.Nodes[0] {
|
||||||
|
solution = append(solution, current)
|
||||||
|
current = s.parent[current]
|
||||||
|
}
|
||||||
|
solution = append(solution, m.Nodes[0])
|
||||||
|
for i, j := 0, len(solution)-1; i < j; i, j = i+1, j-1 {
|
||||||
|
solution[i], solution[j] = solution[j], solution[i]
|
||||||
|
}
|
||||||
|
return solution
|
||||||
|
}
|
@ -1,7 +1,54 @@
|
|||||||
package solver
|
package solver
|
||||||
|
|
||||||
import "maze-solver/maze"
|
import (
|
||||||
|
"fmt"
|
||||||
|
"maze-solver/maze"
|
||||||
|
)
|
||||||
|
|
||||||
type Solver interface {
|
type Solver interface {
|
||||||
Solve(*maze.Maze) *maze.SolvedMaze
|
Solve(*maze.Maze) *maze.SolvedMaze
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type SolverFactory struct {
|
||||||
|
Type *string
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
_DFS = "dfs"
|
||||||
|
_BFS = "bfs"
|
||||||
|
_Dijkstra = "dijkstra"
|
||||||
|
_AStar = "a-star"
|
||||||
|
)
|
||||||
|
|
||||||
|
var TYPES = []string{
|
||||||
|
_DFS,
|
||||||
|
_BFS,
|
||||||
|
_Dijkstra,
|
||||||
|
_AStar,
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *SolverFactory) Get(solved_chan chan<- *maze.SolvedMaze) Solver {
|
||||||
|
switch *f.Type {
|
||||||
|
case _DFS:
|
||||||
|
return &DFSSolver{
|
||||||
|
solved_chan: solved_chan,
|
||||||
|
}
|
||||||
|
case _BFS:
|
||||||
|
return &BFSSolver{
|
||||||
|
solved_chan: solved_chan,
|
||||||
|
}
|
||||||
|
case _AStar:
|
||||||
|
return &AStarSolver{
|
||||||
|
solved_chan: solved_chan,
|
||||||
|
}
|
||||||
|
case _Dijkstra:
|
||||||
|
return &DijkstraSolver{
|
||||||
|
solved_chan: solved_chan,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
panic(fmt.Sprintf("Unrecognized solver type %q", *f.Type))
|
||||||
|
}
|
||||||
|
|
||||||
|
func visited(node *maze.Node) bool {
|
||||||
|
return node == nil || node.Visited
|
||||||
|
}
|
||||||
|
27
solver/utils.go
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
package solver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"maze-solver/maze"
|
||||||
|
"slices"
|
||||||
|
)
|
||||||
|
|
||||||
|
type sorted_stack []*maze.Node
|
||||||
|
|
||||||
|
func (s *sorted_stack) insert(node *maze.Node, weights *map[*maze.Node]int) {
|
||||||
|
var dummy *maze.Node
|
||||||
|
*s = append(*s, dummy) // extend the slice
|
||||||
|
|
||||||
|
i, _ := slices.BinarySearchFunc(*s, node, func(e, t *maze.Node) int {
|
||||||
|
return (*weights)[t] - (*weights)[e]
|
||||||
|
})
|
||||||
|
|
||||||
|
copy((*s)[i+1:], (*s)[i:]) // make room
|
||||||
|
(*s)[i] = node
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *sorted_stack) pop() *maze.Node {
|
||||||
|
last_i := len(*s) - 1
|
||||||
|
ret := (*s)[last_i]
|
||||||
|
*s = (*s)[:last_i]
|
||||||
|
return ret
|
||||||
|
}
|
@ -1,8 +1,10 @@
|
|||||||
package utils
|
package utils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"golang.org/x/exp/constraints"
|
"golang.org/x/exp/constraints"
|
||||||
)
|
)
|
||||||
@ -27,3 +29,14 @@ func AssertEqual[T comparable](t *testing.T, got T, want T, msg string, args ...
|
|||||||
t.Fatalf(msg+"\nGot: %v, Want: %v", args...)
|
t.Fatalf(msg+"\nGot: %v, Want: %v", args...)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var VERBOSE_LEVEL int
|
||||||
|
|
||||||
|
func Timer(msg string, level int) func() {
|
||||||
|
start := time.Now()
|
||||||
|
return func() {
|
||||||
|
if level <= VERBOSE_LEVEL {
|
||||||
|
fmt.Printf("%-19s %12v\n", msg, time.Since(start))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
71
visualizer/video.go
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
package visualizer
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"image/color"
|
||||||
|
"maze-solver/io/writer"
|
||||||
|
"maze-solver/maze"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/mazznoer/colorgrad"
|
||||||
|
)
|
||||||
|
|
||||||
|
type VideoVisualizer struct {
|
||||||
|
Filename string
|
||||||
|
Framerate float64
|
||||||
|
ffmpeg_cmd string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *VideoVisualizer) Init(*maze.Maze) {
|
||||||
|
path, err := exec.LookPath("ffmpeg")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
v.ffmpeg_cmd = path
|
||||||
|
println(path)
|
||||||
|
}
|
||||||
|
func (v *VideoVisualizer) Run(lets_go chan<- bool) { lets_go <- true }
|
||||||
|
|
||||||
|
func (v *VideoVisualizer) Visualize(solved_chan <-chan *maze.SolvedMaze) {
|
||||||
|
tmp_dir, err := os.MkdirTemp("", "maze-solver-go-")
|
||||||
|
defer os.RemoveAll(tmp_dir)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
i := 0
|
||||||
|
for solved := range solved_chan {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
img_writer := writer.ImageWriter{
|
||||||
|
Filename: path.Join(tmp_dir, fmt.Sprintf("%07v.png", i)),
|
||||||
|
Maze: solved,
|
||||||
|
CellWidth: 2,
|
||||||
|
CellHeight: 2,
|
||||||
|
WallColor: color.Black,
|
||||||
|
PathColor: color.White,
|
||||||
|
SolutionGradient: colorgrad.Warm(),
|
||||||
|
}
|
||||||
|
img_writer.Write()
|
||||||
|
wg.Done()
|
||||||
|
}()
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
cmd := exec.Command(
|
||||||
|
v.ffmpeg_cmd,
|
||||||
|
"-y",
|
||||||
|
"-pattern_type", "glob",
|
||||||
|
"-i", path.Join(tmp_dir, "*.png"),
|
||||||
|
"-framerate", fmt.Sprint(v.Framerate),
|
||||||
|
v.Filename,
|
||||||
|
)
|
||||||
|
err = cmd.Run()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
41
visualizer/visualizer.go
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
package visualizer
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"maze-solver/maze"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Visualizer interface {
|
||||||
|
Init(*maze.Maze)
|
||||||
|
Visualize(<-chan *maze.SolvedMaze)
|
||||||
|
Run(lets_go chan<- bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
type VisualizerFactory struct {
|
||||||
|
Type *string
|
||||||
|
Filename *string
|
||||||
|
Framerate *float64
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
_VIDEO = "video"
|
||||||
|
_WINDOW = "window"
|
||||||
|
)
|
||||||
|
|
||||||
|
var VIZ_METHODS = []string{
|
||||||
|
_VIDEO,
|
||||||
|
_WINDOW,
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *VisualizerFactory) Get() Visualizer {
|
||||||
|
switch *f.Type {
|
||||||
|
case _VIDEO:
|
||||||
|
return &VideoVisualizer{
|
||||||
|
Filename: *f.Filename,
|
||||||
|
Framerate: *f.Framerate,
|
||||||
|
}
|
||||||
|
case _WINDOW:
|
||||||
|
return &WindowVisualizer{}
|
||||||
|
}
|
||||||
|
panic(fmt.Sprintf("Unrecognized visualizer type %q", *f.Type))
|
||||||
|
}
|
65
visualizer/window.go
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
package visualizer
|
||||||
|
|
||||||
|
import (
|
||||||
|
"image/color"
|
||||||
|
"maze-solver/io/writer"
|
||||||
|
"maze-solver/maze"
|
||||||
|
|
||||||
|
"fyne.io/fyne"
|
||||||
|
"fyne.io/fyne/app"
|
||||||
|
"fyne.io/fyne/canvas"
|
||||||
|
"fyne.io/fyne/dialog"
|
||||||
|
"github.com/mazznoer/colorgrad"
|
||||||
|
)
|
||||||
|
|
||||||
|
type WindowVisualizer struct {
|
||||||
|
app fyne.App
|
||||||
|
window fyne.Window
|
||||||
|
img_writer writer.ImageWriter
|
||||||
|
cimg *canvas.Image
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *WindowVisualizer) Init(m *maze.Maze) {
|
||||||
|
v.app = app.New()
|
||||||
|
v.window = v.app.NewWindow("maze-solver-go")
|
||||||
|
v.img_writer = writer.ImageWriter{
|
||||||
|
Filename: "",
|
||||||
|
Maze: &maze.SolvedMaze{
|
||||||
|
Maze: m,
|
||||||
|
Solution: []*maze.Node{},
|
||||||
|
},
|
||||||
|
CellWidth: 2,
|
||||||
|
CellHeight: 2,
|
||||||
|
WallColor: color.Black,
|
||||||
|
PathColor: color.White,
|
||||||
|
SolutionGradient: colorgrad.Warm(),
|
||||||
|
}
|
||||||
|
v.cimg = canvas.NewImageFromImage(v.img_writer.GenerateImage())
|
||||||
|
v.window.SetContent(v.cimg)
|
||||||
|
v.window.Resize(
|
||||||
|
fyne.NewSize(
|
||||||
|
m.Width*v.img_writer.CellWidth,
|
||||||
|
m.Height*v.img_writer.CellHeight,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
v.window.Show()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *WindowVisualizer) Visualize(solved_chan <-chan *maze.SolvedMaze) {
|
||||||
|
for solved := range solved_chan {
|
||||||
|
v.img_writer.Maze = solved
|
||||||
|
v.cimg.Image = v.img_writer.GenerateImage()
|
||||||
|
v.cimg.Refresh()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *WindowVisualizer) Run(lets_go chan<- bool) {
|
||||||
|
dial := dialog.NewConfirm("Start", "Let's go", func(ok bool) {
|
||||||
|
lets_go <- ok
|
||||||
|
if !ok {
|
||||||
|
v.window.Close()
|
||||||
|
}
|
||||||
|
}, v.window)
|
||||||
|
dial.Show()
|
||||||
|
v.window.ShowAndRun()
|
||||||
|
}
|