mirror of
https://codeberg.org/scip/golsky.git
synced 2025-12-16 20:20:57 +01:00
even an array doesn't make it faster...
This commit is contained in:
57
src/grid.go
57
src/grid.go
@@ -19,10 +19,12 @@ type Neighbor struct {
|
|||||||
X, Y int
|
X, Y int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const max int = 2250000
|
||||||
|
|
||||||
type Grid struct {
|
type Grid struct {
|
||||||
Data []uint8
|
Data [max]uint8
|
||||||
NeighborCount []int
|
NeighborCount [max]int
|
||||||
Neighbors [][]Neighbor
|
Neighbors [max][]Neighbor
|
||||||
Empty bool
|
Empty bool
|
||||||
Config *Config
|
Config *Config
|
||||||
Counter func(x, y int) uint8
|
Counter func(x, y int) uint8
|
||||||
@@ -35,29 +37,29 @@ func NewGrid(config *Config) *Grid {
|
|||||||
STRIDE = config.Width
|
STRIDE = config.Width
|
||||||
}
|
}
|
||||||
|
|
||||||
size := STRIDE * STRIDE
|
//size := STRIDE * STRIDE
|
||||||
|
|
||||||
grid := &Grid{
|
grid := &Grid{
|
||||||
Data: make([]uint8, size),
|
//Data: make([]uint8, size),
|
||||||
NeighborCount: make([]int, size),
|
//NeighborCount: make([]int, size),
|
||||||
Neighbors: make([][]Neighbor, size),
|
//Neighbors: make([][]Neighbor, size),
|
||||||
Empty: config.Empty,
|
Empty: config.Empty,
|
||||||
Config: config,
|
Config: config,
|
||||||
}
|
}
|
||||||
|
|
||||||
// first setup the cells
|
// first setup the cells
|
||||||
for y := 0; y < config.Height; y++ {
|
// for y := 0; y < config.Height; y++ {
|
||||||
for x := 0; x < config.Width; x++ {
|
// for x := 0; x < config.Width; x++ {
|
||||||
grid.Data[y+STRIDE*x] = 0
|
// grid.Data[y+STRIDE*x] = 0
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
// in a second pass, collect positions to the neighbors of each cell
|
// in a second pass, collect positions to the neighbors of each cell
|
||||||
for y := 0; y < config.Height; y++ {
|
// for y := 0; y < config.Height; y++ {
|
||||||
for x := 0; x < config.Width; x++ {
|
// for x := 0; x < config.Width; x++ {
|
||||||
grid.SetupNeighbors(x, y)
|
// grid.SetupNeighbors(x, y)
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
if grid.Config.Wrap {
|
if grid.Config.Wrap {
|
||||||
grid.Counter = grid.CountNeighborsWrap
|
grid.Counter = grid.CountNeighborsWrap
|
||||||
@@ -110,19 +112,23 @@ func (grid *Grid) SetupNeighbors(x, y int) {
|
|||||||
|
|
||||||
func (grid *Grid) CountNeighborsWrap(x, y int) uint8 {
|
func (grid *Grid) CountNeighborsWrap(x, y int) uint8 {
|
||||||
var sum uint8
|
var sum uint8
|
||||||
|
var col, row int
|
||||||
|
|
||||||
|
width := grid.Config.Width
|
||||||
|
height := grid.Config.Height
|
||||||
|
|
||||||
for nbgX := -1; nbgX < 2; nbgX++ {
|
for nbgX := -1; nbgX < 2; nbgX++ {
|
||||||
for nbgY := -1; nbgY < 2; nbgY++ {
|
for nbgY := -1; nbgY < 2; nbgY++ {
|
||||||
var col, row int
|
|
||||||
|
|
||||||
// In wrap mode we look at all the 8 neighbors surrounding us.
|
// In wrap mode we look at all the 8 neighbors surrounding us.
|
||||||
// In case we are on an edge we'll look at the neighbor on the
|
// In case we are on an edge we'll look at the neighbor on the
|
||||||
// other side of the grid, thus wrapping lookahead around
|
// other side of the grid, thus wrapping lookahead around
|
||||||
// using the mod() function.
|
// using the mod() function.
|
||||||
col = (x + nbgX + grid.Config.Width) % grid.Config.Width
|
col = (x + nbgX + width) % width
|
||||||
row = (y + nbgY + grid.Config.Height) % grid.Config.Height
|
row = (y + nbgY + height) % height
|
||||||
|
|
||||||
sum += grid.Data[row+STRIDE*col]
|
p := row + STRIDE*col
|
||||||
|
sum += grid.Data[p]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,6 +140,7 @@ func (grid *Grid) CountNeighborsWrap(x, y int) uint8 {
|
|||||||
|
|
||||||
func (grid *Grid) CountNeighbors(x, y int) uint8 {
|
func (grid *Grid) CountNeighbors(x, y int) uint8 {
|
||||||
var sum uint8
|
var sum uint8
|
||||||
|
var val uint8
|
||||||
|
|
||||||
width := grid.Config.Width
|
width := grid.Config.Width
|
||||||
height := grid.Config.Height
|
height := grid.Config.Height
|
||||||
@@ -152,7 +159,9 @@ func (grid *Grid) CountNeighbors(x, y int) uint8 {
|
|||||||
col = xnbgX
|
col = xnbgX
|
||||||
row = ynbgY
|
row = ynbgY
|
||||||
|
|
||||||
sum += grid.Data[row+STRIDE*col]
|
p := row + STRIDE*col
|
||||||
|
val = grid.Data[p]
|
||||||
|
sum += val // this uses 18% of the whole running time!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user