немного рефакторинга

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,114 @@
+namespace ProjectCatamaran.CollectionGenericObjects;
+
+/// <summary>
+/// Абстракция компании, хранящий коллекцию лодок
+/// </summary>
+public abstract class AbstractCompany
+{
+    /// <summary>
+	/// Размер места (ширина)
+	/// </summary>
+	protected readonly int _placeSizeWidth = 210;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 80;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция лодок
+    /// </summary>
+    protected ICollectionGenericObjects<DrawningBoat>? _collection = null;
+
+    /// <summary>
+    /// Вычисление максимального количества элементов, который можно разместить в окне
+    /// </summary>
+    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина окна</param>
+    /// <param name="picHeight">Высота окна</param>
+    /// <param name="collection">Коллекция лодок</param>
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="boat">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningBoat boat)
+    {
+        return company._collection?.Insert(boat) ?? -1;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static DrawningBoat operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position) ?? null;
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningBoat? 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);
+        DrawBackground(graphics);
+
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            DrawningBoat? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackground(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/BoatSharingService.cs

@@ -0,0 +1,63 @@
+namespace ProjectCatamaran.CollectionGenericObjects;
+
+public class BoatSharingService : AbstractCompany
+{
+    private List<Tuple<int, int>> locCoord = new List<Tuple<int, int>>();
+    private int numRows, numCols;
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	/// <param name="picWidth"></param>
+	/// <param name="picHeight"></param>
+	/// <param name="collection"></param>
+	public BoatSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackground(Graphics g)
+    {
+        Color backgroundColor = Color.SkyBlue;
+        using (Brush brush = new SolidBrush(backgroundColor))
+        {
+            g.FillRectangle(brush, new Rectangle(0, 0, _pictureWidth, _pictureHeight));
+        }
+        Pen pen = new Pen(Color.Brown, 3);
+        int offsetX = 10, offsetY = -12;
+        int x = 1 + offsetX, y = _pictureHeight - _placeSizeHeight + offsetY;
+        numRows = 0;
+        while (y >= 0)
+        {
+            int numCols = 0;
+            while (x + _placeSizeWidth <= _pictureWidth)
+            {
+                numCols++;
+                g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y);
+                g.DrawLine(pen, x, y, x, y + _placeSizeHeight + 4);
+                locCoord.Add(new Tuple<int, int>(x, y));
+                x += _placeSizeWidth + 2;
+            }
+            numRows++;
+            x = 1 + offsetX;
+            y -= _placeSizeHeight + 5 + offsetY;
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+        if (locCoord == null || _collection == null)
+        {
+            return;
+        }
+        int row = numRows - 1, col = numCols;
+        for (int i = 0; i < _collection?.Count; i++, col--)
+        {
+            _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+            _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+            if (col == 1)
+            {
+                col = numCols + 1;
+                row--;
+            }
+        }
+    }
+}

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,44 @@
+namespace ProjectCatamaran.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);
+}

ProjectCatamaran/ProjectCatamaran/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,104 @@
+namespace ProjectCatamaran.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)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public MassiveGenericObjects()
+    {
+        _collection = Array.Empty<T?>();
+    }
+
+    public T? Get(int position)
+    {
+        if (position >= 0 && position < Count)
+        {
+            return _collection[position];
+        }
+
+        return null;
+    }
+
+    public int Insert(T obj)
+    {
+        for (int i = 0; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public int Insert(T obj, int position)
+    {
+        if (position < 0 || position >= Count)
+        {
+            return -1;
+        }
+        if (_collection[position] == null)
+        {
+            _collection[position] = obj;
+            return position;
+        }
+
+        for (int i = position + 1; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        for (int i = position - 1; i >= 0; i--)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    public T Remove(int position)
+    {
+        if (position < 0 || position >= Count)
+        {
+            return null;
+        }
+        T obj = _collection[position];
+        _collection[position] = null;
+        return obj;
+    }
+}

ProjectCatamaran/ProjectCatamaran/DrawingCatamaran.cs

@@ -1,246 +0,0 @@
-namespace ProjectCatamaran;
-
-/// <summary>
-/// Класс, отвечающий за прорисовку и перемещения объекта-сущности
-/// </summary>
-public class DrawingCatamaran
-{
-    /// <summary>
-    /// Класс сущность
-    /// </summary>
-    public EntityCatamaran? EntityCatamaran { get; private set; }
-
-    /// <summary>
-    /// Ширина окна
-    /// </summary>
-    private int? _pictureWidth;
-
-    /// <summary>
-    /// Высота окна
-    /// </summary>
-    private int? _pictureHeight;
-
-    /// <summary>
-    /// Левая координата прорисовки автомобиля
-    /// </summary>
-    private int? _startPosX;
-
-    /// <summary>
-    /// Верхняя координата прорисовки автомобиля
-    /// </summary>
-    private int? _startPosY;
-
-    /// <summary>
-    /// Ширина прорисовки автомобиля
-    /// </summary>
-    private readonly int _drawingCatamaranWidth = 110;
-
-    /// <summary>
-    /// Высота прорисовки автомобиля
-    /// </summary>
-    private readonly int _drawingCatamaranHeight = 54;
-
-/// <summary>
-/// Инициализация свойств
-/// </summary>
-/// <param name="speed">скорость</param>
-/// <param name="weight">вес</param>
-/// <param name="bodyColor">основной цвет</param>
-/// <param name="additionalColor">дополнительный цвет</param>
-/// <param name="floats">наличие поплавков</param>
-/// <param name="sail">наличие паруса</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail)
-    {
-        EntityCatamaran = new EntityCatamaran();
-        EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, floats, sail);
-        _startPosX = null;
-        _startPosY = null;
-        _pictureHeight = null;
-        _pictureWidth = null;
-    }
-
-    /// <summary>
-    /// Установка границ поля
-    /// </summary>
-    /// <param name="width">Ширина поля</param>
-    /// <param name="height">Высота поля</param>
-    /// <returns>true - границы заливки, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
-    public bool SetPictureSize(int width, int height)
-    {
-        // TODO проверка что объект влезает в размеры поля
-        // если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена
-       
-        if (_drawingCatamaranHeight > height || _drawingCatamaranWidth > width)
-            return false;
-        _pictureHeight = height;
-        _pictureWidth = width;
-        if (_startPosX.HasValue && _startPosY.HasValue)
-        {
-            if (_startPosX + _drawingCatamaranWidth > _pictureWidth)
-                _startPosX = _pictureWidth - _drawingCatamaranWidth;
-            
-            if (_startPosY + _drawingCatamaranHeight > _pictureHeight)
-                _startPosY = _pictureHeight - _drawingCatamaranHeight;
-            
-        }
-
-        return true;
-
-
-
-    }
-
-    /// <summary>
-    /// Установка позиции
-    /// </summary>
-    /// <param name="x">Координата X</param>
-    /// <param name="y">Координата Y</param>
-    public void SetPosition(int x, int y)
-    {
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            return;
-
-        _startPosX = x;
-        _startPosY = y;
-
-        if (_drawingCatamaranWidth + x > _pictureWidth || x < 0)
-        {
-            _startPosX = 0;
-        }
-        if (_drawingCatamaranHeight + y > _pictureHeight || y < 0)
-        {
-            _startPosY = 0;
-        }
-
-
-
-        return;
-
-    }
-
-    /// <summary>
-	/// Изменение направления перемещения
-	/// </summary>
-	/// <param name="direction">Направление</param>
-	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
-    public bool MoveTransport(DirectionType direction)
-    {
-        if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        { 
-            return false;
-        }
-
-        switch (direction)
-        {
-            case DirectionType.Left:
-                if (_startPosX.Value - EntityCatamaran.Step > 0)
-                {
-                    _startPosX -= (int)EntityCatamaran.Step;
-                }
-                return true;
-            case DirectionType.Right:
-                if (_startPosX + EntityCatamaran.Step + _drawingCatamaranWidth < _pictureWidth)
-                {
-                    _startPosX += (int)EntityCatamaran.Step;
-                }
-                return true;
-            case DirectionType.Up:
-                if (_startPosY - EntityCatamaran.Step > 0)
-                {
-                    _startPosY -= (int)EntityCatamaran.Step;
-                }
-                return true;
-            case DirectionType.Down:
-                if (_startPosY + EntityCatamaran.Step + _drawingCatamaranHeight < _pictureHeight)
-                {
-                    _startPosY += (int)EntityCatamaran.Step;
-                }
-                return true;
-            default:
-                return false;
-
-        }
-    }
-    /// <summary>
-    /// Метод отрисовки поплавка
-    /// </summary>
-    /// <param name="y0"></param>
-    /// <param name="additionalBrush"></param>
-    /// <param name="g"></param>
-    private void DrawFloater(int y0, Brush additionalBrush, Graphics g)
-    {
-        Point[] Floater = new Point[]
-           {
-            new Point(_startPosX.Value + 10, _startPosY.Value + y0 + 6),
-            new Point(_startPosX.Value + 90, _startPosY.Value + y0 + 6),
-            new Point(_startPosX.Value + 110, _startPosY.Value + y0 + 3),
-            new Point(_startPosX.Value + 90, _startPosY.Value + y0),
-            new Point(_startPosX.Value + 10, _startPosY.Value + y0),
-
-           };
-        g.FillPolygon(additionalBrush, Floater);
-        g.DrawPolygon(Pens.Black, Floater);
-    }
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-
-    public void DrawTransport(Graphics g)
-    {
-        if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return;
-        }
-
-        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
-            return;
-        Pen pen = new(Color.Black);
-        Brush BodyBrush = new SolidBrush(EntityCatamaran.BodyColor);
-        Brush additionalBrush = new SolidBrush(EntityCatamaran.AdditionalColor);       
-        Pen additionalPen = new(EntityCatamaran.AdditionalColor, 2);
-
-        // границы катамарана 
-        Point[] catamaranBorders = new Point[]
-        {
-            new Point(_startPosX.Value + 10, _startPosY.Value + 10),
-            new Point(_startPosX.Value + 80, _startPosY.Value + 10),
-            new Point(_startPosX.Value + 107, _startPosY.Value + 30),
-            new Point(_startPosX.Value + 80, _startPosY.Value + 45),
-            new Point(_startPosX.Value + 10, _startPosY.Value + 45),
-
-        };
-        g.DrawPolygon(pen, catamaranBorders);        
-        g.FillPolygon(BodyBrush, catamaranBorders);
-
-        g.DrawEllipse(pen, _startPosX.Value + 17, _startPosY.Value + 14, 65, 27);
-        g.FillEllipse(Brushes.White, _startPosX.Value + 17, _startPosY.Value + 14, 65, 27);
-
-        if(EntityCatamaran.Floaters)
-        {
-            g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 10, _startPosX.Value + 20, _startPosY.Value + 7);
-            g.DrawLine(pen, _startPosX.Value + 80, _startPosY.Value + 10, _startPosX.Value + 80, _startPosY.Value + 7);
-            g.DrawLine(pen, _startPosX.Value + 20, _startPosY.Value + 45, _startPosX.Value + 20, _startPosY.Value + 48);
-            g.DrawLine(pen, _startPosX.Value + 80, _startPosY.Value + 45, _startPosX.Value + 80, _startPosY.Value + 48);
-           
-            DrawFloater(1, additionalBrush, g);
-            DrawFloater(48, additionalBrush, g);            
-        }
-
-        if (EntityCatamaran.Sail)
-        {
-            Point[] Sail = new Point[]
-            {
-            new Point(_startPosX.Value + 50, _startPosY.Value + 35),            
-            new Point(_startPosX.Value + 35, _startPosY.Value + 29),
-            new Point(_startPosX.Value + 35, _startPosY.Value + 14),
-            new Point(_startPosX.Value + 50, _startPosY.Value + 8),
-            new Point(_startPosX.Value + 50, _startPosY.Value + 33),
-            };
-            g.FillPolygon(additionalBrush, Sail);
-            g.DrawPolygon(pen, Sail);
-        }
-
-
-    }
-}

ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs

@@ -0,0 +1,19 @@
+namespace ProjectCatamaran.Drawnings;
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum DirectionType
+{
+    /// <summary>
+	/// Неизвестное направление
+	/// </summary>
+	Unknow = -1,
+
+    Up = 1,
+
+    Down = 2,
+
+    Left = 3,
+
+    Right = 4,
+}

ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs

@@ -0,0 +1,223 @@
+using ProjectCatamaran.Drawnings;
+using ProjectCatamaran.Entities;
+
+public class DrawningBoat
+{
+    /// <summary>
+    /// Класс сущность
+    /// </summary>
+    public EntityBoat? EntityBoat { get; protected set; }
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+
+    /// <summary>
+    /// Левая координата прорисовки автомобиля
+    /// </summary>
+    protected int? _startPosX;
+
+    /// <summary>
+    /// Верхняя координата прорисовки автомобиля
+    /// </summary>
+    protected int? _startPosY;
+
+    /// <summary>
+    /// Ширина прорисовки автомобиля
+    /// </summary>
+    private readonly int _drawningBoatWidth = 97;
+
+    /// <summary>
+    /// Высота прорисовки автомобиля
+    /// </summary>
+    private readonly int _drawningBoatHeight = 35;
+
+    /// <summary>
+	/// Координата X объекта
+	/// </summary>
+	public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int? GetWidth => _drawningBoatWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int? GetHeight => _drawningBoatHeight;
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+    private DrawningBoat()
+    {
+        _startPosX = null;
+        _startPosY = null;
+        _pictureHeight = null;
+        _pictureWidth = null;
+    }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">скорость</param>
+    /// <param name="weight">вес</param>
+    /// <param name="bodyColor">основной цвет</param>
+    public DrawningBoat(int speed, double weight, Color bodyColor) : this()
+    {
+        EntityBoat = new EntityBoat(speed, weight, bodyColor);      
+       
+    }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="drawingCatamaranWidth">Ширина прорисовки автомобиля</param>
+    /// <param name="drawingCatamaranHeight">Высота прорисовки автомобиля</param>
+    public DrawningBoat(int drawingCatamaranWidth, int drawingCatamaranHeight) : this()
+    {
+        _drawningBoatHeight = drawingCatamaranHeight;
+        _drawningBoatWidth = drawingCatamaranWidth;                  
+    }
+
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    /// <returns>true - границы заливки, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+    public bool SetPictureSize(int width, int height)
+    {
+        // TODO проверка что объект влезает в размеры поля
+        // если влезает, сохраняем границы и корректируем позицию объекта, если она уже была установлена
+
+        if (_drawningBoatHeight > height || _drawningBoatWidth > width)
+            return false;
+        _pictureHeight = height;
+        _pictureWidth = width;
+        if (_startPosX.HasValue && _startPosY.HasValue)
+        {
+            if (_startPosX + _drawningBoatWidth > _pictureWidth)
+                _startPosX = _pictureWidth - _drawningBoatWidth;
+
+            if (_startPosY + _drawningBoatHeight > _pictureHeight)
+                _startPosY = _pictureHeight - _drawningBoatHeight;
+
+        }
+
+        return true;
+
+    }
+
+    /// <summary>
+    /// Установка позиции
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            return;
+
+        _startPosX = x;
+        _startPosY = y;
+
+        if (_drawningBoatWidth + x > _pictureWidth || x < 0)
+        {
+            _startPosX = 0;
+        }
+        if (_drawningBoatHeight + y > _pictureHeight || y < 0)
+        {
+            _startPosY = 0;
+        }
+
+        return;
+
+    }
+    /// <summary>
+	/// Изменение направления перемещения
+	/// </summary>
+	/// <param name="direction">Направление</param>
+	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return false;
+        }
+
+        switch (direction)
+        {
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityBoat.Step > 0)
+                {
+                    _startPosX -= (int)EntityBoat.Step;
+                }
+                return true;
+            case DirectionType.Right:
+                if (_startPosX + EntityBoat.Step + _drawningBoatWidth < _pictureWidth)
+                {
+                    _startPosX += (int)EntityBoat.Step;
+                }
+                return true;
+            case DirectionType.Up:
+                if (_startPosY - EntityBoat.Step > 0)
+                {
+                    _startPosY -= (int)EntityBoat.Step;
+                }
+                return true;
+            case DirectionType.Down:
+                if (_startPosY + EntityBoat.Step + _drawningBoatHeight < _pictureHeight)
+                {
+                    _startPosY += (int)EntityBoat.Step;
+                }
+                return true;
+            default:
+                return false;
+
+        }
+    }
+    
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+    public virtual void DrawTransport(Graphics g)
+    {
+        if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            return;
+        Pen pen = new(Color.Black);
+        Brush BodyBrush = new SolidBrush(EntityBoat.BodyColor);
+       
+        // границы катамарана 
+        Point[] BoatBorders = new Point[]
+        {
+            new Point(_startPosX.Value, _startPosY.Value),
+            new Point(_startPosX.Value + 70, _startPosY.Value),
+            new Point(_startPosX.Value + 97, _startPosY.Value + 20),
+            new Point(_startPosX.Value + 70, _startPosY.Value + 35),
+            new Point(_startPosX.Value, _startPosY.Value + 35),
+
+        };
+        g.DrawPolygon(pen, BoatBorders);
+        g.FillPolygon(BodyBrush, BoatBorders);
+
+        g.DrawEllipse(pen, _startPosX.Value + 7, _startPosY.Value + 4, 57, 24);
+        g.FillEllipse(Brushes.White, _startPosX.Value + 7, _startPosY.Value + 4, 57, 24);
+
+    }
+}

ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs

@@ -0,0 +1,81 @@
+using ProjectCatamaran.Entities;
+namespace ProjectCatamaran.Drawnings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещения объекта-сущности
+/// </summary>
+public class DrawningCatamaran : DrawningBoat
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">скорость</param>
+    /// <param name="weight">вес</param>
+    /// <param name="bodyColor">основной цвет</param>
+    /// <param name="additionalColor">дополнительный цвет</param>
+    /// <param name="floats">наличие поплавков</param>
+    /// <param name="sail">наличие паруса</param>
+    public DrawningCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail) : base(97, 54)
+    {
+        EntityBoat = new EntityCatamaran(speed, weight, bodyColor, additionalColor, floats, sail);
+       
+    }
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityBoat == null || EntityBoat is not EntityCatamaran catamaran || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(catamaran.AdditionalColor);
+        Pen additionalPen = new(catamaran.AdditionalColor, 2);
+        
+        if (catamaran.Floaters)
+        {
+            g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 10, _startPosX.Value + 10, _startPosY.Value + 7);
+            g.DrawLine(pen, _startPosX.Value + 70, _startPosY.Value + 10, _startPosX.Value + 70, _startPosY.Value + 7);
+            g.DrawLine(pen, _startPosX.Value + 10, _startPosY.Value + 45, _startPosX.Value + 10, _startPosY.Value + 48);
+            g.DrawLine(pen, _startPosX.Value + 70, _startPosY.Value + 45, _startPosX.Value + 70, _startPosY.Value + 48);
+
+            DrawFloater(1, additionalBrush, g);
+            DrawFloater(48, additionalBrush, g);
+        }
+        _startPosY += 10;
+        base.DrawTransport(g);
+        _startPosY -= 10;
+      
+        if (catamaran.Sail)
+        {
+            Point[] Sail = new Point[]
+            {
+            new Point(_startPosX.Value + 40, _startPosY.Value + 35),
+            new Point(_startPosX.Value + 25, _startPosY.Value + 29),
+            new Point(_startPosX.Value + 25, _startPosY.Value + 14),
+            new Point(_startPosX.Value + 40, _startPosY.Value + 8),
+            new Point(_startPosX.Value + 40, _startPosY.Value + 33),
+            };
+            g.DrawPolygon(pen, Sail);
+            g.FillPolygon(additionalBrush, Sail);
+        }
+    }
+    /// <summary>
+    /// Метод отрисовки поплавка
+    /// </summary>
+    /// <param name="y0"></param>
+    /// <param name="additionalBrush"></param>
+    /// <param name="g"></param>
+    private void DrawFloater(int y0, Brush additionalBrush, Graphics g)
+    {
+        Point[] Floater = new Point[]
+           {
+            new Point(_startPosX.Value, _startPosY.Value + y0 + 6),
+            new Point(_startPosX.Value + 80, _startPosY.Value + y0 + 6),
+            new Point(_startPosX.Value + 100, _startPosY.Value + y0 + 3),
+            new Point(_startPosX.Value + 80, _startPosY.Value + y0),
+            new Point(_startPosX.Value, _startPosY.Value + y0),
+           };
+        g.FillPolygon(additionalBrush, Floater);
+        g.DrawPolygon(Pens.Black, Floater);
+    }
+       
+}

ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs

@@ -0,0 +1,36 @@
+namespace ProjectCatamaran.Entities;
+
+public class EntityBoat
+{
+    /// <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 EntityBoat(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;        
+    }
+}

ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs

@@ -1,22 +1,7 @@
-namespace ProjectCatamaran;
-
-public class EntityCatamaran
-{
-    /// <summary>
-    /// Скорость 
-    /// </summary>
-    public int Speed { get; private set; } 
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
+namespace ProjectCatamaran.Entities;
 
+public class EntityCatamaran : EntityBoat
+{   
     /// <summary>
     /// Дополнительный цвет для дополнительных модулей
     /// </summary>
@@ -26,13 +11,11 @@ public class EntityCatamaran
     /// Признак наличия поплавков слева и справа 
     /// </summary>
     public bool Floaters { get; private set; }
- 
-    public bool Sail {  get; private set; }
 
     /// <summary>
-    /// Шаг перемещения катамарана
+    /// Признак наличия паруса
     /// </summary>
-    public double Step => Speed * 100 / Weight;
+    public bool Sail {  get; private set; }
 
     /// <summary>
     /// Инициализация полей объекта-класса катамарана
@@ -43,14 +26,10 @@ public class EntityCatamaran
     /// <param name="additionalColor">доп цвет для паурса и поплавков</param>
     /// <param name="floaters">наличие поплавков</param>
     /// <param name="sail">наличие паруса</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floaters, bool sail)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
+    public EntityCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool floaters, bool sail) : base(speed, weight, bodyColor)
+    {      
         AdditionalColor = additionalColor;
         Floaters = floaters;  
         Sail = sail;
-
     }
 }

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.Designer.cs

@@ -0,0 +1,172 @@
+namespace ProjectCatamaran
+{
+    partial class FormBoatCollection
+    {
+        /// <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()
+        {
+            Инструменты = new GroupBox();
+            buttonGoToCheck = new Button();
+            buttonRefresh = new Button();
+            buttonRemoveBoat = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddCatamaran = new Button();
+            buttonAddCar = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            Инструменты.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // Инструменты
+            // 
+            Инструменты.Controls.Add(buttonGoToCheck);
+            Инструменты.Controls.Add(buttonRefresh);
+            Инструменты.Controls.Add(buttonRemoveBoat);
+            Инструменты.Controls.Add(maskedTextBoxPosition);
+            Инструменты.Controls.Add(buttonAddCatamaran);
+            Инструменты.Controls.Add(buttonAddCar);
+            Инструменты.Controls.Add(comboBoxSelectorCompany);
+            Инструменты.Dock = DockStyle.Right;
+            Инструменты.Location = new Point(861, 0);
+            Инструменты.Name = "Инструменты";
+            Инструменты.Size = new Size(225, 592);
+            Инструменты.TabIndex = 0;
+            Инструменты.TabStop = false;
+            Инструменты.Text = "Инструменты";
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(22, 358);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(191, 49);
+            buttonGoToCheck.TabIndex = 6;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(22, 476);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(191, 49);
+            buttonRefresh.TabIndex = 5;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            // 
+            // buttonRemoveBoat
+            // 
+            buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveBoat.Location = new Point(22, 251);
+            buttonRemoveBoat.Name = "buttonRemoveBoat";
+            buttonRemoveBoat.Size = new Size(191, 49);
+            buttonRemoveBoat.TabIndex = 4;
+            buttonRemoveBoat.Text = "Удаление лодки";
+            buttonRemoveBoat.UseVisualStyleBackColor = true;
+            buttonRemoveBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(22, 212);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(187, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonAddCatamaran
+            // 
+            buttonAddCatamaran.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddCatamaran.Location = new Point(22, 132);
+            buttonAddCatamaran.Name = "buttonAddCatamaran";
+            buttonAddCatamaran.Size = new Size(191, 49);
+            buttonAddCatamaran.TabIndex = 2;
+            buttonAddCatamaran.Text = "Добавление катамарана";
+            buttonAddCatamaran.UseVisualStyleBackColor = true;
+            buttonAddCatamaran.Click += buttonAddCatamaran_Click;
+            // 
+            // buttonAddCar
+            // 
+            buttonAddCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddCar.Location = new Point(22, 77);
+            buttonAddCar.Name = "buttonAddCar";
+            buttonAddCar.Size = new Size(191, 49);
+            buttonAddCar.TabIndex = 1;
+            buttonAddCar.Text = "Добавление лодки";
+            buttonAddCar.UseVisualStyleBackColor = true;
+            buttonAddCar.Click += buttonAddBoat_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(22, 22);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(197, 23);
+            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(861, 592);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormBoatCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1086, 592);
+            Controls.Add(pictureBox);
+            Controls.Add(Инструменты);
+            Name = "FormBoatCollection";
+            Text = "Коллекция лодок";
+            Инструменты.ResumeLayout(false);
+            Инструменты.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox Инструменты;
+        private Button buttonAddCar;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddCatamaran;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonRemoveBoat;
+        private Button buttonGoToCheck;
+    }
+}

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs

@@ -0,0 +1,186 @@
+using ProjectCatamaran.CollectionGenericObjects;
+using ProjectCatamaran.Drawnings;
+
+namespace ProjectCatamaran;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormBoatCollection : Form
+{
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company;
+
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+    public FormBoatCollection()
+    {
+        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 BoatSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningBoat>());
+                break;
+        }
+    }
+
+    /// <summary>
+	/// Создание объекта класса-перемещения
+	/// </summary>
+	/// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        DrawningBoat _drawningBoat;
+        Random random = new();
+        switch (type)
+        {
+            case nameof(DrawningBoat):
+                _drawningBoat = new DrawningBoat(random.Next(30, 70), random.Next(100, 500),
+                    GetColor(random));
+                break;
+            case nameof(DrawningCatamaran):                  
+                _drawningBoat = new DrawningCatamaran(random.Next(30, 70), random.Next(100, 500),
+                    GetColor(random), GetColor(random), 
+                    Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+
+        }
+
+        if (_company + _drawningBoat != -1)
+        {
+            MessageBox.Show("Объект добавлен");
+            pictureBox.Image = _company.Show();
+        }
+        else
+        {
+            MessageBox.Show("Не удалось добавить объект");
+        }
+    }
+
+    /// <summary>
+	/// Добавление обычного автомобиля
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat));
+
+    /// <summary>
+    /// Добавление спортивного автомобиля
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonAddCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran));
+
+    /// <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();
+        if (dialog.ShowDialog() == DialogResult.OK)
+        {
+            color = dialog.Color;
+        }
+
+        return color;
+    }
+
+    /// <summary>
+	/// Удаление объекта
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+	private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+        if (_company - pos != 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;
+        }
+
+        DrawningBoat? boat = null;
+        int counter = 100;
+        while (boat == null)
+        {
+            boat = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (boat == null)
+        {
+            return;
+        }
+
+        FormCatamaran form = new FormCatamaran();
+        form.SetBoat = boat;      
+        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();
+    }
+}

ProjectCatamaran/ProjectCatamaran/FormBoatCollection.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>

ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs

@@ -29,11 +29,12 @@
         private void InitializeComponent()
         {
             pictureBoxCatamaran = new PictureBox();
-            buttonCreateCatamaran = new Button();
             buttonLeft = new Button();
             buttonRight = new Button();
             buttonDown = new Button();
             buttonUp = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit();
             SuspendLayout();
             // 
@@ -44,19 +45,7 @@
             pictureBoxCatamaran.Name = "pictureBoxCatamaran";
             pictureBoxCatamaran.Size = new Size(1139, 474);
             pictureBoxCatamaran.TabIndex = 0;
-            pictureBoxCatamaran.TabStop = false;         
-            // 
-            // buttonCreateCatamaran
-            // 
-            buttonCreateCatamaran.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateCatamaran.Location = new Point(10, 448);
-            buttonCreateCatamaran.Margin = new Padding(3, 2, 3, 2);
-            buttonCreateCatamaran.Name = "buttonCreateCatamaran";
-            buttonCreateCatamaran.Size = new Size(75, 23);
-            buttonCreateCatamaran.TabIndex = 1;
-            buttonCreateCatamaran.Text = "Создать";
-            buttonCreateCatamaran.UseVisualStyleBackColor = true;
-            buttonCreateCatamaran.Click += ButtonCreateCatamaran_Click;
+            pictureBoxCatamaran.TabStop = false;
             // 
             // buttonLeft
             // 
@@ -110,16 +99,37 @@
             buttonUp.UseVisualStyleBackColor = true;
             buttonUp.Click += ButtonMove_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(1006, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(1052, 50);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(75, 23);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormCatamaran
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1139, 474);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
             Controls.Add(buttonRight);
             Controls.Add(buttonLeft);
-            Controls.Add(buttonCreateCatamaran);
             Controls.Add(pictureBoxCatamaran);
             Name = "FormCatamaran";
             Text = "Катамаран";
@@ -135,5 +145,8 @@
         private Button buttonRight;
         private Button buttonDown;
         private Button buttonUp;
+        private Button buttonCreateBoat;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs

@@ -1,12 +1,44 @@
-namespace ProjectCatamaran;
+using ProjectCatamaran.Drawnings;
+using ProjectCatamaran.MovementStrategy;
 
+namespace ProjectCatamaran;
 
+/// <summary>
+/// Форма работы с объектом "Лодка"
+/// </summary>
 public partial class FormCatamaran : Form
 {
-    private DrawingCatamaran? _drawingCatamaran;
+    /// <summary>
+    /// Поле-объект для прорисовки объекта
+    /// </summary>
+    private DrawningBoat? _drawningBoat;
+
+    /// <summary>
+    /// Стратегия перемещения
+    /// </summary>
+    private AbstractStrategy? _strategy;
+
+    /// <summary>
+    /// Получение объекта
+    /// </summary>
+    public DrawningBoat SetBoat
+    {
+        set
+        {
+            _drawningBoat = value;
+            _drawningBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
+    /// <summary>
+    /// Конструктор формы
+    /// </summary>
     public FormCatamaran()
     {
         InitializeComponent();
+        _strategy = null;
     }
 
     /// <summary>
@@ -14,7 +46,7 @@ public partial class FormCatamaran : Form
 	/// </summary>
     private void Draw()
     {
-        if (_drawingCatamaran == null)
+        if (_drawningBoat == null)
         {
             return;
         }
@@ -25,29 +57,10 @@ public partial class FormCatamaran : Form
 
         Bitmap bmp = new(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
         Graphics gr = Graphics.FromImage(bmp);
-        _drawingCatamaran?.DrawTransport(gr);
+        _drawningBoat?.DrawTransport(gr);
         pictureBoxCatamaran.Image = bmp;
     }
 
-    /// <summary>
-    /// Обработка нажатия кнопки "Создать"
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    private void ButtonCreateCatamaran_Click(object sender, EventArgs e)
-    {
-        Random random = new();
-        _drawingCatamaran = new DrawingCatamaran();
-        _drawingCatamaran.Init(random.Next(30, 100), random.Next(100, 500),
-            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)));
-        _drawingCatamaran.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
-        _drawingCatamaran.SetPosition(random.Next(15, 100), random.Next(15, 100));
-
-        Draw();
-
-    }
     /// <summary>
 	/// Перемещение объекта по форме (нажатие кнопок навигации)
 	/// </summary>
@@ -55,7 +68,7 @@ public partial class FormCatamaran : Form
 	/// <param name="e"></param>
     private void ButtonMove_Click(object sender, EventArgs e)
     {
-        if (_drawingCatamaran == null)
+        if (_drawningBoat == null)
         {
             return;
         }
@@ -65,16 +78,16 @@ public partial class FormCatamaran : Form
         switch (name)
         {
             case "buttonUp":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Up);
+                result = _drawningBoat.MoveTransport(DirectionType.Up);
                 break;
             case "buttonDown":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Down);
+                result = _drawningBoat.MoveTransport(DirectionType.Down);
                 break;
             case "buttonLeft":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Left);
+                result = _drawningBoat.MoveTransport(DirectionType.Left);
                 break;
             case "buttonRight":
-                result = _drawingCatamaran.MoveTransport(DirectionType.Right);
+                result = _drawningBoat.MoveTransport(DirectionType.Right);
                 break;
         }
 
@@ -83,4 +96,46 @@ public partial class FormCatamaran : Form
             Draw();
         }
     }
+
+    /// <summary>
+	/// Обработка нажатия кнопки "Шаг"
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void buttonStrategyStep_Click(object sender, EventArgs e)
+    {
+        if (_drawningBoat == null)
+        {
+            return;
+        }
+
+        if (comboBoxStrategy.Enabled)
+        {
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null)
+            {
+                return;
+            }
+            _strategy.SetData(new MoveableBoat(_drawningBoat), pictureBoxCatamaran.Width, pictureBoxCatamaran.Height);
+        }
+
+        if (_strategy == null)
+        {
+            return;
+        }
+        comboBoxStrategy.Enabled = false;      
+        _strategy.MakeStep();
+        Draw();
+
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+        }
+    }
 }

ProjectCatamaran/ProjectCatamaran/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,139 @@
+namespace ProjectCatamaran.MovementStrategy;
+
+/// <summary>
+/// Класс-стратегия перемещения объекта
+/// </summary>
+public abstract class AbstractStrategy
+{
+    /// <summary>
+	/// Перемещаемый объект
+	/// </summary>
+	private IMoveableObject? _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(IMoveableObject 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;
+    }
+}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/IMoveableObject.cs

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

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,48 @@
+namespace ProjectCatamaran.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.RightBorder - FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.DownBorder - FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+
+        }
+    }
+}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,50 @@
+namespace ProjectCatamaran.MovementStrategy;
+
+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();
+            }
+        }
+    }
+}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveableBoat.cs

@@ -0,0 +1,62 @@
+using ProjectCatamaran.Drawnings;
+
+namespace ProjectCatamaran.MovementStrategy;
+
+/// <summary>
+/// Класс-реализация IMoveableObject с использованием DrawningBoat
+/// </summary>
+public class MoveableBoat : IMoveableObject
+{
+    /// <summary>
+	/// Поле-объект класса DrawningBoat или его наследника
+	/// </summary>
+    private readonly DrawningBoat? _boat = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="drawningBoat">Объект класса DrawningCar</param>
+    public MoveableBoat(DrawningBoat drawningBoat)
+    {
+        _boat = drawningBoat;
+    }
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_boat == null || _boat.EntityBoat == null || !_boat.GetPosX.HasValue || !_boat.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_boat.GetPosX.Value, _boat.GetPosY.Value,
+                _boat.GetWidth.Value, _boat.GetHeight.Value);
+        }
+    }
+    public int GetStep => (int)(_boat?.EntityBoat?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_boat == null || _boat.EntityBoat == null)
+        {
+            return false;
+        }
+
+        return _boat.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,
+        };
+    }
+}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovementDirection.cs

@@ -1,8 +1,8 @@
-namespace ProjectCatamaran;
+namespace ProjectCatamaran.MovementStrategy;
 /// <summary>
 /// Направление перемещения
 /// </summary>
-public enum DirectionType
+public enum MovementDirection
 {
     Up = 1,
 

ProjectCatamaran/ProjectCatamaran/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,69 @@
+namespace ProjectCatamaran.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;
+    }
+}

ProjectCatamaran/ProjectCatamaran/MovementStrategy/StrategyStatus.cs

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

ProjectCatamaran/ProjectCatamaran/Program.cs

@@ -12,7 +12,7 @@ namespace ProjectCatamaran
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
 
-            Application.Run(new FormCatamaran());
+            Application.Run(new FormBoatCollection());
         }
     }
 }