готова к сдаче

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs

@@ -1,4 +1,5 @@
 using ProjectContainerShip.Drawnings;
+using ProjectContainerShip.Exceptions;
 
 namespace ProjectContainerShip.CollectionGenericObjects;
 /// <summary>
@@ -34,7 +35,7 @@ public abstract class AbstractCompany
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместить в окне
     /// </summary>
-    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
 
     /// <summary>
     /// Конструктор
@@ -54,11 +55,11 @@ public abstract class AbstractCompany
     /// Перегрузка оператора сложения для класса
     /// </summary>
     /// <param name="company">Компания</param>
-    /// <param name="ship">Добавляемый объект</param>
+    /// <param name="boat">Добавляемый объект</param>
     /// <returns></returns>
     public static int operator +(AbstractCompany company, DrawningShip boat)
     {
-        return company._collection?.Insert(boat) ?? -1;
+        return company._collection?.Insert(boat, new DrawningShipEqutables()) ?? -1;
     }
 
     /// <summary>
@@ -72,6 +73,7 @@ public abstract class AbstractCompany
         return company._collection?.Remove(position) ?? null;
     }
 
+
     /// <summary>
     /// Получение случайного объекта из коллекции
     /// </summary>
@@ -95,8 +97,12 @@ public abstract class AbstractCompany
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            DrawningShip? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
+            try
+            {
+                DrawningShip? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }
+            catch (Exception) { }
         }
 
         return bitmap;
@@ -113,4 +119,9 @@ public abstract class AbstractCompany
     /// </summary>
     protected abstract void SetObjectsPosition();
 
+    /// <summary>
+    /// Сортировка
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    public void Sort(IComparer<DrawningShip?> comparer) => _collection?.CollectionSort(comparer);
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/CollectionInfo.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.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();
+    }
+}

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -19,7 +19,7 @@ public interface ICollectionGenericObjects <T>
     /// </summary>
     /// <param name="obj">Добавляемый объект</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert (T obj);
+    int Insert(T obj, IEqualityComparer<T?>? comparer = null);
 
     /// <summary>
     /// Добавление объекта в коллекцию на конкретную позицию
@@ -27,7 +27,7 @@ public interface ICollectionGenericObjects <T>
     /// /// <param name="obj">Добавляемый объект</param>
     /// /// <param name="position">Позиция</param>
     /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-    int Insert (T obj, int position);
+    int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
 
     /// <summary>
     /// Удаление объекта из коллекции с конктретной позиции
@@ -53,4 +53,10 @@ public interface ICollectionGenericObjects <T>
     /// </summary>
     /// <returns>Поэлементый вывод элементов коллекции</returns>
     IEnumerable<T?> GetItems();
+
+    /// <summary>
+    /// Сортировка коллекции
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    void CollectionSort(IComparer<T?> comparer);
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,4 +1,5 @@
-using System;
+using ProjectContainerShip.Exceptions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -49,50 +50,59 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= 0 && position < Count)
-        {
-            return _collection[position];
-        }
-        else
-        {
-            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)
     {
-        if (Count == _maxCount) { return -1; }
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectIsEqualException();
+            }
+        }
+        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)
     {
-        if (position < 0 || position >= Count || Count == _maxCount)
+        if (comparer != null)
         {
-            return -1;
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectIsEqualException();
+            }
         }
-        _collection.Insert(position, obj);
+        if (position < 0 || position >= Count)
+            throw new PositionOutOfCollectionException(position);
 
+        if (Count == _maxCount)
+            throw new CollectionOverflowException(Count);
+        _collection.Insert(position, obj);
         return position;
 
     }
 
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) return null;
-        T? obj = _collection[position];
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+        T obj = _collection[position];
         _collection.RemoveAt(position);
         return obj;
     }
 
-    public IEnumerable<T?> GetItems()
+        public IEnumerable<T?> GetItems()
     {
         for (int i = 0; i < _collection.Count; ++i)
         {
             yield return _collection[i];
         }
     }
-
+    void ICollectionGenericObjects<T>.CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
+    }
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,7 @@
-namespace ProjectContainerShip.CollectionGenericObjects;
+using ProjectContainerShip.Drawnings;
+using ProjectContainerShip.Exceptions;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -48,24 +51,45 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= 0 && position < Count)
+        if (position >= _collection.Length || position < 0) throw new PositionOutOfCollectionException(position);
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
+        return _collection[position];
+    }
+
+    public int Insert(T obj, IEqualityComparer<T?> comparer = null)
+    {
+        if (comparer != null)
         {
-            return _collection[position];
+            foreach (T? item in _collection)
+            {
+                if ((comparer as IEqualityComparer<DrawningShip>).Equals(obj as DrawningShip, item as DrawningShip))
+                    throw new ObjectIsEqualException();
+            }
         }
-
-        return null;
+        for (int i = 0; i < Count; i++)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return i;
+            }
+        }
+        throw new CollectionOverflowException(Count);
     }
 
-    public int Insert(T obj)
-    {
-        return Insert(obj, 0);
-    }
-
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
+        if (comparer != null)
+        {
+            foreach (T? item in _collection)
+            {
+                if ((comparer as IEqualityComparer<DrawningShip>).Equals(obj as DrawningShip, item as DrawningShip))
+                    throw new ObjectIsEqualException();
+            }
+        }
         if (position < 0 || position >= Count)
         {
-            return -1;
+            throw new PositionOutOfCollectionException(position);
         }
         if (_collection[position] == null)
         {
@@ -90,15 +114,16 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
 
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
     public T Remove(int position)
     {
         if (position < 0 || position >= Count)
         {
-            return null;
+            throw new PositionOutOfCollectionException(position);
         }
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
         T obj = _collection[position];
         _collection[position] = null;
         return obj;
@@ -111,4 +136,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+
+    void ICollectionGenericObjects<T>.CollectionSort(IComparer<T?> comparer)
+    {
+        Array.Sort(_collection, comparer);
+    }
 }

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs

@@ -1,4 +1,5 @@
 using ProjectContainerShip.Drawnings;
+using ProjectContainerShip.Exceptions;
 
 namespace ProjectContainerShip.CollectionGenericObjects;
 
@@ -18,6 +19,11 @@ public class ShipSharingService : AbstractCompany
 
     protected override void DrawBackground(Graphics g)
     {
+        Color backgroundColor = Color.SkyBlue;
+        using (Brush brush = new SolidBrush(backgroundColor))
+        {
+            g.FillRectangle(brush, new Rectangle(0, 0, _pictureWidth, _pictureHeight));
+        }
         Pen pen = new Pen(Color.Brown, 3);
         int offsetX = 10, offsetY = -12;
         int x = 1 + offsetX, y = _pictureHeight - _placeSizeHeight + offsetY;
@@ -29,7 +35,7 @@ public class ShipSharingService : AbstractCompany
             {
                 numCols++;
                 g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y);
-                g.DrawLine(pen, x, y, x, y + _placeSizeHeight + 8);
+                g.DrawLine(pen, x, y, x, y + _placeSizeHeight + 4);
                 locCoord.Add(new Tuple<int, int>(x, y));
                 x += _placeSizeWidth + 2;
             }
@@ -48,8 +54,12 @@ public class ShipSharingService : AbstractCompany
         int row = numRows - 1, col = numCols;
         for (int i = 0; i < _collection?.Count; i++, col--)
         {
-            _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
-            _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+            try
+            {
+                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+                _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+            }
+            catch (Exception) { }
             if (col == 1)
             {
                 col = numCols + 1;

ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/StorageCollection.cs

@@ -1,4 +1,5 @@
 using ProjectContainerShip.Drawnings;
+using ProjectContainerShip.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,13 +18,13 @@ public class StorageCollection<T>
     /// <summary>
 	/// Словарь (хранилище) с коллекциями
 	/// </summary>
-	readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+	readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
 
 
     /// <summary>
     /// Возвращение списка названий коллекций
     /// </summary>
-    public List<string> Keys => _storages.Keys.ToList();
+    public List<CollectionInfo> Keys => _storages.Keys.ToList();
 
     /// <summary>
     /// Ключевое слово, с которого должен начинаться файл
@@ -46,10 +47,10 @@ public class StorageCollection<T>
     /// </summary>
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
     }
 
-   
+
     /// <summary>
     /// Добавление коллекции в хранилище
     /// </summary>
@@ -57,17 +58,18 @@ public class StorageCollection<T>
     /// <param name="collectionType">тип коллекции</param>
     public void AddCollection(string name, CollectionType collectionType)
     {
-        if (string.IsNullOrEmpty(name) || _storages.ContainsKey(name))
+        CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty);
+        if (_storages.ContainsKey(collectionInfo))
         {
             return;
         }
         switch (collectionType)
         {
             case CollectionType.Massive:
-                _storages[name] = new MassiveGenericObjects<T>();
+                _storages[collectionInfo] = new MassiveGenericObjects<T>();
                 break;
             case CollectionType.List:
-                _storages[name] = new ListGenericObjects<T>();
+                _storages[collectionInfo] = new ListGenericObjects<T>();
                 break;
             default:
                 return;
@@ -80,9 +82,10 @@ public class StorageCollection<T>
     /// <param name="name">Название коллекции</param>
     public void DelCollection(string name)
     {
-        if (_storages.ContainsKey(name))
+        CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+        if (_storages.ContainsKey(collectionInfo))
         {
-            _storages.Remove(name);
+            _storages.Remove(collectionInfo);
         }
 
     }
@@ -96,10 +99,9 @@ public class StorageCollection<T>
     {
         get
         {
-            if (_storages.ContainsKey(name))
-            {
-                return _storages[name];
-            }
+            CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+            if (_storages.ContainsKey(collectionInfo))
+                return _storages[collectionInfo];
             return null;
         }
     }
@@ -109,11 +111,11 @@ public class StorageCollection<T>
 	/// </summary>
 	/// <param name="filename">Путь и имя файла</param>
 	/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-    public bool SaveData(string filename)
+    public void SaveData(string filename)
     {
         if (_storages.Count == 0)
         {
-            return false;
+            throw new Exception("В хранилище отсутствуют коллекции для сохранения");
         }
 
         if (File.Exists(filename))
@@ -126,15 +128,13 @@ public class StorageCollection<T>
         using (StreamWriter sw = new StreamWriter(filename))
         {
             sw.WriteLine(_collectionKey.ToString());
-            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> kvpair in _storages)
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> kvpair in _storages)
             {
                 // не сохраняем пустые коллекции
                 if (kvpair.Value.Count == 0)
                     continue;
                 sb.Append(kvpair.Key);
                 sb.Append(_separatorForKeyValue);
-                sb.Append(kvpair.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
                 sb.Append(kvpair.Value.MaxCount);
                 sb.Append(_separatorForKeyValue);
                 foreach (T? item in kvpair.Value.GetItems())
@@ -149,58 +149,68 @@ public class StorageCollection<T>
                 sb.Clear();
             }
         }
-        return true;
     }
 
+
     /// <summary>
 	/// Загрузка информации по автомобилям в хранилище из файла
 	/// </summary>
 	/// <param name="filename">Путь и имя файла</param>
 	/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
-	public bool LoadData(string filename)
+	public void LoadData(string filename)
     {
         if (!File.Exists(filename))
         {
-            return false;
+            throw new Exception("Файл не существует");
         }
 
         using (StreamReader sr = new StreamReader(filename))
         {
             string? str;
             str = sr.ReadLine();
-            if (str != _collectionKey.ToString())
-                return false;
+            if (str == null || str.Length == 0)
+                throw new Exception("В файле нет данных");
+            if (!str.StartsWith(_collectionKey))
+                throw new Exception("В файле неверные данные");
             _storages.Clear();
-            while ((str = sr.ReadLine()) != null)
+            string strs = "";
+            while ((strs = sr.ReadLine()) != null)
             {
-                string[] record = str.Split(_separatorForKeyValue);
-                if (record.Length != 4)
+                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 3)
                 {
                     continue;
                 }
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ??
+                    throw new Exception("Не удалось определить информацию коллекции: " + record[0]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
+                    throw new Exception("Не удалось создать коллекцию");
                 if (collection == null)
                 {
-                    return false;
+                    throw new Exception("Не удалось создать коллекцию");
                 }
-
-                collection.MaxCount = Convert.ToInt32(record[2]);
-
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                collection.MaxCount = Convert.ToInt32(record[1]);
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
                 foreach (string elem in set)
                 {
-                    if (elem?.CreateDrawningShip() is T boat)
+                    if (elem?.CreateDrawningShip() is T ship)
                     {
-                        if (collection.Insert(boat) == -1)
-                            return false;
+                        try
+                        {
+                            if (collection.Insert(ship) == -1)
+                            {
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
+                        }
                     }
                 }
-                _storages.Add(record[0], collection);
+                _storages.Add(collectionInfo, collection);
             }
         }
-
-        return true;
     }
 
     /// <summary>

ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningShipCompareByColor.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.Drawnings;
+
+public class DrawningShipCompareByColor : IComparer<DrawningShip?>
+{
+    public int Compare(DrawningShip? x, DrawningShip? y)
+    {
+        if (x == null || x.EntityShip == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityShip == null)
+        {
+            return -1;
+        }
+        var bodycolorCompare = x.EntityShip.BodyColor.Name.CompareTo(y.EntityShip.BodyColor.Name);
+        if (bodycolorCompare != 0)
+        {
+            return bodycolorCompare;
+        }
+        var speedCompare = x.EntityShip.Speed.CompareTo(y.EntityShip.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityShip.Weight.CompareTo(y.EntityShip.Weight);
+    }
+}

ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningShipCompareByType.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.Drawnings;
+
+public class DrawningShipCompareByType : IComparer<DrawningShip?>
+{
+    public int Compare(DrawningShip? x, DrawningShip? y)
+    {
+        if (x == null || x.EntityShip == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityShip == null)
+        {
+            return -1;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return x.GetType().Name.CompareTo(y.GetType().Name);
+        }
+
+        var speedCompare = x.EntityShip.Speed.CompareTo(y.EntityShip.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        return x.EntityShip.Weight.CompareTo(y.EntityShip.Weight);
+    }
+}

ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningShipEqutables.cs

@@ -0,0 +1,62 @@
+using ProjectContainerShip.Entities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.Drawnings;
+
+public class DrawningShipEqutables : IEqualityComparer<DrawningShip>
+{
+    public bool Equals(DrawningShip? x, DrawningShip? y)
+    {
+        if (x == null || x.EntityShip == null)
+        {
+            return false;
+        }
+        if (y == null || y.EntityShip == null)
+        {
+            return false;
+        }
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+        if (x.EntityShip.Speed != y.EntityShip.Speed)
+        {
+            return false;
+        }
+        if (x.EntityShip.Weight != y.EntityShip.Weight)
+        {
+            return false;
+        }
+        if (x.EntityShip.BodyColor != y.EntityShip.BodyColor)
+        {
+            return false;
+        }
+        if (x is DrawningContainerShip && y is DrawningContainerShip)
+        {
+            EntityContainerShip _x = (EntityContainerShip)x.EntityShip;
+            EntityContainerShip _y = (EntityContainerShip)x.EntityShip;
+            if (_x.AdditionalColor != _y.AdditionalColor)
+            {
+                return false;
+            }
+            if (_x.Crane != _y.Crane)
+            {
+                return false;
+            }
+            if (_x.Container != _y.Container)
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+    public int GetHashCode([DisallowNull] DrawningShip obj)
+    {
+        return obj.GetHashCode();
+    }
+}

ProjectContainerShip/ProjectContainerShip/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.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) { }
+}

ProjectContainerShip/ProjectContainerShip/Exceptions/ObjectIsEqualException.cs

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

ProjectContainerShip/ProjectContainerShip/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.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) { }
+}

ProjectContainerShip/ProjectContainerShip/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip.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) { }
+}

ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs

@@ -52,6 +52,8 @@
             loadToolStripMenuItem = new ToolStripMenuItem();
             saveFileDialog = new SaveFileDialog();
             openFileDialog = new OpenFileDialog();
+            ButtonSortByColor = new Button();
+            ButtonSortByType = new Button();
             groupBoxTools.SuspendLayout();
             panelCompanyTools.SuspendLayout();
             panelStorage.SuspendLayout();
@@ -66,15 +68,17 @@
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(935, 25);
+            groupBoxTools.Location = new Point(947, 25);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(206, 644);
+            groupBoxTools.Size = new Size(206, 738);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
             // panelCompanyTools
             // 
+            panelCompanyTools.Controls.Add(ButtonSortByColor);
+            panelCompanyTools.Controls.Add(ButtonSortByType);
             panelCompanyTools.Controls.Add(buttonAddShip);
             panelCompanyTools.Controls.Add(maskedTextBoxPosition);
             panelCompanyTools.Controls.Add(buttonRefresh);
@@ -83,7 +87,7 @@
             panelCompanyTools.Enabled = false;
             panelCompanyTools.Location = new Point(6, 386);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(197, 246);
+            panelCompanyTools.Size = new Size(197, 346);
             panelCompanyTools.TabIndex = 9;
             // 
             // buttonAddShip
@@ -251,7 +255,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 25);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(935, 644);
+            pictureBox.Size = new Size(947, 738);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -260,7 +264,7 @@
             menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(1141, 25);
+            menuStrip.Size = new Size(1153, 25);
             menuStrip.TabIndex = 2;
             menuStrip.Text = "menuStrip";
             // 
@@ -296,11 +300,35 @@
             openFileDialog.FileName = "openFileDialog1";
             openFileDialog.Filter = "txt file | *.txt";
             // 
+            // ButtonSortByColor
+            // 
+            ButtonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            ButtonSortByColor.Location = new Point(6, 289);
+            ButtonSortByColor.Name = "ButtonSortByColor";
+            ButtonSortByColor.RightToLeft = RightToLeft.No;
+            ButtonSortByColor.Size = new Size(191, 34);
+            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(6, 246);
+            ButtonSortByType.Name = "ButtonSortByType";
+            ButtonSortByType.RightToLeft = RightToLeft.No;
+            ButtonSortByType.Size = new Size(191, 34);
+            ButtonSortByType.TabIndex = 7;
+            ButtonSortByType.Text = "Сортировка по типу";
+            ButtonSortByType.UseVisualStyleBackColor = true;
+            ButtonSortByType.Click += ButtonSortByType_Click;
+            // 
             // FormShipCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1141, 669);
+            ClientSize = new Size(1153, 763);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Controls.Add(menuStrip);
@@ -345,5 +373,7 @@
         private ToolStripMenuItem loadToolStripMenuItem;
         private SaveFileDialog saveFileDialog;
         private OpenFileDialog openFileDialog;
+        private Button ButtonSortByColor;
+        private Button ButtonSortByType;
     }
 }

ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs

@@ -1,6 +1,8 @@
 using ProjectContainerShip.CollectionGenericObjects;
 using ProjectContainerShip.Drawnings;
 using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
+using ProjectContainerShip.Exceptions;
 
 
 namespace ProjectContainerShip
@@ -20,15 +22,23 @@ namespace ProjectContainerShip
         /// </summary>
         private readonly StorageCollection<DrawningShip> _storageCollection;
 
+        /// <summary>
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+
         /// <summary>
         /// Конструктор
         /// </summary>
-        public FormShipCollection()
+        public FormShipCollection(ILogger<FormShipCollection> logger)
         {
             InitializeComponent();
             _storageCollection = new();
+            _logger = logger;
+            _logger.LogInformation("Форма загрузилась");
         }
 
+        #region Работа с компанией
         /// <summary>
         /// Выбор компании
         /// </summary>
@@ -59,19 +69,30 @@ namespace ProjectContainerShip
         /// <param name="boat"></param>
         private void SetShip(DrawningShip? ship)
         {
-            if (_company == null || ship == null)
+            try
             {
-                return;
-            }
+                if (_company == null || ship == null)
+                {
+                    return;
+                }
 
-            if (_company + ship != -1)
-            {
-                MessageBox.Show("Объект добавлен");
-                pictureBox.Image = _company.Show();
+                if (_company + ship != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _company.Show();
+                    _logger.LogInformation("Добавлен объект: " + ship.GetDataForSave());
+                }
             }
-            else
+            catch (ObjectNotFoundException) { }
+            catch (CollectionOverflowException ex)
             {
-                MessageBox.Show("Не удалось добавить объект");
+                MessageBox.Show("В коллекции превышено допустимое количество элементов");
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+            catch (ObjectIsEqualException ex)
+            {
+                MessageBox.Show("Такой объект уже существует в коллекции");
+                _logger.LogError("Ошибка: {Message}", ex.Message);
             }
         }
 
@@ -82,25 +103,31 @@ namespace ProjectContainerShip
         /// <param name="e"></param>
         private void ButtonDelShip_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
-            {
-                return;
-            }
-
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
-            {
-                return;
-            }
-
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_company - pos != null)
+            try
             {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _company.Show();
+                if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+                {
+                    throw new Exception("Входные данные отсутствуют");
+                }
+
+                if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+                {
+                    return;
+                }
+
+
+                if (_company - pos != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    pictureBox.Image = _company.Show();
+                    _logger.LogInformation("Объект удален");
+                }
             }
-            else
+            catch (Exception ex)
             {
-                MessageBox.Show("Не удалось удалить объект");
+                MessageBox.Show("Не найден объект по позиции " + pos);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
             }
         }
 
@@ -118,24 +145,32 @@ namespace ProjectContainerShip
 
             DrawningShip? ship = null;
             int counter = 100;
-            while (ship == null)
+            try
             {
-                ship = _company.GetRandomObject();
-                counter--;
-                if (counter <= 0)
+                while (ship == null)
                 {
-                    break;
+                    ship = _company.GetRandomObject();
+                    counter--;
+                    if (counter <= 0)
+                    {
+                        break;
+                    }
                 }
-            }
 
-            if (ship == null)
+                if (ship == null)
+                {
+                    return;
+                }
+
+                FormContainerShip form = new FormContainerShip();
+                form.SetShip = ship;
+                form.ShowDialog();
+            }
+            catch (Exception ex)
             {
-                return;
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
 
-            FormContainerShip form = new FormContainerShip();
-            form.SetShip = ship;
-            form.ShowDialog();
         }
 
         /// <summary>
@@ -152,7 +187,8 @@ namespace ProjectContainerShip
 
             pictureBox.Image = _company.Show();
         }
-
+        #endregion
+        #region Работа с коллекцией
         /// <summary>
         /// Добавление коллекции
         /// </summary>
@@ -163,6 +199,7 @@ namespace ProjectContainerShip
             if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
             {
                 MessageBox.Show("Не все данный заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogInformation("Не удалось добавить коллекцию: не все данные заполнены");
                 return;
             }
             CollectionType collectionType = CollectionType.None;
@@ -176,6 +213,7 @@ namespace ProjectContainerShip
             }
 
             _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            _logger.LogInformation("Добавлена коллекция типа {type} с названием {name}", collectionType, textBoxCollectionName.Text);
             RefreshListBoxItems();
         }
 
@@ -187,7 +225,7 @@ namespace ProjectContainerShip
             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);
@@ -208,12 +246,22 @@ namespace ProjectContainerShip
                 MessageBox.Show("Коллекция не выбрана");
                 return;
             }
-            if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+
+            try
             {
-                return;
+                if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                {
+                    return;
+                }
+                _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+                RefreshListBoxItems();
+                _logger.LogInformation("Удалена коллекция: ", listBoxCollection.SelectedItem.ToString());
             }
-            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-            RefreshListBoxItems();
+            catch (Exception ex)
+            {
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+
         }
 
         /// <summary>
@@ -241,11 +289,13 @@ namespace ProjectContainerShip
                 case "Хранилище":
                     _company = new ShipSharingService(pictureBox.Width, pictureBox.Height, collection);
                     break;
+                default:
+                    return;
             }
-
             panelCompanyTools.Enabled = true;
             RefreshListBoxItems();
         }
+        #endregion
 
         /// <summary>
         /// Обработка нажатия "Сохранение"
@@ -256,13 +306,16 @@ namespace ProjectContainerShip
         {
             if (saveFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_storageCollection.SaveData(saveFileDialog.FileName))
+                try
                 {
+                    _storageCollection.SaveData(saveFileDialog.FileName);
                     MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
                 }
-                else
+                catch (Exception ex)
                 {
-                    MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError("Ошибка: {Message}", ex.Message);
                 }
             }
         }
@@ -276,16 +329,39 @@ namespace ProjectContainerShip
         {
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_storageCollection.LoadData(openFileDialog.FileName))
+                try
                 {
+                    _storageCollection.LoadData(openFileDialog.FileName);
                     RefreshListBoxItems();
-                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
                 }
-                else
+                catch (Exception ex)
                 {
                     MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError("Ошибка: {Message}", ex.Message);
                 }
             }
         }
+
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            CompareShip(new DrawningShipCompareByType());
+        }
+
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            CompareShip(new DrawningShipCompareByColor());
+        }
+
+        private void CompareShip(IComparer<DrawningShip?> comparer)
+        {
+            if (_company == null)
+            {
+                return;
+            }
+            _company.Sort(comparer);
+            pictureBox.Image = _company.Show();
+        }
     }
 }

ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs

@@ -145,9 +145,9 @@ public partial class FormShipConfig : Form
 
     private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
     {
-        if (_ship?.EntityShip is EntityContainerShip _catamaran)
+        if (_ship?.EntityShip is EntityContainerShip _containerShip)
         {
-            _catamaran.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+            _containerShip.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
         }
         DrawObject();
 

ProjectContainerShip/ProjectContainerShip/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+
 namespace ProjectContainerShip
 {
     internal static class Program
@@ -11,7 +16,27 @@ namespace ProjectContainerShip
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormShipCollection());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormShipCollection>());
+        }
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            string[] path = Directory.GetCurrentDirectory().Split('\\');
+            string pathNeed = "";
+            for (int i = 0; i < path.Length - 3; i++)
+            {
+                pathNeed += path[i] + "\\";
+            }
+
+            services.AddSingleton<FormShipCollection>()
+            .AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(new LoggerConfiguration().ReadFrom.Configuration(new ConfigurationBuilder().
+                    AddJsonFile($"{pathNeed}appSetting.json").Build()).CreateLogger());
+            });
         }
     }
 }

ProjectContainerShip/ProjectContainerShip/ProjectContainerShip.csproj

@@ -8,6 +8,16 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -23,4 +33,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appSetting.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

ProjectContainerShip/ProjectContainerShip/appSetting.json

@@ -0,0 +1,15 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Debug",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": { "path": "log.log" }
+      }
+    ],
+    "Properties": {
+      "Applicatoin": "Sample"
+    }
+  }
+}