LabWork_08.1

MotorBoat/MotorBoat/BoatDelegate.cs

@@ -0,0 +1,9 @@
+using MotorBoat.Drawnings;
+namespace MotorBoat
+{
+    /// <summary>
+    /// Делегат передачи объекта класса-прорисовки
+    /// </summary>
+    /// <param name="boat"></param>
+    public delegate void BoatDelegate(DrawningBoat boat);
+}

MotorBoat/MotorBoat/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,123 @@
+using MotorBoat.Drawnings;
+
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Абстракция компании, хранящий коллекцию лодок
+    /// </summary>
+    public abstract class AbstractCompany
+    {
+        /// <summary>
+        /// Размер места (ширина)
+        /// </summary>
+        protected readonly int _placeSizeWidth = 200;
+
+        /// <summary>
+        /// Размер места (высота)
+        /// </summary>
+        protected readonly int _placeSizeHeight = 120;
+
+        /// <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 * 73/50);
+
+        /// <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.MaxCount = GetMaxCount;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора сложения для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="boat">Добавляемый объект</param>
+        /// <returns></returns>
+        public static bool operator +(AbstractCompany company, DrawningBoat boat)
+        {
+            return company._collection?.Insert(boat, new DrawningBoatEqutables()) ?? false;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора удаления для класса
+        /// </summary>
+        /// <param name="company">Компания</param>
+        /// <param name="position">Номер удаляемого объекта</param>
+        /// <returns></returns>
+        public static bool operator -(AbstractCompany company, int position)
+        {
+            return company._collection?.Remove(position) ?? false;
+        }
+
+        /// <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);
+            DrawBackgound(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="comparer">Сравнитель объектов</param>
+        public void Sort(IComparer<DrawningBoat?> comparer) => _collection?.CollectionSort(comparer);
+
+        /// <summary>
+        /// Вывод заднего фона
+        /// </summary>
+        /// <param name="g"></param>
+        protected abstract void DrawBackgound(Graphics g);
+
+        /// <summary>
+        /// Расстановка объектов
+        /// </summary>
+        protected abstract void SetObjectsPosition();
+    }
+}

MotorBoat/MotorBoat/CollectionGenericObjects/BoatSharingService.cs

@@ -0,0 +1,91 @@
+using MotorBoat.Drawnings;
+using System.Drawing;
+
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Реализация абстрактной компании - прокат лодок
+    /// </summary>
+    public class BoatSharingService : AbstractCompany
+    {
+        /// <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 DrawBackgound(Graphics g)
+        {
+            Pen pen = new Pen(Color.Black, 5);
+            int fHeight = _pictureHeight / _placeSizeHeight;
+            int fWidth = _pictureWidth / _placeSizeWidth;
+
+            for (int i = 0; i < fHeight - 1; i++)
+            {
+                for (int j = 0; j < fWidth + 1; j++)
+                {
+                    int startY = i * _placeSizeHeight * 3 / 2;
+                    int endY = (i+1) * (_placeSizeHeight * 3 / 2);
+
+                    g.DrawLine(pen, j * _placeSizeWidth, startY + _placeSizeHeight / 3, j * _placeSizeWidth, endY - _placeSizeHeight / 3);
+                }
+
+                int bottomY = (i+1) * (_placeSizeHeight * 3 / 2);
+                g.DrawLine(pen, 0, bottomY - _placeSizeHeight / 3, _pictureWidth / _placeSizeWidth * _placeSizeWidth, bottomY - _placeSizeHeight / 3);
+            }
+        }
+
+        protected override void SetObjectsPosition()
+        
+        {
+            int x = _placeSizeWidth / 8;
+            int y = _placeSizeHeight / 2;
+            int objMove = _placeSizeHeight * 3 / 2;
+            int rowSum = _pictureHeight / _placeSizeHeight;
+            int rowCount = rowSum;
+            int massX = _placeSizeWidth / _pictureWidth * _pictureWidth;
+            int massY = _placeSizeHeight / _pictureHeight * _pictureHeight;
+
+            for (int i = 0; i < (_collection?.Count ?? 0); i++)
+            
+            {
+                DrawningBoat? obj = _collection?.Get(i);
+
+
+                if (obj == null)
+                {
+                    x += _placeSizeWidth;
+                    continue;
+                }
+
+                obj.SetPictureSize(massX, massY);
+
+                if (i > 0)
+                {
+                    x += _placeSizeWidth;
+                }
+
+                if (x >= _pictureWidth - _placeSizeWidth)
+                {
+                    x = _placeSizeWidth / 8;
+                    y += objMove;
+                    Console.WriteLine(rowSum);
+                    rowCount--;
+
+                    if (rowCount < 2)
+                    {
+                        Console.WriteLine("Все места заняты");
+                        break;
+                    }
+                }
+
+                obj.SetPosition(x, y);
+
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,77 @@
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Класс, хранящиий информацию по коллекции
+    /// </summary>
+    public class CollectionInfo : IEquatable<CollectionInfo>
+    {
+        /// <summary>
+        /// Название
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Тип
+        /// </summary>
+        public CollectionType CollectionType { get; private set; }
+
+        /// <summary>
+        /// Описание
+        /// </summary>
+        public string Description { get; private set; }
+
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly string _separator = "-";
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="name">Название</param>
+        /// <param name="collectionType">Тип</param>
+        /// <param name="description">Описание</param>
+        public CollectionInfo(string name, CollectionType collectionType, string description)
+        {
+            Name = name;
+            CollectionType = collectionType;
+            Description = description;
+        }
+
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="data">Строка</param>
+        /// <returns>Объект или null</returns>
+        public static CollectionInfo? GetCollectionInfo(string data)
+        {
+            string[] strs = data.Split(_separator, StringSplitOptions.RemoveEmptyEntries);
+            if (strs.Length < 1 || strs.Length > 3)
+            {
+                return null;
+            }
+
+            return new CollectionInfo(strs[0], (CollectionType)Enum.Parse(typeof(CollectionType), strs[1]), strs.Length > 2 ? strs[2] : string.Empty);
+        }
+
+        public override string ToString()
+        {
+            return Name + _separator + CollectionType + _separator + Description;
+        }
+
+        public bool Equals(CollectionInfo? other)
+        {
+            return Name == other?.Name;
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return Equals(obj as CollectionInfo);
+        }
+
+        public override int GetHashCode()
+        {
+            return Name.GetHashCode();
+        }
+    }
+}

MotorBoat/MotorBoat/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,24 @@
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Тип коллекции
+    /// </summary>
+    public enum CollectionType
+    {
+        /// <summary>
+        /// Неопределено
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Массив
+        /// </summary>
+        Massive = 1,
+
+        /// <summary>
+        /// Список
+        /// </summary>
+        List = 2
+    }
+}
+

MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,68 @@
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Интерфейс описания действий для набора хранимых объектов
+    /// </summary>
+    /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+    public interface ICollectionGenericObjects<T>
+        where T : class
+    {
+        /// <summary>
+        /// Количество объектов в коллекции
+        /// </summary>
+        int Count { get; }
+
+        /// <summary>
+        /// Установка максимального количества элементов
+        /// </summary>
+        int MaxCount { get; set; }
+
+        /// <summary>
+        /// Добавление объекта в коллекцию
+        /// </summary>
+        /// <param name="obj">Добавляемый объект</param>
+        /// <param name="comparer">Cравнение двух объектов</param>
+        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+        bool Insert(T obj, IEqualityComparer<T?>? comparer = null);
+
+        /// <summary>
+        /// Добавление объекта в коллекцию на конкретную позицию
+        /// </summary>
+        /// <param name="obj">Добавляемый объект</param>
+        /// <param name="position">Позиция</param>
+        /// <param name="comparer">Cравнение двух объектов</param>
+        /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+        bool Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
+
+        /// <summary>
+        /// Удаление объекта из коллекции с конкретной позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
+        bool Remove(int position);
+
+        /// <summary>
+        /// Получение объекта по позиции
+        /// </summary>
+        /// <param name="position">Позиция</param>
+        /// <returns>Объект</returns>
+        T? Get(int position);
+
+        /// <summary>
+        /// Получение типа коллекции
+        /// </summary>
+        CollectionType GetCollectionType { get; }
+
+        /// <summary>
+        /// Получение объектов коллекции по одному
+        /// </summary>
+        /// <returns>Поэлементый вывод элементов коллекции</returns>
+        IEnumerable<T?> GetItems();
+
+        /// <summary>
+        /// Сортировка коллекции
+        /// </summary>
+        /// <param name="comparer">Сравнитель объектов</param>
+        void CollectionSort(IComparer<T?> comparer);
+    }
+}

MotorBoat/MotorBoat/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,125 @@
+using MotorBoat.Exceptions;
+
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+    public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+        where T : class
+    {
+        /// <summary>
+        /// Список объектов, которые храним
+        /// </summary>
+        private readonly List<T?> _collection;
+
+        /// <summary>
+        /// Максимально допустимое число объектов в списке
+        /// </summary>
+        private int _maxCount;
+
+        public int Count => _collection.Count;
+
+        public int MaxCount
+        {
+            get => _maxCount;
+            set
+            {
+                if (value > 0)
+                {
+                    _maxCount = value;
+                }
+            }
+        }
+
+        public CollectionType GetCollectionType => CollectionType.List;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public ListGenericObjects()
+        {
+            _collection = new();
+        }
+
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T? Get(int position)
+        {
+
+            if (position < 0 || position >= _maxCount)
+            {           
+                throw new PositionOutOfCollectionException(position);
+            }
+            return _collection[position];
+        }
+
+        public bool Insert(T obj, IEqualityComparer<T?>? comparer = null)
+        {
+            ////////////////////////////////////////////////////////////////////////////////////////////
+            //---------------Lab08 - выборс ошибки, если такой объект есть в коллекции---------------//
+            //////////////////////////////////////////////////////////////////////////////////////////
+
+
+            if (Count == _maxCount)
+            {
+                throw new CollectionOverflowException(_maxCount);
+            }
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new AlreadyExistException();
+            }
+            _collection.Add(obj);
+            return true;
+        }
+
+        public bool Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
+        {
+            ////////////////////////////////////////////////////////////////////////////////////////////
+            //---------------Lab08 - выборс ошибки, если такой объект есть в коллекции---------------//
+            //////////////////////////////////////////////////////////////////////////////////////////
+
+
+            if (position < 0 || position >= _maxCount)
+            {
+                return false;
+            }
+            if (Count == _maxCount)
+            {
+                throw new CollectionOverflowException(_maxCount);
+            }
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new AlreadyExistException();
+            }
+            _collection.Insert(position, obj);
+            return true;
+        }
+
+        public bool Remove(int position)
+        {
+            if (/*_collection.Count == 0 || position < 0 || */position > _collection.Count)
+            {
+                throw new PositionOutOfCollectionException(position);
+            }
+            _collection.RemoveAt(position);
+            return true;
+        }
+
+        public IEnumerable<T?> GetItems()
+        {
+            for (int i = 0; i < _collection.Count; ++i)
+            {
+                yield return _collection[i];
+            }
+        }
+
+        ///////////////////////////////////////////////////////
+        //---------------Lab08 - добавить код---------------//
+        /////////////////////////////////////////////////////
+        ///как и проверка на равенство идентично, у листа встроенный метод сорт точка, у массива класс аррэй точка
+        ///туда передаем компэир который говорит как мы хотим сравнивать и внутри будет вызываться метод компэир
+        public void CollectionSort(IComparer<T?> comparer) => _collection.Sort(comparer);
+    }
+}

MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,172 @@
+
+using MotorBoat.Exceptions;
+using System.Text;
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+    public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
+        where T : class
+    {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private T?[] _collection;
+
+        public int Count => _collection.Length;
+
+        public int MaxCount
+        {
+            get
+            {
+                return _collection.Length;
+            }
+            set
+            {
+                if (value > 0)
+                {
+                    if (_collection.Length > 0)
+                    {
+                        Array.Resize(ref _collection, value);
+                    }
+                    else
+                    {
+                        _collection = new T?[value];
+                    }
+                }
+            }
+        }
+
+        public CollectionType GetCollectionType => CollectionType.Massive;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public MassiveGenericObjects()
+        {
+            _collection = Array.Empty<T?>();
+        }
+
+        public T? Get(int position)
+        {
+            if (position < 0 || position >= _collection.Length)
+            {             
+                throw new PositionOutOfCollectionException(position);
+            }
+            return _collection[position];
+        }
+
+        public bool Insert(T obj, IEqualityComparer<T?>? comparer = null)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+            int result = _collection.Count(s => s == null);
+            if (result == 0)
+            {
+                throw new CollectionOverflowException(Count);
+            }
+
+            ////////////////////////////////////////////////////////////////////////////////////////////
+            //---------------Lab08 - выборс ошибки, если такой объект есть в коллекции---------------//
+            //////////////////////////////////////////////////////////////////////////////////////////
+            
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new AlreadyExistException();
+            }
+            for (int i = 0; i < _collection.Length; i++)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+            if (position < 0 || position >= _collection.Length)
+            {
+                throw new PositionOutOfCollectionException(position);
+            }
+
+            ////////////////////////////////////////////////////////////////////////////////////////////
+            //---------------Lab08 - выборс ошибки, если такой объект есть в коллекции---------------//
+            //////////////////////////////////////////////////////////////////////////////////////////
+
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new AlreadyExistException();
+            }
+
+            int result = _collection.Count(s => s == null);
+            if (result == 0)
+            {
+                throw new CollectionOverflowException(Count);
+            }
+
+            if (_collection[position] == null)
+            {
+                _collection[position] = obj;
+                return true;
+            }
+            for (int i = ++position; i < _collection.Length; i++)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return true;
+                }
+            }
+            for (int i = --position; i >= 0; i--)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool Remove(int position)
+        {
+            if (position < 0 || position >= _collection.Length)
+            {
+                throw new PositionOutOfCollectionException(position);
+            }
+            if (_collection[position] == null)
+            {
+                throw new ObjectNotFoundException(position);
+            }
+            _collection[position] = null;
+            return true;
+        }
+
+        public IEnumerable<T?> GetItems()
+        {
+            for (int i = 0; i < _collection.Length; ++i)
+            {
+                yield return _collection[i];
+            }
+        }
+
+        public void CollectionSort(IComparer<T?> comparer)
+        {
+            if (_collection != null && _collection.Length > 0)
+            {
+                Array.Sort(_collection, comparer);
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,242 @@
+using MotorBoat.Drawnings;
+using MotorBoat.Exceptions;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MotorBoat.CollectionGenericObjects
+{
+    /// <summary>
+    /// Класс-хранилище коллекций
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class StorageCollection<T>
+        where T : DrawningBoat
+    {
+        /// <summary>
+        /// Словарь (хранилище) с коллекциями
+        /// </summary>
+        readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
+
+        /// <summary>
+        /// Возвращение списка названий коллекций
+        /// </summary>
+        public List<CollectionInfo> Keys => _storages.Keys.ToList();
+
+        /// <summary>
+        /// Ключевое слово, с которого должен начинаться файл
+        /// </summary>
+        private readonly string _collectionKey = "CollectionsStorage";
+
+        /// <summary>
+        /// Разделитель для записи ключа и значения элемента словаря
+        /// </summary>
+        private readonly string _separatorForKeyValue = "|";
+
+        /// <summary>
+        /// Разделитель для записей коллекции данных в файл
+        /// </summary>
+        private readonly string _separatorItems = ";";
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public StorageCollection()
+        {
+            _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
+        }
+
+        /// <summary>
+        /// Добавление коллекции в хранилище
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        /// <param name="collectionType">тип коллекции</param>
+        public void AddCollection(string name, CollectionType collectionType)
+        {
+            CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty);
+
+            if (name == null || Keys.Contains(collectionInfo))
+            {
+                return;
+            }
+
+            switch (collectionType)
+            {
+                case CollectionType.Massive:
+                    _storages.Add(collectionInfo, new MassiveGenericObjects<T>());
+                    break;
+                case CollectionType.List:
+                    _storages.Add(collectionInfo, new ListGenericObjects<T>());
+                    break;
+                default:
+                    return; // Обработка других типов, если необходимо
+            }
+        }
+
+        /// <summary>
+        /// Удаление коллекции
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        public void DelCollection(string name)
+        {
+            CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+            if (name == null || !Keys.Contains(collectionInfo))
+            {
+                return;
+            }
+            _storages.Remove(collectionInfo);
+        }
+
+        /// <summary>
+        /// Доступ к коллекции
+        /// </summary>
+        /// <param name="name">Название коллекции</param>
+        /// <returns></returns>
+        public ICollectionGenericObjects<T>? this[string name]
+        {
+            get
+            {
+                return _storages.GetValueOrDefault(new CollectionInfo(name, CollectionType.Massive, string.Empty), null);
+            }
+        }
+
+
+
+        /// <summary>
+        /// Сохранение информации по автомобилям в хранилище в файл
+        /// </summary>
+        /// <param name="filename">Путь и имя файла</param>
+        public void SaveData(string filename)
+        {
+            if (_storages.Count == 0)
+            {
+                throw new Exception("В хранилище отсутствуют коллекции для сохранения");
+            }
+
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+
+            StringBuilder sb = new();
+
+            sb.Append(_collectionKey);
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
+            {
+                sb.Append(Environment.NewLine);
+                // не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+                sb.Append(value.Key);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(value.Value.MaxCount);
+                sb.Append(_separatorForKeyValue);
+
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+
+                    sb.Append(data);
+                    sb.Append(_separatorItems);
+                }
+            }
+
+            using FileStream fs = new(filename, FileMode.Create);
+            byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
+            fs.Write(info, 0, info.Length);
+        }
+
+        /// <summary>
+        /// Загрузка информации по автомобилям в хранилище из файла
+        /// </summary>
+        /// <param name="filename">Путь и имя файла</param>
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new Exception("Файл не существует");
+            }
+
+            string bufferTextFromFile = "";
+            using (FileStream fs = new(filename, FileMode.Open))
+            {
+                byte[] b = new byte[fs.Length];
+                UTF8Encoding temp = new(true);
+                while (fs.Read(b, 0, b.Length) > 0)
+                {
+                    bufferTextFromFile += temp.GetString(b);
+                }
+            }
+
+            string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+            if (strs == null || strs.Length == 0)
+            {
+                throw new Exception("В файле нет данных");
+            }
+
+            if (!strs[0].Equals(_collectionKey))
+            {
+                throw new Exception("В файле неверные данные");
+            }
+
+            _storages.Clear();
+            foreach (string data in strs)
+            {
+                string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 3)
+                {
+                    continue;
+                }
+
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ??
+                    throw new Exception("Не удалось определить информацию коллекции:" + record[0]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
+                    throw new Exception("Не удалось определить тип коллекции:" + record[1]);
+                collection.MaxCount = Convert.ToInt32(record[1]);
+
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningBoat() is T boat)
+                    {
+                        try
+                        {
+                            if (!collection.Insert(boat))
+                            {
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
+                        }
+                    }
+                }
+
+                _storages.Add(collectionInfo, collection);
+            }
+        }
+
+        /// <summary>
+        /// Создание коллекции по типу
+        /// </summary>
+        /// <param name="collectionType"></param>
+        /// <returns></returns>
+        private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
+        {
+            return collectionType switch
+            {
+                CollectionType.Massive => new MassiveGenericObjects<T>(),
+                CollectionType.List => new ListGenericObjects<T>(),
+                _ => null,
+            };
+        }
+    }
+}
+

MotorBoat/MotorBoat/Drawnings/DirectionType.cs

@@ -4,13 +4,18 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MotorBoat
+namespace MotorBoat.Drawnings
 {
     /// <summary>
     /// Направление перемещения
     /// </summary>
     public enum DirectionType
     {
+        /// <summary>
+        /// Неизвестное направление
+        /// </summary>
+        Unknow = -1,
+
         /// <summary>
         /// Вверх
         /// </summary>

MotorBoat/MotorBoat/Drawnings/DrawningBoat.cs

@@ -1,11 +1,18 @@
-namespace MotorBoat
+using MotorBoat.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.Drawnings
 {
-    internal class DrawningMotorBoat
+    public class DrawningBoat
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityMotorBoat? EntityMotorBoat { get; private set; }
+        public EntityBoat? EntityBoat { get; protected set; }
 
         /// <summary>
         /// Ширина окна
@@ -20,12 +27,12 @@
         /// <summary>
         /// Координата прорисовки x
         /// </summary>
-        private int? _startPosX;
+        protected int? _startPosX;
 
         /// <summary>
         /// Координата прорисовки y
         /// </summary>
-        private int? _startPosY;
+        protected int? _startPosY;
 
         /// <summary>
         /// Ширина прорисовки 
@@ -38,25 +45,66 @@
         private readonly int _drawningMotorBoatHeight = 60;
 
         /// <summary>
-        /// Инициализация свойств
+        /// Координата X объекта
         /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес</param>
-        /// <param name="bodyColor">Основной цвет</param>
-        /// <param name="additionalColor">Дополнительный цвет</param>
-        /// <param name="addTwoMotors">Два дополнительных мотора</param>
-        /// <param name="sofa">Наличие дивана</param>
-        /// <param name="sportLines">Наличие двух полос</param>
-        public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool addTwoMotors, bool sofa, bool sportLines)
+        public int? GetPosX => _startPosX;
+
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
+        public int? GetPosY => _startPosY;
+
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => _drawningMotorBoatWidth;
+
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => _drawningMotorBoatHeight;
+
+        /// <summary>
+        /// Пустой конструктор
+        /// </summary>
+        public DrawningBoat()
         {
-            EntityMotorBoat = new EntityMotorBoat();
-            EntityMotorBoat.Init(speed, weight, bodyColor, additionalColor, addTwoMotors, sofa, sportLines);
             _pictureWidth = null;
             _pictureHeight = null;
             _startPosX = null;
             _startPosY = 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="drawningMotorBoatWidth">Ширина прорисовки лодки</param>
+        /// <param name="drawningMotorBoatHeight">Высота прорисовки лодки</param>
+        protected DrawningBoat(int drawningMotorBoatWidth, int drawningMotorBoatHeight) : this()
+        {
+            _drawningMotorBoatWidth = drawningMotorBoatWidth;
+            _drawningMotorBoatHeight = drawningMotorBoatHeight;
+        }
+
+        //////////////////////////////////////////////////////
+        //---------------Lab06 - Конструктор---------------//
+        ////////////////////////////////////////////////////
+        public DrawningBoat(EntityBoat? entityBoat)
+        {
+            EntityBoat = entityBoat;
+        }
+
         /// <summary>
         /// Установка границ поля
         /// </summary>
@@ -65,8 +113,6 @@
         /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
         public bool SetPictureSize(int width, int height)
         {
-            // TODO проверка, что объект "влезает" в размеры поля
-            // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена
             _pictureWidth = width;
             _pictureHeight = height;
             return true;
@@ -124,7 +170,7 @@
         /// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
         public bool MoveTransport(DirectionType direction)
         {
-            if (EntityMotorBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+            if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
             {
                 return false;
             }
@@ -133,30 +179,30 @@
             {
                 //влево
                 case DirectionType.Left:
-                    if (_startPosX.Value - EntityMotorBoat.Step > 0)
+                    if (_startPosX.Value - EntityBoat.Step > 0)
                     {
-                        _startPosX -= (int)EntityMotorBoat.Step;
+                        _startPosX -= (int)EntityBoat.Step;
                     }
                     return true;
                 //вверх
                 case DirectionType.Up:
-                    if (_startPosY.Value - EntityMotorBoat.Step > 0)
+                    if (_startPosY.Value - EntityBoat.Step > 0)
                     {
-                        _startPosY -= (int)EntityMotorBoat.Step;
+                        _startPosY -= (int)EntityBoat.Step;
                     }
                     return true;
                 // вправо
                 case DirectionType.Right:
-                    if (_startPosX.Value + 140 + EntityMotorBoat.Step < _pictureWidth)
+                    if (_startPosX.Value + 140 + EntityBoat.Step < _pictureWidth)
                     {
-                        _startPosX += (int)EntityMotorBoat.Step;
+                        _startPosX += (int)EntityBoat.Step;
                     }
                     return true;
                 //вниз
                 case DirectionType.Down:
-                    if (_startPosY.Value + 60 + EntityMotorBoat.Step < _pictureHeight)
+                    if (_startPosY.Value + 60 + EntityBoat.Step < _pictureHeight)
                     {
-                        _startPosY += (int)EntityMotorBoat.Step;
+                        _startPosY += (int)EntityBoat.Step;
                     }
                     return true;
                 default:
@@ -168,88 +214,51 @@
         /// Прорисовка объекта
         /// </summary>
         /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+        public virtual void DrawTransport(Graphics g)
         {
-            if (EntityMotorBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+            if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
             {
                 return;
             }
 
             Pen pen = new(Color.Black);
-            Brush additionalBrush = new SolidBrush(EntityMotorBoat.AdditionalColor);
-
-            // добавляем два мотора
-            if (EntityMotorBoat.AddTwoMotors)
-            {
-                Brush br1 = new SolidBrush(EntityMotorBoat.AdditionalColor);
-                g.FillEllipse(br1, _startPosX.Value + 10, _startPosY.Value + 10, 10, 10); 
-                g.FillRectangle(br1, _startPosX.Value + 20, _startPosY.Value + 10, 5, 10); 
-                g.FillEllipse(br1, _startPosX.Value + 10, _startPosY.Value + 40, 10, 10); 
-                g.FillRectangle(br1, _startPosX.Value + 20, _startPosY.Value + 40, 5, 10); 
-                g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 10, 10, 10); 
-                g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 10, 5, 10); 
-                g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 40, 10, 10); 
-                g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 40, 5, 10); 
-            }
 
             // нос лодки
-            Brush br2 = new SolidBrush(EntityMotorBoat.BodyColor);
+            Brush br2 = new SolidBrush(EntityBoat.BodyColor);
             g.FillEllipse(br2, _startPosX.Value + 40, _startPosY.Value + 5, 100, 50);
-            g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 5, 100, 50); 
+            g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 5, 100, 50);
 
             // лобовое стекло
             Brush brBlue = new SolidBrush(Color.Blue);
             g.FillEllipse(brBlue, _startPosX.Value + 87, _startPosY.Value + 10, 10, 40);
-            g.DrawEllipse(pen, _startPosX.Value + 87, _startPosY.Value + 10, 10, 40); 
+            g.DrawEllipse(pen, _startPosX.Value + 87, _startPosY.Value + 10, 10, 40);
 
             // тело лодки
-            Brush br3 = new SolidBrush(EntityMotorBoat.BodyColor);
+            Brush br3 = new SolidBrush(EntityBoat.BodyColor);
             g.FillRectangle(br3, _startPosX.Value + 22, _startPosY.Value + 5, 70, 50);
-            g.DrawRectangle(pen, _startPosX.Value + 22, _startPosY.Value + 5, 70, 50); 
+            g.DrawRectangle(pen, _startPosX.Value + 22, _startPosY.Value + 5, 70, 50);
 
             // пространство для пассажиров 
             Brush brLightGray = new SolidBrush(Color.LightGray);
-            g.FillRectangle(brLightGray, _startPosX.Value + 30, _startPosY.Value + 10, 62, 40); 
+            g.FillRectangle(brLightGray, _startPosX.Value + 30, _startPosY.Value + 10, 62, 40);
             g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 10, 62, 40);
 
             // прожектор лампа
             Brush brYellow = new SolidBrush(Color.Yellow);
             g.FillEllipse(brYellow, _startPosX.Value + 130, _startPosY.Value + 27, 6, 6);
-            g.DrawEllipse(pen, _startPosX.Value + 130, _startPosY.Value + 27, 6, 6); 
+            g.DrawEllipse(pen, _startPosX.Value + 130, _startPosY.Value + 27, 6, 6);
 
             // прожектор корпус
             Brush brBlack = new SolidBrush(Color.Black);
             g.FillRectangle(brBlack, _startPosX.Value + 129, _startPosY.Value + 26, 3, 8);
-            g.DrawRectangle(pen, _startPosX.Value + 129, _startPosY.Value + 26, 3, 8); 
+            g.DrawRectangle(pen, _startPosX.Value + 129, _startPosY.Value + 26, 3, 8);
 
             // мотор центральный
             Brush brDarkBlue = new SolidBrush(Color.DarkBlue);
-            g.FillEllipse(brDarkBlue, _startPosX.Value + 10, _startPosY.Value + 25, 10, 10); 
-            g.FillRectangle(brDarkBlue, _startPosX.Value + 20, _startPosY.Value + 25, 5, 10); 
-            g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 25, 10, 10); 
-            g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 25, 5, 10); 
-
-            // добавляем две полоски
-            if (EntityMotorBoat.SportLines)
-            {
-                g.FillRectangle(additionalBrush, _startPosX.Value + 100, _startPosY.Value + 22, 25, 2); 
-                g.FillRectangle(additionalBrush, _startPosX.Value + 100, _startPosY.Value + 36, 25, 2); 
-                g.DrawRectangle(pen, _startPosX.Value + 100, _startPosY.Value + 22, 25, 2); 
-                g.DrawRectangle(pen, _startPosX.Value + 100, _startPosY.Value + 36, 25, 2); 
-            }
-
-            // добавляем диван
-            if (EntityMotorBoat.Sofa)
-            {
-                g.FillRectangle(additionalBrush, _startPosX.Value + 30, _startPosY.Value + 10, 15, 40); 
-                g.FillRectangle(additionalBrush, _startPosX.Value + 30, _startPosY.Value + 10, 3, 40); 
-                g.FillRectangle(additionalBrush, _startPosX.Value + 33, _startPosY.Value + 10, 10, 2); 
-                g.FillRectangle(additionalBrush, _startPosX.Value + 33, _startPosY.Value + 48, 10, 2); 
-                g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 10, 15, 40); 
-                g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 10, 3, 40); 
-                g.DrawRectangle(pen, _startPosX.Value + 33, _startPosY.Value + 10, 10, 2); 
-                g.DrawRectangle(pen, _startPosX.Value + 33, _startPosY.Value + 48, 10, 2); 
-            }
+            g.FillEllipse(brDarkBlue, _startPosX.Value + 10, _startPosY.Value + 25, 10, 10);
+            g.FillRectangle(brDarkBlue, _startPosX.Value + 20, _startPosY.Value + 25, 5, 10);
+            g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 25, 10, 10);
+            g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 25, 5, 10);
         }
     }
 }

MotorBoat/MotorBoat/Drawnings/DrawningBoatCompareByColor.cs

@@ -0,0 +1,34 @@
+namespace MotorBoat.Drawnings
+{
+    /// <summary>
+    /// Сравнение по цвету, скорости, весу
+    /// </summary>
+    public class DrawningBoatCompareByColor : IComparer<DrawningBoat?>
+    {
+        public int Compare(DrawningBoat? x, DrawningBoat? y)
+        {
+            //////////////////////////////////////////////////////////////////////////////////////////////
+            //---------------Lab08 - прописать логику сравения по цветам, скорости, весу---------------//
+            ////////////////////////////////////////////////////////////////////////////////////////////
+            
+            if (x == null || x.EntityBoat == null)
+            {
+                return -1;
+            }
+            if (y == null || y.EntityBoat == null)
+            {
+                return 1;
+            }
+            if (x.EntityBoat.BodyColor.Name != y.EntityBoat.BodyColor.Name)
+            {
+                return x.EntityBoat.BodyColor.Name.CompareTo(y.EntityBoat.BodyColor.Name);
+            }
+            var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+        }
+    }
+}

MotorBoat/MotorBoat/Drawnings/DrawningBoatCompareByType.cs

@@ -0,0 +1,34 @@
+namespace MotorBoat.Drawnings
+{
+    /// <summary>
+    /// Сравнение по типу, скорости, весу
+    /// </summary>
+    public class DrawningBoatCompareByType : IComparer<DrawningBoat?>
+    {
+        public int Compare(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                return -1;
+            }
+
+            if (y == null || y.EntityBoat == null)
+            {
+                return 1;
+            }
+
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return x.GetType().Name.CompareTo(y.GetType().Name);
+            }
+
+            var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+
+            return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+        }
+    }
+}

MotorBoat/MotorBoat/Drawnings/DrawningBoatEqutables.cs

@@ -0,0 +1,78 @@
+using MotorBoat.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace MotorBoat.Drawnings
+{
+    /// <summary>
+    /// Реализация сравнения двух объектов класса-прорисовки
+    /// </summary>
+    public class DrawningBoatEqutables : IEqualityComparer<DrawningBoat?>
+    {
+        public bool Equals(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                return false;
+            }
+
+            if (y == null || y.EntityBoat == null)
+            {
+                return false;
+            }
+
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return false;
+            }
+
+            if (x.EntityBoat.Speed != y.EntityBoat.Speed)
+            {
+                return false;
+            }
+
+            if (x.EntityBoat.Weight != y.EntityBoat.Weight)
+            {
+                return false;
+            }
+
+            if (x.EntityBoat.BodyColor != y.EntityBoat.BodyColor)
+            {
+                return false;
+            }
+
+            if (x is DrawningMotorBoat && y is DrawningMotorBoat)
+            {
+                //////////////////////////////////////////////////////////////////////////////////////////////
+                //---------------Lab08 - доделать логику сравнения дополнительных параметров---------------//
+                ////////////////////////////////////////////////////////////////////////////////////////////
+
+                EntityMotorBoat entityMotorBoatX = (EntityMotorBoat)x.EntityBoat;
+                EntityMotorBoat entityMotorBoatY = (EntityMotorBoat)y.EntityBoat;
+                if (entityMotorBoatX.AdditionalColor != entityMotorBoatY.AdditionalColor)
+                {
+                    return false;
+                }
+                if (entityMotorBoatX.AddTwoMotors != entityMotorBoatY.AddTwoMotors)
+                {
+                    return false;
+                }
+                if (entityMotorBoatX.Sofa != entityMotorBoatY.Sofa)
+                {
+                    return false;
+                }
+                if (entityMotorBoatX.SportLines != entityMotorBoatY.SportLines)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public int GetHashCode([DisallowNull] DrawningBoat obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+
+}

MotorBoat/MotorBoat/Drawnings/DrawningMotorBoat.cs

@@ -0,0 +1,78 @@
+using MotorBoat.Entities;
+
+namespace MotorBoat.Drawnings
+{
+    public class DrawningMotorBoat : DrawningBoat
+    {
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="addTwoMotors">Два дополнительных мотора</param>
+        /// <param name="sofa">Наличие дивана</param>
+        /// <param name="sportLines">Наличие двух полос</param>
+        public DrawningMotorBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool addTwoMotors, bool sofa, bool sportLines) : base (140, 60)
+        {
+            EntityBoat = new EntityMotorBoat(speed, weight, bodyColor, additionalColor, addTwoMotors, sofa, sportLines);
+        }
+
+        //////////////////////////////////////////////////////
+        //---------------Lab06 - Конструктор---------------//
+        ////////////////////////////////////////////////////
+        public DrawningMotorBoat(EntityMotorBoat? entityMotorBoat) : base(entityMotorBoat)
+        {
+        }
+
+        public override void DrawTransport(Graphics g)
+        {
+            if (EntityBoat == null || EntityBoat is not EntityMotorBoat motorBoat || !_startPosX.HasValue || !_startPosY.HasValue)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Brush additionalBrush = new SolidBrush(motorBoat.AdditionalColor);
+            base.DrawTransport(g);
+
+            base.DrawTransport(g);
+
+            // добавляем два мотора
+            if (motorBoat.AddTwoMotors)
+            {
+                g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 10, 10, 10);
+                g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 10, 5, 10);
+                g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 40, 10, 10);
+                g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 40, 5, 10);
+                g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 10, 10, 10);
+                g.FillRectangle(additionalBrush, _startPosX.Value + 20, _startPosY.Value + 10, 5, 10);
+                g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 40, 10, 10);
+                g.FillRectangle(additionalBrush, _startPosX.Value + 20, _startPosY.Value + 40, 5, 10);
+            }
+
+            // добавляем две полоски
+            if (motorBoat.SportLines)
+            {
+                g.FillRectangle(additionalBrush, _startPosX.Value + 100, _startPosY.Value + 22, 25, 2);
+                g.FillRectangle(additionalBrush, _startPosX.Value + 100, _startPosY.Value + 36, 25, 2);
+                g.DrawRectangle(pen, _startPosX.Value + 100, _startPosY.Value + 22, 25, 2);
+                g.DrawRectangle(pen, _startPosX.Value + 100, _startPosY.Value + 36, 25, 2);
+            }
+
+            // добавляем диван
+            if (motorBoat.Sofa)
+            {
+                g.FillRectangle(additionalBrush, _startPosX.Value + 30, _startPosY.Value + 10, 15, 40);
+                g.FillRectangle(additionalBrush, _startPosX.Value + 30, _startPosY.Value + 10, 3, 40);
+                g.FillRectangle(additionalBrush, _startPosX.Value + 33, _startPosY.Value + 10, 10, 2);
+                g.FillRectangle(additionalBrush, _startPosX.Value + 33, _startPosY.Value + 48, 10, 2);
+                g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 10, 15, 40);
+                g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 10, 3, 40);
+                g.DrawRectangle(pen, _startPosX.Value + 33, _startPosY.Value + 10, 10, 2);
+                g.DrawRectangle(pen, _startPosX.Value + 33, _startPosY.Value + 48, 10, 2);
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/Drawnings/ExtentionDrawningBoat.cs

@@ -0,0 +1,79 @@
+using MotorBoat.Entities;
+
+namespace MotorBoat.Drawnings
+{
+    /// <summary>
+    /// Расширение для класса EntityCar
+    /// </summary>
+    public static class ExtentionDrawningCar
+    {
+        /// <summary>
+        /// Разделитель для записи информации по объекту в файл
+        /// </summary>
+        private static readonly string _separatorForObject = ":";
+
+        /// <summary>
+        /// Создание объекта из строки
+        /// </summary>
+        /// <param name="info">Строка с данными для создания объекта</param>
+        /// <returns>Объект</returns>
+        //public static DrawningBoat? CreateDrawningBoat(this string info)
+        //{
+        //    string[] strs = info.Split(_separatorForObject);
+        //    EntityBoat? boat = EntityMotorBoat.CreateEntityMotorBoat(strs);
+        //    if (boat != null)
+        //    {
+        //        return new DrawningMotorBoat(boat);
+        //    }
+
+        //    boat = EntityBoat.CreateEntityBoat(strs);
+        //    if (boat != null)
+        //    {
+        //        return new DrawningBoat(boat);
+        //    }
+
+        //    return null;
+        //}
+
+        public static DrawningBoat? CreateDrawningBoat(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            EntityBoat? boat = EntityMotorBoat.CreateEntityMotorBoat(strs);
+
+            DrawningBoat? drawnBoat = null;
+
+            if (boat != null)
+            {
+                EntityMotorBoat? motorBoat = (EntityMotorBoat?)boat;
+                drawnBoat = new DrawningMotorBoat(motorBoat);
+            }
+            else
+            {
+                boat = EntityBoat.CreateEntityBoat(strs);
+                if (boat != null)
+                {
+                    drawnBoat = new DrawningBoat(boat);
+                }
+            }
+
+            return drawnBoat;
+        }
+
+        /// <summary>
+        /// Получение данных для сохранения в файл
+        /// </summary>
+        /// <param name="drawningBoat">Сохраняемый объект</param>
+        /// <returns>Строка с данными по объекту</returns>
+        public static string GetDataForSave(this DrawningBoat drawningBoat)
+        {
+            string[]? array = drawningBoat?.EntityBoat?.GetStringRepresentation();
+
+            if (array == null)
+            {
+                return string.Empty;
+            }
+
+            return string.Join(_separatorForObject, array);
+        }
+    }
+}

MotorBoat/MotorBoat/Entities/EntityBoat.cs

@@ -0,0 +1,78 @@
+namespace MotorBoat.Entities
+{
+    /// <summary>
+    /// Класс-сущность лодка
+    /// </summary>
+    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;
+        }
+
+        /// <summary>
+        /// Новый основной цвет
+        /// </summary>
+        /// <param name="color"></param>
+        public void ChangeColor(Color color)
+        {
+            BodyColor = color;
+        }
+        //{
+        //    BodyColor = color != null ? color : Color.White;
+        //}
+
+        /// <summary>
+        /// Получение строк со значениями свойств объекта класса-сущности
+        /// </summary>
+        /// <returns></returns>
+        public virtual string[] GetStringRepresentation()
+        {
+            return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+        }
+
+        /// <summary>
+        /// Создание объекта из массива строк
+        /// </summary>
+        /// <param name="strs"></param>
+        /// <returns></returns>
+        public static EntityBoat? CreateEntityBoat(string[] strs)
+        {
+            if (strs.Length != 4 || strs[0] != nameof(EntityBoat))
+            {
+                return null;
+            }
+
+            return new EntityBoat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+        }
+    }
+}
+

MotorBoat/MotorBoat/Entities/EntityMotorBoat.cs

@@ -0,0 +1,96 @@
+namespace MotorBoat.Entities
+{
+    /// <summary>
+    /// Класс-сущность моторная лодка
+    /// </summary>
+    public class EntityMotorBoat : EntityBoat
+    {
+        /// <summary>
+        /// Дополнительный цвет 
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+
+        /// <summary>
+        /// Два дополнительных мотора
+        /// </summary>
+        public bool AddTwoMotors { get; private set; }
+
+        /// <summary>
+        /// Наличие дивана
+        /// </summary>
+        public bool Sofa { get; private set; }
+
+        /// <summary>
+        /// Наличие двух полос
+        /// </summary>
+        public bool SportLines { 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="addTwoMotors">Два дополнительных мотора</param>
+        /// <param name="sofa">Наличие дивана</param>
+        /// <param name="sportLines">Наличие полос</param>
+        public EntityMotorBoat(int speed, double weight, Color bodyColor, Color additionalColor, bool addTwoMotors, bool sofa, bool sportLines) : base (speed, weight, bodyColor)
+        {
+            AdditionalColor = additionalColor;
+            AddTwoMotors = addTwoMotors;
+            Sofa = sofa;
+            SportLines = sportLines;
+        }
+
+        /// <summary>
+        /// Новый дополнительный цвет
+        /// </summary>
+        /// <param name="color"></param>
+        public void ChangeAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
+        //{
+        //    AdditionalColor = color != null ? color : Color.White;
+        //}
+
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////
+        //---------------Lab06 - Получение строк со значениями свойств объекта класса-сущности---------------//
+        //////////////////////////////////////////////////////////////////////////////////////////////////////
+        /// <summary>
+        /// Получение строк со значениями свойств объекта класса-сущности
+        /// </summary>
+        /// <returns></returns>
+        public override string[] GetStringRepresentation()
+        {
+            //return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+
+            return new[] { nameof(EntityMotorBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,
+                AddTwoMotors.ToString(), Sofa.ToString(), SportLines.ToString() };
+        }
+
+        ////////////////////////////////////////////////////////////////////////////
+        //---------------Lab06 - Создание объекта из массива строк---------------//
+        //////////////////////////////////////////////////////////////////////////
+        /// <summary>
+        /// Создание объекта из массива строк
+        /// </summary>
+        /// <param name="strs"></param>
+        /// <returns></returns>
+        public static EntityMotorBoat? CreateEntityMotorBoat(string[] strs)
+        {
+            if (strs.Length != 8 || strs[0] != nameof(EntityMotorBoat))
+            {
+                return null;
+            }
+            return new EntityMotorBoat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]),
+                Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]), Convert.ToBoolean(strs[7]));
+        }
+    }
+}

MotorBoat/MotorBoat/EntityMotorBoat.cs

@@ -1,69 +0,0 @@
-namespace MotorBoat
-{
-    /// <summary>
-    /// Класс-сущность
-    /// </summary>
-    public class EntityMotorBoat
-    {
-        /// <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 AddTwoMotors { get; private set; }
-
-        /// <summary>
-        /// Наличие дивана
-        /// </summary>
-        public bool Sofa { get; private set; }
-
-        /// <summary>
-        /// Наличие двух полос
-        /// </summary>
-        public bool SportLines { 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="addTwoMotors">Два дополнительных мотора</param>
-        /// <param name="sofa">Наличие дивана</param>
-        /// <param name="sportLines">Наличие полос</param>
-        public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool addTwoMotors, bool sofa, bool sportLines)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-            AdditionalColor = additionalColor;
-            AddTwoMotors = addTwoMotors;
-            Sofa = sofa;
-            SportLines = sportLines;
-        }
-    }
-}

MotorBoat/MotorBoat/Exceptions/AlreadyExistException.cs

@@ -0,0 +1,16 @@
+using System.Runtime.Serialization;
+
+namespace MotorBoat.Exceptions
+{
+    /// <summary>
+    /// Объект уже есть в коллекции
+    /// </summary>
+    [Serializable]
+    internal class AlreadyExistException: ApplicationException
+    {
+        public AlreadyExistException() : base("Объект уже есть в коллекции") { }
+        public AlreadyExistException(string message) : base(message) { }
+        public AlreadyExistException(string message, Exception exception) : base(message, exception) { }
+        protected AlreadyExistException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

MotorBoat/MotorBoat/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,21 @@
+using System.Runtime.Serialization;
+
+namespace MotorBoat.Exceptions
+{
+    /// <summary>
+    /// Класс, описывающий ошибку переполнения коллекции
+    /// </summary>
+    [Serializable]
+    internal class CollectionOverflowException : ApplicationException
+    {
+        public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество: " + count) { }
+
+        public CollectionOverflowException() : base() { }
+
+        public CollectionOverflowException(string message) : base(message) { }
+
+        public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
+
+        protected CollectionOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

MotorBoat/MotorBoat/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,21 @@
+using System.Runtime.Serialization;
+
+namespace MotorBoat.Exceptions
+{
+    /// <summary>
+    /// Класс, описывающий ошибку, что по указанной позиции нет элемента
+    /// </summary>
+    [Serializable]
+    internal class ObjectNotFoundException : ApplicationException
+    {
+        public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { }
+
+        public ObjectNotFoundException() : base() { }
+
+        public ObjectNotFoundException(string message) : base(message) { }
+
+        public ObjectNotFoundException(string message, Exception exception) : base(message, exception) { }
+
+        protected ObjectNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

MotorBoat/MotorBoat/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,21 @@
+using System.Runtime.Serialization;
+
+namespace MotorBoat.Exceptions
+{
+    /// <summary>
+    /// Класс, описывающий ошибку выхода за границы коллекции
+    /// </summary>
+    [Serializable]
+    internal class PositionOutOfCollectionException : ApplicationException
+    {
+        public PositionOutOfCollectionException(int i) : base("Выход за границы коллекции. Позиция " + i) { }
+
+        public PositionOutOfCollectionException() : base() { }
+
+        public PositionOutOfCollectionException(string message) : base(message) { }
+
+        public PositionOutOfCollectionException(string message, Exception exception) : base(message, exception) { }
+
+        protected PositionOutOfCollectionException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

MotorBoat/MotorBoat/FormBoatCollection.Designer.cs

@@ -0,0 +1,375 @@
+namespace MotorBoat
+{
+    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()
+        {
+            groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddBoat = new Button();
+            buttonRefresh = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonGoToCheck = new Button();
+            buttonRemoveBoat = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            menuStrip = new MenuStrip();
+            файлToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
+            buttonSortByColor = new Button();
+            buttonSortByType = new Button();
+            groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(834, 24);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(200, 508);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonSortByColor);
+            panelCompanyTools.Controls.Add(buttonSortByType);
+            panelCompanyTools.Controls.Add(buttonAddBoat);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveBoat);
+            panelCompanyTools.Dock = DockStyle.Bottom;
+            panelCompanyTools.Location = new Point(3, 301);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(194, 204);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // buttonAddBoat
+            // 
+            buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddBoat.Location = new Point(14, 3);
+            buttonAddBoat.Name = "buttonAddBoat";
+            buttonAddBoat.Size = new Size(167, 24);
+            buttonAddBoat.TabIndex = 1;
+            buttonAddBoat.Text = "Добавить лодку";
+            buttonAddBoat.UseVisualStyleBackColor = true;
+            buttonAddBoat.Click += ButtonAddBoat_Click;
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(14, 118);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(167, 21);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            maskedTextBoxPosition.Location = new Point(14, 33);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(167, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(14, 89);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(167, 23);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Передать на тесты";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += buttonGoToCheck_Click;
+            // 
+            // buttonRemoveBoat
+            // 
+            buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveBoat.Location = new Point(14, 62);
+            buttonRemoveBoat.Name = "buttonRemoveBoat";
+            buttonRemoveBoat.Size = new Size(167, 21);
+            buttonRemoveBoat.TabIndex = 4;
+            buttonRemoveBoat.Text = "Удалить лодку";
+            buttonRemoveBoat.UseVisualStyleBackColor = true;
+            buttonRemoveBoat.Click += ButtonRemoveBoat_Click;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(15, 272);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(173, 23);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 19);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(194, 218);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(12, 189);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(173, 23);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(12, 119);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(173, 64);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(12, 86);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(173, 23);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(119, 61);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(16, 61);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(12, 27);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(173, 23);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(35, 9);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(125, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
+            // 
+            // 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, 243);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(173, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Left;
+            pictureBox.Enabled = false;
+            pictureBox.Location = new Point(0, 24);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(830, 508);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // menuStrip
+            // 
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1034, 24);
+            menuStrip.TabIndex = 0;
+            menuStrip.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(48, 20);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(181, 22);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(181, 22);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(14, 174);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(167, 21);
+            buttonSortByColor.TabIndex = 8;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += ButtonSortByColor_Click;
+            // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByType.Location = new Point(14, 145);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(167, 23);
+            buttonSortByType.TabIndex = 7;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += ButtonSortByType_Click;
+            // 
+            // FormBoatCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1034, 532);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
+            Name = "FormBoatCollection";
+            Text = "Коллекция лодок";
+            groupBoxTools.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private Button buttonAddBoat;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonRemoveBoat;
+        private MaskedTextBox maskedTextBoxPosition;
+        private PictureBox pictureBox;
+        private Button buttonRefresh;
+        private Button buttonGoToCheck;
+        private Panel panelStorage;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private Panel panelCompanyTools;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
+    }
+}

MotorBoat/MotorBoat/FormBoatCollection.cs

@@ -0,0 +1,333 @@
+using MotorBoat.CollectionGenericObjects;
+using MotorBoat.Drawnings;
+using Microsoft.Extensions.Logging;
+
+namespace MotorBoat
+{
+    /// <summary>
+    /// Форма работы с компанией и ее коллекцией
+    /// </summary>
+    public partial class FormBoatCollection : Form
+    {
+        /// <summary>
+        /// Хранилише коллекций
+        /// </summary>
+        private readonly StorageCollection<DrawningBoat> _storageCollection;
+
+        /// <summary>
+        /// Компания
+        /// </summary>
+        private AbstractCompany? _company = null;
+
+        /// <summary>
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatCollection(ILogger<FormBoatCollection> logger)
+        {
+            InitializeComponent();
+            _storageCollection = new();
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// Выбор компании
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            panelCompanyTools.Enabled = false;
+        }
+
+        /// <summary>
+        /// Добавление обычной лодки
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBoat_Click(object sender, EventArgs e)
+        {
+            FormBoatConfig form = new();
+            form.AddEvent(SetBoat);
+            form.Show();
+        }
+
+        /// <summary>
+        /// Добавление лодки в коллекцию
+        /// </summary>
+        /// <param name="boat"></param>
+        private void SetBoat(DrawningBoat boat)
+        {
+            if (_company == null || boat == null)
+            {
+                return;
+            }
+            try
+            {
+                bool isSet = _company + boat;
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Добавлен объект: {boat}", saveFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+
+        /// <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);
+            try
+            {
+                bool isRemove = _company - pos;
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Удален объект с индексом: {pos}", saveFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+
+        /// <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;
+            }
+
+            FormMotorBoat form = new()
+            {
+                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();
+        }
+
+        /// <summary>
+        /// Добавление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: Не все данные заполнены");
+                return;
+            }
+
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
+
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RerfreshListBoxItems();
+            _logger.LogInformation("Добавлена коллекция: {textBoxCollectionName.Text}", saveFileDialog.FileName);
+        }
+
+        /// <summary>
+        /// Удаление коллекции
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCollectionDel_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+            {
+                MessageBox.Show("Коллекция не выбрана", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+            {
+                return;
+            }
+            _storageCollection.DelCollection(textBoxCollectionName.Text);
+            RerfreshListBoxItems();
+        }
+
+        /// <summary>
+        /// Обновление списка в listBoxCollection
+        /// </summary>
+        private void RerfreshListBoxItems()
+        {
+            listBoxCollection.Items.Clear();
+            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+            {
+                string? colName = _storageCollection.Keys?[i].Name;
+                if (!string.IsNullOrEmpty(colName))
+                {
+                    listBoxCollection.Items.Add(colName);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Создание компании
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateCompany_Click(object sender, EventArgs e)
+        {
+            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+            {
+                MessageBox.Show("Коллекция не выбрана");
+                return;
+            }
+
+            ICollectionGenericObjects<DrawningBoat>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+            if (collection == null)
+            {
+                MessageBox.Show("Коллекция не проинициализирована");
+                return;
+            }
+
+            switch (comboBoxSelectorCompany.Text)
+            {
+                case "Хранилище":
+                    _company = new BoatSharingService(pictureBox.Width, pictureBox.Height, collection);
+                    break;
+            }
+
+            panelCompanyTools.Enabled = true;
+            RerfreshListBoxItems();
+        }
+
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storageCollection.SaveData(saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError("Ошибка: {Message}", ex.Message);
+                }
+            }
+        }
+
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _storageCollection.LoadData(openFileDialog.FileName);
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Загрузка файла: {filename}", openFileDialog.FileName);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Не загрузилось", "Результат",
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError("Ошибка: {Message}", ex.Message);
+                }
+            }
+            RerfreshListBoxItems();
+        }
+
+        /// <summary>
+        /// Сортировка по типу
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+
+            CompareBoats(new DrawningBoatCompareByType());
+        }
+
+            /// <summary>
+            /// Сортировка по цвету
+            /// </summary>
+            /// <param name="sender"></param>
+            /// <param name="e"></param>
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            CompareBoats(new DrawningBoatCompareByColor());
+        }
+
+            /// <summary>
+            /// Сортировка по сравнителю
+            /// </summary>
+            /// <param name="comparer">Сравнитель объектов</param>
+            private void CompareBoats(IComparer<DrawningBoat?> comparer)
+            {
+                if (_company == null)
+                {
+                    return;
+                }
+                _company.Sort(comparer);
+                pictureBox.Image = _company.Show();
+            }
+        }
+}

MotorBoat/MotorBoat/FormBoatCollection.resx

@@ -0,0 +1,132 @@
+<?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>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>127, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>261, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>62</value>
+  </metadata>
+</root>

MotorBoat/MotorBoat/FormBoatConfig.Designer.cs

@@ -0,0 +1,375 @@
+namespace MotorBoat
+{
+    partial class FormBoatConfig
+    {
+        /// <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()
+        {
+            groupBoxConfig = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelPurple = new Panel();
+            panelBlack = new Panel();
+            panelGray = new Panel();
+            panelWhite = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxSportLines = new CheckBox();
+            checkBoxSofa = new CheckBox();
+            checkBoxAddTwoMotors = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            pictureBoxObject = new PictureBox();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            panelObject.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxSportLines);
+            groupBoxConfig.Controls.Add(checkBoxSofa);
+            groupBoxConfig.Controls.Add(checkBoxAddTwoMotors);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(370, 206);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelGray);
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(173, 35);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(191, 122);
+            groupBoxColors.TabIndex = 9;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(144, 74);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(40, 40);
+            panelPurple.TabIndex = 9;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(98, 74);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(40, 40);
+            panelBlack.TabIndex = 8;
+            // 
+            // panelGray
+            // 
+            panelGray.BackColor = Color.Gray;
+            panelGray.Location = new Point(52, 74);
+            panelGray.Name = "panelGray";
+            panelGray.Size = new Size(40, 40);
+            panelGray.TabIndex = 7;
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(6, 74);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(40, 40);
+            panelWhite.TabIndex = 6;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(144, 28);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(40, 40);
+            panelYellow.TabIndex = 5;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(98, 28);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(40, 40);
+            panelBlue.TabIndex = 4;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(52, 28);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(40, 40);
+            panelGreen.TabIndex = 2;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(6, 28);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(40, 40);
+            panelRed.TabIndex = 1;
+            // 
+            // checkBoxSportLines
+            // 
+            checkBoxSportLines.AutoSize = true;
+            checkBoxSportLines.Location = new Point(6, 168);
+            checkBoxSportLines.Name = "checkBoxSportLines";
+            checkBoxSportLines.Size = new Size(121, 19);
+            checkBoxSportLines.TabIndex = 8;
+            checkBoxSportLines.Text = "Наличие 2 полос";
+            checkBoxSportLines.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxSofa
+            // 
+            checkBoxSofa.AutoSize = true;
+            checkBoxSofa.Location = new Point(6, 143);
+            checkBoxSofa.Name = "checkBoxSofa";
+            checkBoxSofa.Size = new Size(116, 19);
+            checkBoxSofa.TabIndex = 7;
+            checkBoxSofa.Text = "Наличие дивана";
+            checkBoxSofa.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxAddTwoMotors
+            // 
+            checkBoxAddTwoMotors.AutoSize = true;
+            checkBoxAddTwoMotors.Location = new Point(6, 118);
+            checkBoxAddTwoMotors.Name = "checkBoxAddTwoMotors";
+            checkBoxAddTwoMotors.Size = new Size(116, 19);
+            checkBoxAddTwoMotors.TabIndex = 6;
+            checkBoxAddTwoMotors.Text = "Два доп. мотора";
+            checkBoxAddTwoMotors.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(74, 76);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(72, 23);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(6, 78);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(29, 15);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(74, 35);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(72, 23);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(6, 37);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(62, 15);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(271, 164);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(93, 33);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(173, 164);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(92, 33);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += LabelObject_MouseDown;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(15, 60);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(184, 102);
+            pictureBoxObject.TabIndex = 1;
+            pictureBoxObject.TabStop = false;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(376, 174);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(75, 23);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(497, 174);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(75, 23);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(376, 3);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(202, 165);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.AutoSize = true;
+            labelAdditionalColor.Image = Properties.Resources.White;
+            labelAdditionalColor.Location = new Point(137, 9);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(59, 15);
+            labelAdditionalColor.TabIndex = 3;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.DragDrop += LabelColor_DragDrop;
+            labelAdditionalColor.DragEnter += LabelColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.AutoSize = true;
+            labelBodyColor.BackColor = SystemColors.Control;
+            labelBodyColor.Image = Properties.Resources.White;
+            labelBodyColor.Location = new Point(3, 9);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(81, 15);
+            labelBodyColor.TabIndex = 2;
+            labelBodyColor.Text = "Базовый цвет";
+            labelBodyColor.DragDrop += LabelColor_DragDrop;
+            labelBodyColor.DragEnter += LabelColor_DragEnter;
+            // 
+            // FormBoatConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(584, 206);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormBoatConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            panelObject.ResumeLayout(false);
+            panelObject.PerformLayout();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSimpleObject;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private Label labelModifiedObject;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private CheckBox checkBoxAddTwoMotors;
+        private CheckBox checkBoxSofa;
+        private CheckBox checkBoxSportLines;
+        private GroupBox groupBoxColors;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelRed;
+        private Panel panelPurple;
+        private Panel panelBlack;
+        private Panel panelGray;
+        private Panel panelWhite;
+        private PictureBox pictureBoxObject;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private Label labelBodyColor;
+        private Label labelAdditionalColor;
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.cs

@@ -0,0 +1,223 @@
+using MotorBoat.Drawnings;
+using MotorBoat.Entities;
+
+namespace MotorBoat
+{
+    /// <summary>
+    /// Форма конфигурации объекта
+    /// </summary>
+    public partial class FormBoatConfig : Form
+    {
+        /// <summary>
+        /// Объект - прорисовка лодки
+        /// </summary>
+        private DrawningBoat _boat;
+
+        /// <summary>
+        /// Событие для передачи объекта
+        /// </summary>
+        private event BoatDelegate? BoatDelegate;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormBoatConfig()
+        {
+            InitializeComponent();
+
+            panelRed.MouseDown += Panel_MouseDown;
+            panelGreen.MouseDown += Panel_MouseDown;
+            panelBlue.MouseDown += Panel_MouseDown;
+            panelYellow.MouseDown += Panel_MouseDown;
+            panelWhite.MouseDown += Panel_MouseDown;
+            panelGray.MouseDown += Panel_MouseDown;
+            panelBlack.MouseDown += Panel_MouseDown;
+            panelPurple.MouseDown += Panel_MouseDown;
+
+            //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            //---------------buttonCancel.Click привязать анонимный метод через lambda с закрытием формы---------------//
+            ////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            
+            buttonCancel.Click += (sender, e) => Close();
+
+        }
+
+        /// <summary>
+        /// Привязка внешнего метода к событию
+        /// </summary>
+        /// <param name="boatDelegate"></param>
+        public void AddEvent(BoatDelegate boatDelegate)
+        {
+            BoatDelegate += boatDelegate;
+        }
+
+        //public void AddEvent(Action<DrawningBoat> ev)
+        //{
+        //    if (EventAddMotorBoat == null)
+        //    {
+        //        EventAddMotorBoat = new Action<DrawingBoat>(ev);
+        //    }
+        //    else
+        //    {
+        //        EventAddMotorBoat += ev;
+        //    }
+        //}
+
+        /// <summary>
+        /// Прорисовка объекта
+        /// </summary>
+        private void DrawObject()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _boat?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+            _boat?.SetPosition(5, 5);
+            _boat?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Label
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragEnter(object sender, DragEventArgs e)
+        {
+            e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+        }
+
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PanelObject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+            {
+                case "labelSimpleObject":
+                    _boat = new DrawningBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                    break;
+                case "labelModifiedObject":
+                    _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                        Color.Black, checkBoxAddTwoMotors.Checked, checkBoxSofa.Checked, checkBoxSportLines.Checked);
+                    break;
+            }
+            DrawObject();
+        }
+
+        /// <summary>
+        /// Передаем информацию при нажатии на Panel
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Panel_MouseDown(object? sender, MouseEventArgs e)
+        {
+
+            //22/25 минута
+            /////////////////////////////////////////////////////////////
+            //---------------отправка цвета в Drag&Drop---------------//
+            ///////////////////////////////////////////////////////////
+
+            (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy);
+
+            //if (sender is Panel panel)
+            //{
+            //    panel.DoDragDrop(panel.BackColor != null ? panel.BackColor : Color.White, DragDropEffects.Move | DragDropEffects.Copy);
+            //}
+            //if (sender is Panel panel)
+            //{
+            //    panel.DoDragDrop(panel.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+            //}
+
+        }
+
+        //22/25 минута
+        //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        //---------------Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)---------------//
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+        }
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LabelColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_boat == null || _boat.EntityBoat == null)
+                return;
+
+            ((Label)sender).BackColor = (Color)e.Data.GetData(typeof(Color));
+
+            switch (((Label)sender).Name)
+            {
+                case "labelBodyColor":
+                    _boat.EntityBoat.ChangeColor((Color)e.Data.GetData(typeof(Color)));
+                    break;
+                case "labelAdditionalColor":
+                    if (_boat is DrawningMotorBoat drawningMotorBoat && _boat.EntityBoat is EntityMotorBoat entityMotorBoat)
+                    {
+                        entityMotorBoat.ChangeAdditionalColor((Color)e.Data?.GetData(typeof(Color)));
+                    }
+                    break;
+            }
+
+            DrawObject();
+        }
+
+        //private void LabelColor_DragDrop(object sender, DragEventArgs e)
+        //{
+        //    if (_boat == null || _boat.EntityBoat == null)
+        //        return;
+
+        //    ((Label)sender).BackColor = (Color)e.Data.GetData(typeof(Color));
+        //    switch (((Label)sender).Name)
+        //    {
+        //        case "labelBodyColor":
+        //            _boat.EntityBoat.ChangeColor((Color)e.Data.GetData(typeof(Color)));
+        //            break;
+        //        case "labelAdditionalColor":
+        //            if (!(_boat is DrawningMotorBoat))
+        //            {
+        //                return;
+        //            }
+        //            ((EntityMotorBoat)_boat.EntityBoat).ChangeAdditionalColor((Color)e.Data?.GetData(typeof(Color)));
+        //            break;
+        //    }
+        //    DrawObject();
+        //}
+
+        /// <summary>
+        /// Передача объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAdd_Click(object sender, EventArgs e)
+        {
+            if (_boat != null)
+            {
+                BoatDelegate?.Invoke(_boat);
+                Close();
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/FormBoatConfig.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>

MotorBoat/MotorBoat/FormMotorBoat.Designer.cs

@@ -29,11 +29,12 @@
         private void InitializeComponent()
         {
             pictureBoxMotorBoat = new PictureBox();
-            buttonCreateMotorBoat = new Button();
             buttonRight = new Button();
             buttonUp = new Button();
             buttonLeft = new Button();
             buttonDown = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).BeginInit();
             SuspendLayout();
             // 
@@ -46,17 +47,6 @@
             pictureBoxMotorBoat.TabIndex = 0;
             pictureBoxMotorBoat.TabStop = false;
             // 
-            // buttonCreateMotorBoat
-            // 
-            buttonCreateMotorBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreateMotorBoat.Location = new Point(12, 345);
-            buttonCreateMotorBoat.Name = "buttonCreateMotorBoat";
-            buttonCreateMotorBoat.Size = new Size(75, 23);
-            buttonCreateMotorBoat.TabIndex = 1;
-            buttonCreateMotorBoat.Text = "Создать";
-            buttonCreateMotorBoat.UseVisualStyleBackColor = true;
-            buttonCreateMotorBoat.Click += ButtonCreateMotorBoat_Click;
-            // 
             // buttonRight
             // 
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -105,16 +95,39 @@
             buttonDown.UseVisualStyleBackColor = true;
             buttonDown.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(712, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(117, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonStrategyStep.Location = new Point(712, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(116, 23);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
             // FormMotorBoat
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(841, 380);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonDown);
             Controls.Add(buttonLeft);
             Controls.Add(buttonUp);
             Controls.Add(buttonRight);
-            Controls.Add(buttonCreateMotorBoat);
             Controls.Add(pictureBoxMotorBoat);
             Name = "FormMotorBoat";
             Text = "Моторная лодка";
@@ -125,10 +138,11 @@
         #endregion
 
         private PictureBox pictureBoxMotorBoat;
-        private Button buttonCreateMotorBoat;
         private Button buttonRight;
         private Button buttonUp;
         private Button buttonLeft;
         private Button buttonDown;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

MotorBoat/MotorBoat/FormMotorBoat.cs

@@ -1,4 +1,7 @@
-namespace MotorBoat
+using MotorBoat.Drawnings;
+using MotorBoat.MovementStratagy;
+
+namespace MotorBoat
 {
     /// <summary>
     /// Форма работы с объектом
@@ -8,7 +11,27 @@
         /// <summary>
         /// Поле-объект для прорисовки объекта
         /// </summary>
-        private DrawningMotorBoat? _drawningMotorBoat;
+        private DrawningBoat? _drawningBoat;
+
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
+        /// <summary>
+        /// Получение объекта 
+        /// </summary>
+        public DrawningBoat SetBoat
+        {
+            set
+            {
+                _drawningBoat = value;
+                _drawningBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }
 
         /// <summary>
         /// Конструктор формы
@@ -16,6 +39,7 @@
         public FormMotorBoat()
         {
             InitializeComponent();
+            _strategy = null;
         }
 
         /// <summary>
@@ -23,35 +47,17 @@
         /// </summary>
         private void Draw()
         {
-            if (_drawningMotorBoat == null)
+            if (_drawningBoat == null)
             {
                 return;
             }
 
             Bitmap bmp = new(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawningMotorBoat.DrawTransport(gr);
+            _drawningBoat.DrawTransport(gr);
             pictureBoxMotorBoat.Image = bmp;
         }
 
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreateMotorBoat_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawningMotorBoat = new DrawningMotorBoat();
-            _drawningMotorBoat.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)), Convert.ToBoolean(random.Next(0, 2)));
-            _drawningMotorBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
-            _drawningMotorBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-
         /// <summary>
         /// Перемещение объекта по форме (нажатие кнопок навигации)
         /// </summary>
@@ -59,7 +65,7 @@
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_drawningMotorBoat == null)
+            if (_drawningBoat == null)
             {
                 return;
             }
@@ -69,16 +75,16 @@
             switch (name)
             {
                 case "buttonUp":
-                    result = _drawningMotorBoat.MoveTransport(DirectionType.Up);
+                    result = _drawningBoat.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    result = _drawningMotorBoat.MoveTransport(DirectionType.Down);
+                    result = _drawningBoat.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    result = _drawningMotorBoat.MoveTransport(DirectionType.Left);
+                    result = _drawningBoat.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    result = _drawningMotorBoat.MoveTransport(DirectionType.Right);
+                    result = _drawningBoat.MoveTransport(DirectionType.Right);
                     break;
             }
 
@@ -87,5 +93,43 @@
                 Draw();
             }
         }
+
+        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 MoveableCar(_drawningBoat), pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+            }
+
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
     }
 }

MotorBoat/MotorBoat/MotorBoat.csproj

@@ -8,6 +8,11 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -23,4 +28,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

MotorBoat/MotorBoat/MovementStratagy/AbstractStrategy.cs

@@ -0,0 +1,140 @@
+namespace MotorBoat.MovementStratagy
+{
+    /// <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;
+        }
+    }
+}

MotorBoat/MotorBoat/MovementStratagy/IMoveableObject.cs

@@ -0,0 +1,25 @@
+namespace MotorBoat.MovementStratagy
+{
+    /// <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);
+    }
+}

MotorBoat/MotorBoat/MovementStratagy/MoveToBorder.cs

@@ -0,0 +1,47 @@
+namespace MotorBoat.MovementStratagy
+{
+    /// <summary>
+    /// Стратегия перемещения объекта в правый нижний угол экрана
+    /// </summary>
+    public class MoveToBorder : AbstractStrategy
+    {
+        protected override bool IsTargetDestinaion()
+        {
+            ObjectParameters? objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return false;
+            }
+
+            return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth - 150 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth - 150 &&
+                objParams.ObjectMiddleVertical - GetStep() <= FieldHeight - 60 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight - 60;
+        }
+
+        protected override void MoveToTarget()
+        {
+            ObjectParameters? objParams = GetObjectParameters;
+            if (objParams == null)
+            {
+                return;
+            }
+
+            int diffX = objParams.ObjectMiddleHorizontal - (FieldWidth - 75);
+            if (Math.Abs(diffX) > GetStep())
+            {
+                if (diffX < 0)
+                {
+                    MoveRight();
+                }
+            }
+
+            int diffY = objParams.ObjectMiddleVertical - (FieldWidth - 30);
+            if (Math.Abs(diffY) > GetStep())
+            {
+                if (diffY < 0)
+                {
+                    MoveDown();
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/MovementStratagy/MoveToCenter.cs

@@ -0,0 +1,55 @@
+namespace MotorBoat.MovementStratagy
+{
+    /// <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();
+                }
+            }
+        }
+    }
+}

MotorBoat/MotorBoat/MovementStratagy/MoveableBoat.cs

@@ -0,0 +1,65 @@
+using MotorBoat.Drawnings;
+
+namespace MotorBoat.MovementStratagy
+{
+    /// <summary>
+    /// Класс-реализация IMoveableObject с использованием DrawningCar
+    /// </summary>
+    public class MoveableCar : IMoveableObject
+    {
+        /// <summary>
+        /// Поле-объект класса DrawningBoat или его наследника
+        /// </summary>
+        private readonly DrawningBoat? _boat = null;
+
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="boat">Объект класса DrawningCar</param>
+        public MoveableCar(DrawningBoat boat)
+        {
+            _boat = boat;
+        }
+
+        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, _boat.GetHeight);
+            }
+        }
+
+        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,
+            };
+        }
+    }
+}

MotorBoat/MotorBoat/MovementStratagy/MovementDirections.cs

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

MotorBoat/MotorBoat/MovementStratagy/ObjectParameters.cs

@@ -0,0 +1,73 @@
+namespace MotorBoat.MovementStratagy
+{
+    /// <summary>
+    /// Параметры-координаты объекта
+    /// </summary>
+    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;
+        }
+    }
+}

MotorBoat/MotorBoat/MovementStratagy/StrategyStatus.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.MovementStratagy
+{
+    /// <summary>
+    /// Статус выполнения операции перемещения
+    /// </summary>
+    public enum StrategyStatus
+    {
+        /// <summary>
+        /// Все готово к началу
+        /// </summary>
+        NotInit,
+
+        /// <summary>
+        /// Выполняется
+        /// </summary>
+        InProgress,
+
+        /// <summary>
+        /// Завершено
+        /// </summary>
+        Finish
+    }
+}

MotorBoat/MotorBoat/Program.cs

@@ -1,3 +1,7 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
+
 namespace MotorBoat
 {
     internal static class Program
@@ -11,7 +15,25 @@ namespace MotorBoat
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMotorBoat());
+
+            ServiceCollection services = new();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormBoatCollection>());
+        }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DI
+        /// </summary>
+        /// <param name="services"></param>
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormBoatCollection>()
+                    .AddLogging(option =>
+                    {
+                        option.SetMinimumLevel(LogLevel.Information);
+                        option.AddNLog("nlog.config");
+                    });
         }
     }
 }

MotorBoat/MotorBoat/Properties/Resources.Designer.cs

@@ -99,5 +99,15 @@ namespace MotorBoat.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap White {
+            get {
+                object obj = ResourceManager.GetObject("White", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

MotorBoat/MotorBoat/Properties/Resources.resx

@@ -118,16 +118,19 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\up.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="White" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\White.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

MotorBoat/MotorBoat/nlog.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        autoReload="true" internalLogLevel="Info">
+
+		<targets>
+			<target xsi:type="File" name="tofile" fileName="carlog-${shortdate}.log" />
+		</targets>
+
+		<rules>
+			<logger name="*" minlevel="Debug" writeTo="tofile" />
+		</rules>
+	</nlog>
+</configuration>