Changeset 7 for trunk

Timestamp:

Mar 26, 2015, 4:31:05 PM (10 years ago)

Author:

chronos

Message:

• Added: Now passengers use path finding to change line and wait for nearest station with same symbol.

File:

• trunk/UEngine.pas (modified) (13 diffs)

trunk/UEngine.pas

@@ -20 +20 @@
 
   TMetroStation = class
+  private
+  public
     Engine: TEngine;
     Shape: TStationShape;
@@ -25 +27 @@
     Passengers: TMetroPassengers;
     Lines: TMetroLines;
+    ShapeDistance: array[TStationShape] of Integer;
+    function GetBestStationForShape(Shape: TStationShape; Check: TMetroStation): Boolean;
     constructor Create;
     destructor Destroy; override;
@@ -127 +131 @@
     procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
       Size: Integer);
+    procedure ComputeShapeDistance;
+    procedure ComputeShapeDistanceStation(Station: TMetroStation;
+      UpdatedShape: TStationShape; Distance: Integer);
   public
     Passengers: TMetroPassengers;
@@ -226 +233 @@
   Result.Shape := TStationShape(Random(Integer(Engine.ShapeCount)));
   Add(Result);
+  Engine.ComputeShapeDistance;
 end;
 
@@ -272 +280 @@
        end;
   end;
+  Engine.ComputeShapeDistance;
 end;
 
@@ -292 +301 @@
       end;
   end;
+  Engine.ComputeShapeDistance;
 end;
 
@@ -388 +398 @@
 
 { TMetroStation }
+
+function TMetroStation.GetBestStationForShape(Shape: TStationShape;
+  Check: TMetroStation): Boolean;
+var
+  I: Integer;
+  Distance: Integer;
+  StationIndex: Integer;
+begin
+  Distance := High(Integer);
+  for I := 0 to Lines.Count - 1 do
+  with TMetroLine(Lines[I]) do begin
+    StationIndex := Stations.IndexOf(Self);
+    if StationIndex > 0 then begin
+      if (TMetroStation(Stations[StationIndex - 1]).ShapeDistance[Shape] <> -1) and
+        (TMetroStation(Stations[StationIndex - 1]).ShapeDistance[Shape] < Distance) then begin
+        Distance := TMetroStation(Stations[StationIndex - 1]).ShapeDistance[Shape];
+      end;
+    end;
+    if (StationIndex >= 0) and (StationIndex < Stations.Count - 1) then begin
+      if (TMetroStation(Stations[StationIndex + 1]).ShapeDistance[Shape] <> -1) and
+        (TMetroStation(Stations[StationIndex + 1]).ShapeDistance[Shape] < Distance) then begin
+        Distance := TMetroStation(Stations[StationIndex + 1]).ShapeDistance[Shape];
+      end;
+    end
+  end;
+  Result := Check.ShapeDistance[Shape] = Distance;
+end;
 
 constructor TMetroStation.Create;
@@ -488 +525 @@
 end;
 
+procedure TEngine.ComputeShapeDistance;
+var
+  I: Integer;
+  L: Integer;
+  S: TStationShape;
+begin
+  // Reset all distances
+  for I := 0 to Stations.Count - 1 do
+  with TMetroStation(Stations[I]) do begin
+    for S := Low(ShapeDistance) to High(ShapeDistance) do
+      ShapeDistance[S] := -1;
+  end;
+
+  // Propagate shape distance for all stations
+  // Distace 0 means that station is final target
+  for I := 0 to Stations.Count - 1 do
+  with TMetroStation(Stations[I]) do begin
+    ComputeShapeDistanceStation(TMetroStation(Stations[I]), Shape, 0);
+  end;
+end;
+
+procedure TEngine.ComputeShapeDistanceStation(Station: TMetroStation;
+  UpdatedShape: TStationShape; Distance: Integer);
+var
+  I: Integer;
+  StationIndex: Integer;
+begin
+  with Station do begin
+    if (Distance < ShapeDistance[UpdatedShape]) or (ShapeDistance[UpdatedShape] = -1) then begin
+      ShapeDistance[UpdatedShape] := Distance;
+      // Do for all lines connected to station
+      for I := 0 to Lines.Count - 1 do
+      with TMetroLine(Lines[I]) do begin
+        StationIndex := Stations.IndexOf(Station);
+        // Update for all adjecent stations
+        if StationIndex > 0 then
+          ComputeShapeDistanceStation(TMetroStation(Stations[StationIndex - 1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+        if (StationIndex >= 0) and (StationIndex < Stations.Count - 1) then
+          ComputeShapeDistanceStation(TMetroStation(Stations[StationIndex + 1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+      end;
+    end;
+  end;
+end;
+
 procedure TEngine.Tick;
 const
@@ -499 +580 @@
   PosDelta: Integer;
   TargetStationIndex: Integer;
+  CurrentStation: TMetroStation;
+  BestStation: TMetroStation;
 begin
   if State = gsRunning then begin
@@ -531 +614 @@
       if InStation then begin
         if (Now - StationStopTime) > OneSecond then begin
-          // Unload passengers
-          for P := Passengers.Count - 1 downto 0 do begin
-            if TMetroPassenger(Passengers[P]).Shape = TargetStation.Shape then begin
-              Passenger := TMetroPassenger(Passengers[P]);
-              Passengers.Delete(P);
-              Self.Passengers.Remove(Passenger);
-              Inc(ServedPassengerCount);
-            end;
-          end;
-          while (TargetStation.Passengers.Count > 0) and (Passengers.Count < TrainPassengerCount) do begin
-            Passenger := TMetroPassenger(TargetStation.Passengers[0]);
-            Passenger.Station := nil;
-            TargetStation.Passengers.Delete(0);
-            Passengers.Add(Passenger);
-            Passenger.Train := TMetroTrain(Trains[I]);
-          end;
-
-
-          // Load new passengers
-          while (TargetStation.Passengers.Count > 0) and (Passengers.Count < TrainPassengerCount) do begin
-            Passenger := TMetroPassenger(TargetStation.Passengers[0]);
-            Passenger.Station := nil;
-            TargetStation.Passengers.Delete(0);
-            Passengers.Add(Passenger);
-            Passenger.Train := TMetroTrain(Trains[I]);
-          end;
+          CurrentStation := TargetStation;
 
           // Choose next target station
@@ -568 +626 @@
           end;
           TargetStation := TMetroStation(Line.Stations[TargetStationIndex]);
+
+          // Unload passengers in target station
+          for P := Passengers.Count - 1 downto 0 do begin
+            if TMetroPassenger(Passengers[P]).Shape = CurrentStation.Shape then begin
+              Passenger := TMetroPassenger(Passengers[P]);
+              Passengers.Delete(P);
+              Self.Passengers.Remove(Passenger);
+              Inc(ServedPassengerCount);
+            end;
+          end;
+          // Unload passengers to change line
+          for P := Passengers.Count - 1 downto 0 do begin
+            if not CurrentStation.GetBestStationForShape(TMetroPassenger(Passengers[P]).Shape, TargetStation) then begin
+              Passenger := TMetroPassenger(Passengers[P]);
+              Passengers.Delete(P);
+              CurrentStation.Passengers.Add(Passenger);
+              Passenger.Station := CurrentStation;
+            end;
+          end;
+
+          // Load new passengers
+          for P := CurrentStation.Passengers.Count - 1 downto 0 do begin
+            if (Passengers.Count < TrainPassengerCount) then begin
+              Passenger := TMetroPassenger(CurrentStation.Passengers[P]);
+              if CurrentStation.GetBestStationForShape(Passenger.Shape, TargetStation) then begin
+                Passenger.Station := nil;
+                CurrentStation.Passengers.Delete(P);
+                Passengers.Add(Passenger);
+                Passenger.Train := TMetroTrain(Trains[I]);
+              end;
+            end else Break; // No more space
+          end;
+
           LastPosDelta := Abs(TrackPos - Line.GetStationTrackPos(TargetStation));
           InStation := False;
@@ -594 +685 @@
   for I := 0 to Stations.Count - 1 do
   with TMetroStation(Stations[I]) do begin
-    if Passengers.Count > MaxWaitingPassengers then State := gsGameOver;
+    //if Passengers.Count > MaxWaitingPassengers then State := gsGameOver;
   end;
 
@@ -837 +928 @@
     Canvas.Pen.Color := clBlack;
     DrawShape(Canvas, Position, Shape, StationSize);
+    Text := '';
+    for P := 0 to 2 do
+      Text := Text + IntToStr(ShapeDistance[TStationShape(P)]) + ',';
+    Canvas.TextOut(Position.X + 20, Position.Y + 20, Text);
 
     // Draw passengers