fix conflict

ConsoleApp1/ConsoleApp1.sln

@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34525.116
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{D8A4ACE0-0728-47AB-9F80-9EDA475782ED}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp2", "ConsoleApp2\ConsoleApp2.csproj", "{C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8A4ACE0-0728-47AB-9F80-9EDA475782ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1FC7C16-B9EC-4007-BD39-E6B47A89CE34}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3368BA78-2800-49EC-9A71-865DC3C2F15F}
-	EndGlobalSection
-EndGlobal

ConsoleApp1/ConsoleApp1/ConsoleApp1.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>

ConsoleApp1/ConsoleApp1/Program.cs

@@ -1,68 +0,0 @@
-using System.Collections;
-using System;
-
-// Класс компонента компьютера
-public class ComputerComponent
-{
-    public string Name { get; set; }
-    public string Type { get; set; }
-
-    public ComputerComponent(string name, string type)
-    {
-        Name = name;
-        Type = type;
-    }
-}
-
-// АТД Очередь на основе массива
-public class CustomQueue
-{
-    private ArrayList elements = new ArrayList();
-
-    public int Count { get { return elements.Count; } }
-
-    public void Enqueue(ComputerComponent component)
-    {
-        elements.Add(component);
-    }
-
-    public ComputerComponent Dequeue()
-    {
-        if (elements.Count == 0)
-        {
-            throw new InvalidOperationException("Queue is empty");
-        }
-
-        ComputerComponent component = (ComputerComponent)elements[0];
-        elements.RemoveAt(0);
-        return component;
-    }
-
-    public ComputerComponent Peek()
-    {
-        if (elements.Count == 0)
-        {
-            throw new InvalidOperationException("Queue is empty");
-        }
-
-        return (ComputerComponent)elements[0];
-    }
-}
-class Program
-{
-    public static void Main(string[] args)
-    {
-        CustomQueue queue = new CustomQueue();
-
-        // Добавление компонентов в очередь
-        ComputerComponent cpu = new ComputerComponent("Intel Core i7", "CPU");
-        ComputerComponent gpu = new ComputerComponent("Nvidia RTX 3080", "GPU");
-
-        queue.Enqueue(cpu);
-        queue.Enqueue(gpu);
-
-        // Проверка совместимости компонентов в сборке
-        Console.WriteLine("Первый компонент в очереди: {0} ({1})", queue.Peek().Name, queue.Peek().Type);
-        Console.WriteLine("Извлечен компонент из очереди: {0} ({1})", queue.Dequeue().Name, queue.Dequeue().Type);
-    }
-}

ConsoleApp1/ConsoleApp2/ConsoleApp2.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>

ConsoleApp1/ConsoleApp2/Program.cs

@@ -1,113 +0,0 @@
-using System;
-
-// Реализация АТД Очередь
-public class Queue<T>
-{
-    private T[] elements;
-    private int front, rear, size, capacity;
-
-    public Queue(int capacity)
-    {
-        this.capacity = capacity;
-        elements = new T[capacity];
-        front = size = 0;
-        rear = capacity - 1;
-    }
-
-    public void Enqueue(T item)
-    {
-        if (size == capacity)
-            throw new Exception("Queue is full");
-        rear = (rear + 1) % capacity;
-        elements[rear] = item;
-        size++;
-    }
-
-    public T Dequeue()
-    {
-        if (size == 0)
-            throw new Exception("Queue is empty");
-        T item = elements[front];
-        front = (front + 1) % capacity;
-        size--;
-        return item;
-    }
-
-    // Реализация СД Массив
-    public static void SelectionSort(int[] array)
-    {
-        for (int i = 0; i < array.Length - 1; i++)
-        {
-            int minIndex = i;
-            for (int j = i + 1; j < array.Length; j++)
-            {
-                if (array[j] < array[minIndex])
-                {
-                    minIndex = j;
-                }
-            }
-            if (minIndex != i)
-            {
-                int temp = array[i];
-                array[i] = array[minIndex];
-                array[minIndex] = temp;
-            }
-        }
-    }
-
-    // Быстрая сортировка
-    public static void QuickSort(int[] array, int left, int right)
-    {
-        if (left < right)
-        {
-            int pivot = Partition(array, left, right);
-            QuickSort(array, left, pivot - 1);
-            QuickSort(array, pivot + 1, right);
-        }
-    }
-
-    private static int Partition(int[] array, int left, int right)
-    {
-        int pivot = array[right];
-        int i = left - 1;
-        for (int j = left; j < right; j++)
-        {
-            if (array[j] < pivot)
-            {
-                i++;
-                int temp = array[i];
-                array[i] = array[j];
-                array[j] = temp;
-            }
-        }
-        int temp1 = array[i + 1];
-        array[i + 1] = array[right];
-        array[right] = temp1;
-        return i + 1;
-    }
-
-    public static void Main()
-    {
-        int[] array = { 64, 34, 25, 12, 22, 11, 90 };
-
-        // Сортировка выбором
-        Console.WriteLine("Before selection sort:");
-        foreach (var item in array) Console.Write(item + " ");
-        SelectionSort(array);
-        Console.WriteLine("\n\nAfter selection sort:");
-        foreach (var item in array) Console.Write(item + " ");
-
-        // Быстрая сортировка
-        Console.WriteLine("\n\nBefore quick sort:");
-        foreach (var item in array) Console.Write(item + " ");
-        QuickSort(array, 0, array.Length - 1);
-        Console.WriteLine("\n\nAfter quick sort:");
-        foreach (var item in array) Console.Write(item + " ");
-
-        // Использование Очереди
-        Queue<int> queue = new Queue<int>(5);
-        queue.Enqueue(10);
-        queue.Enqueue(20);
-        queue.Dequeue();
-    }
-}

ProjectMotorboat/ProjectMotorboat/BoatDelegate.cs

@@ -1,10 +1,4 @@
 using ProjectMotorboat.Drownings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace ProjectMotorboat;
 
 public delegate void BoatDelegate(DrawningBoat car);

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/AbstractCompany.cs

@@ -1,5 +1,5 @@
-using ProjectMotorboat.CollectionGenericObjects;
-using ProjectMotorboat.Drownings;
+using ProjectMotorboat.Drownings;
+using ProjectMotorboat.Exceptions;
 
 namespace ProjectMotorboat.CollectionGenericObjects;
 
@@ -16,19 +16,18 @@ public abstract class AbstractCompany
 
     protected ICollectionGenericObjects<DrawningBoat>? _collection = null;
 
-    
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
 
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
     public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> collection)
     {
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-        _collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
     public static int operator +(AbstractCompany company, DrawningBoat boat)
     {
-        return company._collection.Insert(boat);
+        return company._collection.Insert(boat, new DrawningBoatEqutables());
     }
 
     public static DrawningBoat operator -(AbstractCompany company, int position)
@@ -49,12 +48,20 @@ public abstract class AbstractCompany
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            DrawningBoat? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
+            try
+            {
+                DrawningBoat? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            catch (ObjectNotFoundException e)
+            { }
+            catch (PositionOutOfCollectionException e)
+            { }
         }
 
         return bitmap;
     }
+    public void Sort(IComparer<DrawningBoat?> comparer) => _collection?.CollectionSort(comparer);
     protected abstract void DrawBackgound(Graphics g);
 
     protected abstract void SetObjectsPosition();

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,45 @@
+namespace ProjectMotorboat.CollectionGenericObjects;
+
+public class CollectionInfo : IEquatable<CollectionInfo>
+{
+    public string Name { get; private set; }
+    public CollectionType CollectionType { get; private set; }
+    public string Description { get; private set; }
+    private static readonly string _separator = "-";
+    public CollectionInfo(string name, CollectionType collectionType, string description)
+    {
+        Name = name;
+        CollectionType = collectionType;
+        Description = description;
+    }
+    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();
+    }
+}

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/CollectionType.cs

@@ -1,14 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.CollectionGenericObjects;
-
+namespace ProjectMotorboat.CollectionGenericObjects;
 public enum CollectionType
 {
-   
 	None = 0,
     Massive = 1,
     List = 2

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/HarborService.cs

@@ -1,9 +1,7 @@
-using ProjectMotorboat.CollectionGenericObjects;
-using ProjectMotorboat.Drownings;
+using ProjectMotorboat.Drownings;
+using ProjectMotorboat.Exceptions;
 
 namespace ProjectMotorboat.CollectionGenericObjects;
-
-
 public class HarborService : AbstractCompany
 {
     public HarborService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningBoat> collection) : base(picWidth, picHeight, collection)
@@ -36,12 +34,13 @@ public class HarborService : AbstractCompany
 
         for (int i = 0; i < (_collection?.Count ?? 0); i++)
         {
-            if (_collection.Get(i) != null)
+           try
             {
                 _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
                 _collection.Get(i).SetPosition(_placeSizeWidth * boatWidth + 20, boatHeight * _placeSizeHeight + 20);
             }
-
+            catch (ObjectNotFoundException) { }
+            catch (PositionOutOfCollectionException e) { }
             if (boatWidth < width - 1)
                 boatWidth++;
             else

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,20 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.CollectionGenericObjects;
+namespace ProjectMotorboat.CollectionGenericObjects;
 
 public interface ICollectionGenericObjects<T>
 
     where T : class
 {
     int Count { get; }
-    int SetMaxCount { set; }
-    int Insert(T obj);
-    int Insert(T obj, int position);
+    int MaxCount { get; set; }
+    int Insert(T obj, IEqualityComparer<T?>? comparer = null);
+    int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
     T Remove(int position);
     T? Get(int position);
+    CollectionType GetCollectionType { get; }
+    IEnumerable<T> GetItems();
+    void CollectionSort(IComparer<T?> comparer);
 }
 

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,71 +1,101 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using ProjectMotorboat.Exceptions;
 namespace ProjectMotorboat.CollectionGenericObjects;
 
 public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
 where T : class
 {
-    /// <summary>
-    /// Список объектов, которые храним
-    /// </summary>
+   
     private readonly List<T?> _collection;
 
-    /// <summary>
-    /// Максимально допустимое число объектов в списке
-    /// </summary>
+    public CollectionType GetCollectionType => CollectionType.List;
+
+    
     private int _maxCount;
 
     public int Count => _collection.Count;
 
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    public int MaxCount
+    {
+        get
+        {
+            return Count;
+        }
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
 
-    /// <summary>
-    /// Конструктор
-    /// </summary>
     public ListGenericObjects()
     {
         _collection = new();
     }
 
-    public T? Get(int position)
+    public T Get(int position)
     {
-        // TODO проверка позиции
-        if (position >= Count || position < 0) return null;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         return _collection[position];
     }
-
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
-        // TODO проверка, что не превышено максимальное количество элементов
-        // TODO вставка в конец набора
-        if (Count + 1 > _maxCount) return -1;
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new CollectionOverflowException();
+            }
+        }
+        if (Count == _maxCount)
+        {
+            throw new CollectionOverflowException(Count);
+        }
         _collection.Add(obj);
         return Count;
     }
 
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
-        // TODO проверка, что не превышено максимальное количество элементов
-        // TODO проверка позиции
-        // TODO вставка по позиции
-        if (Count + 1 > _maxCount) return -1;
-        if (position < 0 || position > Count) return -1;
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new CollectionOverflowException();
+            }
+        }
+        if (Count == _maxCount)
+        {
+            throw new CollectionOverflowException(Count);
+        }
+        if (position >= Count || position < 0)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
         _collection.Insert(position, obj);
-        return 1;
+        return position;
     }
 
-    public T? Remove(int position)
+    public T Remove(int position)
     {
-        // TODO проверка позиции
-        // TODO удаление объекта из списка
-        if (position < 0 || position > Count) return null;
-        T? pos = _collection[position];
+
+        if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
+        T obj = _collection[position];
         _collection.RemoveAt(position);
-        return pos;
+        return obj;
+    }
+
+    public IEnumerable<T> GetItems()
+    {
+        for (int i = 0; i < Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
     }
 }

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,17 +1,25 @@
-namespace ProjectMotorboat.CollectionGenericObjects;
+using ProjectMotorboat.Exceptions;
+
+namespace ProjectMotorboat.CollectionGenericObjects;
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     where T : class
 {
-   
+
     private T?[] _collection;
+
     public int Count => _collection.Length;
-    public int SetMaxCount
+
+    public int MaxCount
     {
+        get
+        {
+            return _collection.Length;
+        }
         set
         {
             if (value > 0)
             {
-                if (_collection.Length > 0)
+                if (Count > 0)
                 {
                     Array.Resize(ref _collection, value);
                 }
@@ -22,7 +30,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
     }
-    
+
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
     public MassiveGenericObjects()
     {
         _collection = Array.Empty<T?>();
@@ -30,15 +40,34 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position < 0 || position >= _collection.Length)
-        {
-            return null;
-        }
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
         return _collection[position];
     }
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
-        for (int i = 0; i < _collection.Length; i++)
+        return Insert(obj, 0, comparer);
+    }
+
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
+    {
+        if (position < 0 || position >= Count)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new CollectionOverflowException();
+            }
+        }
+        if (_collection[position] == null)
+        {
+            _collection[position] = obj;
+            return position;
+        }
+        for (int i = position + 1; i < Count; i++)
         {
             if (_collection[i] == null)
             {
@@ -46,52 +75,41 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
                 return i;
             }
         }
-
-        return -1;
-    }
-    public int Insert(T obj, int position)
-    {
-        if (position < 0 || position >= _collection.Length) { return position; }
-
-        if (_collection[position] == null)
+        for (int i = position - 1; i >= 0; i--)
         {
-            _collection[position] = obj;
-            return position;
-        }
-        else
-        {
-            for (int i = position + 1; i < _collection.Length; i++)
+            if (_collection[i] == null)
             {
-                if (_collection[i] == null)
-                {
-                    _collection[i] = obj;
-                    return i;
-                }
-            }
-
-            for (int i = position - 1; i >= 0; i--)
-            {
-                if (_collection[i] == null)
-                {
-                    _collection[i] = obj;
-                    return i;
-                }
+                _collection[i] = obj;
+                return i;
             }
         }
-
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
+
     public T Remove(int position)
     {
-        if (position < 0 || position >= _collection.Length)
-        {
-            return null;
-        }
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
 
-        T? obj = _collection[position];
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+
+        T? temp = _collection[position];
         _collection[position] = null;
+        return temp;
+    }
 
-        return obj;
+    public IEnumerable<T> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        Array.Sort(_collection, comparer);
     }
 }
 
+
+
+

ProjectMotorboat/ProjectMotorboat/CollectionGenericObjects/StorageCollection.cs

@@ -1,60 +1,172 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using ProjectMotorboat.Drownings;
+using ProjectMotorboat.Exceptions;
 namespace ProjectMotorboat.CollectionGenericObjects;
 
 public class StorageCollection<T>
-    where T : class
+    where T : DrawningBoat
 {
-    
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
 
-    public List<string> Keys => _storages.Keys.ToList();
+    private Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
+
+    public List<CollectionInfo> Keys => _storages.Keys.ToList();
 
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
     }
-
-    
     public void AddCollection(string name, CollectionType collectionType)
     {
-        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
-        // TODO Прописать логику для добавления
-        if (name == null || _storages.ContainsKey(name)) { return; }
-        switch (collectionType)
-
+        CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty);
+        if (_storages.ContainsKey(collectionInfo))
         {
-            case CollectionType.None:
-                return;
-            case CollectionType.Massive:
-                _storages[name] = new MassiveGenericObjects<T>();
-                return;
-            case CollectionType.List:
-                _storages[name] = new ListGenericObjects<T>();
-                return;
+            return;
+        }
+        if (collectionType == CollectionType.None)
+        {
+            return;
+        }
+        else if (collectionType == CollectionType.Massive)
+        {
+            _storages[collectionInfo] = new MassiveGenericObjects<T>();
+        }
+        else if (collectionType == CollectionType.List)
+        {
+            _storages[collectionInfo] = new ListGenericObjects<T>();
         }
     }
-
-   
     public void DelCollection(string name)
     {
-        // TODO Прописать логику для удаления коллекции
-        if (_storages.ContainsKey(name))
-            _storages.Remove(name);
+        CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+        if (_storages.ContainsKey(collectionInfo))
+        {
+            _storages.Remove(collectionInfo);
+        }
     }
-
-   
     public ICollectionGenericObjects<T>? this[string name]
     {
         get
         {
-            // TODO Продумать логику получения объекта
-            if (name == null || !_storages.ContainsKey(name)) { return null; }
-            return _storages[name];
+            CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+            if (_storages.ContainsKey(collectionInfo))
+            {
+                return _storages[collectionInfo];
+            }
+            return null;
         }
     }
-}
+
+    private readonly string _collectionKey = "CollectionsStorage";
+
+    private readonly string _separatorForKeyValue = "|";
+
+    private readonly string _separatorItems = ";";
+    public void SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            throw new ArgumentException("В хранилище отсутствуют коллекции для сохранения");
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        using (StreamWriter writer = new StreamWriter(filename))
+        {
+            writer.Write(_collectionKey);
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
+            {
+                writer.Write(Environment.NewLine);
+               
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+                writer.Write(value.Key);
+                writer.Write(_separatorForKeyValue);
+                writer.Write(value.Value.MaxCount);
+                writer.Write(_separatorForKeyValue);
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+                    writer.Write(data);
+                    writer.Write(_separatorItems);
+                }
+            }
+        }
+    }
+    public void LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            throw new FileNotFoundException("Файл не существует");
+        }
+
+        using (StreamReader read = File.OpenText(filename))
+        {
+            string str = read.ReadLine();
+
+            if (str == null || str.Length == 0)
+            {
+                throw new FormatException("В файле нет данных");
+            }
+
+            if (!str.StartsWith(_collectionKey))
+            {
+                throw new FormatException("В файле неверные данные");
+            }
+
+            _storages.Clear();
+            string strs = "";
+            while ((strs = read.ReadLine()) != null)
+            {
+                string[] record = strs.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 InvalidOperationException("Не удалось создать коллекцию");
+
+                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) == -1)
+                            {
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new CollectionOverflowException("Коллекция переполнена", ex);
+                        }
+                    }
+                }
+                _storages.Add(collectionInfo, collection);
+            }
+        }
+    }
+
+    private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
+}

ProjectMotorboat/ProjectMotorboat/Drownings/DirectionType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.Drownings
+namespace ProjectMotorboat.Drownings
 {
     public enum DirectionType
     {

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoat.cs

@@ -1,10 +1,4 @@
 using ProjectMotorboat.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace ProjectMotorboat.Drownings;
 
 public class DrawningBoat
@@ -51,6 +45,11 @@ public class DrawningBoat
         _drawningBoatHeight = drawningBoatHeight;
         
     }
+
+    public DrawningBoat(EntityBoat ship) : this()
+    {
+        EntityBoat = new EntityBoat(ship.Speed, ship.Weight, ship.BodyColor);
+    }
     public bool SetPictureSize(int width, int height)
     {
         if (_drawningBoatWidth < width && _drawningBoatHeight < height)
@@ -109,28 +108,28 @@ public class DrawningBoat
         }
         switch (direction)
         {
-            //влево
+            
             case DirectionType.Left:
                 if (_startPosX.Value - EntityBoat.Step > 0)
                 {
                     _startPosX -= (int)EntityBoat.Step;
                 }
                 return true;
-            //вверх
+            
             case DirectionType.Up:
                 if (_startPosY.Value - EntityBoat.Step > 0)
                 {
                     _startPosY -= (int)EntityBoat.Step;
                 }
                 return true;
-            // вправо
+           
             case DirectionType.Right:
                 if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth)
                 {
                     _startPosX += (int)EntityBoat.Step;
                 }
                 return true;
-            //вниз
+      
             case DirectionType.Down:
                 if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight)
                 {
@@ -141,8 +140,6 @@ public class DrawningBoat
                 return false;
         }
     }
-
-
     public virtual void DrawTransport(Graphics g)
     {
         if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
@@ -150,7 +147,7 @@ public class DrawningBoat
         Pen pen = new(Color.Black);
         Brush mainBrush = new SolidBrush(EntityBoat.BodyColor);
 
-        // корпус
+        
         Point[] hull = new Point[]
         {
                 new Point(_startPosX.Value + 5, _startPosY.Value + 0),
@@ -162,7 +159,7 @@ public class DrawningBoat
         g.FillPolygon(mainBrush, hull);
         g.DrawPolygon(pen, hull);
 
-        // основная часть
+        
         Brush blockBrush = new SolidBrush(EntityBoat.BodyColor);
         g.FillRectangle(blockBrush, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);
         g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 15, 80, 40);

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoatCompareByColor.cs

@@ -0,0 +1,30 @@
+namespace ProjectMotorboat.Drownings;
+
+public class DrawningBoatCompareByColor : 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.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);
+    }
+}

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoatCompareByType.cs

@@ -0,0 +1,30 @@
+namespace ProjectMotorboat.Drownings;
+
+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);
+    }
+}

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningBoatEqutables.cs

@@ -0,0 +1,66 @@
+using ProjectMotorboat.Entities;
+using System.Diagnostics.CodeAnalysis;
+namespace ProjectMotorboat.Drownings;
+
+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)
+        {
+            EntityMotorboat EntityX = (EntityMotorboat)x.EntityBoat;
+            EntityMotorboat EntityY = (EntityMotorboat)y.EntityBoat;
+
+            if (EntityX.Glass != EntityY.Glass)
+            {
+                return false;
+            }
+
+            if (EntityX.Motor != EntityY.Motor)
+            {
+                return false;
+            }
+
+            if (EntityX.AdditionalColor != EntityY.AdditionalColor)
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningBoat obj)
+    {
+        return obj.GetHashCode();
+    }
+}

ProjectMotorboat/ProjectMotorboat/Drownings/DrawningMotorboat.cs

@@ -1,5 +1,4 @@
 using ProjectMotorboat.Entities;
-
 namespace ProjectMotorboat.Drownings;
 
 public class DrawningMotorboat : DrawningBoat
@@ -9,6 +8,12 @@ public class DrawningMotorboat : DrawningBoat
         EntityBoat = new EntityMotorboat(speed, weight, bodyColor, additionalColor, motor, glass);
         
     }
+
+    public DrawningMotorboat(EntityMotorboat boat) : base(129, 80)
+    {
+        EntityBoat = new EntityMotorboat(boat.Speed, boat.Weight, boat.BodyColor, boat.AdditionalColor, boat.Motor, boat.Glass);
+    }
+
     public override void DrawTransport(Graphics g)
     {
         if (EntityBoat == null || EntityBoat is not EntityMotorboat motorboat|| !_startPosX.HasValue || !_startPosY.HasValue)
@@ -20,15 +25,12 @@ public class DrawningMotorboat : DrawningBoat
         Brush additionalBrush = new SolidBrush(motorboat.AdditionalColor);
 
         base.DrawTransport(g);
-
-        // стекло впереди
         if (motorboat.Glass)
         {
             Brush glassBrush = new SolidBrush(Color.LightBlue);
             g.FillEllipse(glassBrush, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
             g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 15, 100, 40);
         }
-        // двигатель 
         if (motorboat.Motor)
         {
             Brush engineBrush = new

ProjectMotorboat/ProjectMotorboat/Drownings/ExtentionDrawningBoat.cs

@@ -0,0 +1,34 @@
+using ProjectMotorboat.Entities;
+namespace ProjectMotorboat.Drownings;
+public static class ExtentionDrawningBoat
+{
+    private static readonly string _separatorForObject = ":";
+
+    public static DrawningBoat? CreateDrawningBoat(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityBoat? boat = EntityMotorboat.CreateEntityMotorboat(strs);
+        if (boat != null)
+        {
+            return new DrawningMotorboat((EntityMotorboat)boat);
+        }
+
+        boat = EntityBoat.CreateEntityBoat(strs);
+        if (boat != null)
+        {
+            return new DrawningBoat(boat);
+        }
+        return null;
+    }
+    public static string GetDataForSave(this DrawningBoat drawningBoat)
+    {
+        string[]? array = drawningBoat?.EntityBoat?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+}

ProjectMotorboat/ProjectMotorboat/Entities/EntityBoat.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.Entities;
-
+namespace ProjectMotorboat.Entities;
 public class EntityBoat
 {
     public int Speed { get; private set; }
@@ -26,4 +19,17 @@ public class EntityBoat
         Weight = weight;
         BodyColor = bodyColor;
     }
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityBoat), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+    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]));
+    }
 }

ProjectMotorboat/ProjectMotorboat/Entities/EntityMotorboat.cs

@@ -20,4 +20,12 @@ public class EntityMotorboat : EntityBoat
         Motor = motor;
         Glass = glass;
     }
+    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]));
+    }
 }

ProjectMotorboat/ProjectMotorboat/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,18 @@
+
+using System.Runtime.Serialization;
+
+namespace ProjectMotorboat.Exceptions;
+
+[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) { }
+}

ProjectMotorboat/ProjectMotorboat/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,15 @@
+using System.Runtime.Serialization;
+namespace ProjectMotorboat.Exceptions;
+[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) { }
+}

ProjectMotorboat/ProjectMotorboat/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,17 @@
+using System.Runtime.Serialization;
+
+namespace ProjectMotorboat.Exceptions;
+[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) { }
+}

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.Designer.cs

@@ -46,10 +46,19 @@
             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
@@ -59,15 +68,17 @@
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(1027, 0);
+            groupBoxTools.Location = new Point(967, 28);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(231, 746);
+            groupBoxTools.Size = new Size(231, 681);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
             // panelCompanyTools
             // 
+            panelCompanyTools.Controls.Add(buttonSortByColor);
+            panelCompanyTools.Controls.Add(buttonSortByType);
             panelCompanyTools.Controls.Add(buttonAddBoat);
             panelCompanyTools.Controls.Add(maskedTextBox);
             panelCompanyTools.Controls.Add(buttonRefresh);
@@ -75,9 +86,9 @@
             panelCompanyTools.Controls.Add(buttonGoToCheck);
             panelCompanyTools.Dock = DockStyle.Bottom;
             panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 418);
+            panelCompanyTools.Location = new Point(3, 359);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(225, 325);
+            panelCompanyTools.Size = new Size(225, 319);
             panelCompanyTools.TabIndex = 7;
             // 
             // buttonAddBoat
@@ -85,7 +96,7 @@
             buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
             buttonAddBoat.Location = new Point(3, 3);
             buttonAddBoat.Name = "buttonAddBoat";
-            buttonAddBoat.Size = new Size(219, 54);
+            buttonAddBoat.Size = new Size(219, 30);
             buttonAddBoat.TabIndex = 1;
             buttonAddBoat.Text = "Добавление лодки";
             buttonAddBoat.UseVisualStyleBackColor = true;
@@ -93,7 +104,7 @@
             // 
             // maskedTextBox
             // 
-            maskedTextBox.Location = new Point(3, 123);
+            maskedTextBox.Location = new Point(3, 39);
             maskedTextBox.Mask = "00";
             maskedTextBox.Name = "maskedTextBox";
             maskedTextBox.Size = new Size(219, 27);
@@ -103,9 +114,9 @@
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 276);
+            buttonRefresh.Location = new Point(3, 156);
             buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(219, 54);
+            buttonRefresh.Size = new Size(219, 31);
             buttonRefresh.TabIndex = 6;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
@@ -114,9 +125,9 @@
             // buttonDelBoat
             // 
             buttonDelBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonDelBoat.Location = new Point(3, 156);
+            buttonDelBoat.Location = new Point(3, 72);
             buttonDelBoat.Name = "buttonDelBoat";
-            buttonDelBoat.Size = new Size(222, 54);
+            buttonDelBoat.Size = new Size(222, 37);
             buttonDelBoat.TabIndex = 4;
             buttonDelBoat.Text = "удалить лодку";
             buttonDelBoat.UseVisualStyleBackColor = true;
@@ -125,9 +136,9 @@
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 216);
+            buttonGoToCheck.Location = new Point(3, 115);
             buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(219, 54);
+            buttonGoToCheck.Size = new Size(219, 35);
             buttonGoToCheck.TabIndex = 5;
             buttonGoToCheck.Text = "Передать на тесты";
             buttonGoToCheck.UseVisualStyleBackColor = true;
@@ -135,7 +146,7 @@
             // 
             // buttonCreateCompany
             // 
-            buttonCreateCompany.Location = new Point(6, 383);
+            buttonCreateCompany.Location = new Point(3, 324);
             buttonCreateCompany.Name = "buttonCreateCompany";
             buttonCreateCompany.Size = new Size(222, 29);
             buttonCreateCompany.TabIndex = 8;
@@ -155,12 +166,12 @@
             panelStorage.Dock = DockStyle.Top;
             panelStorage.Location = new Point(3, 23);
             panelStorage.Name = "panelStorage";
-            panelStorage.Size = new Size(225, 320);
+            panelStorage.Size = new Size(225, 261);
             panelStorage.TabIndex = 7;
             // 
             // buttonCollectionDel
             // 
-            buttonCollectionDel.Location = new Point(0, 251);
+            buttonCollectionDel.Location = new Point(0, 220);
             buttonCollectionDel.Name = "buttonCollectionDel";
             buttonCollectionDel.Size = new Size(222, 29);
             buttonCollectionDel.TabIndex = 6;
@@ -171,14 +182,14 @@
             // listBoxCollection
             // 
             listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.Location = new Point(3, 141);
+            listBoxCollection.Location = new Point(3, 130);
             listBoxCollection.Name = "listBoxCollection";
-            listBoxCollection.Size = new Size(213, 104);
+            listBoxCollection.Size = new Size(213, 84);
             listBoxCollection.TabIndex = 5;
             // 
             // buttonCollectionAdd
             // 
-            buttonCollectionAdd.Location = new Point(3, 106);
+            buttonCollectionAdd.Location = new Point(0, 95);
             buttonCollectionAdd.Name = "buttonCollectionAdd";
             buttonCollectionAdd.Size = new Size(222, 29);
             buttonCollectionAdd.TabIndex = 4;
@@ -189,7 +200,7 @@
             // radioButtonList
             // 
             radioButtonList.AutoSize = true;
-            radioButtonList.Location = new Point(121, 76);
+            radioButtonList.Location = new Point(136, 65);
             radioButtonList.Name = "radioButtonList";
             radioButtonList.Size = new Size(80, 24);
             radioButtonList.TabIndex = 3;
@@ -200,7 +211,7 @@
             // radioButtonMassive
             // 
             radioButtonMassive.AutoSize = true;
-            radioButtonMassive.Location = new Point(13, 76);
+            radioButtonMassive.Location = new Point(14, 65);
             radioButtonMassive.Name = "radioButtonMassive";
             radioButtonMassive.Size = new Size(82, 24);
             radioButtonMassive.TabIndex = 2;
@@ -210,7 +221,7 @@
             // 
             // textBoxCollectionName
             // 
-            textBoxCollectionName.Location = new Point(3, 43);
+            textBoxCollectionName.Location = new Point(3, 32);
             textBoxCollectionName.Name = "textBoxCollectionName";
             textBoxCollectionName.Size = new Size(219, 27);
             textBoxCollectionName.TabIndex = 1;
@@ -218,7 +229,7 @@
             // labelCollectionName
             // 
             labelCollectionName.AutoSize = true;
-            labelCollectionName.Location = new Point(43, 20);
+            labelCollectionName.Location = new Point(31, 9);
             labelCollectionName.Name = "labelCollectionName";
             labelCollectionName.Size = new Size(158, 20);
             labelCollectionName.TabIndex = 0;
@@ -230,7 +241,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 349);
+            comboBoxSelectorCompany.Location = new Point(6, 290);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(213, 28);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -239,19 +250,80 @@
             // pictureBox
             // 
             pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+            pictureBox.Location = new Point(0, 28);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(1027, 746);
+            pictureBox.Size = new Size(967, 681);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
+            // menuStrip
+            // 
+            menuStrip.ImageScalingSize = new Size(20, 20);
+            menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1198, 28);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip";
+            // 
+            // файлToolStripMenuItem
+            // 
+            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            файлToolStripMenuItem.Size = new Size(59, 24);
+            файлToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+            saveToolStripMenuItem.Size = new Size(227, 26);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+            loadToolStripMenuItem.Size = new Size(227, 26);
+            loadToolStripMenuItem.Text = "загрузка";
+            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonSortByColor.Location = new Point(3, 259);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(219, 31);
+            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(3, 218);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(219, 35);
+            buttonSortByType.TabIndex = 7;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += ButtonSortByType_Click;
+            // 
             // FormBoatCollection
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1258, 746);
+            ClientSize = new Size(1198, 709);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
             Name = "FormBoatCollection";
             Text = "Коллекция лодок";
             groupBoxTools.ResumeLayout(false);
@@ -260,7 +332,10 @@
             panelStorage.ResumeLayout(false);
             panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
@@ -283,5 +358,13 @@
         private Button buttonCollectionDel;
         private Button buttonCreateCompany;
         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;
     }
 }

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.cs

@@ -1,83 +1,61 @@
-using ProjectMotorboat.CollectionGenericObjects;
+using Microsoft.Extensions.Logging;
+using ProjectMotorboat.CollectionGenericObjects;
 using ProjectMotorboat.Drownings;
 
 namespace ProjectMotorboat;
 
-/// <summary>
-/// Форма работы с компанией и ее коллекцией
-/// </summary>
 public partial class FormBoatCollection : Form
-{ 
+{
     private readonly StorageCollection<DrawningBoat> _storageCollection;
 
-    /// <summary>
-    /// Компания
-    /// </summary>
     private AbstractCompany? _company = null;
 
-    /// <summary>
-    /// Конструктор
-    /// </summary>
-    public FormBoatCollection()
+    private readonly ILogger _logger;
+
+    public FormBoatCollection(ILogger<FormBoatCollection> logger)
     {
         InitializeComponent();
         _storageCollection = new();
+        _logger = logger;
+        _logger.LogInformation("Форма загрузилась");
     }
 
-    /// <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();
-        // TODO передать метод
+        form.Show();
         form.AddEvent(SetBoat);
 
-        form.Show();
     }
-    private void SetBoat(DrawningBoat? boat)
+    private void SetBoat(DrawningBoat boat)
     {
         if (_company == null || boat == null)
         {
             return;
         }
-
-        if (_company + boat != -1)
+        try
         {
+            var res = _company + boat;
             MessageBox.Show("Объект добавлен");
+            _logger.LogInformation($"Объект добавлен под индексом {res}");
             pictureBox.Image = _company.Show();
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось добавить объект");
+            MessageBox.Show($"Такой объект уже присутствует в коллекции", "Результат", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
-
     }
 
 
-
-    /// <summary>
-    /// Создание объекта класса-перемещения
-    /// </summary>
-    /// <param name="type">Тип создаваемого объекта</param>
-
-    /// <summary>
-    /// Удаление объекта
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
     private void ButtonRemoveBoat_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
@@ -85,28 +63,30 @@ public partial class FormBoatCollection : Form
             return;
         }
 
-        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
+            DialogResult.Yes)
         {
             return;
         }
 
         int pos = Convert.ToInt32(maskedTextBox.Text);
-        if (_company - pos != null)
+        try
         {
+            var res = _company - pos;
             MessageBox.Show("Объект удален");
+            _logger.LogInformation($"Объект удален под индексом {pos}");
             pictureBox.Image = _company.Show();
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show(ex.Message, "Не удалось удалить объект",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
-    /// <summary>
-    /// Передача объекта в другую форму
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
+
+
     private void ButtonGoToCheck_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -125,12 +105,10 @@ public partial class FormBoatCollection : Form
                 break;
             }
         }
-
         if (boat == null)
         {
             return;
         }
-
         FormMotorboat form = new()
         {
             SetBoat = boat
@@ -138,11 +116,7 @@ public partial class FormBoatCollection : Form
         form.ShowDialog();
     }
 
-    /// <summary>
-    /// Перерисовка коллекции
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
+
     private void ButtonRefresh_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -155,7 +129,8 @@ public partial class FormBoatCollection : Form
 
     private void ButtonCollectionAdd_Click(object sender, EventArgs e)
     {
-        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) ||
+            (!radioButtonList.Checked && !radioButtonMassive.Checked))
         {
             MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             return;
@@ -171,22 +146,36 @@ public partial class FormBoatCollection : Form
             collectionType = CollectionType.List;
         }
 
-        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-        RerfreshListBoxItems();
+        try
+        {
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            _logger.LogInformation("Добавление коллекции");
+            RerfreshListBoxItems();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+        }
+
     }
 
     private void ButtonCollectionDel_Click(object sender, EventArgs e)
     {
-        if (listBoxCollection.SelectedItem == null)
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
         {
             MessageBox.Show("Коллекция не выбрана");
             return;
         }
-        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
+            DialogResult.Yes)
         {
             return;
         }
+
         _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        _logger.LogInformation("Коллекция удалена");
         RerfreshListBoxItems();
     }
 
@@ -195,7 +184,7 @@ public partial class FormBoatCollection : Form
         listBoxCollection.Items.Clear();
         for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
         {
-            string? colName = _storageCollection.Keys?[i];
+            string? colName = _storageCollection.Keys?[i].Name;
             if (!string.IsNullOrEmpty(colName))
             {
                 listBoxCollection.Items.Add(colName);
@@ -211,7 +200,8 @@ public partial class FormBoatCollection : Form
             return;
         }
 
-        ICollectionGenericObjects<DrawningBoat>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        ICollectionGenericObjects<DrawningBoat>? collection =
+            _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
         if (collection == null)
         {
             MessageBox.Show("Коллекция не проинициализирована");
@@ -222,10 +212,66 @@ public partial class FormBoatCollection : Form
         {
             case "Хранилище":
                 _company = new HarborService(pictureBox.Width, pictureBox.Height, collection);
+                _logger.LogInformation("Компания создана");
                 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("Не сохранилось", "Результат", 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);
+                RerfreshListBoxItems();
+                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);
+            }
+        }
+    }
+
+    private void ButtonSortByType_Click(object sender, EventArgs e)
+    {
+        CompareBoat(new DrawningBoatCompareByType());
+    }
+
+    private void ButtonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareBoat(new DrawningBoatCompareByColor());
+    }
+    private void CompareBoat(IComparer<DrawningBoat?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
+    }
+}

ProjectMotorboat/ProjectMotorboat/FormBoatCollection.resx

@@ -117,4 +117,16 @@
   <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>145, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>310, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

ProjectMotorboat/ProjectMotorboat/FormBoatConfig.cs

@@ -1,22 +1,12 @@
 using ProjectMotorboat.Drownings;
 using ProjectMotorboat.Entities;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
 namespace ProjectMotorboat
 {
     public partial class FormBoatConfig : Form
     {
         private DrawningBoat? _boat;
 
-        private event BoatDelegate? BoatDelegate;
+        private event Action<DrawningBoat>? BoatDelegate;
         public FormBoatConfig()
         {
             InitializeComponent();
@@ -32,9 +22,16 @@ namespace ProjectMotorboat
             buttonCancel.Click += (sender, e) => Close();
         }
 
-        public void AddEvent(BoatDelegate boatDelegate)
+        public void AddEvent(Action<DrawningBoat> boatDelegate)
         {
-            BoatDelegate += boatDelegate;
+            if (BoatDelegate != null)
+            {
+                BoatDelegate = boatDelegate;
+            }
+            else
+            {
+                BoatDelegate += boatDelegate;
+            }
         }
 
         private void DrawObject()
@@ -74,11 +71,9 @@ namespace ProjectMotorboat
 
         private void Panel_MouseDown(object? sender, MouseEventArgs e)
         {
-            // TODO отправка цвета в Drag&Drop
             (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
 
         }
-        // Логика смены цветов: основного и дополнительного (для продвинутого объекта)
         private void LabelBodyColor_DragEnter(object sender, DragEventArgs e)
         {
             if (e.Data?.GetDataPresent(typeof(Color)) ?? false)

ProjectMotorboat/ProjectMotorboat/MovementStrategy/AbstractStrategy.cs

@@ -1,30 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.MovementStrategy;
-
-
+namespace ProjectMotorboat.MovementStrategy;
 public abstract class AbstractStrategy
 {
-    
     private IMoveableObject? _moveableObject;
 
-    
     private StrategyStatus _state = StrategyStatus.NotInit;
 
-    
     protected int FieldWidth { get; private set; }
 
-    
     protected int FieldHeight { get; private set; }
 
-    
     public StrategyStatus GetStatus() { return _state; }
 
-    
     public void SetData(IMoveableObject moveableObject, int width, int height)
     {
         if (moveableObject == null)
@@ -39,7 +25,6 @@ public abstract class AbstractStrategy
         FieldHeight = height;
     }
 
-    
     public void MakeStep()
     {
         if (_state != StrategyStatus.InProgress)
@@ -56,22 +41,16 @@ public abstract class AbstractStrategy
         MoveToTarget();
     }
 
-   
     protected bool MoveLeft() => MoveTo(MovementDirection.Left);
 
-   
     protected bool MoveRight() => MoveTo(MovementDirection.Right);
 
-    
     protected bool MoveUp() => MoveTo(MovementDirection.Up);
 
-   
     protected bool MoveDown() => MoveTo(MovementDirection.Down);
 
-    
     protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
 
-    
     protected int? GetStep()
     {
         if (_state != StrategyStatus.InProgress)
@@ -81,13 +60,10 @@ public abstract class AbstractStrategy
         return _moveableObject?.GetStep;
     }
 
-    
     protected abstract void MoveToTarget();
 
-    
     protected abstract bool IsTargetDestinaion();
 
-   
     private bool MoveTo(MovementDirection movementDirection)
     {
         if (_state != StrategyStatus.InProgress)

ProjectMotorboat/ProjectMotorboat/MovementStrategy/IMoveableObject.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.MovementStrategy;
+namespace ProjectMotorboat.MovementStrategy;
 
 public interface IMoveableObject
 {
@@ -12,7 +6,6 @@ public interface IMoveableObject
     ObjectParameters? GetObjectPosition { get; }
 
     int GetStep { get; }
-
     
     bool TryMoveObject(MovementDirection direction);
 }

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToBorder.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.MovementStrategy;
+namespace ProjectMotorboat.MovementStrategy;
 public class MoveToBorder : AbstractStrategy
 {
     protected override bool IsTargetDestinaion()

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveToCenter.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace ProjectMotorboat.MovementStrategy;
 public class MoveToCenter : AbstractStrategy
 {

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MoveableBoat.cs

@@ -1,9 +1,4 @@
 using ProjectMotorboat.Drownings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ProjectMotorboat.MovementStrategy;
 

ProjectMotorboat/ProjectMotorboat/MovementStrategy/MovementDirection.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.MovementStrategy;
+namespace ProjectMotorboat.MovementStrategy;
 
 public enum MovementDirection
 {

ProjectMotorboat/ProjectMotorboat/MovementStrategy/ObjectParameters.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectMotorboat.MovementStrategy;
+namespace ProjectMotorboat.MovementStrategy;
 
 public class ObjectParameters
 {

ProjectMotorboat/ProjectMotorboat/MovementStrategy/StrategyStatus.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace ProjectMotorboat.MovementStrategy;
 
 public enum StrategyStatus

ProjectMotorboat/ProjectMotorboat/Program.cs

@@ -1,17 +1,43 @@
-namespace ProjectMotorboat
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
+namespace ProjectMotorboat;
+
+internal static class Program
 {
-    internal static class Program
+    [STAThread]
+    static void Main()
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
+        // To customize application configuration such as set high DPI settings or default font,
+        // see https://aka.ms/applicationconfiguration.
+        ApplicationConfiguration.Initialize();
+        var services = new ServiceCollection();
+        ConfigureServices(services);
+        using (ServiceProvider serviceProvider = services.BuildServiceProvider())
         {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(new FormBoatCollection());
+            Application.Run(serviceProvider.GetRequiredService<FormBoatCollection>());
         }
     }
+
+    private static void ConfigureServices(ServiceCollection services)
+    {
+        services.AddSingleton<FormBoatCollection>().AddLogging(option =>
+        {
+            string[] path = Directory.GetCurrentDirectory().Split('\\');
+            string pathNeed = "";
+            for (int i = 0; i < path.Length - 3; i++)
+            {
+                pathNeed += path[i] + "\\";
+            }
+
+            var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile(path: $"{pathNeed}serilogConfig.json", optional: false, reloadOnChange: true)
+                .Build();
+            var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
+            option.SetMinimumLevel(LogLevel.Information);
+            option.AddSerilog(logger);
+        });
+    }
 }

ProjectMotorboat/ProjectMotorboat/ProjectMotorboat.csproj

@@ -8,4 +8,19 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.10" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="serilogConfig.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

ProjectMotorboat/ProjectMotorboat/serilogConfig.json

@@ -0,0 +1,20 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/log_.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+    "Properties": {
+      "Application": "Motorboat"
+    }
+  }
+}

WinFormsApp1/WinFormsApp1.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34525.116
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsApp1", "WinFormsApp1\WinFormsApp1.csproj", "{50092433-6AF5-4E71-9559-079AE2F9901A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50092433-6AF5-4E71-9559-079AE2F9901A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {59C3FED6-0E53-4AF0-9E1B-5ACF902ED5CE}
-	EndGlobalSection
-EndGlobal

WinFormsApp1/WinFormsApp1/Form1.Designer.cs

@@ -1,39 +0,0 @@
-namespace WinFormsApp1
-{
-    partial class Form1
-    {
-        /// <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()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "Form1";
-        }
-
-        #endregion
-    }
-}

WinFormsApp1/WinFormsApp1/Form1.cs

@@ -1,10 +0,0 @@
-namespace WinFormsApp1
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

WinFormsApp1/WinFormsApp1/Form1.resx

@@ -1,120 +0,0 @@
-<?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>

WinFormsApp1/WinFormsApp1/Program.cs

@@ -1,17 +0,0 @@
-namespace WinFormsApp1
-{
-    internal static class Program
-    {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            // To customize application configuration such as set high DPI settings or default font,
-            // see https://aka.ms/applicationconfiguration.
-            ApplicationConfiguration.Initialize();
-            Application.Run(new Form1());
-        }
-    }
-}

WinFormsApp1/WinFormsApp1/WinFormsApp1.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-</Project>