2 Commits

Author SHA1 Message Date
c0e37c3183 add init_amount to config 2022-12-01 22:12:05 +01:00
3db36407ea add last_step to config file 2022-11-26 16:01:37 +01:00
2 changed files with 55 additions and 43 deletions

View File

@ -1,24 +1,30 @@
last_step: 100
init_amount: 10
steps:
- step: 10 - step: 10
amount: 100
neighbours: 1
- step: 100
amount: 100
neighbours: 50
- step: 200
amount: 500
neighbours: 20
- step: 400
amount: 10
neighbours: 5
- step: 500
amount: 1 amount: 1
neighbours: 1 neighbours: 1
- step: 600 - step: 20
amount: 500 amount: 100
neighbours: 50
- step: 1500
amount: 10
neighbours: 1 neighbours: 1
- step: 2000 - step: 30
amount: 1 amount: 1
neighbours: 1 neighbours: 1
- step: 40
amount: 10
neighbours: 2
- step: 50
Amount: 2
neighbours: 1
- step: 60
amount: 2
neighbours: 1
- step: 70
amount: 3
neighbours: 2
- step: 80
amount: 3
neighbours: 1
- step: 3000
amount: 3
neighbours: 1

30
main.go
View File

@ -28,6 +28,11 @@ var numNeighbours = 5
var separationFactor = float64(goidSize * 5) var separationFactor = float64(goidSize * 5)
var coherenceFactor = 8 var coherenceFactor = 8
type configuration struct {
Steps []steps `yaml:"steps"`
LastStep int `yaml:"last_step"`
InitAmount int `yaml:"init_amount"`
}
type steps struct { type steps struct {
Step int `yaml:"step"` Step int `yaml:"step"`
Amount int `yaml:"amount"` Amount int `yaml:"amount"`
@ -65,8 +70,11 @@ func main() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
td := []steps{} config := configuration{}
err = yaml.Unmarshal(conf, &td) err = yaml.Unmarshal(conf, &config)
steps := config.Steps
loops = config.LastStep
populationSize = config.InitAmount
defer func() { defer func() {
if err := fo.Close(); err != nil { if err := fo.Close(); err != nil {
panic(err) panic(err)
@ -75,21 +83,19 @@ func main() {
clearScreen() clearScreen()
hideCursor() hideCursor()
var goids []*Goid var goids []*Goid
for i := 0; i < populationSize; i++ {
// for i := 0; i < populationSize; i++ { g := createRandomGoid()
// g := createRandomGoid() goids = append(goids, &g)
// goids = append(goids, &g) }
// }
current_stage := 0 current_stage := 0
for i := 0; i < loops; i++ { for i := 0; i < loops; i++ {
goids, populationSize = fixGoids(goids, populationSize, td[current_stage].Amount) goids, populationSize = fixGoids(goids, populationSize, steps[current_stage].Amount)
if td[current_stage].NumNeighbours >= populationSize { if steps[current_stage].NumNeighbours >= populationSize {
numNeighbours = populationSize numNeighbours = populationSize
} else { } else {
numNeighbours = td[current_stage].NumNeighbours numNeighbours = steps[current_stage].NumNeighbours
} }
if i == td[current_stage+1].Step { if i == steps[current_stage+1].Step {
current_stage += 1 current_stage += 1
} }
move(goids, fo, i) move(goids, fo, i)