Igor-Melnikov/ISEbd-21_Melnikov_I.O._Locomotives._Advanced
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

доработка базовой части (Insert, Remove)

Browse Source
This commit is contained in:
Мельников Игорь 2022-12-07 17:47:51 +04:00
parent 51262a3eb0
commit 6f8d738bf3
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
LocomotivesAdvanced/LocomotivesAdvanced/SetLocomotivesGeneric.cs
View File

@ -29,7 +29,7 @@
/// <returns></returns>
public int Insert(T locomotive, int position)
{
if (position < 0 || position > _maxCount)
if (position < 0 || position > Count + 1)
{
return position;
}
@ -38,22 +38,8 @@
_places.Add(locomotive);
return 0;
}
if (position == 0)
{
for (int i = Count; i >= 1; i--)
{
_places.Insert(i, _places[i - 1]);
_places.RemoveAt(i - 1);
}
_places.Insert(0, locomotive);
return 0;
}
if (_places[position] == null)
{
_places.Insert(position, locomotive);
return position;
}
return -1;
_places.Insert(position, locomotive);
return position;
}
/// <summary>
/// Удаление объекта из набора с конкретной позиции
@ -62,12 +48,12 @@
/// <returns></returns>
public T Remove(int position)
{
if (_places[position] == null)
if (position > Count || _places[position] == null)
{
return null;
}
var result = _places[position];
_places[position] = null;
_places.RemoveAt(position);
return result;
}
/// <summary>