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

Лабораторная 3 финал

Browse Source
This commit is contained in:
sqdselo 2024-04-22 19:48:41 +04:00
parent 5f5f61f51b
commit 4de1bca002
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ namespace HoistingCrane.CollectionGenericObjects
{
get
{
return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth);
return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth)-3;
}
}
public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> array)

3
HoistingCrane/HoistingCrane/CollectionGenericObjects/Garage.cs
View File

@ -36,7 +36,7 @@ namespace HoistingCrane.CollectionGenericObjects
arr?.Get(i)?.SetPictureSize(pictureWidth, pictureHeight);
arr?.Get(i)?.SetPosition(_placeSizeWidth * currentPosWidth + 25, _placeSizeHeight * currentPosHeight + 15);
}
if (currentPosWidth > 0)
currentPosWidth--;
else
@ -51,5 +51,6 @@ namespace HoistingCrane.CollectionGenericObjects
}
}
}
}

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

@ -31,50 +31,50 @@
}
public int Insert(T obj)
{
for (int i = 0; i < Count; i++)
{
if (arr[i] == null)
{
return Insert(obj, 0);
}
}
return -1;
return Insert(obj, 0);
}
public int Insert(T obj, int position)
{
//todo Проверка позиции
if (position < 0 || position > Count)
{
return -1;
}
if (arr[position] == null)
int pos = position - 1;
while (position < Count)
{
arr[position] = obj;
return position;
}
else
{
if (Insert(obj, position + 1) != null)
if (arr[position] == null)
{
arr[position] = obj;
return position;
}
if (Insert(obj, position - 1) != null)
position++;
}
while (pos > 0)
{
if (arr[position] == null)
{
arr[position] = obj;
return position;
}
position--;
}
return -1;
}
}
public T? Remove(int position)
{
if(position >= 0 && position < Count)
if (position < 0 || position > Count)
{
T? temp = arr[position];
arr[position] = null;
return temp;
return null;
}
return null;
T? removed_object = arr[position];
arr[position] = null;
return removed_object;
}
}
}