Reader -> Reader+Parser refacfotring: create the
parser package, moved the parsing aspect of reader to parser (still have some naughty stuff like WallChar and PathChar in parser but it'll be fixed in next commit)
This commit is contained in:
Karma Riuk
@ -3,5 +3,5 @@ package reader
|
||||
import "maze-solver/maze"
|
||||
|
||||
type Reader interface {
|
||||
Read(filename string) (*maze.Maze, error)
|
||||
Read() (*maze.RawMaze, error)
|
||||
}
|
||||
|
||||
@ -2,26 +2,23 @@ package reader
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"maze-solver/maze"
|
||||
"os"
|
||||
)
|
||||
|
||||
type TextReader struct {
|
||||
Filename string
|
||||
PathChar, WallChar byte
|
||||
}
|
||||
|
||||
func (r *TextReader) Read(filename string) (*maze.Maze, error) {
|
||||
nodesByCoord := make(map[maze.Coordinates]*maze.Node)
|
||||
func (r TextReader) Read() (*maze.RawMaze, error) {
|
||||
var lines []string
|
||||
|
||||
ret := &maze.Maze{}
|
||||
|
||||
if _, err := os.Stat(filename); err != nil {
|
||||
if _, err := os.Stat(r.Filename); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
file, err := os.Open(filename)
|
||||
file, err := os.Open(r.Filename)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -37,120 +34,5 @@ func (r *TextReader) Read(filename string) (*maze.Maze, error) {
|
||||
file.Close()
|
||||
}
|
||||
|
||||
for y, line := range lines {
|
||||
fmt.Println(line)
|
||||
for x := 1; x < len(line)-1; x++ {
|
||||
char := line[x]
|
||||
var left_char, right_char, above_char byte
|
||||
|
||||
if y > 0 {
|
||||
left_char = line[x-1]
|
||||
right_char = line[x+1]
|
||||
above_char = lines[y-1][x]
|
||||
}
|
||||
|
||||
// Parse first line to get entrance
|
||||
if y == 0 && char == r.PathChar {
|
||||
coords := maze.Coordinates{X: x, Y: y}
|
||||
node := maze.NewNode(coords)
|
||||
ret.Nodes = append(ret.Nodes, node)
|
||||
nodesByCoord[coords] = node
|
||||
continue
|
||||
}
|
||||
|
||||
// Parse middle of the maze
|
||||
if y > 0 && char == r.PathChar &&
|
||||
(left_char == r.WallChar && right_char == r.PathChar ||
|
||||
left_char == r.PathChar && right_char == r.WallChar ||
|
||||
above_char == r.PathChar && (left_char == r.PathChar || right_char == r.PathChar)) {
|
||||
coords := maze.Coordinates{X: x, Y: y}
|
||||
node := maze.NewNode(coords)
|
||||
|
||||
r.lookupNeighbourAbove(&lines, node, &nodesByCoord, ret)
|
||||
|
||||
ret.Nodes = append(ret.Nodes, node)
|
||||
nodesByCoord[coords] = node
|
||||
|
||||
if left_char == r.PathChar && right_char == r.WallChar ||
|
||||
above_char == r.PathChar && (left_char == r.PathChar || right_char == r.PathChar) {
|
||||
r.lookupNeighbourLeft(&line, node, &nodesByCoord)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println(len(lines))
|
||||
// Parse last line to get exit
|
||||
for x, rune := range lines[len(lines)-1] {
|
||||
char := byte(rune)
|
||||
if char == r.PathChar {
|
||||
coords := maze.Coordinates{X: x, Y: len(lines) - 1}
|
||||
node := maze.NewNode(coords)
|
||||
r.lookupNeighbourAbove(&lines, node, &nodesByCoord, ret)
|
||||
ret.Nodes = append(ret.Nodes, node)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func (r *TextReader) lookupNeighbourAbove(lines *[]string, 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}]
|
||||
|
||||
if ok {
|
||||
node.Up = neighbour
|
||||
neighbour.Down = node
|
||||
break
|
||||
}
|
||||
|
||||
if y > 0 && (*lines)[y][node.Coords.X] == r.WallChar {
|
||||
y++
|
||||
if y == node.Coords.Y {
|
||||
break
|
||||
}
|
||||
coords := maze.Coordinates{X: node.Coords.X, Y: y}
|
||||
new_node := maze.NewNode(coords)
|
||||
r.lookupNeighbourLeft(&(*lines)[y], new_node, nodesByCoord)
|
||||
r.lookupNeighbourRight(&(*lines)[y], new_node, nodesByCoord)
|
||||
(*nodesByCoord)[coords] = new_node
|
||||
m.Nodes = append(m.Nodes, new_node)
|
||||
|
||||
node.Up = new_node
|
||||
new_node.Down = node
|
||||
break
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
func (r *TextReader) lookupNeighbourLeft(line *string, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node) {
|
||||
for x := node.Coords.X - 1; x > 0; x-- {
|
||||
if (*line)[x] == r.WallChar && x < node.Coords.X-1 {
|
||||
panic(fmt.Sprintf("Found no node before wall while looking to the left at neighbours of node %v", node))
|
||||
}
|
||||
|
||||
neighbour, ok := (*nodesByCoord)[maze.Coordinates{X: x, Y: node.Coords.Y}]
|
||||
if ok {
|
||||
node.Left = neighbour
|
||||
neighbour.Right = node
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (r *TextReader) lookupNeighbourRight(line *string, node *maze.Node, nodesByCoord *map[maze.Coordinates]*maze.Node) {
|
||||
for x := node.Coords.X + 1; x < len(*line); x++ {
|
||||
if (*line)[x] == r.WallChar {
|
||||
panic(fmt.Sprintf("Found no node before wall while looking to the right at neighbours of node %v", node))
|
||||
}
|
||||
|
||||
neighbour, ok := (*nodesByCoord)[maze.Coordinates{X: x, Y: node.Coords.Y}]
|
||||
if ok {
|
||||
node.Right = neighbour
|
||||
neighbour.Left = node
|
||||
break
|
||||
}
|
||||
}
|
||||
return &maze.RawMaze{PathChar: r.PathChar, WallChar: r.WallChar, Data: lines}, nil
|
||||
}
|
||||
|
||||
@ -1,218 +0,0 @@
|
||||
package reader
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"maze-solver/maze"
|
||||
"maze-solver/utils"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestTextReadTrivial(t *testing.T) {
|
||||
/* trivial.txt
|
||||
## ##
|
||||
# #
|
||||
### #
|
||||
|
||||
Nodes are
|
||||
##0##
|
||||
#123#
|
||||
###4#
|
||||
*/
|
||||
nodes := make([]*maze.Node, 5)
|
||||
|
||||
nodes[0] = maze.NewNode(maze.Coordinates{X: 2, Y: 0})
|
||||
|
||||
nodes[1] = maze.NewNode(maze.Coordinates{X: 1, Y: 1})
|
||||
nodes[2] = maze.NewNode(maze.Coordinates{X: 2, Y: 1})
|
||||
nodes[3] = maze.NewNode(maze.Coordinates{X: 3, Y: 1})
|
||||
|
||||
nodes[4] = maze.NewNode(maze.Coordinates{X: 3, Y: 2})
|
||||
|
||||
nodes[0].Down = nodes[2]
|
||||
|
||||
nodes[1].Right = nodes[2]
|
||||
|
||||
nodes[2].Up = nodes[0]
|
||||
nodes[2].Left = nodes[1]
|
||||
nodes[2].Right = nodes[3]
|
||||
|
||||
nodes[3].Left = nodes[2]
|
||||
nodes[3].Down = nodes[4]
|
||||
|
||||
nodes[4].Up = nodes[3]
|
||||
|
||||
reader := TextReader{
|
||||
PathChar: ' ',
|
||||
WallChar: '#',
|
||||
}
|
||||
|
||||
filename := "../../assets/trivial.txt"
|
||||
got, err := reader.Read(filename)
|
||||
utils.Check(err, "Couldn't create maze from %q", filename)
|
||||
|
||||
if len(nodes) != len(got.Nodes) {
|
||||
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 TestTextReadTrivialBigger(t *testing.T) {
|
||||
/* trivial-bigger.txt
|
||||
### ###
|
||||
### ###
|
||||
# #
|
||||
##### #
|
||||
##### #
|
||||
|
||||
Nodes are
|
||||
###0###
|
||||
### ###
|
||||
#1 2 3#
|
||||
##### #
|
||||
#####4#
|
||||
*/
|
||||
nodes := make([]*maze.Node, 5)
|
||||
|
||||
nodes[0] = maze.NewNode(maze.Coordinates{X: 3, Y: 0})
|
||||
|
||||
nodes[1] = maze.NewNode(maze.Coordinates{X: 1, Y: 2})
|
||||
nodes[2] = maze.NewNode(maze.Coordinates{X: 3, Y: 2})
|
||||
nodes[3] = maze.NewNode(maze.Coordinates{X: 5, Y: 2})
|
||||
|
||||
nodes[4] = maze.NewNode(maze.Coordinates{X: 5, Y: 4})
|
||||
|
||||
nodes[0].Down = nodes[2]
|
||||
|
||||
nodes[1].Right = nodes[2]
|
||||
|
||||
nodes[2].Up = nodes[0]
|
||||
nodes[2].Left = nodes[1]
|
||||
nodes[2].Right = nodes[3]
|
||||
|
||||
nodes[3].Left = nodes[2]
|
||||
nodes[3].Down = nodes[4]
|
||||
|
||||
nodes[4].Up = nodes[3]
|
||||
|
||||
reader := TextReader{
|
||||
PathChar: ' ',
|
||||
WallChar: '#',
|
||||
}
|
||||
|
||||
filename := "../../assets/trivial-bigger.txt"
|
||||
got, err := reader.Read(filename)
|
||||
utils.Check(err, "Couldn't create maze from %q", filename)
|
||||
|
||||
if len(nodes) != len(got.Nodes) {
|
||||
t.Fatalf("Didn't get the same size of nodes: %v, want %v", len(got.Nodes), len(nodes))
|
||||
}
|
||||
|
||||
for _, node := range got.Nodes {
|
||||
fmt.Println(node)
|
||||
}
|
||||
|
||||
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 TestTextReadTrivialBiggerStaggered(t *testing.T) {
|
||||
/* trivial-bigger-staggered.txt
|
||||
### ###
|
||||
### ###
|
||||
# #
|
||||
#### ##
|
||||
#### ##
|
||||
|
||||
Nodes are
|
||||
###0###
|
||||
### ###
|
||||
#1 243#
|
||||
#### ##
|
||||
####5##
|
||||
*/
|
||||
fmt.Println("---------- STAGGERED ----------")
|
||||
nodes := make([]*maze.Node, 6)
|
||||
|
||||
nodes[0] = maze.NewNode(maze.Coordinates{X: 3, Y: 0})
|
||||
|
||||
nodes[1] = maze.NewNode(maze.Coordinates{X: 1, Y: 2})
|
||||
nodes[2] = maze.NewNode(maze.Coordinates{X: 3, Y: 2})
|
||||
nodes[3] = maze.NewNode(maze.Coordinates{X: 5, Y: 2})
|
||||
|
||||
nodes[4] = maze.NewNode(maze.Coordinates{X: 4, Y: 2})
|
||||
|
||||
nodes[5] = maze.NewNode(maze.Coordinates{X: 4, Y: 4})
|
||||
|
||||
nodes[0].Down = nodes[2]
|
||||
|
||||
nodes[1].Right = nodes[2]
|
||||
|
||||
nodes[2].Up = nodes[0]
|
||||
nodes[2].Left = nodes[1]
|
||||
nodes[2].Right = nodes[4]
|
||||
|
||||
nodes[3].Left = nodes[4]
|
||||
|
||||
nodes[4].Down = nodes[5]
|
||||
nodes[4].Left = nodes[2]
|
||||
nodes[4].Right = nodes[3]
|
||||
|
||||
nodes[5].Up = nodes[4]
|
||||
|
||||
reader := TextReader{
|
||||
PathChar: ' ',
|
||||
WallChar: '#',
|
||||
}
|
||||
|
||||
filename := "../../assets/trivial-bigger-staggered.txt"
|
||||
got, err := reader.Read(filename)
|
||||
utils.Check(err, "Couldn't create maze from %q", filename)
|
||||
|
||||
if len(nodes) != len(got.Nodes) {
|
||||
t.Fatalf("Didn't get the same size of nodes: %v, want %v", len(got.Nodes), len(nodes))
|
||||
}
|
||||
|
||||
for _, node := range got.Nodes {
|
||||
fmt.Println(node)
|
||||
}
|
||||
|
||||
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) {
|
||||
if expected == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if got == nil {
|
||||
t.Fatalf("No %s node of %v, want %v", side, i, expected.Coords)
|
||||
}
|
||||
|
||||
if got.Coords != expected.Coords {
|
||||
t.Fatalf("Coords %s node of %v: %v, but want %v", side, i, got.Coords, expected.Coords)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user