Skip to content
Snippets Groups Projects
Commit 0171892a authored by julienpillis's avatar julienpillis
Browse files

restructuration

parent f3fc3a98
No related branches found
No related tags found
2 merge requests!4Multiple pixels agt,!2Agents
Hide whitespace changes
Inline Side-by-side
HTML/index.html deleted 100644 → 0
+ 0
− 17
View file @ f3fc3a98
<!DOCTYPE html>
<html>
<head>
<title>π en direct</title>
<meta charset="utf-8" />
<link rel="stylesheet" type="text/css" href="style.css">
<script src="pi.js"></script>
</head>
<body>
<section>
<h1> π </h1>
<p>
π = <span id="pi"></pspan>
</p>
</section>
</body>
</html>
HTML/server.go → api/HTML/server.go
+ 0
− 0
View file @ 0171892a
File moved
api.go → api/api.go
+ 4
− 3
View file @ 0171892a
package simulation
package api
import (
"encoding/json"
......@@ -6,13 +6,14 @@ import (
"log"
"net/http"
"time"
sim "metrosim/internal/simulation"
)
func StartAPI(sim *Simulation) {
func StartAPI(sim *sim.Simulation) {
mux := http.NewServeMux()
pi := func(w http.ResponseWriter, r *http.Request) {
msg, _ := json.Marshal(sim.env.PI())
msg, _ := json.Marshal(sim.Env().PI())
fmt.Fprintf(w, "%s", msg)
}
......
cmd/simu/main.go
+ 1
− 1
View file @ 0171892a
package main
import (
simulation "metrosim"
simulation "metrosim/internal/simulation"
"time"
)
......
astar.go → internal/algorithms/astar.go
+ 14
− 2
View file @ 0171892a
package simulation
package algorithms
import (
"container/heap"
......@@ -13,6 +13,18 @@ type Node struct {
row, col, cost, heuristic int
}
func NewNode(row, col, cost, heuristic int) *Node{
return &Node{row, col ,cost , heuristic}
}
func (nd *Node) Row() int{
return nd.row
}
func (nd *Node) Col() int{
return nd.col
}
type PriorityQueue []*Node
func (pq PriorityQueue) Len() int { return len(pq) }
......@@ -38,7 +50,7 @@ func (pq *PriorityQueue) Pop() interface{} {
return item
}
func findPath(matrix [20][20]string, start, end Node, forbidenCell Node) []Node {
func FindPath(matrix [20][20]string, start, end Node, forbidenCell Node) []Node {
pq := make(PriorityQueue, 0)
heap.Init(&pq)
......
agent.go → internal/simulation/agent.go
+ 14
− 40
View file @ 0171892a
......@@ -3,8 +3,10 @@ package simulation
import (
//"fmt"
//"fmt"
"log"
"math/rand"
alg "metrosim/internal/algorithms"
"time"
)
......@@ -43,33 +45,6 @@ type Behavior interface {
Act(*Agent)
}
type UsagerLambda struct{}
func (ul *UsagerLambda) Percept(ag *Agent) {
ag.stuck = ag.isStuck()
if ag.stuck {
return
}
}
func (ul *UsagerLambda) Deliberate(ag *Agent) {
if ag.stuck {
ag.decision = Wait
} else {
ag.decision = Move
}
}
func (ul *UsagerLambda) Act(ag *Agent) {
if ag.decision == Move {
ag.MoveAgent()
} else if ag.decision == Wait {
n := rand.Intn(2) // temps d'attente aléatoire
time.Sleep(time.Duration(n) * time.Second)
}
}
func NewAgent(id string, env *Environment, syncChan chan int, vitesse time.Duration, force int, politesse bool, UpCoord Coord, DownCoord Coord, behavior Behavior, departure, destination Coord) *Agent {
return &Agent{AgentID(id), vitesse, force, politesse, UpCoord, DownCoord, departure, destination, behavior, env, syncChan, Noop, env.station[UpCoord[0]][UpCoord[1]], false}
......@@ -100,14 +75,14 @@ func (ag *Agent) Act(env *Environment) {
}
}
func IsMovementSafe(path []Node, env *Environment) bool {
func IsMovementSafe(path []alg.Node, env *Environment) bool {
// Détermine si le movement est faisable
return len(path) > 0 && (env.station[path[0].row][path[0].col] == "B" || env.station[path[0].row][path[0].col] == "_")
return len(path) > 0 && (env.station[path[0].Row()][path[0].Col()] == "B" || env.station[path[0].Row()][path[0].Col()] == "_")
}
func IsAgentBlocking(path []Node, env *Environment) bool {
func IsAgentBlocking(path []alg.Node, env *Environment) bool {
// Détermine si un agent se trouve sur la case à visiter
return len(path) > 0 && env.station[path[0].row][path[0].col] == "A"
return len(path) > 0 && env.station[path[0].Row()][path[0].Col()] == "A"
}
func (ag *Agent) isStuck() bool {
......@@ -138,27 +113,26 @@ func (ag *Agent) MoveAgent() {
// Il faudrait faire en sorte que les agents bougent et laisse passer les autres
// ============ Initialisation des noeuds de départ ======================
start := Node{ag.coordBasOccupation[0], ag.coordBasOccupation[1], 0, 0}
end := Node{ag.destination[0], ag.destination[1], 0, 0}
start := *alg.NewNode(ag.coordBasOccupation[0], ag.coordBasOccupation[1], 0, 0)
end := *alg.NewNode(ag.destination[0], ag.destination[1], 0, 0)
// ================== Tentative de calcul du chemin =======================
path := findPath(ag.env.station, start, end, Node{})
path := alg.FindPath(ag.env.station, start, end, *alg.NewNode(-1,-1,0,0))
// ================== Etude de faisabilité =======================
if IsAgentBlocking(path, ag.env) {
// Si un agent bloque notre déplacement, on attend un temps aléatoire, et reconstruit un chemin en évitant la position
time.Sleep(time.Duration(rand.Intn(1000)) * time.Millisecond)
path = findPath(ag.env.station, start, end, path[0])
path = alg.FindPath(ag.env.station, start, end, path[0])
time.Sleep(time.Second)
}
if IsMovementSafe(path, ag.env) {
ag.env.station[ag.coordBasOccupation[0]][ag.coordBasOccupation[1]] = ag.isOn
ag.isOn = ag.env.station[path[0].row][path[0].col]
ag.coordBasOccupation[0] = path[0].row
ag.coordBasOccupation[1] = path[0].col
ag.isOn = ag.env.station[path[0].Row()][path[0].Col()]
ag.coordBasOccupation[0] = path[0].Row()
ag.coordBasOccupation[1] = path[0].Col()
ag.env.station[ag.coordBasOccupation[0]][ag.coordBasOccupation[1]] = "A"
// ============ Prise en compte de la vitesse de déplacement ======================
time.Sleep(ag.vitesse)
}
......
env.go → internal/simulation/env.go
+ 0
− 0
View file @ 0171892a
File moved
simu.go → internal/simulation/simu.go
+ 4
− 0
View file @ 0171892a
......@@ -75,6 +75,10 @@ type Simulation struct {
syncChans sync.Map
}
func (sim *Simulation) Env() (*Environment){
return &sim.env
}
func NewSimulation(agentCount int, maxStep int, maxDuration time.Duration) (simu *Simulation) {
simu = &Simulation{}
simu.agents = make([]Agent, 0, agentCount)
......
internal/simulation/usagerLambda.go 0 → 100644
+ 34
− 0
View file @ 0171892a
package simulation
import(
"math/rand"
"time"
)
type UsagerLambda struct{}
func (ul *UsagerLambda) Percept(ag *Agent) {
ag.stuck = ag.isStuck()
if ag.stuck {
return
}
}
func (ul *UsagerLambda) Deliberate(ag *Agent) {
if ag.stuck {
ag.decision = Wait
} else {
ag.decision = Move
}
}
func (ul *UsagerLambda) Act(ag *Agent) {
if ag.decision == Move {
ag.MoveAgent()
} else if ag.decision == Wait {
n := rand.Intn(2) // temps d'attente aléatoire
time.Sleep(time.Duration(n) * time.Second)
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment