ad todo

hugoppp-uni · May 22, 2023 · 6055daa · 6055daa
1 parent 0a6be37
commit 6055daa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Solution1/ConsoleApp1/Program.cs b/src/Solution1/ConsoleApp1/Program.cs
@@ -43,7 +43,7 @@
 var physicalWorld = new PhysicalWorld(graph, parkerCount, cruiserCount);
 
 // sim meta data
-//var simDataTask = await SimDataClient.Create(mqttClientFactory, physicalWorld, simDataPublishInterval);
+var simDataTask = await SimDataClient.Create(mqttClientFactory, physicalWorld, simDataPublishInterval);
 
 ParkingGuidanceSystem pgs = new ParkingGuidanceSystem(physicalWorld, new NearestParkingStrategy(), false);
 // init cruisers 

diff --git a/src/Solution1/ConsoleApp1/clients/behaviour/RandomParkerClientBehaviour.cs b/src/Solution1/ConsoleApp1/clients/behaviour/RandomParkerClientBehaviour.cs
@@ -51,17 +51,21 @@ public bool AttemptLocalParking(MockCar car)
         }
 
         if (passedParkingSpots.Count == 0) return false;
+
+        // occupy
         var nearestUnoccupiedSpot = passedParkingSpots.Peek();
+        car.OccupiedSpot = nearestUnoccupiedSpot;
+        car.OccupiedSpot.Occupied = true;
 
         // physically park
         car.Position = new StreetPosition(car.Position.StreetEdge, nearestUnoccupiedSpot.DistanceFromSource);
 
-        nearestUnoccupiedSpot.Occupied = true;
         car.Position.StreetEdge.DecrementCarCount();
         Random rand = new Random();
         car.ParkTime = rand.Next(0, MockCar.MaxParkTime + 1);
 
         car.World.DecrementUnoccupiedSpotCount();
+        car.World.IncrementParkEvents();
         car.KpiManager.DistanceTravelledParking += car.Position.DistanceFromSource;
 
         // car.KpiManager.PublishAll(); TODO publish kpis with async and await

diff --git a/src/Solution1/ConsoleApp1/sim/MockCar.cs b/src/Solution1/ConsoleApp1/sim/MockCar.cs
@@ -55,7 +55,6 @@ public void RespawnAtRandom()
     public void ResetAfterParking()
     {
         OccupiedSpot.Occupied = false;
-        OccupiedSpot = null!;
         Position.StreetEdge.IncrementCarCount();
 
         // kpi