Saanechkaa/ISEbd-21_Tomasheva_RoadTrain_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Lab7 fix

Browse Source
This commit is contained in:
Saanechkaa 2022-12-13 17:24:29 +04:00
parent cebb91a24c
commit 5f39e71615
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RoadTrain/RoadTrain/MapWithSetRoadTrainsGeneric.cs
View File

@ -49,7 +49,7 @@
{ {
int width = picWidth / _placeSizeWidth; int width = picWidth / _placeSizeWidth;
int height = picHeight / _placeSizeHeight; int height = picHeight / _placeSizeHeight;
_setRoadTrains = new SetRoadTrainsGeneric<T>(width * height - 2); _setRoadTrains = new SetRoadTrainsGeneric<T>(width * height - 1);
_pictureWidth = picWidth; _pictureWidth = picWidth;
_pictureHeight = picHeight; _pictureHeight = picHeight;
_map = map; _map = map;

1
RoadTrain/RoadTrain/RoadTrain.csproj
View File

@ -27,6 +27,7 @@
<PackageReference Include="Serilog" Version="2.12.0" /> <PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" /> <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
RoadTrain/RoadTrain/SetRoadTrainsGeneric.cs
View File

@ -72,9 +72,13 @@
public T Remove(int position) public T Remove(int position)
{ {
// проверка позиции // проверка позиции
if (position < 0 || position >= _maxCount) if (position < 0 || position >= _maxCount - 1)
return null; return null;
T delObj = _places[position]; if (position >= _places.Count)
{
throw new RoadTrainNotFoundException(position);
}
var delObj = _places[position];
if (delObj == null) if (delObj == null)
{ {
throw new RoadTrainNotFoundException(position); throw new RoadTrainNotFoundException(position);