lab8 сделано и сдано

MotorBoat/MotorBoat/AppSetting.json

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

MotorBoat/MotorBoat/BoatCompareByColor.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+using MotorBoat.Entities;
+
+namespace MotorBoat.Generics
+{
+    internal class BoatCompareByColor : IComparer<DrawningBoat?>
+    {
+        public int Compare(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            var bodyColorCompare = x.EntityBoat.BodyColor.Name.CompareTo(y.EntityBoat.BodyColor.Name);
+            if (bodyColorCompare != 0)
+            {
+                return bodyColorCompare;
+            }
+            if (x.EntityBoat is EntityMotorBoat xEntityMotorBoat && y.EntityBoat is EntityMotorBoat yEntityMotorBoat)
+            {
+                var BodyColorCompare = xEntityMotorBoat.BodyColor.Name.CompareTo(yEntityMotorBoat.BodyColor.Name);
+                if (BodyColorCompare != 0)
+                {
+                    return BodyColorCompare;
+                }
+                var AdditionalColorCompare = xEntityMotorBoat.AdditionalColor.Name.CompareTo(yEntityMotorBoat.AdditionalColor.Name);
+                if (AdditionalColorCompare != 0)
+                {
+                    return AdditionalColorCompare;
+                }
+            }
+            var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+        }
+    }
+}

MotorBoat/MotorBoat/BoatCompareByType.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+
+namespace MotorBoat.Generics
+{
+    internal class BoatCompareByType : IComparer<DrawningBoat?>
+    {
+        public int Compare(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return x.GetType().Name.CompareTo(y.GetType().Name);
+            }
+            var speedCompare = x.EntityBoat.Speed.CompareTo(y.EntityBoat.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return x.EntityBoat.Weight.CompareTo(y.EntityBoat.Weight);
+        }
+    }
+}

MotorBoat/MotorBoat/BoatGenericCollection.cs

@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using MotorBoat.Exceptions;
+using Microsoft.Extensions.Logging;
 
 namespace MotorBoat.Generics
 {
@@ -69,7 +71,8 @@ namespace MotorBoat.Generics
             {
                 return false;
             }
-            return collect?._collection.Insert(obj) ?? false;
+            return collect?._collection.Insert(obj, new DrawningBoatEqutables()) ?? false;
+
         }
 
         /// <summary>
@@ -80,8 +83,8 @@ namespace MotorBoat.Generics
         /// <returns></returns>
         public static T? operator -(BoatsGenericCollection<T, U>? collect, int pos)
         {
-            T? obj = collect._collection[pos];
-            if (obj != null)
+            T? obj = collect?._collection[pos];
+            if (obj != null && collect != null)
             {
                 collect._collection.Remove(pos);
             }
@@ -153,5 +156,6 @@ namespace MotorBoat.Generics
         /// Получение объектов коллекции
         /// </summary>
         public IEnumerable<T?> GetBoats => _collection.GetBoats();
+        public void Sort(IComparer<T?> comparer) => _collection.SortSet(comparer);
     }
 }

MotorBoat/MotorBoat/BoatNotFoundException.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.Exceptions
+{
+    internal class BoatNotFoundException : ApplicationException
+    {
+        public BoatNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+        public BoatNotFoundException() : base() { }
+        public BoatNotFoundException(string message) : base(message) { }
+        public BoatNotFoundException(string message, Exception exception) : base(message, exception)
+        { }
+        protected BoatNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+
+    }
+}

MotorBoat/MotorBoat/BoatsCollectionInfo.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MotorBoat.Generics
+{
+    internal class BoatsCollectionInfo : IEquatable<BoatsCollectionInfo>
+    {
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public BoatsCollectionInfo(string name, string description)
+        {
+            Name = name;
+            Description = description;
+        }
+        public bool Equals(BoatsCollectionInfo? other)
+        {
+            if (Name == other?.Name)
+                return true;
+
+            return false;
+        }
+        public override int GetHashCode()
+        {
+            return Name.GetHashCode();
+        }
+    }
+}

MotorBoat/MotorBoat/BoatsGenericStorage.cs

@@ -5,6 +5,9 @@ using System.Text;
 using System.Threading.Tasks;
 using MotorBoat.DrawningObjects;
 using MotorBoat.MovementStrategy;
+using MotorBoat.Exceptions;
+using Microsoft.Extensions.Logging;
+using System.Numerics;
 
 namespace MotorBoat.Generics
 {
@@ -16,12 +19,12 @@ namespace MotorBoat.Generics
         /// <summary>
         /// Словарь (хранилище)
         /// </summary>
-        readonly Dictionary<string, BoatsGenericCollection<DrawningBoat,DrawningObjectBoat>> _boatStorages;
+        readonly Dictionary<BoatsCollectionInfo, BoatsGenericCollection<DrawningBoat,DrawningObjectBoat>> _boatStorages;
 
         /// <summary>
         /// Возвращение списка названий наборов
         /// </summary>
-        public List<string> Keys => _boatStorages.Keys.ToList();
+        public List<BoatsCollectionInfo> Keys => _boatStorages.Keys.ToList();
 
         /// <summary>
         /// Разделитель для записи ключа и значения элемента словаря
@@ -55,7 +58,7 @@ namespace MotorBoat.Generics
         /// <param name="pictureHeight"></param>
         public BoatsGenericStorage(int pictureWidth, int pictureHeight)
         {
-            _boatStorages = new Dictionary<string, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>>();
+            _boatStorages = new Dictionary<BoatsCollectionInfo, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
@@ -66,9 +69,9 @@ namespace MotorBoat.Generics
         /// <param name="name">Название набора</param>
         public void AddSet(string name)
         {
-            if (_boatStorages.ContainsKey(name))
-                return;
-            _boatStorages[name] = new BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>(_pictureWidth, _pictureHeight);
+            if (!_boatStorages.ContainsKey(new BoatsCollectionInfo(name, string.Empty)))
+                _boatStorages.Add(new BoatsCollectionInfo(name, string.Empty),
+                    new BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>(_pictureWidth, _pictureHeight));
         }
 
         /// <summary>
@@ -77,9 +80,8 @@ namespace MotorBoat.Generics
         /// <param name="name">Название набора</param>
         public void DelSet(string name)
         {
-            if (!_boatStorages.ContainsKey(name))
-                return;
-            _boatStorages.Remove(name);
+            if (_boatStorages.ContainsKey(new BoatsCollectionInfo(name, string.Empty)))
+                _boatStorages.Remove(new BoatsCollectionInfo(name, string.Empty));
         }
 
         /// <summary>
@@ -87,13 +89,13 @@ namespace MotorBoat.Generics
         /// </summary>
         /// <param name="ind"></param>
         /// <returns></returns>
-        public BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>?
-        this[string ind]
+        public BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>? this[string ind]
         {
             get
             {
-                if (_boatStorages.ContainsKey(ind))
-                    return _boatStorages[ind];
+                if (_boatStorages.ContainsKey(new BoatsCollectionInfo(ind, string.Empty)))
+                    return _boatStorages[new BoatsCollectionInfo(ind, string.Empty)];
+
                 return null;
             }
         }
@@ -103,45 +105,43 @@ namespace MotorBoat.Generics
         /// </summary>
         /// <param name="filename">Путь и имя файла</param>
         /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
-        public bool SaveData(string filename)
+        public void SaveData(string filename)
         {
             if (File.Exists(filename))
             {
                 File.Delete(filename);
             }
             StringBuilder data = new();
-            foreach (KeyValuePair<string, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>> record in _boatStorages)
+            foreach (KeyValuePair<BoatsCollectionInfo, BoatsGenericCollection<DrawningBoat, DrawningObjectBoat>> record in _boatStorages)
             {
                 StringBuilder records = new();
                 foreach (DrawningBoat? elem in record.Value.GetBoats)
                 {
                     records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
                 }
-                data.AppendLine($"{record.Key}{_separatorForKeyValue}{records}");
+                data.AppendLine($"{record.Key.Name}{_separatorForKeyValue}{records}");
             }
 
             if (data.Length == 0) {
-                return false;
+                throw new InvalidOperationException("Невалидная операция, нет данных для сохранения");
             }
       
             using (StreamWriter writer = new StreamWriter(filename))
             {
                 writer.Write($"BoatStorage{Environment.NewLine}{data}");
             }
-            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 FileNotFoundException($"Файл {filename} не найден");
             }
 
             using (StreamReader fs = File.OpenText(filename))
@@ -149,11 +149,12 @@ namespace MotorBoat.Generics
                 string str = fs.ReadLine();
                 if (str == null || str.Length == 0)
                 {
-                    return false;
+                    throw new NullReferenceException("Нет данных для загрузки");
                 }
                 if (!str.StartsWith("BoatStorage"))
                 {
-                    return false;
+                    // если нет такой записи,то это не те данные
+                    throw new FormatException("Неверный формат данных");
                 }
 
                 _boatStorages.Clear();
@@ -163,7 +164,7 @@ namespace MotorBoat.Generics
                 {
                     if (strs == null)
                     {
-                        return false;
+                        throw new NullReferenceException("Нет данных для загрузки");
                     }
 
                     string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
@@ -178,15 +179,23 @@ namespace MotorBoat.Generics
                         DrawningBoat? boat = elem?.CreateDrawningBoat(_separatorForObject, _pictureWidth, _pictureHeight);
                         if (boat != null)
                         {
-                            if (!(collection + boat))
+                            try
                             {
-                                return false;
+                                _ = collection + boat;
+                            }
+                            catch (BoatNotFoundException e)
+                            {
+                                throw e;
+                            }
+
+                            catch (StorageOverflowException e)
+                            {
+                                throw e;
                             }
                         }
                     }
-                    _boatStorages.Add(record[0], collection);
-                }
-                return true;
+                    _boatStorages.Add(new BoatsCollectionInfo(record[0], string.Empty), collection);
+                }
             }
         }
     }

MotorBoat/MotorBoat/DrawningBoat.cs

@@ -210,5 +210,11 @@ namespace MotorBoat.DrawningObjects
                     break;
             }
         }
+
+        public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight)
+        {
+            _pictureWidth = pictureBoxWidth;
+            _pictureHeight = pictureBoxHeight;
+        }
     }
 }

MotorBoat/MotorBoat/DrawningShipEqutables.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MotorBoat.DrawningObjects;
+using MotorBoat.Entities;
+using System.Diagnostics.CodeAnalysis;
+
+namespace MotorBoat.Generics
+{
+    internal class DrawningBoatEqutables : IEqualityComparer<DrawningBoat?>
+    {
+        public bool Equals(DrawningBoat? x, DrawningBoat? y)
+        {
+            if (x == null || x.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(x));
+            }
+            if (y == null || y.EntityBoat == null)
+            {
+                throw new ArgumentNullException(nameof(y));
+            }
+            if (x.GetType().Name != y.GetType().Name)
+            {
+                return false;
+            }
+            if (x.EntityBoat.Speed != y.EntityBoat.Speed)
+            {
+                return false;
+            }
+            if (x.EntityBoat.Weight != y.EntityBoat.Weight)
+            {
+                return false;
+            }
+            if (x.EntityBoat.BodyColor != y.EntityBoat.BodyColor)
+            {
+                return false;
+            }
+            if (x is DrawningMotorBoat && y is DrawningMotorBoat)
+            {
+                EntityMotorBoat EntityX = (EntityMotorBoat)x.EntityBoat;
+                EntityMotorBoat EntityY = (EntityMotorBoat)y.EntityBoat;
+
+                if (EntityX.Glass != EntityY.Glass)
+                    return false;
+                if (EntityX.Engine != EntityY.Engine)
+                    return false;
+                if (EntityX.AdditionalColor != EntityY.AdditionalColor)
+                    return false;
+            }
+            return true;
+        }
+
+        public int GetHashCode([DisallowNull] DrawningBoat obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+}

MotorBoat/MotorBoat/ExtentionDrawningBoat.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MotorBoat.Entities;
+using System.Runtime.Serialization;
 
 namespace MotorBoat.DrawningObjects
 {

MotorBoat/MotorBoat/FormBoatCollection.Designer.cs

@@ -34,6 +34,8 @@
             ButtonRemoveBoat = new Button();
             ButtonRefreshCollection = new Button();
             groupBoxTools = new GroupBox();
+            buttonSortByType = new Button();
+            buttonSortByColor = new Button();
             groupBoxCollections = new GroupBox();
             ButtonRemoveObject = new Button();
             listBoxStorages = new ListBox();
@@ -56,20 +58,20 @@
             pictureBoxCollection.Dock = DockStyle.Left;
             pictureBoxCollection.Location = new Point(0, 24);
             pictureBoxCollection.Name = "pictureBoxCollection";
-            pictureBoxCollection.Size = new Size(578, 504);
+            pictureBoxCollection.Size = new Size(578, 576);
             pictureBoxCollection.TabIndex = 1;
             pictureBoxCollection.TabStop = false;
             // 
             // maskedTextBoxNumber
             // 
-            maskedTextBoxNumber.Location = new Point(51, 371);
+            maskedTextBoxNumber.Location = new Point(51, 454);
             maskedTextBoxNumber.Name = "maskedTextBoxNumber";
             maskedTextBoxNumber.Size = new Size(100, 23);
             maskedTextBoxNumber.TabIndex = 0;
             // 
             // ButtonAddBoat
             // 
-            ButtonAddBoat.Location = new Point(6, 325);
+            ButtonAddBoat.Location = new Point(6, 408);
             ButtonAddBoat.Name = "ButtonAddBoat";
             ButtonAddBoat.Size = new Size(188, 40);
             ButtonAddBoat.TabIndex = 1;
@@ -79,7 +81,7 @@
             // 
             // ButtonRemoveBoat
             // 
-            ButtonRemoveBoat.Location = new Point(6, 407);
+            ButtonRemoveBoat.Location = new Point(6, 490);
             ButtonRemoveBoat.Name = "ButtonRemoveBoat";
             ButtonRemoveBoat.Size = new Size(188, 41);
             ButtonRemoveBoat.TabIndex = 2;
@@ -89,7 +91,7 @@
             // 
             // ButtonRefreshCollection
             // 
-            ButtonRefreshCollection.Location = new Point(6, 454);
+            ButtonRefreshCollection.Location = new Point(6, 537);
             ButtonRefreshCollection.Name = "ButtonRefreshCollection";
             ButtonRefreshCollection.Size = new Size(188, 39);
             ButtonRefreshCollection.TabIndex = 3;
@@ -99,6 +101,8 @@
             // 
             // groupBoxTools
             // 
+            groupBoxTools.Controls.Add(buttonSortByType);
+            groupBoxTools.Controls.Add(buttonSortByColor);
             groupBoxTools.Controls.Add(groupBoxCollections);
             groupBoxTools.Controls.Add(ButtonRefreshCollection);
             groupBoxTools.Controls.Add(ButtonRemoveBoat);
@@ -107,11 +111,31 @@
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(584, 24);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(200, 504);
+            groupBoxTools.Size = new Size(200, 576);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
+            // buttonSortByType
+            // 
+            buttonSortByType.Location = new Point(12, 339);
+            buttonSortByType.Name = "buttonSortByType";
+            buttonSortByType.Size = new Size(176, 29);
+            buttonSortByType.TabIndex = 6;
+            buttonSortByType.Text = "Сортировка по типу";
+            buttonSortByType.UseVisualStyleBackColor = true;
+            buttonSortByType.Click += buttonSortByType_Click;
+            // 
+            // buttonSortByColor
+            // 
+            buttonSortByColor.Location = new Point(12, 304);
+            buttonSortByColor.Name = "buttonSortByColor";
+            buttonSortByColor.Size = new Size(176, 29);
+            buttonSortByColor.TabIndex = 5;
+            buttonSortByColor.Text = "Сортировка по цвету";
+            buttonSortByColor.UseVisualStyleBackColor = true;
+            buttonSortByColor.Click += buttonSortByColor_Click;
+            // 
             // groupBoxCollections
             // 
             groupBoxCollections.Controls.Add(ButtonRemoveObject);
@@ -181,14 +205,14 @@
             // SaveToolStripMenuItem
             // 
             SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            SaveToolStripMenuItem.Size = new Size(180, 22);
+            SaveToolStripMenuItem.Size = new Size(141, 22);
             SaveToolStripMenuItem.Text = "Сохранение";
             SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
             // 
             // LoadToolStripMenuItem
             // 
             LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            LoadToolStripMenuItem.Size = new Size(180, 22);
+            LoadToolStripMenuItem.Size = new Size(141, 22);
             LoadToolStripMenuItem.Text = "Загрузка";
             LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
             // 
@@ -205,7 +229,7 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(784, 528);
+            ClientSize = new Size(784, 600);
             Controls.Add(groupBoxTools);
             Controls.Add(pictureBoxCollection);
             Controls.Add(menuStrip1);
@@ -242,5 +266,7 @@
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private Button buttonSortByColor;
+        private Button buttonSortByType;
     }
 }

MotorBoat/MotorBoat/FormBoatCollection.cs

@@ -10,6 +10,9 @@ using System.Windows.Forms;
 using MotorBoat.DrawningObjects;
 using MotorBoat.Generics;
 using MotorBoat.MovementStrategy;
+using Microsoft.Extensions.Logging;
+using MotorBoat.Exceptions;
+using System.Xml.Linq;
 
 namespace MotorBoat
 {
@@ -23,13 +26,18 @@ namespace MotorBoat
         /// </summary>
         private readonly BoatsGenericStorage _storage;
 
+        /// Логер
+        /// </summary>
+        private readonly ILogger _logger;
+
         /// <summary>
         /// Конструктор
         /// </summary>
-        public FormBoatCollection()
+        public FormBoatCollection(ILogger<FormBoatCollection> logger)
         {
             InitializeComponent();
             _storage = new BoatsGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
+            _logger = logger;
         }
 
         /// <summary>
@@ -41,7 +49,7 @@ namespace MotorBoat
             listBoxStorages.Items.Clear();
             for (int i = 0; i < _storage.Keys.Count; i++)
             {
-                listBoxStorages.Items.Add(_storage.Keys[i]);
+                listBoxStorages.Items.Add(_storage.Keys[i].Name);
             }
             if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
             {
@@ -62,12 +70,12 @@ namespace MotorBoat
         {
             if (string.IsNullOrEmpty(textBoxStorageName.Text))
             {
-                MessageBox.Show("Не все данные заполнены", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             _storage.AddSet(textBoxStorageName.Text);
             ReloadObjects();
+            _logger.LogInformation($"Добавлен набор: {textBoxStorageName.Text}");
         }
 
         /// <summary>
@@ -90,13 +98,18 @@ namespace MotorBoat
         {
             if (listBoxStorages.SelectedIndex == -1)
             {
+                _logger.LogWarning("Коллекция не выбрана");
                 return;
             }
-            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            string nameSet = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
+            if (MessageBox.Show($"Удалить объект {nameSet}?", "Удаление",
+                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
             {
-                _storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty);
+                _storage.DelSet(nameSet);
                 ReloadObjects();
+                _logger.LogInformation($"Удален набор: {nameSet}");
             }
+            _logger.LogWarning("Отмена удаления набора");
         }
 
         /// <summary>
@@ -107,7 +120,10 @@ namespace MotorBoat
         private void ButtonAddBoat_Click(object sender, EventArgs e)
         {
             if (listBoxStorages.SelectedIndex == -1)
+            {
+                _logger.LogWarning("Коллекция не выбрана");
                 return;
+            }
 
             var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
 
@@ -127,17 +143,30 @@ namespace MotorBoat
             var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
 
             if (obj == null)
+            {
+                _logger.LogWarning("Добавление пустого объекта");
                 return;
+            }
 
-
+            try
+            {
                 if (obj + drawningBoat)
                 {
                     MessageBox.Show("Объект добавлен");
                     pictureBoxCollection.Image = obj.ShowBoats();
+                    _logger.LogInformation($"Объект {obj.GetType()} добавлен");
                 }
-            else
+            }
+            catch (StorageOverflowException ex)
             {
+                MessageBox.Show(ex.Message);
                 MessageBox.Show("Не удалось добавить объект");
+                _logger.LogWarning($"{ex.Message} в наборе {listBoxStorages.SelectedItem.ToString()}");
+            }
+            catch (ArgumentException ex)
+            {
+                MessageBox.Show(ex.Message);
+                _logger.LogWarning($"Не удалось добавить объект: {ex.Message}");
             }
         }
 
@@ -149,27 +178,46 @@ namespace MotorBoat
         private void ButtonRemoveBoat_Click(object sender, EventArgs e)
         {
             if (listBoxStorages.SelectedIndex == -1)
+            {
+                _logger.LogWarning("Удаление объекта из несуществующего набора");
                 return;
+            }
 
             var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
 
             if (obj == null)
                 return;
 
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
+                _logger.LogWarning("Отмена удаления объекта");
                 return;
             }
+
             int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            try
+            {
                 if (obj - pos != null)
                 {
                     MessageBox.Show("Объект удален");
+                    _logger.LogInformation($"Удален объект из коллекции {listBoxStorages.SelectedItem.ToString() ?? string.Empty} по номеру {pos}");
                     pictureBoxCollection.Image = obj.ShowBoats();
                 }
                 else
                 {
                     MessageBox.Show("Не удалось удалить объект");
+                    _logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorages.SelectedItem.ToString()}");
+                }
+            }
+            catch (BoatNotFoundException ex)
+            {
+                MessageBox.Show(ex.Message);
+                _logger.LogWarning($"Нет объекта{ex.Message} из набора {listBoxStorages.SelectedItem.ToString()}");
+            }
+            catch (FormatException)
+            {
+                _logger.LogWarning($"Было введено не число");
+                MessageBox.Show("Введите число");
             }
         }
 
@@ -200,15 +248,17 @@ namespace MotorBoat
         {
             if (saveFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_storage.SaveData(saveFileDialog.FileName))
+                try
                 {
-                    MessageBox.Show("Сохранение прошло успешно",
-                    "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _storage.SaveData(saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"Данные загружены в файл {saveFileDialog.FileName}");
                 }
-                else
+
+                catch (Exception ex)
                 {
-                    MessageBox.Show("Не сохранилось", "Результат",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogWarning($"Не удалось сохранить информацию в файл: {ex.Message}");
                 }
             }
         }
@@ -222,19 +272,37 @@ namespace MotorBoat
         {
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                if (_storage.LoadData(openFileDialog.FileName))
+                try
                 {
+                    _storage.LoadData(openFileDialog.FileName);
                     MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    foreach (var collection in _storage.Keys)
+                    _logger.LogInformation($"Данные загружены из файла {openFileDialog.FileName}");
+                }
+                catch (Exception ex)
                 {
-                        listBoxStorages.Items.Add(collection);
+                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogWarning($"Не удалось загрузить информацию из файла: {ex.Message}");
                 }
             }
-                else
+            ReloadObjects();
+        }
+
+        private void buttonSortByColor_Click(object sender, EventArgs e) => CompareBoats(new BoatCompareByType());
+        private void buttonSortByType_Click(object sender, EventArgs e) => CompareBoats(new BoatCompareByColor());
+        private void CompareBoats(IComparer<DrawningBoat?> comparer)
         {
-                    MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
+            if (listBoxStorages.SelectedIndex == -1)
+            {
+                return;
+            }
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
+            string.Empty];
+            if (obj == null)
+            {
+                return;
+            }
+            obj.Sort(comparer);
+            pictureBoxCollection.Image = obj.ShowBoats();
         }
     }
 }

MotorBoat/MotorBoat/FormMotorBoat.cs

@@ -28,7 +28,7 @@ namespace MotorBoat
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         /// </summary>
-        public DrawningBoat? SelectedBoat { get; private set; }
+        public DrawningBoat? SelectedBoat { get; set; }
 
         /// <summary>
         /// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>

MotorBoat/MotorBoat/MotorBoat.csproj

@@ -8,6 +8,19 @@
     <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="NLog.Extensions.Logging" Version="5.3.7" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

MotorBoat/MotorBoat/Program.cs

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

MotorBoat/MotorBoat/SetGeneric.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using MotorBoat.Exceptions;
 
 namespace MotorBoat.Generics
 {
@@ -32,10 +33,12 @@ namespace MotorBoat.Generics
         /// Конструктор
         /// </summary>
         /// <param name="count"></param>
+
+        public void SortSet(IComparer<T?> comparer) => _places.Sort(comparer);
         public SetGeneric(int count)
         {
             _maxCount = count;
-            _places = new List<T?>(count);
+            _places = new List<T?>(_maxCount);
         }
 
         /// <summary>
@@ -43,14 +46,9 @@ namespace MotorBoat.Generics
         /// </summary>
         /// <param name="boat">Добавляемая лодка</param>
         /// <returns></returns>
-        public bool Insert(T boat)
+        public bool Insert(T boat, IEqualityComparer<T?>? equal = null)
         {   
-            if (_places.Count == _maxCount)
-            {
-                return false;
-            }
-            Insert(boat, 0);
-            return true;
+            return Insert(boat, 0, equal);
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
@@ -58,13 +56,18 @@ namespace MotorBoat.Generics
         /// <param name="boat">Добавляемая лодка</param>
         /// <param name="position">Позиция</param>
         /// <returns></returns>
-        public bool Insert(T boat, int position)
+        public bool Insert(T boat, int position, IEqualityComparer<T>? equal = null)
         {
-            if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
-            {
-                return false;
-            }
-            _places.Insert(position, boat);
+            if (position < 0 || position >= _maxCount)
+                throw new BoatNotFoundException(position);
+
+            if (Count >= _maxCount)
+                throw new StorageOverflowException(_maxCount);
+
+            if (equal != null && _places.Contains(boat, equal))
+                throw new ArgumentException("Данный объект уже есть в коллекции");
+
+            _places.Insert(0, boat);
             return true;
         }
 
@@ -75,7 +78,8 @@ namespace MotorBoat.Generics
         /// <returns></returns>
         public bool Remove(int position)
         {
-            if (position < 0 || position >= Count) return false;
+            if (position < 0 || position > _maxCount || position >= Count)
+                throw new BoatNotFoundException(position);
             _places.RemoveAt(position);
             return true;
         }
@@ -88,25 +92,24 @@ namespace MotorBoat.Generics
         {
             get
             {
-                if (position < 0 || position > _maxCount)
+                if (position < 0 || position >= Count)
                     return null;
                 return _places[position];
             }
             set
             {
-                if (!(position >= 0 && position < Count && _places.Count < _maxCount))
+                if (position < 0 || position > _maxCount || Count == _maxCount)
                 {
                     return;
                 }
-                _places.Insert(position, value);
-                return;
+                _places[position] = value;
             }
         }
 
         /// <summary>
         /// Проход по списку
         /// </summary>
-        /// <param name="maxShips"></param>
+        /// <param name="maxBoats"></param>
         /// <returns></returns>
         public IEnumerable<T> GetBoats(int? maxBoats = null)
         {

MotorBoat/MotorBoat/StorageOverflowException.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace MotorBoat.Exceptions
+{
+    internal class StorageOverflowException : ApplicationException
+    {
+        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: { count}") { }
+        public StorageOverflowException() : base() { }
+        public StorageOverflowException(string message) : base(message) { }
+        public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
+        protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}