From 5a12656650250b78f88e592dab1d49df2363c1ca Mon Sep 17 00:00:00 2001 From: julienpillis <pllsjulien@gmail.com> Date: Fri, 8 Dec 2023 11:26:02 +0100 Subject: [PATCH] ajout TODO --- internal/algorithms/astar.go | 2 +- internal/simulation/simu.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/algorithms/astar.go b/internal/algorithms/astar.go index 77eb0df..41e1f30 100644 --- a/internal/algorithms/astar.go +++ b/internal/algorithms/astar.go @@ -7,7 +7,7 @@ import ( /* * Utilisation de l'algorithme A* pour les déplacements * //TODO: Peut-être gérer un passage par référence et non par copie - * + * //TODO: Prise en compte des dimensions des agents */ type Node struct { row, col, cost, heuristic int diff --git a/internal/simulation/simu.go b/internal/simulation/simu.go index 8137128..cfd4879 100644 --- a/internal/simulation/simu.go +++ b/internal/simulation/simu.go @@ -75,7 +75,7 @@ type Simulation struct { syncChans sync.Map } -func (sim *Simulation) Env() (*Environment){ +func (sim *Simulation) Env() *Environment { return &sim.env } @@ -87,17 +87,17 @@ func NewSimulation(agentCount int, maxStep int, maxDuration time.Duration) (simu // Communication entre agents mapChan := make(map[AgentID]chan AgentID) - simu.env = *NewEnvironment([]Agent{}, carte, mapChan) - //simu.env = *NewEnvironment([]Agent{}, playground) + //simu.env = *NewEnvironment([]Agent{}, carte, mapChan) + simu.env = *NewEnvironment([]Agent{}, playground, mapChan) // création des agents et des channels for i := 0; i < agentCount; i++ { // création de l'agent id := fmt.Sprintf("Agent #%d", i) 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, 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, 1, 0, true, Coord{4,10}, Coord{4,10}, &UsagerLambda{}, Coord{4,10}, Coord{0, 0}) + ag := NewAgent(id, &simu.env, syncChan, 1, 0, true, Coord{4, 10}, Coord{4, 10}, &UsagerLambda{}, Coord{4, 10}, Coord{0, 0}) // ajout de l'agent à la simulation simu.agents = append(simu.agents, *ag) -- GitLab