Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

Commit

Permalink
Removed comments
Browse files Browse the repository at this point in the history
  • Loading branch information
SveinIsdahl authored Mar 17, 2024
1 parent ce396ff commit 735aeaa
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions orderSync/orderSync.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const (

const bcastPort int = 25565

type SyncOrder map[string]int //Map of what each elevator thinks the state of this order is (Could we reduce amount of state even more?
type SyncOrder map[string]int //Map of what each elevator thinks the state of this order is

type SyncOrderSystem struct {
HallOrders [][]SyncOrder
Expand Down Expand Up @@ -118,7 +118,7 @@ func Sync(elevatorSystemFromFSM chan elevator.Elevator, localId string, orderAss
case orderToClear := <-orderCompleted:
syncOrderSystem = RemoveOrder(localId, orderToClear, syncOrderSystem)

case <-timer.C: //Timer reset, send new state update
case <-timer.C:
msgCounter += 1
networkTransmitter <- StateMsg{localId, msgCounter, elevatorSystems[localId], SyncOrderSystemToNetworkOrderSystem(localId, syncOrderSystem)}
timer.Reset(time.Millisecond * 5)
Expand Down Expand Up @@ -206,10 +206,9 @@ func ConsensusBarrierTransition(localId string, syncOrderSystem SyncOrderSystem,
return syncOrderSystem
}

// Cab and hall are very similar, we should refactor more
func ConsensusTransitionSingleCab(localId string, CabOrders []SyncOrder, peers []string) (floor, order int) {
for orderFloor, order := range CabOrders { //We only check our own cabs for consensus
if ConsensusAmongPeers(order, peers) { //Consensus
for orderFloor, order := range CabOrders {
if ConsensusAmongPeers(order, peers) {
ourorder := order[localId]
if ourorder == servicedOrder {
return orderFloor, noOrder
Expand Down Expand Up @@ -288,7 +287,7 @@ func NewSyncOrderSystem(id string) SyncOrderSystem {

CabOrders := make(map[string][]SyncOrder)
CabOrders[id] = make([]SyncOrder, elevator.N_FLOORS)
for i := 0; i < elevator.N_FLOORS; i++ { //Fix
for i := 0; i < elevator.N_FLOORS; i++ {
CabOrders[id][i] = SyncOrder{id: unknownStatus}
}
return SyncOrderSystem{
Expand Down Expand Up @@ -379,7 +378,6 @@ func NewLocalElevatorState(elevatorSystem Elevator, id string, syncOrderSystem S
func SyncOrderSystemToElevatorSystem(elevatorSystems map[string]Elevator, localId string, syncOrderSystem SyncOrderSystem, peers []string) hra.HraElevatorSystem {
hraElevSys := hra.NewElevatorSystem(elevator.N_FLOORS)

//Fill halls. Don't need peers, because we base it on our own id
for i, floor := range syncOrderSystem.HallOrders {
for j, order := range floor {
hraElevSys.HallOrders[i][j] = (order[localId] == confirmedOrder)
Expand Down

0 comments on commit 735aeaa

Please sign in to comment.