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

Tomasheva_Lab_№7 #8

Closed
Saanechkaa wants to merge 2 commits from Lab7 into Lab6
pull from: Lab7
merge into: Saanechkaa:Lab6
Conversation 1 Commits 2 Files Changed 10 +8 -3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5f39e71615 - Show all commits

2
RoadTrain/RoadTrain/MapWithSetRoadTrainsGeneric.cs
View File

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

1
RoadTrain/RoadTrain/RoadTrain.csproj
View File

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

8
RoadTrain/RoadTrain/SetRoadTrainsGeneric.cs
View File

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