Changeset 10 for trunk

Timestamp:

Mar 26, 2015, 10:14:59 PM (10 years ago)

Author:

chronos

Message:

• Fixed: Passengers behaviour in case of circural track and trainn going only in onde direction.

File:

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

trunk/UEngine.pas

@@ -28 +28 @@
     Lines: TMetroLines;
     ShapeDistance: array[TStationShape] of Integer;
-    function GetBestStationForShape(Shape: TStationShape; Check: TMetroStation): Boolean;
+    function GetBestStationForShape(Shape: TStationShape; Check: TMetroStation;
+      CurrentStationIndex: Integer): Boolean;
     constructor Create;
     destructor Destroy; override;
@@ -60 +61 @@
     constructor Create;
     destructor Destroy; override;
+    function IsCircular: Boolean;
   end;
 
@@ -384 +386 @@
 end;
 
+function TMetroLine.IsCircular: Boolean;
+begin
+  Result := False;
+  if Stations.Count >= 2 then
+    Result := (Stations.Last = Stations.First);
+end;
+
 { TMetroTrain }
 
@@ -436 +445 @@
 
 function TMetroStation.GetBestStationForShape(Shape: TStationShape;
-  Check: TMetroStation): Boolean;
-var
-  I: Integer;
+  Check: TMetroStation; CurrentStationIndex: Integer): Boolean;
+var
+  I: Integer;
+  T: Integer;
   Distance: Integer;
   StationIndex: Integer;
+  DirectionUp: Boolean;
+  DirectionDown: Boolean;
+  NextStationUp: TMetroStation;
+  NextStationDown: TMetroStation;
 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];
+    StationIndex := CurrentStationIndex;
+    if IsCircular then begin
+      DirectionUp := False;
+      DirectionDown := False;
+      for T := 0 to Trains.Count - 1 do begin
+        if TMetroTrain(Trains[T]).Direction = 1 then DirectionUp := True;
+        if TMetroTrain(Trains[T]).Direction = -1 then DirectionDown := True;
       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
+      if StationIndex = 0 then
+        NextStationDown := TMetroStation(Stations[Stations.Count - 2])
+      else
+      if StationIndex > 0 then
+        NextStationDown := TMetroStation(Stations[StationIndex - 1]);
+
+      if (StationIndex >= 0) and (StationIndex = Stations.Count - 1) then
+        NextStationUp := TMetroStation(Stations[1])
+      else
+      if (StationIndex >= 0) and (StationIndex < Stations.Count - 1) then
+        NextStationUp := TMetroStation(Stations[StationIndex + 1]);
+    end else begin
+      if StationIndex > 0 then begin
+        DirectionDown := True;
+        NextStationDown := TMetroStation(Stations[StationIndex - 1])
+      end else DirectionDown := False;
+      if (StationIndex >= 0) and (StationIndex < Stations.Count - 1) then begin
+        DirectionUp := True;
+        NextStationUp := TMetroStation(Stations[StationIndex + 1]);
+      end else DirectionUp := False;
+    end;
+    if DirectionDown and (NextStationDown.ShapeDistance[Shape] <> -1) and
+      (NextStationDown.ShapeDistance[Shape] < Distance) then begin
+      Distance := NextStationDown.ShapeDistance[Shape];
+    end;
+    if DirectionUp and (NextStationUp.ShapeDistance[Shape] <> -1) and
+      (NextStationUp.ShapeDistance[Shape] < Distance) then begin
+      Distance := NextStationUp.ShapeDistance[Shape];
+    end;
   end;
   Result := Check.ShapeDistance[Shape] = Distance;
@@ -586 +624 @@
 var
   I: Integer;
+  T: Integer;
   StationIndex: Integer;
+  DirectionDown: Boolean;
+  DirectionUp: Boolean;
 begin
   with Station do begin
@@ -593 +634 @@
       // 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);
+      with TMetroLine(Lines[I]) do
+        for StationIndex := 0 to Stations.Count - 1 do
+        if TMetroStation(Stations[StationIndex]) = Station then begin
+        if not IsCircular then begin
+          // 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 else begin
+          // If circular then trains might go in single direction so passengers
+          // waiting for oposite directions are wrong
+          DirectionUp := False;
+          DirectionDown := False;
+          for T := 0 to Trains.Count - 1 do begin
+            if TMetroTrain(Trains[T]).Direction = 1 then DirectionUp := True;
+            if TMetroTrain(Trains[T]).Direction = -1 then DirectionDown := True;
+          end;
+          // Update for all adjecent stations
+          if DirectionUp then begin
+            if StationIndex = 0 then
+              ComputeShapeDistanceStation(TMetroStation(Stations[Stations.Count - 2]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+            if StationIndex > 0 then
+              ComputeShapeDistanceStation(TMetroStation(Stations[StationIndex - 1]), UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+          end;
+          if DirectionDown then begin
+            if (StationIndex >= 0) and (StationIndex = Stations.Count - 1) then
+              ComputeShapeDistanceStation(TMetroStation(Stations[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;
@@ -650 +716 @@
   PosDelta: Integer;
   CurrentStation: TMetroStation;
+  CurrentStationIndex: Integer;
 begin
   if State = gsRunning then begin
@@ -688 +755 @@
       if InStation then begin
         if (Now - StationStopTime) > OneSecond then begin
+          CurrentStationIndex := TargetStationIndex;
           CurrentStation := TargetStation;
 
@@ -721 +789 @@
           // 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
+            if not CurrentStation.GetBestStationForShape(TMetroPassenger(Passengers[P]).Shape, TargetStation, CurrentStationIndex) then begin
               Passenger := TMetroPassenger(Passengers[P]);
               Passengers.Delete(P);
@@ -730 +798 @@
 
           // Load new passengers
+          if Assigned(CurrentStation) and (CurrentStationIndex < Line.Stations.Count) then
           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
+              if CurrentStation.GetBestStationForShape(Passenger.Shape, TargetStation, CurrentStationIndex) then begin
                 Passenger.Station := nil;
                 CurrentStation.Passengers.Delete(P);
@@ -1024 +1093 @@
         Shape, PassengerSize);
     end;
+
+    Canvas.Brush.Style := bsClear;
+    Text := '';
+    for P := 0 to 2 do
+      Text := Text + IntToStr(ShapeDistance[TStationShape(P)]) + ',';
+    Canvas.TextOut(Position.X + StationSize div 2, Position.Y + StationSize div 2, Text);
   end;