Лабораторная работка #3

HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs

@@ -1,5 +1,4 @@
 using HoistingCrane.Drawning;
-using System;
 namespace HoistingCrane.CollectionGenericObjects
 {
     public abstract class AbstractCompany
@@ -42,13 +41,13 @@ namespace HoistingCrane.CollectionGenericObjects
             arr.SetMaxCount = GetMaxCount;
         }
 
-        public static bool operator +(AbstractCompany company, DrawningTrackedVehicle car)
+        public static DrawningTrackedVehicle operator +(AbstractCompany company, DrawningTrackedVehicle car)
         {
-            return company.arr?.Insert(car) ?? false;
+            return company.arr?.Insert(car) ?? null;
         }
-        public static bool operator -(AbstractCompany company, int position)
+        public static DrawningTrackedVehicle operator -(AbstractCompany company, int position)
         {
-            return company.arr?.Remove(position) ?? false;
+            return company.arr?.Remove(position) ?? null;
         }
 
         public DrawningTrackedVehicle? GetRandomObject()

HoistingCrane/HoistingCrane/CollectionGenericObjects/Garage.cs

@@ -1,7 +1,4 @@
 using HoistingCrane.Drawning;
-using System;
-using System.Collections.Specialized;
-
 namespace HoistingCrane.CollectionGenericObjects
 {
     public class Garage : AbstractCompany

HoistingCrane/HoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,5 +1,4 @@
-using System;
+namespace HoistingCrane.CollectionGenericObjects
-namespace HoistingCrane.CollectionGenericObjects
 {
     public interface ICollectionGenericObjects<T>
         where T: class
@@ -17,20 +16,20 @@ namespace HoistingCrane.CollectionGenericObjects
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        bool Insert(T obj);
+        T? Insert(T obj);
         /// <summary>
         /// Добавление элемента в коллекцию на определенную позицию
         /// </summary>
         /// <param name="obj"></param>
         /// <param name="position"></param>
         /// <returns></returns>
-        bool Insert(T obj, int position);
+        T? Insert(T obj, int position);
         /// <summary>
         /// Удаление элемента из коллекции по его позиции
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        bool Remove(int position);
+        T? Remove(int position);
         T? Get(int position);
     }
 }

HoistingCrane/HoistingCrane/CollectionGenericObjects/MassivGenericObjects.cs

@@ -1,5 +1,4 @@
-using System;
+namespace HoistingCrane.CollectionGenericObjects
-namespace HoistingCrane.CollectionGenericObjects
 {
     public class MassivGenericObjects<T> : ICollectionGenericObjects<T> where T : class
     {
@@ -31,64 +30,54 @@ namespace HoistingCrane.CollectionGenericObjects
             return null;  
         }
 
-        public bool Insert(T obj)
+        public T? Insert(T obj)
         {
-            for(int i = 0; i < Count; i++)
+            for (int i = 0; i < Count; i++)
             {
-                if (arr[i] == null) { 
+                if (arr[i] == null)
-                    arr[i] = obj;
+                {
-                    return true;
+                    return Insert(obj, 0);
                 } 
             }
-            return false;
+            return null;
         }
 
-        public bool Insert(T obj, int position)
+        public T? Insert(T obj, int position)
         {
-            // Проверка позиции
+            //todo Проверка позиции
-            if (position < Count && position >= 0)
+            if (position < 0 || position > Count)
             {
-                if (arr[position] == null)
+                return null;
-                {
-                    arr[position] = obj;
-                }
-                else
-                {
-                    int flag = -1;
-                    for (int i = position + 1; i < arr.Length; i++)
-                    {
-                        if (arr[i] == null)
-                        {
-                            flag = 1;
-                            arr[i] = obj;
-                            break;
-                        }
-                    }
-                    if (flag == -1 && position != 0)
-                    {
-                        for (int i = position - 1; i >= 0; i--)
-                        {
-                            if (arr[i] == null)
-                            {
-                                arr[i] = obj;
-                                break;
-                            }
-                        }
-                    }
-                }
             }
 
-            return false;
+            if (arr[position] == null)
+            {
+                arr[position] = obj;
+                return arr[position];
+            }
+            else
+            {
+                if (Insert(obj, position + 1) != null)
+                {
+                    return arr[position + 1];
+                }
+                if (Insert(obj, position - 1) != null)
+                {
+                    return arr[position - 1];
+                }
+            }
+            return null;
         } 
 
-        public bool Remove(int position)
+        public T? Remove(int position)
         {
-            if(position < 0 || position >= arr.Length || arr[position] == null)
+            if(position >= 0 && position < Count)
             {
-                return false;
+                T? temp = arr[position];
+                arr[position] = null;
+                return temp;
             }
-            arr[position] = null;
+            return null;
-            return true;
         }
     }
 }

HoistingCrane/HoistingCrane/FormCarCollection.cs

@@ -1,15 +1,5 @@
 using HoistingCrane.CollectionGenericObjects;
 using HoistingCrane.Drawning;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
 namespace HoistingCrane
 {
     public partial class FormCarCollection : Form
@@ -30,7 +20,6 @@ namespace HoistingCrane
             }
         }
 
-
         private void CreateObject(string type)
         {
             DrawningTrackedVehicle drawning;
@@ -49,7 +38,7 @@ namespace HoistingCrane
                 default:
                     return;
             }
-            if (_company + drawning)
+            if ((_company + drawning) != null)
             {
                 MessageBox.Show("Объект добавлен");
                 pictureBox.Image = _company.Show();
@@ -71,8 +60,6 @@ namespace HoistingCrane
             return color;
         }
 
-
-
         private void buttonCreateHoistingCrane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningHoistingCrane));
 
 
@@ -91,7 +78,7 @@ namespace HoistingCrane
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBox.Text);
-            if (_company - pos)
+            if ((_company - pos) != null)
             {
                 MessageBox.Show("Объект удален!");
                 pictureBox.Image = _company.Show();

HoistingCrane/HoistingCrane/MovementStrategy/AbstractStrategy.cs

@@ -47,7 +47,6 @@
             FieldWidth = width;
             FieldHeight = height;
         }
-
         /// <summary>
         /// Шаг перемещения
         /// </summary>
@@ -119,7 +118,6 @@
         /// </summary>
         /// <returns></returns>
         protected abstract bool IsTargetDestination();
-
         /// <summary>
         /// Попытка перемещения в требуемом направлении
         /// </summary>

HoistingCrane/HoistingCrane/MovementStrategy/MoveToBorder.cs

@@ -1,4 +1,6 @@
-namespace HoistingCrane.MovementStrategy
+using System.Configuration;
+
+namespace HoistingCrane.MovementStrategy
 {
     public class MoveToBorder : AbstractStrategy
     {
@@ -12,7 +14,6 @@
 
             return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;
         }
-
         protected override void MoveToTarget()
         {
             ObjectParameters? objParams = GetObjectParameters;