Доделал

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,113 @@
+using ProjectContainerShip.Drawings;
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+    /// <summary>
+    /// Абстракция компании, хранящий коллекцию кораблей
+    /// </summary>
+    public abstract class AbstractCompany
+    {
+        /// <summary>
+        /// Размер места (ширина)
+        /// </summary>
+        protected readonly int _placeSizeWidth = 240;
+
+        /// <summary>
+        /// Размер места (высота)
+        /// </summary>
+        protected readonly int _placeSizeHeight = 80;
+
+        /// <summary>
+        /// Ширина окна
+        /// </summary>
+        protected readonly int _pictureWidth;
+
+        /// <summary>
+        /// Высота окна
+        /// </summary>
+        protected readonly int _pictureHeight;
+
+        /// <summary>
+        /// Коллекция кораблей
+        /// </summary>
+        protected ICollectionGenericObjects<DrawningShip>? _collection = null;
+
+        /// <summary>
+        /// Вычисление максимального количества элементов, который можно разместить в окне
+        /// </summary>
+        private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth">Ширина окна</param>
+        /// <param name="pictureHeight">Высота окна</param>
+        /// <param name="collection">Коллекция кораблей</param>
+        public AbstractCompany(int pictureWidth, int pictureHeight, ICollectionGenericObjects<DrawningShip> collection)
+        {
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+            _collection = collection;
+            _collection.SetMaxCount = GetMaxCount;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="ship">Добавляемый объект</param>
+        /// <returns></returns>
+        public static int operator +(AbstractCompany company, DrawningShip ship)
+        {
+            return company._collection?.Insert(ship) ?? -1;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора удаления для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="position">Номер удаляемого объекта</param>
+        /// <returns></returns>
+        public static DrawningShip operator -(AbstractCompany company, int position)
+        {
+            return company._collection?.Remove(position) ?? null;
+        }
+
+        /// <summary>
+        /// Получение случайного объекта из коллекции
+        /// </summary>
+        /// <returns></returns>
+        public DrawningShip? GetRandomObject()
+        {
+            Random rnd = new();
+            return _collection?.Get(rnd.Next(GetMaxCount));
+        }
+
+        /// <summary>
+        /// Вывод всей коллекции
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap? Show()
+        {
+            Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+            Graphics graphics = Graphics.FromImage(bitmap);
+            DrawBackgound(graphics);
+            SetObjectsPosition();
+            for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+            {
+                DrawningShip? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            return bitmap;
+        }
+
+        /// <summary>
+        /// Вывод заднего фона
+        /// </summary>
+        /// <param name="g"></param>
+        protected abstract void DrawBackgound(Graphics g);
+
+        /// <summary>
+        /// Расстановка объектов
+        /// </summary>
+        protected abstract void SetObjectsPosition();
+    }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,52 @@
+namespace ProjectContainerShip.CollectionGenericObjects
+{
+    public interface ICollectionGenericObjects<T>
+        where T : class
+    {
+        /// <summary>
+        /// Количество объектов в коллекции
+        /// </summary>
+        int Count { get; }
+
+        /// <summary>
+        /// Установка максимального количества элементов
+        /// </summary>
+        int SetMaxCount { set; }
+
+        /// <summary>
+        /// Добавление объекта в коллекцию
+        /// </summary>
+        /// <param name="obj">Добавляемый объект</param>
+        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+        int Insert(T obj);
+
+        /// <summary>
+        /// Добавление объекта в коллекцию на конкретную позицию
+        /// </summary>
+        /// <param name="obj">Добавляемый объект</param>
+        /// <param name="position">Позиция</param>
+        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+        int Insert(T obj, int position);
+
+        /// <summary>
+        /// Удаление объекта из коллекции с конкретной позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
+        T? Remove(int position);
+
+        /// <summary>
+        /// Получение объекта по позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>Объект</returns>
+        T? Get(int position);
+    }
+}
+
+namespace ProjectContainerShip.CollectionGenericObjects
+{
+    internal interface ICollectionGenericObjects
+    {
+    }
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.CollectionGenericObjects
+{
+    public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
+        where T : class
+    {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private T?[] _collection;
+        public int Count => _collection.Length;
+        public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } }
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public MassiveGenericObjects()
+        {
+            _collection = Array.Empty<T?>();
+        }
+        public T? Get(int position)
+        {
+            // TODO проверка позиции
+            if (position >= _collection.Length || position < 0) return null;
+            return _collection[position];
+        }
+        public int Insert(T obj)
+        {
+            // TODO вставка в свободное место набора
+            int index = 0;
+            while (index < _collection.Length)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+                ++index;
+            }
+            return -1;
+        }
+        public int Insert(T obj, int position)
+        {
+            // TODO проверка позиции
+            // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+            // ищется свободное место после этой позиции и идет вставка туда
+            // если нет после, ищем до
+            // TODO вставка
+            if (position >= _collection.Length || position < 0)
+                return -1;
+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return position;
+            }
+            int index = position + 1;
+            while (index < _collection.Length)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+                ++index;
+            }
+            index = position - 1;
+            while (index >= 0)
+            {
+                if (_collection[index] == null)
+                {
+                    _collection[index] = obj;
+                    return index;
+                }
+                --index;
+            }
+            return -1;
+        }
+        public T Remove(int position)
+        {
+            // TODO проверка позиции
+            // TODO удаление объекта из массива, присвоив элементу массива значение null
+
+            if (position >= _collection.Length || position < 0) { 
+                return null;
+            }
+
+            T obj = _collection[position];
+            _collection[position] = null;
+            return obj;
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs

@@ -0,0 +1,53 @@
+using ProjectContainerShip.Drawings;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+public class ShipPortService : AbstractCompany
+{
+    public ShipPortService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningShip> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+    protected override void DrawBackgound(Graphics g)
+    {
+        // Пристань
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        Pen pen = new(Color.Black, 3);
+        for (int i = 0; i < width; i++)
+        {
+            for (int j = 0; j < height + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth - 5, j * _placeSizeHeight);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+
+        int curWidth = width - 1;
+        int curHeight = 0;
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
+        {
+            if (_collection.Get(i) != null)
+            {
+                _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection.Get(i).SetPosition(_placeSizeWidth * curWidth + 55, curHeight * _placeSizeHeight + 20);
+            }
+            if (curWidth > 0)
+                curWidth--;
+            else
+            {
+                curWidth = width - 1;
+                curHeight++;
+            }
+            if (curHeight > height)
+            {
+                return;
+            }
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/Drawings/DirectionType.cs

@@ -1,7 +1,12 @@
-namespace ProjectContainerShip;
+namespace ProjectContainerShip.Drawings;
 
 public enum DirectionType
 {
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
+
     /// <summary>
     /// Вверх
     /// </summary>

ProjectContainerShip/ProjectContainerShip/Drawings/DrawningContainerShip.cs

@@ -0,0 +1,70 @@
+using ProjectContainerShip.Entities;
+
+namespace ProjectContainerShip.Drawings;
+
+/// <summary>
+///  Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningContainerShip : DrawningShip
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodycolor">Основной цвет</param>
+    /// <param name="additionalcolor">Дополнительный цвет</param>
+    /// <param name="crane">Признак наличия крана</param>
+    /// <param name="container">Признак наличия контейнеров</param>
+    public DrawningContainerShip(int speed, double weight, Color bodycolor, Color additionalcolor, bool crane, bool container) : base(120,40)
+    {
+        EntityShip = new EntityContainerShip(speed, weight, bodycolor, additionalcolor, crane, container);
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityShip == null || EntityShip is not EntityContainerShip containerShip || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(containerShip.AdditionalColor);
+
+        if (containerShip.Container)
+
+        {
+            // Верхний маленький контейнер
+            Point[] container =
+                {
+                    new Point((int)_startPosX + 30, (int)_startPosY + 10),
+                    new Point((int)_startPosX + 30, (int)_startPosY ),
+                    new Point((int)_startPosX + 55, (int)_startPosY),
+                    new Point((int)_startPosX + 55, (int)_startPosY + 10)
+                };
+
+            g.FillPolygon(additionalBrush, container);
+            g.DrawPolygon(pen, container);
+
+            //Контейнер под маленьким контейнером
+            g.FillRectangle(additionalBrush, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10);
+            g.DrawRectangle(pen, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10);
+
+        }
+
+        base.DrawTransport(g);
+
+        if (containerShip.Crane)
+        {
+            g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY + 10, (int)_startPosX + 70, (int)_startPosY);
+            g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY);
+            g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 5);
+            g.DrawLine(pen, (int)_startPosX + 110, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 30);
+
+            //Хваталка контейнера
+            g.DrawLine(pen, (int)(_startPosX + 100), (int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 30));
+            g.DrawLine(pen, (int)(_startPosX + 100), (int)(_startPosY + 30), (int)_startPosX + 100, (int)(_startPosY + 35));
+            g.DrawLine(pen, (int)(_startPosX + 120), (int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 35));
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/Drawings/DrawningShip.cs

@@ -1,11 +1,18 @@
-namespace ProjectContainerShip;
+using ProjectContainerShip.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
-public class DrawningContainerShip
+namespace ProjectContainerShip.Drawings;
+
+public class DrawningShip
 {
     /// <summary>
     /// Класс-сущность
     /// </summary>
-    public EntityContainerShip? EntityContainerShip { get; private set; }
+    public EntityShip? EntityShip { get; protected set; }
 
     /// <summary>
     /// Ширина окна 
@@ -20,42 +27,76 @@ public class DrawningContainerShip
     /// <summary>
     /// Левая координата прорисовки контейнеровоза
     /// </summary>
-    private int? _startPosX;
+    protected int? _startPosX;
 
     /// <summary>
     /// Верхняя координата прорисовки контейнеровоза
     /// </summary>
-    private int? _startPosY;
+    protected int? _startPosY;
 
     /// <summary>
     /// Ширина прорисовки контейнеровоза
     /// </summary>
-    private readonly int _drawningContainerShipWidth = 120;
+    private readonly int _drawningContainerShipWidth = 100;
 
     /// <summary>
     /// Высота прорисовки контейнеровоза
     /// </summary>
-    private readonly int _drawningContainerShipHeight = 40;
+    private readonly int _drawningContainerShipHeight = 30;
 
     /// <summary>
-    /// Инициализация свойств
+    /// Координата X объекта 
     /// </summary>
-    /// <param name="speed">Скорость</param>
+    public int? GetPosX => _startPosX;
-    /// <param name="weight">Вес</param>
+
-    /// <param name="bodycolor">Основной цвет</param>
+    /// <summary>
-    /// <param name="additionalcolor">Дополнительный цвет</param>
+    /// Координата Y объекта
-    /// <param name="crane">Признак наличия крана</param>
+    /// </summary>
-    /// <param name="container">Признак наличия контейнеров</param>
+    public int? GetPosY => _startPosY;
-    public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, bool crane, bool container)
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningContainerShipWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningContainerShipHeight;
+
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+    private DrawningShip()
     {
-        EntityContainerShip = new EntityContainerShip();
-        EntityContainerShip.Init(speed,weight,bodycolor,additionalcolor,crane,container);
         _pictureWidth = null;
         _pictureHeight = null;
         _startPosX = null;
         _startPosY = null;
     }
 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodycolor">Основной цвет</param>
+    public DrawningShip(int speed, double weight, Color bodycolor) : this()
+    {
+        EntityShip = new EntityShip(speed, weight, bodycolor);
+    }
+
+    /// <summary>
+    /// Конструктор для наследников
+    /// </summary>
+    /// <param name="drawningContainerShipWidth">Ширина прорисовки корабля</param>
+    /// <param name="drawningContainerShipHeight">Высота прорисовки корабля</param>
+    protected DrawningShip(int drawningContainerShipWidth, int drawningContainerShipHeight) : this()
+    {
+        _drawningContainerShipWidth = drawningContainerShipWidth;
+        _drawningContainerShipHeight = drawningContainerShipHeight;
+    }
+
     /// <summary>
 	/// Установка границ поля
 	/// </summary>
@@ -121,7 +162,7 @@ public class DrawningContainerShip
 	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
 	public bool MoveTransport(DirectionType direction)
     {
-        if (EntityContainerShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return false;
         }
@@ -130,30 +171,30 @@ public class DrawningContainerShip
         {
             //влево
             case DirectionType.Left:
-                if (_startPosX.Value - EntityContainerShip.Step > 0)
+                if (_startPosX.Value - EntityShip.Step > 0)
                 {
-                    _startPosX -= (int)EntityContainerShip.Step;
+                    _startPosX -= (int)EntityShip.Step;
                 }
                 return true;
             //вверх
             case DirectionType.Up:
-                if (_startPosY.Value - EntityContainerShip.Step > 0)
+                if (_startPosY.Value - EntityShip.Step > 0)
                 {
-                    _startPosY -= (int)EntityContainerShip.Step;
+                    _startPosY -= (int)EntityShip.Step;
                 }
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + _drawningContainerShipWidth + EntityContainerShip.Step < _pictureWidth)
+                if (_startPosX.Value + _drawningContainerShipWidth + EntityShip.Step < _pictureWidth)
                 {
-                    _startPosX += (int)EntityContainerShip.Step;
+                    _startPosX += (int)EntityShip.Step;
                 }
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + _drawningContainerShipHeight + EntityContainerShip.Step < _pictureHeight)
+                if (_startPosY.Value + _drawningContainerShipHeight + EntityShip.Step < _pictureHeight)
                 {
-                    _startPosY += (int)EntityContainerShip.Step;
+                    _startPosY += (int)EntityShip.Step;
                 }
                 return true;
             default:
@@ -165,15 +206,14 @@ public class DrawningContainerShip
 	/// Прорисовка объекта
 	/// </summary>
 	/// <param name="g"></param>
-	public void DrawTransport(Graphics g)
+	public virtual void DrawTransport(Graphics g)
     {
-        if (EntityContainerShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        if (EntityShip == null || !_startPosX.HasValue || !_startPosY.HasValue)
         {
             return;
         }
 
         Pen pen = new(Color.Black);
-        Brush additionalBrush = new SolidBrush(EntityContainerShip.AdditionalColor);
 
         //Корпус контейнеровоза
         g.DrawPolygon(pen, new Point[]
@@ -184,8 +224,7 @@ public class DrawningContainerShip
         }
         );
 
-
+        Brush br = new SolidBrush(EntityShip.BodyColor);
-        Brush br = new SolidBrush(EntityContainerShip.BodyColor);
         g.FillPolygon(br, new Point[]
         {
         new Point((int)_startPosX+10,(int)_startPosY+20),new Point((int)_startPosX+100,(int)_startPosY+20),
@@ -202,42 +241,5 @@ public class DrawningContainerShip
         //Длинный контейнер справа
         g.DrawRectangle(pen, (int)_startPosX + 40, (int)_startPosY + 10, 57, 10);
         g.FillRectangle(br, (int)_startPosX + 40, (int)_startPosY + 10, 57, 10);
-
-        //Кран
-        if (EntityContainerShip.Crane)
-        {
-            g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY + 10, (int)_startPosX + 70, (int)_startPosY);
-            g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY);
-            g.DrawLine(pen, (int)_startPosX + 70, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 5);
-            g.DrawLine(pen, (int)_startPosX + 110, (int)_startPosY, (int)_startPosX + 110, (int)_startPosY + 30);
-
-            //Хваталка крана
-            g.DrawLine(pen,(int)(_startPosX + 100),(int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 30));
-            g.DrawLine(pen, (int)(_startPosX + 100), (int)(_startPosY + 30), (int)_startPosX + 100, (int)(_startPosY + 35));
-            g.DrawLine(pen, (int)(_startPosX + 120), (int)(_startPosY + 30), (int)_startPosX + 120, (int)(_startPosY + 35));
-        }
-
-        //Контейнер
-        if (EntityContainerShip.Container)
-
-        {
-            // Верхний маленький контейнер
-            Point[] container =
-                {
-                    new Point((int)_startPosX + 30, (int)_startPosY + 10),
-                    new Point((int)_startPosX + 30, (int)_startPosY ),
-                    new Point((int)_startPosX + 55, (int)_startPosY),
-                    new Point((int)_startPosX + 55, (int)_startPosY + 10)
-                };
-
-            g.FillPolygon(additionalBrush, container);
-            g.DrawPolygon(pen, container);
-
-            //Контейнер под маленьким контейнером
-            g.FillRectangle(additionalBrush, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10);
-            g.DrawRectangle(pen, (int)_startPosX + 20, (int)_startPosY + 10, 27, 10);
-            
     }
 }
-
-}

ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs

@@ -0,0 +1,39 @@
+namespace ProjectContainerShip.Entities;
+
+/// <summary>
+/// Класс-сущность Контейнеровоз
+/// </summary>
+public class EntityContainerShip : EntityShip
+{
+    /// <summary>
+    /// Дополнительный цвет (для опциональных элементов)
+    /// </summary>
+    public Color AdditionalColor { get; private set; }
+
+    /// <summary>
+    /// Признак (опция) наличия крана
+    /// </summary>
+    public bool Crane { get; private set; }
+
+    /// <summary>
+    /// Признак (опция) наличия контейнеров
+    /// </summary>
+    public bool Container { get; private set; }
+
+    /// <summary>
+    /// Инициализация поле объекта-класса Контейнеровоза
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес контейнеровоза</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="crane">Признак наличия крана</param>
+    /// <param name="container">Признак наличия контейнеров</param>
+    public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed,weight,bodyColor)
+    {
+        AdditionalColor = additionalColor;
+        Crane = crane;
+        Container = container;
+    }
+
+}

ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs

@@ -0,0 +1,40 @@
+namespace ProjectContainerShip.Entities;
+
+/// <summary>
+/// Класс-сущность "Корабль"
+/// </summary>
+public class EntityShip
+{
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get; private set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; private set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; private set; }
+
+    /// <summary>
+    /// Шаг перемещения грузового судна 
+    /// </summary>
+    public double Step => Speed * 100 / Weight;
+
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес контейнеровоза</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    public EntityShip(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+    }
+}

ProjectContainerShip/ProjectContainerShip/EntityContainerShip.cs

@@ -1,62 +0,0 @@
-namespace ProjectContainerShip;
-
-    /// <summary>
-    /// Класс-сущность Контейнеровоз
-    /// </summary>
-    public class EntityContainerShip
-    {   
-        /// <summary>
-        /// Скорость
-        /// </summary>
-        public int Speed { get; private set; }
-        
-        /// <summary>
-        /// Вес
-        /// </summary>
-        public double Weight { get; private set; }
-        
-        /// <summary>
-        /// Основной цвет
-        /// </summary>
-        public Color BodyColor { get; private set; }
-        
-        /// <summary>
-        /// Дополнительный цвет (для опциональных элементов)
-        /// </summary>
-        public Color AdditionalColor { get; private set; }
-
-        /// <summary>
-        /// Признак (опция) наличия крана
-        /// </summary>
-        public bool Crane { get; private set; }
-
-        /// <summary>
-        /// Признак (опция) наличия контейнеров
-        /// </summary>
-        public bool Container { get; private set; }
-        
-        /// <summary>
-        /// Шаг перемещения грузового судна 
-        /// </summary>
-        public double Step => Speed * 100 / Weight;
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес контейнеровоза</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="crane">Признак наличия крана</param>
-        /// <param name="container">Признак наличия контейнеров</param>
-        public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-            AdditionalColor = additionalColor;
-            Crane = crane;
-            Container = container;
-        }
-
-    }

ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs

@@ -1,4 +1,5 @@
-namespace ProjectContainerShip
+
+namespace ProjectContainerShip
 {
     partial class FormContainerShip
     {
@@ -29,11 +30,12 @@
         private void InitializeComponent()
         {
             pictureBoxContainerShip = new PictureBox();
-            buttonCreateContainerShip = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit();
             SuspendLayout();
             // 
@@ -45,17 +47,7 @@
             pictureBoxContainerShip.Size = new Size(1256, 529);
             pictureBoxContainerShip.TabIndex = 0;
             pictureBoxContainerShip.TabStop = false;
-            // 
+            pictureBoxContainerShip.Click += pictureBoxContainerShip_Click;
-            // buttonCreateContainerShip
-            // 
-            buttonCreateContainerShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateContainerShip.Location = new Point(12, 457);
-            buttonCreateContainerShip.Name = "buttonCreateContainerShip";
-            buttonCreateContainerShip.Size = new Size(150, 46);
-            buttonCreateContainerShip.TabIndex = 1;
-            buttonCreateContainerShip.Text = "Создать";
-            buttonCreateContainerShip.UseVisualStyleBackColor = true;
-            buttonCreateContainerShip.Click += ButtonCreateContainerShip_Click;
             // 
             // buttonLeft
             // 
@@ -105,16 +97,39 @@
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += ButtonMove_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру ", "К краю" });
+            comboBoxStrategy.Location = new Point(1002, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(242, 40);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStrategyStep.Location = new Point(1094, 58);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(150, 46);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
             // FormContainerShip
             // 
             AutoScaleDimensions = new SizeF(13F, 32F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1256, 529);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateContainerShip);
             Controls.Add(pictureBoxContainerShip);
             Name = "FormContainerShip";
             Text = "Контейнеровоз";
@@ -122,15 +137,21 @@
             ResumeLayout(false);
         }
 
+        private void pictureBoxContainerShip_Click(object sender, EventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
 
 
         #endregion
 
         private PictureBox pictureBoxContainerShip;
-        private Button buttonCreateContainerShip;
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonDown;
         private Button buttonUp;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs

@@ -1,4 +1,6 @@
 using System;
+using ProjectContainerShip.Drawings;
+using ProjectContainerShip.MovementStrategy;
 
 namespace ProjectContainerShip;
 
@@ -10,7 +12,24 @@ public partial class FormContainerShip : Form
     /// <summary>
     /// Поле-объект для прорисовки объекта
     /// </summary>
-    private DrawningContainerShip? _drawningContainerShip;
+    private DrawningShip? _drawningShip;
+
+    /// <summary>
+    /// Стратегия перемещения 
+    /// </summary>
+    private AbstractStrategy? _strategy;
+
+    public DrawningShip SetShip
+    {
+        set
+        {
+            _drawningShip = value;
+            _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
 
     /// <summary>
     /// Конструктор формы
@@ -18,6 +37,7 @@ public partial class FormContainerShip : Form
     public FormContainerShip()
     {
         InitializeComponent();
+        _strategy = null;
     }
 
     /// <summary>
@@ -25,35 +45,17 @@ public partial class FormContainerShip : Form
     /// </summary>
     private void Draw()
     {
-        if (_drawningContainerShip == null)
+        if (_drawningShip == null)
         {
             return;
         }
 
         Bitmap bmp = new(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
         Graphics gr = Graphics.FromImage(bmp);
-        _drawningContainerShip.DrawTransport(gr);
+        _drawningShip.DrawTransport(gr);
         pictureBoxContainerShip.Image = bmp;
     }
 
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateContainerShip_Click(object sender, EventArgs e)
-    {
-        Random random = new();
-        _drawningContainerShip = new DrawningContainerShip();
-        _drawningContainerShip.Init(random.Next(100, 300), random.Next(1000, 3000),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-        _drawningContainerShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
-        _drawningContainerShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
-        Draw();
-    }
-
     /// <summary>
     /// Перемещение объекта по форме (нажатие кнопок навигации)
     /// </summary>
@@ -61,7 +63,7 @@ public partial class FormContainerShip : Form
     /// <param name="e"></param>
     private void ButtonMove_Click(object sender, EventArgs e)
     {
-        if (_drawningContainerShip == null)
+        if (_drawningShip == null)
         {
             return;
         }
@@ -71,16 +73,16 @@ public partial class FormContainerShip : Form
         switch (name)
         {
             case "buttonUp":
-                result = _drawningContainerShip.MoveTransport(DirectionType.Up);
+                result = _drawningShip.MoveTransport(DirectionType.Up);
                 break;
             case "buttonDown":
-                result = _drawningContainerShip.MoveTransport(DirectionType.Down);
+                result = _drawningShip.MoveTransport(DirectionType.Down);
                 break;
             case "buttonLeft":
-                result = _drawningContainerShip.MoveTransport(DirectionType.Left);
+                result = _drawningShip.MoveTransport(DirectionType.Left);
                 break;
             case "buttonRight":
-                result = _drawningContainerShip.MoveTransport(DirectionType.Right);
+                result = _drawningShip.MoveTransport(DirectionType.Right);
                 break;
         }
 
@@ -89,4 +91,44 @@ public partial class FormContainerShip : Form
             Draw();
         }
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonStrategyStep_Click(object sender, EventArgs e)
+    {
+        if (_drawningShip == null) return;
+
+        if (comboBoxStrategy.Enabled)
+        {
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null)
+            {
+                return;
+            }
+            _strategy.SetData(new MoveableShip(_drawningShip), pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+        }
+
+        if (_strategy == null)
+        {
+            return;
+        }
+
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
+
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+        }
+    }
 }

ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs

@@ -0,0 +1,174 @@
+namespace ProjectContainerShip
+{
+    partial class FormShipCollection
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            groupBoxTools = new GroupBox();
+            buttonAddContainerShip = new Button();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveShip = new Button();
+            maskedTextBox = new MaskedTextBox();
+            buttonAddShip = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonAddContainerShip);
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveShip);
+            groupBoxTools.Controls.Add(maskedTextBox);
+            groupBoxTools.Controls.Add(buttonAddShip);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.ForeColor = Color.Black;
+            groupBoxTools.Location = new Point(1601, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(388, 1112);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonAddContainerShip
+            // 
+            buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddContainerShip.Location = new Point(15, 247);
+            buttonAddContainerShip.Name = "buttonAddContainerShip";
+            buttonAddContainerShip.Size = new Size(367, 77);
+            buttonAddContainerShip.TabIndex = 7;
+            buttonAddContainerShip.Text = "Добавление контейнеровоза";
+            buttonAddContainerShip.UseVisualStyleBackColor = true;
+            buttonAddContainerShip.Click += ButtonAddContainerShip_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(15, 887);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(367, 77);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(15, 641);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(367, 77);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRemoveShip
+            // 
+            buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveShip.Location = new Point(15, 473);
+            buttonRemoveShip.Name = "buttonRemoveShip";
+            buttonRemoveShip.Size = new Size(367, 77);
+            buttonRemoveShip.TabIndex = 4;
+            buttonRemoveShip.Text = "Удалить корабль";
+            buttonRemoveShip.UseVisualStyleBackColor = true;
+            buttonRemoveShip.Click += ButtonRemoveShip_Click;
+            // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Location = new Point(15, 416);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(367, 39);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
+            // buttonAddShip
+            // 
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(15, 164);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(367, 77);
+            buttonAddShip.TabIndex = 1;
+            buttonAddShip.Text = "Добавление корабля";
+            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += ButtonAddShip_Click;
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectorCompany.Location = new Point(15, 47);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(367, 40);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 0);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(1601, 1112);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormShipCollection
+            // 
+            AutoScaleDimensions = new SizeF(13F, 32F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1989, 1112);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormShipCollection";
+            Text = "Коллекция кораблей";
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddShip;
+        private Button buttonGoToCheck;
+        private Button buttonRemoveShip;
+        private MaskedTextBox maskedTextBox;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonAddContainerShip;
+    }
+}

ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs

@@ -0,0 +1,189 @@
+using ProjectContainerShip.CollectionGenericObjects;
+using ProjectContainerShip.Drawings;
+namespace ProjectContainerShip;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormShipCollection : Form
+{
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormShipCollection()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new ShipPortService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningShip>());
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Создание объекта класса-перемещения 
+    /// </summary>
+    /// <param name="type"></param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        Random random = new();
+        DrawningShip drawningShip;
+        switch (type)
+        {
+            case nameof(DrawningShip):
+                drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningContainerShip):
+                // TODO вызов диалогового окна для выбора цвета (made)
+                drawningShip = new DrawningContainerShip(random.Next(100, 300), random.Next(1000, 3000),
+                GetColor(random), GetColor(random),
+                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+
+        if (_company + drawningShip != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+    /// Получение цвета
+    /// </summary>
+    /// <param name="random"> Генератор случайных чисел</param>
+    /// <returns></returns>
+    private static Color GetColor(Random random)
+    {
+        Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+        ColorDialog dialog = new ColorDialog();
+
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+
+        return color;
+    }
+
+    /// <summary>
+    /// Добавление корабля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
+
+    /// <summary>
+    /// Добавление контейнеровоза
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip));
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRemoveShip_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int position = Convert.ToInt32(maskedTextBox.Text);
+
+        if (_company - position != null)
+        {
+            MessageBox.Show("Объект удален");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось удалить объект");
+        }
+    }
+    
+    /// <summary>
+    /// Передача на тесты
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningShip? ship = null;
+        int counter = 100;
+        while (ship == null)
+        {
+            ship = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break; 
+            }
+        }
+
+        if (ship == null)
+        {
+            return;
+        }
+
+        FormContainerShip form = new ()
+        {
+            SetShip = ship
+        };
+        form.ShowDialog();
+    }
+
+    /// <summary>
+    /// Обновление
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        pictureBox.Image = _company.Show();
+    }
+}

ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ProjectContainerShip/ProjectContainerShip/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,132 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+public abstract class AbstractStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObjects? _moveableObject;
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    private StrategyStatus _state = StrategyStatus.NotInit;
+
+    /// <summary>
+    /// Ширина поля
+    /// </summary>
+    protected int FieldWidth { get; private set; }
+
+    /// <summary>
+    /// Высота поля
+    /// </summary>
+    protected int FieldHeight { get; private set; }
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    public StrategyStatus GetStatus() { return _state; }
+
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObject">Перемещаемый объект</param>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    public void SetData(IMoveableObjects moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return;
+        }
+        if (IsTargetDestinaion())
+        {
+            _state = StrategyStatus.Finish;
+            return;
+        }
+        MoveToTarget();
+    }
+
+    /// <summary>
+    /// Перемещение влево
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+
+    /// <summary>
+    /// Перемещение вправо
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveRight() => MoveTo(MovementDirection.Right);
+
+    /// <summary>
+    /// Перемещение вверх
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveUp() => MoveTo(MovementDirection.Up);
+
+    /// <summary>
+    /// Перемещение вниз
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveDown() => MoveTo(MovementDirection.Down);
+
+    /// <summary>
+    /// Параметры объекта
+    /// </summary>
+    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    /// <returns></returns>
+    protected int? GetStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return null;
+        }
+        return _moveableObject?.GetStep;
+    }
+
+    /// <summary>
+    /// Перемещение к цели
+    /// </summary>
+    protected abstract void MoveToTarget();
+
+    /// <summary>
+    /// Достигнута ли цель
+    /// </summary>
+    /// <returns></returns>
+    protected abstract bool IsTargetDestinaion();
+
+    /// <summary>
+    /// Попытка перемещения в требуемом направлении
+    /// </summary>
+    /// <param name="movementDirection">Направление</param>
+    /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
+    private bool MoveTo(MovementDirection movementDirection)
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return false;
+        }
+        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+    }
+}

ProjectContainerShip/ProjectContainerShip/MovementStrategy/IMoveableObjects.cs

@@ -0,0 +1,21 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+public interface IMoveableObjects
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep { get; }
+
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
+    bool TryMoveObject(MovementDirection direction);
+}

ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,31 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null) return false;
+
+        return objParams.RightBorder + GetStep() >= FieldWidth
+            && objParams.DownBorder + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null) return;
+
+        int diffX = objParams.LeftBorder - FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            MoveRight();
+        }
+
+        int diffY = objParams.DownBorder - FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            MoveDown();
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,54 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+/// <summary>
+/// Стратегия перемещения объекта в центр экрана
+/// </summary>
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

ProjectContainerShip/ProjectContainerShip/MovementStrategy/MoveableShip.cs

@@ -0,0 +1,64 @@
+using ProjectContainerShip.Drawings;
+
+namespace ProjectContainerShip.MovementStrategy;
+
+/// <summary>
+/// Класс-реализация IMoveableObjects с использованием DrawningShip
+/// </summary>
+public class MoveableShip : IMoveableObjects
+{
+    /// <summary>
+	/// Поле-объект класса DrawningCar или его наследника
+	/// </summary>
+	private readonly DrawningShip? _ship = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="ship">Объект класса DrawningShip</param>
+    public MoveableShip(DrawningShip ship)
+    {
+        _ship = ship;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_ship == null || _ship.EntityShip == null || !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_ship.GetPosX.Value, _ship.GetPosY.Value, _ship.GetWidth, _ship.GetHeight);
+        }
+    }
+
+    public int GetStep => (int)(_ship?.EntityShip?.Step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_ship == null || _ship.EntityShip == null)
+        {
+            return false;
+        }
+
+        return _ship.MoveTransport(GetDirectionType(direction));
+    }
+
+    /// <summary>
+    /// Конвертация из MovementDirection в DirectionType
+    /// </summary>
+    /// <param name="direction">MovementDirection</param>
+    /// <returns>DirectionType</returns>
+    private static DirectionType GetDirectionType(MovementDirection direction)
+    {
+        return direction switch
+        {
+            MovementDirection.Left => DirectionType.Left,
+            MovementDirection.Right => DirectionType.Right,
+            MovementDirection.Up => DirectionType.Up,
+            MovementDirection.Down => DirectionType.Down,
+            _ => DirectionType.Unknow,
+        };
+    }
+}

ProjectContainerShip/ProjectContainerShip/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,27 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

ProjectContainerShip/ProjectContainerShip/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,69 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координата X
+    /// </summary>
+    private readonly int _x;
+
+    /// <summary>
+    /// Координата Y
+    /// </summary>
+    private readonly int _y;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    private readonly int _width;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    private readonly int _height;
+
+    /// <summary>
+    /// Левая граница
+    /// </summary>
+    public int LeftBorder => _x;
+
+    /// <summary>
+    /// Верхняя граница
+    /// </summary>
+    public int TopBorder => _y;
+
+    /// <summary>
+    /// Правая граница
+    /// </summary>
+    public int RightBorder => _x + _width;
+
+    /// <summary>
+    /// Нижняя граница
+    /// </summary>
+    public int DownBorder => _y + _height;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleHorizontal => _x + _width / 2;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleVertical => _y + _height / 2;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    /// <param name="width">Ширина объекта</param>
+    /// <param name="height">Высота объекта</param>
+    public ObjectParameters(int x, int y, int width, int height)
+    {
+        _x = x;
+        _y = y;
+        _width = width;
+        _height = height;
+    }
+}

ProjectContainerShip/ProjectContainerShip/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,22 @@
+namespace ProjectContainerShip.MovementStrategy;
+
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+    
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}

ProjectContainerShip/ProjectContainerShip/Program.cs

@@ -11,7 +11,7 @@ namespace ProjectContainerShip
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormContainerShip());
+            Application.Run(new FormShipCollection());
         }
     }
 }