Лабораторная работа №8

Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs

@@ -57,9 +57,9 @@ public abstract class AbstractCompany
     /// <param name="company">Компания</param>
     /// <param name="car">Добавляемый объект</param>
     /// <returns></returns>
-    public static int operator +(AbstractCompany company, DrawningSimpleExcavator car)
+    public static int operator +(AbstractCompany company, DrawningSimpleExcavator excavator)
     {
-        return company._collection.Insert(car);
+        return company._collection.Insert(excavator, new DrawningExcavatorEqutables());
     }
 
     /// <summary>
@@ -103,6 +103,12 @@ public abstract class AbstractCompany
         return bitmap;
     }
 
+    /// <summary>
+    /// Сортировка
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    public void Sort(IComparer<DrawningSimpleExcavator?> comparer) => _collection?.CollectionSort(comparer);
+
     /// <summary>
     /// Вывод заднего фона
     /// </summary>

Excavator/Excavator/CollectionGenericObjects/CollectionInfo.cs

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

Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -22,7 +22,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>
     /// Добавление объекта в коллекцию на конкретную позицию
@@ -30,7 +30,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>
     /// Удаление объекта из коллекции с конкретной позиции
@@ -57,4 +57,10 @@ public interface ICollectionGenericObjects<T>
     /// </summary>
     /// <returns>Поэлементный вывод элементов коллекции</returns>
     IEnumerable<T?> GetItems();
+
+    /// <summary>
+    /// Сортировка коллекции
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    void CollectionSort(IComparer<T?> comparer);
 }

Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Excavator.Exceptions;
 
 namespace Excavator.CollectionGenericObjects;
 
@@ -45,27 +41,42 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T Get(int position)
     {
-        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)
     {
-        if (Count == _maxCount) return -1;
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectNotUniqueException();
+            }
+        }
+        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 (Count == _maxCount) return -1;
-        if (position >= Count || position < 0) return -1;
+        if (comparer != null)
+        {
+            if (_collection.Contains(obj, comparer))
+            {
+                throw new ObjectNotUniqueException();
+            }
+        }
+        
+        if (Count == _maxCount) throw new CollectionOverflowException(Count); ;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         _collection.Insert(position, obj);
         return position;
     }
 
     public T Remove(int position)
     {
-        if (position >= Count || position < 0) return null;
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         T temp = _collection[position];
         _collection.RemoveAt(position);
         return temp;
@@ -78,5 +89,9 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+    void ICollectionGenericObjects<T>.CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
+    }
 
 }

Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,4 +1,8 @@
-namespace Excavator.CollectionGenericObjects;
+using Excavator.Exceptions;
+using Excavator.Drawnings;
+using System.Collections.Immutable;
+
+namespace Excavator.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -51,15 +55,25 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         // TODO проверка позиции
         if (position < 0 || position >= Count)
         {
-            return null;
+            throw new PositionOutOfCollectionException(position);
         }
 
         return _collection[position];
     }
 
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
-        for(int i = 0; i < Count; i++)
+        if (comparer != null)
+        {
+            foreach (T? item in _collection)
+            {
+                if ((comparer as IEqualityComparer<DrawningSimpleExcavator>).Equals(obj as DrawningSimpleExcavator, item as DrawningSimpleExcavator))
+                {
+                    throw new ObjectNotUniqueException();
+                }
+            }
+        }
+        for (int i = 0; i < Count; i++)
         {
             if (_collection[i] == null)
             {
@@ -67,21 +81,16 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
                 return i;
             }
          }
-        
-        return -1;
+
+        throw new CollectionOverflowException(Count);
     }
 
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
-        // TODO проверка позиции
-        // TODO проверка, что элемент массима по этой позиции пустой,
-        // если элемент массима по этой позиции не пустой,
-        // найти свободное место после этой позиции, если не найдено,
-        // то искать до
-        // TODO вставка
+        
         if (position < 0 || position >= Count)
         {
-            return -1;
+            throw new PositionOutOfCollectionException(position);
         }
 
         if (_collection[position] == null)
@@ -110,14 +119,18 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
 
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
 
     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];
+        if (obj == null)
+        {
+            throw new ObjectNotFoundException(position);
+        }
         _collection[position] = null;
         return obj;
     }
@@ -129,4 +142,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             yield return _collection[i];
         }
     }
+
+    void ICollectionGenericObjects<T>.CollectionSort(IComparer<T?> comparer)
+    {
+        Array.Sort(_collection, comparer);
+    }
 } 

Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs

@@ -1,5 +1,6 @@
 using Excavator.Drawnings;
 using System.Text;
+using Excavator.Exceptions;
 
 namespace Excavator.CollectionGenericObjects;
 
@@ -8,12 +9,12 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// <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>
     /// Ключевое слово, с которого должен начинаться файл
@@ -35,7 +36,7 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// </summary>
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
     }
     /// <summary>
     /// Добавление коллекции в хранилище
@@ -44,19 +45,17 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// <param name="collectionType">тип коллекции</param>
     public void AddCollection(string name, CollectionType collectionType)
     {
-        if (name == null || _storages.ContainsKey(name))
-            return;
-        switch (collectionType)
+        CollectionInfo collectionInfo = new CollectionInfo(name, collectionType, string.Empty);
+
+        if (_storages.ContainsKey(collectionInfo) || collectionInfo.CollectionType == CollectionType.None) return;
+        switch (collectionInfo.CollectionType)
         {
-            case CollectionType.None:
-                return;
             case CollectionType.Massive:
-                _storages[name] = new MassiveGenericObjects<T>();
-                return;
+                _storages[collectionInfo] = new MassiveGenericObjects<T>();
+                break;
             case CollectionType.List:
-                _storages[name] = new ListGenericObjects<T>();
-                return;
-            default: break;
+                _storages[collectionInfo] = new ListGenericObjects<T>();
+                break;
         }
     }
 
@@ -66,8 +65,13 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// <param name="name">Название коллекции</param>
     public void DelCollection(string name)
     {
-        if (_storages.ContainsKey(name))
-            _storages.Remove(name);
+        {
+            CollectionInfo collectionInfo = new CollectionInfo(name, CollectionType.None, string.Empty);
+            if (_storages.ContainsKey(collectionInfo) && collectionInfo != null)
+            {
+                _storages.Remove(collectionInfo);
+            }
+        }
     }
 
     /// <summary>
@@ -79,8 +83,11 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     {
         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;
         }
     }
@@ -90,11 +97,11 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// </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))
@@ -105,7 +112,7 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
         using (StreamWriter writer = new StreamWriter(filename))
         {
             writer.Write(_collectionKey);
-            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
             {
                 StringBuilder sb = new();
 
@@ -118,8 +125,6 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
 
                 sb.Append(value.Key);
                 sb.Append(_separatorForKeyValue);
-                sb.Append(value.Value.GetCollectionType);
-                sb.Append(_separatorForKeyValue);
                 sb.Append(value.Value.MaxCount);
                 sb.Append(_separatorForKeyValue);
 
@@ -137,10 +142,7 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
 
                 writer.Write(sb);
             }
-
         }
-
-        return true;
     }
 
     /// <summary>
@@ -148,11 +150,11 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
     /// </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 FileNotFoundException("Файл не существует");
         }
 
         using (StreamReader fs = File.OpenText(filename))
@@ -161,12 +163,12 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
 
             if (str == null || str.Length == 0)
             {
-                return false;
+                throw new IOException("В файле нет данных");
             }
 
             if (!str.StartsWith(_collectionKey))
             {
-                return false;
+                throw new IOException("В файле неверные данные");
             }
 
             _storages.Clear();
@@ -174,34 +176,38 @@ public class StorageCollection<T> where T : DrawningSimpleExcavator
             while ((strs = fs.ReadLine()) != null)
             {
                 string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                if (record.Length != 4)
+                if (record.Length != 3)
                 {
                     continue;
                 }
 
-                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-                if (collection == null)
-                {
-                    return false;
-                }
+                CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(record[0]) ??
+                    throw new Exception("Не удалось определить информацию коллекции:" + record[0]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
+                    throw new Exception("Не удалось определить тип коллекции: " + record[1]);
 
-                collection.MaxCount = Convert.ToInt32(record[2]);
+                collection.MaxCount = Convert.ToInt32(record[1]);
 
-                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
                 foreach (string elem in set)
                 {
                     if (elem?.CreateDrawningSimpleExcavator() is T excavator)
                     {
-                        if (collection.Insert(excavator) == -1)
+                        try
                         {
-                            return false;
+                            if (collection.Insert(excavator) == -1)
+                            {
+                                throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                            }
+                        }
+                        catch (CollectionOverflowException ex)
+                        {
+                            throw new Exception("Коллекция переполнена", ex);
                         }
                     }
                 }
-                _storages.Add(record[0], collection);
+                _storages.Add(collectionInfo, collection);
             }
-            return true;
         }
     }
 

Excavator/Excavator/Drawnings/DrawningExcavatorCompareByColor.cs

@@ -0,0 +1,22 @@
+namespace Excavator.Drawnings;
+
+/// <summary>
+/// Сравнение по цвету, скорости, весу
+/// </summary>
+public class DrawningExcavatorCompareByColor : IComparer<DrawningSimpleExcavator?>
+{
+    public int Compare(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
+    {
+        if (x == null || x.EntitySimpleExcavator == null) return 1;
+
+        if (y == null || y.EntitySimpleExcavator == null) return -1;
+
+        var bodycolorCompare = x.EntitySimpleExcavator.BodyColor.Name.CompareTo(y.EntitySimpleExcavator.BodyColor.Name);
+        if (bodycolorCompare != 0) return bodycolorCompare;
+
+        var speedCompare = x.EntitySimpleExcavator.Speed.CompareTo(y.EntitySimpleExcavator.Speed);
+        if (speedCompare != 0) return speedCompare;
+
+        return x.EntitySimpleExcavator.Weight.CompareTo(y.EntitySimpleExcavator.Weight);
+    }
+}

Excavator/Excavator/Drawnings/DrawningExcavatorCompareByType.cs

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

Excavator/Excavator/Drawnings/DrawningExcavatorEqutables.cs

@@ -0,0 +1,43 @@
+using Excavator.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Excavator.Drawnings;
+
+/// <summary>
+/// Реализация сравнения двух объектов класса-прорисовки
+/// </summary>
+public class DrawningExcavatorEqutables : IEqualityComparer<DrawningSimpleExcavator?>
+{
+    public bool Equals(DrawningSimpleExcavator? x, DrawningSimpleExcavator? y)
+    {
+        if (x == null || x.EntitySimpleExcavator == null) return false;
+
+        if (y == null || y.EntitySimpleExcavator == null) return false;
+
+        if (x.GetType().Name != y.GetType().Name) return false;
+
+        if (x.EntitySimpleExcavator.Speed != y.EntitySimpleExcavator.Speed) return false;
+
+        if (x.EntitySimpleExcavator.Weight != y.EntitySimpleExcavator.Weight) return false;
+
+        if (x.EntitySimpleExcavator.BodyColor != y.EntitySimpleExcavator.BodyColor) return false;
+
+        if (x is DrawningExcavator bigX && y is DrawningExcavator bigY)
+        {
+            // TODO доделать логику сравнения дополнительных параметров
+            EntityExcavator _x = (EntityExcavator)x.EntitySimpleExcavator;
+            EntityExcavator _y = (EntityExcavator)y.EntitySimpleExcavator;
+
+            if (_x.Supports != _y.Supports) return false;
+            if (_x.Bucket != _y.Bucket) return false;
+            if (_x.AdditionalColor != _y.AdditionalColor) return false;
+        }
+
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawningSimpleExcavator obj)
+    {
+        return obj.GetHashCode();
+    }
+}

Excavator/Excavator/Excavator.csproj

@@ -8,4 +8,23 @@
     <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="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
+    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Serilog.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

Excavator/Excavator/Exceptions/CollectionOverflowException.cs

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

Excavator/Excavator/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,23 @@
+using System.Runtime.Serialization;
+
+namespace Excavator.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 context) : base(info, context) { }
+}
+
+
+

Excavator/Excavator/Exceptions/ObjectNotUniqueException.cs

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

Excavator/Excavator/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace Excavator.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 context) : base(info, context) { }
+}

Excavator/Excavator/FormExcavatorCollection.Designer.cs

@@ -52,6 +52,8 @@
             LoadToolStripMenuItem = new ToolStripMenuItem();
             openFileDialog = new OpenFileDialog();
             saveFileDialog = new SaveFileDialog();
+            buttonSortByType = new Button();
+            buttonSortByColor = new Button();
             groupBoxTools.SuspendLayout();
             panelStorage.SuspendLayout();
             panelCompanyTools.SuspendLayout();
@@ -62,21 +64,24 @@
             // groupBoxTools
             // 
             groupBoxTools.Anchor = AnchorStyles.Right;
+            groupBoxTools.Controls.Add(buttonSortByColor);
+            groupBoxTools.Controls.Add(buttonSortByType);
             groupBoxTools.Controls.Add(buttonCreateCompany);
             groupBoxTools.Controls.Add(panelStorage);
             groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Controls.Add(panelCompanyTools);
             groupBoxTools.Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point);
-            groupBoxTools.Location = new Point(855, 27);
+            groupBoxTools.Location = new Point(861, 27);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(212, 608);
+            groupBoxTools.Size = new Size(212, 647);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
+            groupBoxTools.Enter += groupBoxTools_Enter;
             // 
             // buttonCreateCompany
             // 
-            buttonCreateCompany.Location = new Point(9, 325);
+            buttonCreateCompany.Location = new Point(12, 322);
             buttonCreateCompany.Name = "buttonCreateCompany";
             buttonCreateCompany.Size = new Size(191, 34);
             buttonCreateCompany.TabIndex = 7;
@@ -100,7 +105,7 @@
             // 
             // buttonCollectionDel
             // 
-            buttonCollectionDel.Location = new Point(6, 231);
+            buttonCollectionDel.Location = new Point(6, 228);
             buttonCollectionDel.Name = "buttonCollectionDel";
             buttonCollectionDel.Size = new Size(191, 38);
             buttonCollectionDel.TabIndex = 6;
@@ -111,7 +116,7 @@
             // listBoxCollection
             // 
             listBoxCollection.FormattingEnabled = true;
-            listBoxCollection.Location = new Point(6, 121);
+            listBoxCollection.Location = new Point(6, 116);
             listBoxCollection.Name = "listBoxCollection";
             listBoxCollection.Size = new Size(191, 108);
             listBoxCollection.TabIndex = 5;
@@ -172,7 +177,7 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(9, 298);
+            comboBoxSelectorCompany.Location = new Point(12, 295);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
             comboBoxSelectorCompany.Size = new Size(191, 21);
             comboBoxSelectorCompany.TabIndex = 0;
@@ -185,14 +190,14 @@
             panelCompanyTools.Controls.Add(maskedTextBoxPosition);
             panelCompanyTools.Controls.Add(buttonRemoveExcavator);
             panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Location = new Point(6, 365);
+            panelCompanyTools.Location = new Point(6, 362);
             panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(200, 263);
+            panelCompanyTools.Size = new Size(200, 210);
             panelCompanyTools.TabIndex = 7;
             // 
             // buttonGoToCheck
             // 
-            buttonGoToCheck.Location = new Point(3, 148);
+            buttonGoToCheck.Location = new Point(6, 114);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(191, 42);
             buttonGoToCheck.TabIndex = 5;
@@ -202,7 +207,7 @@
             // 
             // buttonAddSimpleExcavator
             // 
-            buttonAddSimpleExcavator.Location = new Point(3, 3);
+            buttonAddSimpleExcavator.Location = new Point(3, 0);
             buttonAddSimpleExcavator.Name = "buttonAddSimpleExcavator";
             buttonAddSimpleExcavator.Size = new Size(191, 35);
             buttonAddSimpleExcavator.TabIndex = 1;
@@ -212,7 +217,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            maskedTextBoxPosition.Location = new Point(3, 75);
+            maskedTextBoxPosition.Location = new Point(3, 41);
             maskedTextBoxPosition.Mask = "00";
             maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             maskedTextBoxPosition.Size = new Size(191, 20);
@@ -220,7 +225,7 @@
             // 
             // buttonRemoveExcavator
             // 
-            buttonRemoveExcavator.Location = new Point(3, 101);
+            buttonRemoveExcavator.Location = new Point(6, 67);
             buttonRemoveExcavator.Name = "buttonRemoveExcavator";
             buttonRemoveExcavator.Size = new Size(191, 41);
             buttonRemoveExcavator.TabIndex = 4;
@@ -230,7 +235,7 @@
             // 
             // buttonRefresh
             // 
-            buttonRefresh.Location = new Point(3, 196);
+            buttonRefresh.Location = new Point(6, 162);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(191, 41);
             buttonRefresh.TabIndex = 6;
@@ -245,7 +250,7 @@
             pictureBox.BackgroundImageLayout = ImageLayout.None;
             pictureBox.Location = new Point(0, 27);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(855, 608);
+            pictureBox.Size = new Size(855, 647);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             pictureBox.Click += pictureBox_Click;
@@ -291,11 +296,31 @@
             // 
             saveFileDialog.Filter = "txt file | *.txt";
             // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Location = new Point(12, 571);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(191, 31);
+            buttonSortByType.TabIndex = 9;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += buttonSortByType_Click;
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Location = new Point(12, 608);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(191, 31);
+            buttonSortByColor.TabIndex = 10;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += buttonSortByColor_Click;
+            // 
             // FormExcavatorCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1067, 635);
+            ClientSize = new Size(1067, 674);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Controls.Add(menuStrip1);
@@ -340,5 +365,7 @@
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

Excavator/Excavator/FormExcavatorCollection.cs

@@ -1,5 +1,7 @@
-using Excavator.CollectionGenericObjects;
+using Microsoft.Extensions.Logging;
+using Excavator.CollectionGenericObjects;
 using Excavator.Drawnings;
+using Excavator.Exceptions;
 
 namespace Excavator;
 
@@ -13,10 +15,17 @@ public partial class FormExcavatorCollection : Form
 
     private AbstractCompany? _company = null;
 
-    public FormExcavatorCollection()
+    /// <summary>
+    /// Логер
+    /// </summary>
+    private readonly ILogger _logger;
+
+    public FormExcavatorCollection(ILogger<FormExcavatorCollection> logger)
     {
         InitializeComponent();
         _storageCollection = new();
+        _logger = logger;
+        _logger.LogInformation("Форма создалась");
     }
 
     private void pictureBox_Click(object sender, EventArgs e)
@@ -45,20 +54,32 @@ public partial class FormExcavatorCollection : Form
     /// <param name="truck"></param>
     private void SetExcavator(DrawningSimpleExcavator excavator)
     {
-        if (_company == null || excavator == null)
+        try
         {
-            return;
+            if (_company == null || excavator == null)
+            {
+                return;
+            }
+            if (_company + excavator != -1)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Добавлен объект: " + excavator.GetDataForSave());
+            }
         }
-        if (_company + excavator != -1)
+        catch (ObjectNotFoundException ex) { }
+        catch (CollectionOverflowException ex)
         {
-            MessageBox.Show("Объект добавлен");
-            pictureBox.Image = _company.Show();
+            MessageBox.Show(ex.Message);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
-        else
+        catch (ObjectNotUniqueException ex)
         {
-            MessageBox.Show("Не удалось добавить объект");
+            MessageBox.Show("Такой объект уже присутствует в коллекции");
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
+
     private void ButtonRemoveExcavator_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
@@ -72,14 +93,19 @@ public partial class FormExcavatorCollection : Form
         }
 
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        if (_company - pos != null)
+        try
         {
-            MessageBox.Show("Объект удален");
-            pictureBox.Image = _company.Show();
+            if (_company - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Удален объект по позиции " + pos);
+            }
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show(ex.Message);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
     }
     /// <summary>
@@ -96,26 +122,32 @@ public partial class FormExcavatorCollection : Form
 
         DrawningSimpleExcavator? excavator = null;
         int counter = 100;
-        while (excavator == null)
+        try
         {
-            excavator = _company.GetRandomObject();
-            counter--;
-            if (counter <= 0)
+            while (excavator == null)
             {
-                break;
+                excavator = _company.GetRandomObject();
+                counter--;
+                if (counter <= 0)
+                {
+                    break;
+                }
             }
-        }
 
-        if (excavator == null)
-        {
-            return;
+            if (excavator == null)
+            {
+                return;
+            }
+            FormExcavator form = new()
+            {
+                SetExcavator = excavator
+            };
+            form.ShowDialog();
         }
-
-        FormExcavator form = new()
+        catch (Exception ex)
         {
-            SetExcavator = excavator
-        };
-        form.ShowDialog();
+            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
     }
 
     /// <summary>
@@ -151,7 +183,7 @@ public partial class FormExcavatorCollection : 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);
@@ -167,18 +199,26 @@ public partial class FormExcavatorCollection : Form
             return;
         }
 
-        CollectionType collectionType = CollectionType.None;
-        if (radioButtonMassive.Checked)
+        try
         {
-            collectionType = CollectionType.Massive;
-        }
-        else if (radioButtonList.Checked)
-        {
-            collectionType = CollectionType.List;
-        }
+            CollectionType collectionType = CollectionType.None;
+            if (radioButtonMassive.Checked)
+            {
+                collectionType = CollectionType.Massive;
+            }
+            else if (radioButtonList.Checked)
+            {
+                collectionType = CollectionType.List;
+            }
 
-        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
-        RerfreshListBoxItems();
+            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+            RerfreshListBoxItems();
+            _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
     }
 
     /// <summary>
@@ -194,12 +234,20 @@ public partial class FormExcavatorCollection : Form
             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());
+            _logger.LogInformation("Коллекция " + listBoxCollection.SelectedItem.ToString() + " удалена");
+            RerfreshListBoxItems();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Ошибка: {Message}", ex.Message);
         }
-        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
-        RerfreshListBoxItems();
     }
 
     private void buttonCreateCompany_Click(object sender, EventArgs e)
@@ -232,13 +280,16 @@ public partial class FormExcavatorCollection : Form
     {
         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);
             }
         }
     }
@@ -247,15 +298,44 @@ public partial class FormExcavatorCollection : Form
     {
         if (openFileDialog.ShowDialog() == DialogResult.OK)
         {
-            if (_storageCollection.LoadData(openFileDialog.FileName))
+            try
             {
+                _storageCollection.LoadData(openFileDialog.FileName);
                 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);
             }
         }
-        RerfreshListBoxItems();
+
+    }
+
+    private void groupBoxTools_Enter(object sender, EventArgs e)
+    {
+
+    }
+
+    private void buttonSortByType_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawningExcavatorCompareByType());
+    }
+
+    private void buttonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawningExcavatorCompareByColor());
+    }
+
+    private void CompareCars(IComparer<DrawningSimpleExcavator?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
     }
 }

Excavator/Excavator/FormExcavatorCollection.resx

@@ -126,4 +126,7 @@
   <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>272, 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>

Excavator/Excavator/Program.cs

@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
 namespace Excavator
 {
     internal static class Program
@@ -11,7 +16,29 @@ namespace Excavator
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormExcavatorCollection());
+            ServiceCollection services = new();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormExcavatorCollection>());
+        }
+
+        /// <summary>
+        /// Êîíôèãóðàöèÿ ñåðâèñà DI
+        /// </summary>
+        /// <param name="services"></param>
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            
+            services.AddSingleton<FormExcavatorCollection>()
+                .AddLogging(option =>
+                {
+                    option.SetMinimumLevel(LogLevel.Information);
+                    option.AddSerilog(new LoggerConfiguration()
+                        .ReadFrom.Configuration(new ConfigurationBuilder()
+                        .AddJsonFile("serilog.json")
+                        .Build())
+                        .CreateLogger());
+                });
         }
     }
 }

Excavator/Excavator/Serilog.json

@@ -0,0 +1,18 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "log.log",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Properties": {
+      "Application": "Excavator"
+    }
+  }
+}