sqdselo/pibd-12_Tangatarov.I.A._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

доделаю

Browse Source
This commit is contained in:
sqdselo 2024-04-04 15:14:16 +04:00
parent 948209a130
commit 46fb3ca9d8
5 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs
View File

@ -42,9 +42,9 @@ namespace HoistingCrane.CollectionGenericObjects
arr.SetMaxCount = GetMaxCount;
}
public static DrawningTrackedVehicle operator +(AbstractCompany company, DrawningTrackedVehicle car)
public static int operator +(AbstractCompany company, DrawningTrackedVehicle car)
{
return company.arr?.Insert(car) ?? null;
return company.arr?.Insert(car) ?? -1;
}
public static DrawningTrackedVehicle operator -(AbstractCompany company, int position)
{

4
HoistingCrane/HoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

@ -17,14 +17,14 @@ namespace HoistingCrane.CollectionGenericObjects
/// </summary>
/// <param name="obj"></param>
/// <returns></returns>
T? Insert(T obj);
int Insert(T obj);
/// <summary>
/// Добавление элемента в коллекцию на определенную позицию
/// </summary>
/// <param name="obj"></param>
/// <param name="position"></param>
/// <returns></returns>
T? Insert(T obj, int position);
int Insert(T obj, int position);
/// <summary>
/// Удаление элемента из коллекции по его позиции
/// </summary>

25
HoistingCrane/HoistingCrane/CollectionGenericObjects/ListGenericObjects.cs
View File

@ -39,7 +39,7 @@ namespace HoistingCrane.CollectionGenericObjects
public T? Get(int position)
{
// TODO проверка позиции
if(position >= 0 && position < list.Count)
if(position >= 0 && position < _maxCount)
{
return list[position];
}
@ -47,7 +47,7 @@ namespace HoistingCrane.CollectionGenericObjects
}
public T? Insert(T obj)
public int Insert(T obj)
{
// TODO проверка, что не превышено максимальное количество элементов
// TODO вставка в конец набора
@ -55,23 +55,34 @@ namespace HoistingCrane.CollectionGenericObjects
{
return Insert(obj, 0);
}
return null;
return -1;
}
public T? Insert(T obj, int position)
public int Insert(T obj, int position)
{
// TODO проверка, что не превышено максимальное количество элементов
// TODO проверка позиции
// TODO вставка по позиции
if(position >= 0 && position < list.Count)
if(position >= 0 && position < _maxCount)
{
if (list[position] == null)
{
list.Add(obj);
return list[position];
return position;
}
else
{
if (Insert(obj, position + 1) != -1)
{
return position;
}
if (Insert(obj, position - 1) != -1)
{
return position;
}
}
return null;
}
return -1;
}

20
HoistingCrane/HoistingCrane/CollectionGenericObjects/MassivGenericObjects.cs
View File

@ -31,7 +31,7 @@ namespace HoistingCrane.CollectionGenericObjects
return null;
}
public T? Insert(T obj)
public int Insert(T obj)
{
for (int i = 0; i < Count; i++)
{
@ -40,34 +40,34 @@ namespace HoistingCrane.CollectionGenericObjects
return Insert(obj, 0);
}
}
return null;
return -1;
}
public T? Insert(T obj, int position)
public int Insert(T obj, int position)
{
//todo Проверка позиции
if (position < 0 || position > Count)
{
return null;
return -1;
}
if (arr[position] == null)
{
arr[position] = obj;
return arr[position];
return position;
}
else
{
if (Insert(obj, position + 1) != null)
if (Insert(obj, position + 1) != -1)
{
return arr[position + 1];
return position;
}
if (Insert(obj, position - 1) != null)
if (Insert(obj, position - 1) != -1)
{
return arr[position - 1];
return position;
}
}
return null;
return -1;
}
public T? Remove(int position)

2
HoistingCrane/HoistingCrane/FormCarCollection.cs
View File

@ -52,7 +52,7 @@ namespace HoistingCrane
default:
return;
}
if ((_company + drawning) != null)
if ((_company + drawning) != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _company.Show();