diff --git a/cmd/simu/main.go b/cmd/simu/main.go index 9c17dbaeda87fa72e40546a19735b10ffc6b5cd1..c29a1f66f5a6b3a3bf7c3dee0a49389e68be6697 100644 --- a/cmd/simu/main.go +++ b/cmd/simu/main.go @@ -6,7 +6,7 @@ import ( ) func main() { - s := simulation.NewSimulation(20, -1, 600*time.Second) + s := simulation.NewSimulation(1, -1, 600*time.Second) //go simulation.StartAPI(s) s.Run() } diff --git a/internal/simulation/agent.go b/internal/simulation/agent.go index ce42031be9b1b8301efba9445b575ad48bba3198..29bc343007ff6c8e33191a53474748de0801c971 100644 --- a/internal/simulation/agent.go +++ b/internal/simulation/agent.go @@ -51,15 +51,16 @@ type Agent struct { width int height int orientation int //0 : vers le haut, 1 : vers la droite, 2 : vers le bas, 3 : vers la gauche + path []alg.Node request *Request + // visitedPanneaux map[alg.Node]bool + // visiting *alg.Node } type Request struct { demandeur AgentID decision int - path []alg.Node - // visitedPanneaux map[alg.Node]bool - // visiting *alg.Node + } diff --git a/internal/simulation/simu.go b/internal/simulation/simu.go index 32c96658418e3000ae452a5ee24f21b62cbdde80..1f86e93e685277b92cb23cd65458016372902280 100644 --- a/internal/simulation/simu.go +++ b/internal/simulation/simu.go @@ -97,13 +97,15 @@ func NewSimulation(agentCount int, maxStep int, maxDuration time.Duration) (simu syncChan := make(chan int) //ag := NewAgent(id, &simu.env, syncChan, time.Duration(time.Second), 0, true, Coord{0, 8 + i%2}, Coord{0, 8 + i%2}, &UsagerLambda{}, Coord{0, 8 + i%2}, Coord{12 - 4*(i%2), 18 - 15*(i%2)}) - //ag := NewAgent(id, &simu.env, syncChan, 1000, 0, true, &UsagerLambda{}, Coord{3, 4}, Coord{18, 12}, 2, 1) + ag := NewAgent(id, &simu.env, syncChan, 1000, 0, true, &UsagerLambda{}, Coord{18, 4}, Coord{0, 8}, 2, 1) + /* ag := &Agent{} if i%2==0{ ag = NewAgent(id, &simu.env, syncChan, 1000, 0, true, &UsagerLambda{}, Coord{18, 4}, Coord{0, 8}, 2, 1) }else{ ag = NewAgent(id, &simu.env, syncChan, 1000, 0, true, &UsagerLambda{}, Coord{1, 8}, Coord{8, 5}, 1, 1) } + */ //ag := NewAgent(id, &simu.env, syncChan, 1000, 0, true, &UsagerLambda{}, Coord{1, 17}, Coord{0, 0}, 2, 1)