Moved RawMaze to reader package since it is used
mostly there
This commit is contained in:
@ -64,7 +64,7 @@ func Parse(reader reader.Reader) (*maze.Maze, error) {
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func lookupNeighbourAbove(raw_maze *maze.RawMaze, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node, m *maze.Maze) {
|
||||
func lookupNeighbourAbove(raw_maze *reader.RawMaze, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node, m *maze.Maze) {
|
||||
for y := node.Coords.Y - 1; y >= 0; y-- {
|
||||
neighbour, ok := (*nodesByCoord)[maze.Coordinates{X: node.Coords.X, Y: y}]
|
||||
|
||||
@ -94,7 +94,7 @@ func lookupNeighbourAbove(raw_maze *maze.RawMaze, node *maze.Node, nodesByCoord
|
||||
}
|
||||
}
|
||||
|
||||
func lookupNeighbourLeft(raw_maze *maze.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-- {
|
||||
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", node))
|
||||
@ -109,7 +109,7 @@ func lookupNeighbourLeft(raw_maze *maze.RawMaze, node *maze.Node, nodesByCoord *
|
||||
}
|
||||
}
|
||||
|
||||
func lookupNeighbourRight(raw_maze *maze.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++ {
|
||||
if raw_maze.IsWall(x, node.Coords.Y) {
|
||||
panic(fmt.Sprintf("Found no node before wall while looking to the right at neighbours of node %v", node))
|
||||
|
@ -1,41 +0,0 @@
|
||||
package maze
|
||||
|
||||
import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
const CHUNK_SIZE = 8 // size of a byte
|
||||
|
||||
type RawMaze struct {
|
||||
Width, Height int
|
||||
Data [][]byte
|
||||
}
|
||||
|
||||
func (m *RawMaze) String() string {
|
||||
var ret strings.Builder
|
||||
ret.WriteString("{\n")
|
||||
ret.WriteString("\tData: \n")
|
||||
for _, line := range m.Data {
|
||||
ret.WriteRune('\t')
|
||||
ret.WriteRune('\t')
|
||||
ret.Write(line) // TODO: prolly should fix this to make it readable
|
||||
ret.WriteRune('\n')
|
||||
}
|
||||
ret.WriteString("}")
|
||||
|
||||
return ret.String()
|
||||
}
|
||||
|
||||
func (m *RawMaze) IsPath(x int, y int) bool {
|
||||
chunk_index := x / CHUNK_SIZE
|
||||
chunk_rest := x % CHUNK_SIZE
|
||||
chunk := m.Data[y][chunk_index]
|
||||
return chunk&(1<<(CHUNK_SIZE-1-chunk_rest)) != 0
|
||||
}
|
||||
|
||||
func (m *RawMaze) IsWall(x int, y int) bool {
|
||||
chunk_index := x / CHUNK_SIZE
|
||||
chunk_rest := x % CHUNK_SIZE
|
||||
chunk := m.Data[y][chunk_index]
|
||||
return chunk&(1<<(CHUNK_SIZE-1-chunk_rest)) == 0
|
||||
}
|
@ -1,214 +0,0 @@
|
||||
package maze
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestRawMazeWall(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
width, height int
|
||||
data [][]byte
|
||||
expected [][]bool
|
||||
}{
|
||||
{
|
||||
"Trivial",
|
||||
5, 3,
|
||||
[][]byte{
|
||||
{0b_00100_000},
|
||||
{0b_01110_000},
|
||||
{0b_00010_000},
|
||||
},
|
||||
[][]bool{
|
||||
{true, true, false, true, true},
|
||||
{true, false, false, false, true},
|
||||
{true, true, true, false, true},
|
||||
},
|
||||
},
|
||||
{
|
||||
"Trivial Bigger",
|
||||
7, 5,
|
||||
[][]byte{
|
||||
{0b_0001000_0},
|
||||
{0b_0001000_0},
|
||||
{0b_0111110_0},
|
||||
{0b_0000010_0},
|
||||
{0b_0000010_0},
|
||||
},
|
||||
[][]bool{
|
||||
{true, true, true, false, true, true, true},
|
||||
{true, true, true, false, true, true, true},
|
||||
{true, false, false, false, false, false, true},
|
||||
{true, true, true, true, true, false, true},
|
||||
{true, true, true, true, true, false, true},
|
||||
},
|
||||
},
|
||||
{
|
||||
"Bigger Staggered",
|
||||
7, 5,
|
||||
[][]byte{
|
||||
{0b_0001000_0},
|
||||
{0b_0001000_0},
|
||||
{0b_0111110_0},
|
||||
{0b_0000100_0},
|
||||
{0b_0000100_0},
|
||||
},
|
||||
[][]bool{
|
||||
{true, true, true, false, true, true, true},
|
||||
{true, true, true, false, true, true, true},
|
||||
{true, false, false, false, false, false, true},
|
||||
{true, true, true, true, false, true, true},
|
||||
{true, true, true, true, false, true, true},
|
||||
},
|
||||
},
|
||||
{
|
||||
"Normal",
|
||||
11, 11,
|
||||
[][]byte{
|
||||
{0b_00000100, 0b000_00000},
|
||||
{0b_01111101, 0b110_00000},
|
||||
{0b_00000100, 0b010_00000},
|
||||
{0b_01110111, 0b110_00000},
|
||||
{0b_01010000, 0b010_00000},
|
||||
{0b_01011111, 0b110_00000},
|
||||
{0b_00010001, 0b010_00000},
|
||||
{0b_01110111, 0b010_00000},
|
||||
{0b_01000000, 0b010_00000},
|
||||
{0b_01111101, 0b110_00000},
|
||||
{0b_00000100, 0b000_00000},
|
||||
},
|
||||
[][]bool{
|
||||
{true, true, true, true, true, false, true, true, true, true, true},
|
||||
{true, false, false, false, false, false, true, false, false, false, true},
|
||||
{true, true, true, true, true, false, true, true, true, false, true},
|
||||
{true, false, false, false, true, false, false, false, false, false, true},
|
||||
{true, false, true, false, true, true, true, true, true, false, true},
|
||||
{true, false, true, false, false, false, false, false, false, false, true},
|
||||
{true, true, true, false, true, true, true, false, true, false, true},
|
||||
{true, false, false, false, true, false, false, false, true, false, true},
|
||||
{true, false, true, true, true, true, true, true, true, false, true},
|
||||
{true, false, false, false, false, false, true, false, false, false, true},
|
||||
{true, true, true, true, true, false, true, true, true, true, true},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
rawMaze := RawMaze{
|
||||
Width: test.width,
|
||||
Height: test.height,
|
||||
Data: test.data,
|
||||
}
|
||||
for y, row := range test.expected {
|
||||
for x, expected := range row {
|
||||
if rawMaze.IsWall(x, y) != expected {
|
||||
t.Fatalf("%s: Wanted wall at (%v, %v), apparently it isn't", test.name, x, y)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestRawMazePath(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
width, height int
|
||||
data [][]byte
|
||||
expected [][]bool
|
||||
}{
|
||||
{
|
||||
"Trivial",
|
||||
5, 3,
|
||||
[][]byte{
|
||||
{0b_00100_000},
|
||||
{0b_01110_000},
|
||||
{0b_00010_000},
|
||||
},
|
||||
[][]bool{
|
||||
{false, false, true, false, false},
|
||||
{false, true, true, true, false},
|
||||
{false, false, false, true, false},
|
||||
},
|
||||
},
|
||||
{
|
||||
"Trivial Bigger",
|
||||
7, 5,
|
||||
[][]byte{
|
||||
{0b_0001000_0},
|
||||
{0b_0001000_0},
|
||||
{0b_0111110_0},
|
||||
{0b_0000010_0},
|
||||
{0b_0000010_0},
|
||||
},
|
||||
[][]bool{
|
||||
{false, false, false, true, false, false, false},
|
||||
{false, false, false, true, false, false, false},
|
||||
{false, true, true, true, true, true, false},
|
||||
{false, false, false, false, false, true, false},
|
||||
{false, false, false, false, false, true, false},
|
||||
},
|
||||
},
|
||||
{
|
||||
"Bigger Staggered",
|
||||
7, 5,
|
||||
[][]byte{
|
||||
{0b_0001000_0},
|
||||
{0b_0001000_0},
|
||||
{0b_0111110_0},
|
||||
{0b_0000100_0},
|
||||
{0b_0000100_0},
|
||||
},
|
||||
[][]bool{
|
||||
{false, false, false, true, false, false, false},
|
||||
{false, false, false, true, false, false, false},
|
||||
{false, true, true, true, true, true, false},
|
||||
{false, false, false, false, true, false, false},
|
||||
{false, false, false, false, true, false, false},
|
||||
},
|
||||
},
|
||||
{
|
||||
"Normal",
|
||||
11, 11,
|
||||
[][]byte{
|
||||
{0b_00000100, 0b000_00000},
|
||||
{0b_01111101, 0b110_00000},
|
||||
{0b_00000100, 0b010_00000},
|
||||
{0b_01110111, 0b110_00000},
|
||||
{0b_01010000, 0b010_00000},
|
||||
{0b_01011111, 0b110_00000},
|
||||
{0b_00010001, 0b010_00000},
|
||||
{0b_01110111, 0b010_00000},
|
||||
{0b_01000000, 0b010_00000},
|
||||
{0b_01111101, 0b110_00000},
|
||||
{0b_00000100, 0b000_00000},
|
||||
},
|
||||
[][]bool{
|
||||
{false, false, false, false, false, true, false, false, false, false, false},
|
||||
{false, true, true, true, true, true, false, true, true, true, false},
|
||||
{false, false, false, false, false, true, false, false, false, true, false},
|
||||
{false, true, true, true, false, true, true, true, true, true, false},
|
||||
{false, true, false, true, false, false, false, false, false, true, false},
|
||||
{false, true, false, true, true, true, true, true, true, true, false},
|
||||
{false, false, false, true, false, false, false, true, false, true, false},
|
||||
{false, true, true, true, false, true, true, true, false, true, false},
|
||||
{false, true, false, false, false, false, false, false, false, true, false},
|
||||
{false, true, true, true, true, true, false, true, true, true, false},
|
||||
{false, false, false, false, false, true, false, false, false, false, false},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
rawMaze := RawMaze{
|
||||
Width: test.width,
|
||||
Height: test.height,
|
||||
Data: test.data,
|
||||
}
|
||||
|
||||
for y, row := range test.expected {
|
||||
for x, expected := range row {
|
||||
if rawMaze.IsPath(x, y) != expected {
|
||||
t.Fatalf("%s: Wanted path at (%v, %v), apparently it isn't", test.name, x, y)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user