зафиксировать

ProjectBoat_base/.editorconfig

@@ -1,121 +0,0 @@
-[*.cs]
-
-# IDE0005: Директива using не нужна.
-dotnet_diagnostic.IDE0005.severity = silent
-csharp_style_throw_expression = true:suggestion
-
-[*.{cs,vb}]
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-tab_width = 4
-indent_size = 4
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_prefer_collection_expression = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
-dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_conditional_expression_over_return = true:silent
-dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_compound_assignment = true:suggestion
-dotnet_style_prefer_simplified_interpolation = true:suggestion
-dotnet_style_namespace_match_folder = true:suggestion
-[*.cs]
-#### Стили именования ####
-
-# Правила именования
-
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
-
-dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
-
-# Спецификации символов
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers = 
-
-dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers = 
-
-dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers = 
-
-# Стили именования
-
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix = 
-dotnet_naming_style.begins_with_i.word_separator = 
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
-
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
-dotnet_naming_style.pascal_case.capitalization = pascal_case
-
-[*.vb]
-#### Стили именования ####
-
-# Правила именования
-
-dotnet_naming_rule.interface_should_be_начинается_с_i.severity = suggestion
-dotnet_naming_rule.interface_should_be_начинается_с_i.symbols = interface
-dotnet_naming_rule.interface_should_be_начинается_с_i.style = начинается_с_i
-
-dotnet_naming_rule.типы_should_be_всечастиспрописнойбуквы.severity = suggestion
-dotnet_naming_rule.типы_should_be_всечастиспрописнойбуквы.symbols = типы
-dotnet_naming_rule.типы_should_be_всечастиспрописнойбуквы.style = всечастиспрописнойбуквы
-
-dotnet_naming_rule.не_являющиеся_полем_члены_should_be_всечастиспрописнойбуквы.severity = suggestion
-dotnet_naming_rule.не_являющиеся_полем_члены_should_be_всечастиспрописнойбуквы.symbols = не_являющиеся_полем_члены
-dotnet_naming_rule.не_являющиеся_полем_члены_should_be_всечастиспрописнойбуквы.style = всечастиспрописнойбуквы
-
-# Спецификации символов
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
-dotnet_naming_symbols.interface.required_modifiers = 
-
-dotnet_naming_symbols.типы.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.типы.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
-dotnet_naming_symbols.типы.required_modifiers = 
-
-dotnet_naming_symbols.не_являющиеся_полем_члены.applicable_kinds = property, event, method
-dotnet_naming_symbols.не_являющиеся_полем_члены.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
-dotnet_naming_symbols.не_являющиеся_полем_члены.required_modifiers = 
-
-# Стили именования
-
-dotnet_naming_style.начинается_с_i.required_prefix = I
-dotnet_naming_style.начинается_с_i.required_suffix = 
-dotnet_naming_style.начинается_с_i.word_separator = 
-dotnet_naming_style.начинается_с_i.capitalization = pascal_case
-
-dotnet_naming_style.всечастиспрописнойбуквы.required_prefix = 
-dotnet_naming_style.всечастиспрописнойбуквы.required_suffix = 
-dotnet_naming_style.всечастиспрописнойбуквы.word_separator = 
-dotnet_naming_style.всечастиспрописнойбуквы.capitalization = pascal_case
-
-dotnet_naming_style.всечастиспрописнойбуквы.required_prefix = 
-dotnet_naming_style.всечастиспрописнойбуквы.required_suffix = 
-dotnet_naming_style.всечастиспрописнойбуквы.word_separator = 
-dotnet_naming_style.всечастиспрописнойбуквы.capitalization = pascal_case

ProjectBoat_base/ProjectBoat_bae/BoatDelegate.cs

@@ -0,0 +1,15 @@
+using ProjectBoat_bae.DrawningObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBoat_bae
+{
+    internal class BoatDelegate
+    {
+        // Делегат для передачи объекта-автомобиля
+        public delegate void boatDelegate(Drawningboat boat);
+    }
+}

ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningBoat.cs

@@ -33,10 +33,10 @@ namespace ProjectBoat_bae.DrawningObjects
         protected int _startPosY;
 
         // Ширина прорисовки 
-        protected readonly int _boatWidth = 70;
+        protected readonly int _boatWidth = 80;
 
         // Высота прорисовки 
-        protected readonly int _boatHeight = 40;
+        protected readonly int _boatHeight = 50;
 
         public int GetPosX => _startPosX;
         public int GetPosY => _startPosY;
@@ -74,16 +74,8 @@ namespace ProjectBoat_bae.DrawningObjects
         // Установка позиции
         public void SetPosition(int x, int y)
         {
-            if (x < 0 || x + _boatWidth > _pictureWidth)
+            _startPosX = Math.Min(x, _pictureWidth - _boatWidth);
-            {
+            _startPosY = Math.Min(y, _pictureHeight - _boatHeight);
-                x = Math.Max(0, _pictureWidth - _boatWidth);
-            }
-            if (y < 0 || y + _boatHeight > _pictureHeight)
-            {
-                y = Math.Max(0, _pictureHeight - _boatHeight);
-            }
-            _startPosX = x;
-            _startPosY = y;
         }
 
         // Прорисовка объекта
@@ -96,17 +88,17 @@ namespace ProjectBoat_bae.DrawningObjects
             Pen pen = new(Color.Black);
             //корпус
             Brush br = new SolidBrush(EntityBoat.BodyColor);
-            g.FillRectangle(br, _startPosX + 50, _startPosY + 85, 80, 50);
+            g.FillRectangle(br, _startPosX + 20, _startPosY + 65, 80, 50);
 
             //мотор
             Brush brRed = new SolidBrush(EntityBoat.BodyColor);
-            g.FillEllipse(brRed, _startPosX + 30, _startPosY + 92, 35, 35);
+            g.FillEllipse(brRed, _startPosX + 7, _startPosY + 72, 35, 35);
 
             //стекла
             Brush brBlue = new SolidBrush(Color.LightBlue);
-            g.FillRectangle(brBlue, _startPosX + 125, _startPosY + 87, 5, 45);
+            g.FillRectangle(brBlue, _startPosX + 95, _startPosY + 67, 5, 45);
-            g.FillRectangle(brBlue, _startPosX + 75, _startPosY + 87, 55, 2);
+            g.FillRectangle(brBlue, _startPosX + 45, _startPosY + 67, 55, 2);
-            g.FillRectangle(brBlue, _startPosX + 75, _startPosY + 131, 55, 2);
+            g.FillRectangle(brBlue, _startPosX + 45, _startPosY + 111, 55, 2);
         }
 
         // Проверка, что объект может переместится по указанному направлению

ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs

@@ -22,6 +22,7 @@ namespace ProjectBoat_bae.DrawningObjects
             {
                 EntityBoat = new EntityMotorBoat(speed, weight, bodyColor,
                 additionalColor, body, wing);
+                
             }
         }
 
@@ -31,7 +32,6 @@ namespace ProjectBoat_bae.DrawningObjects
             {
                 return;
             }
-            Point[] points;
             Pen pen = new(Color.Black);
             Brush additionalBrush = new SolidBrush(Boat.AdditionalColor);
             Brush brr = new SolidBrush(EntityBoat.BodyColor);
@@ -39,9 +39,9 @@ namespace ProjectBoat_bae.DrawningObjects
             if (Boat.Wing)
             {
                 //вёсла
-                g.FillRectangle(additionalBrush, _startPosX + 55, _startPosY + 60, 5, 100);
+                g.FillRectangle(additionalBrush, _startPosX + 35, _startPosY + 40, 5, 100);
-                g.FillRectangle(additionalBrush, _startPosX + 48, _startPosY + 60, 12, 8);
+                g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 40, 12, 8);
-                g.FillRectangle(additionalBrush, _startPosX + 48, _startPosY + 155, 12, 8);
+                g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 135, 12, 8);
             }
 
             base.DrawTransport(g);
@@ -49,7 +49,7 @@ namespace ProjectBoat_bae.DrawningObjects
             //кресла
             if (Boat.Body)
             {
-                g.FillRectangle(additionalBrush, _startPosX + 58, _startPosY + 90, 25, 40);
+                g.FillRectangle(additionalBrush, _startPosX + 58, _startPosY + 70, 25, 40);
             }
         }
     }

ProjectBoat_base/ProjectBoat_bae/Entities/EntityBoat.cs

@@ -16,7 +16,7 @@ namespace ProjectBoat_bae.Entities
         public int Speed { get; private set; }
         public double Weight { get; private set; }
         public Color BodyColor { get; private set; }
-        public double Step => (double)Speed * 200 / Weight;
+        public double Step => (double)Speed * 100 / Weight;
 
         public EntityBoat(int speed, double weight, Color bodyColor)
         {

ProjectBoat_base/ProjectBoat_bae/Exceptions/BoatNotFoundException.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBoat_bae.Exceptions
-{
-    [Serializable]
-    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)
-        { }
-
-        public BoatNotFoundException(SerializationInfo Info, StreamingContext Context)
-            : base(Info, Context)
-        { }
-    }
-}

ProjectBoat_base/ProjectBoat_bae/Exceptions/StorageOverflowException.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBoat_bae.Exceptions
-{
-    [Serializable]
-    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)
-        { }
-
-        public StorageOverflowException(SerializationInfo Info, StreamingContext Context)
-            : base(Info, Context)
-        { }
-    }
-}

ProjectBoat_base/ProjectBoat_bae/ExtentionBoat.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing.Text;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using ProjectBoat_bae.DrawningObjects;
-using ProjectBoat_bae.Entities;
-
-namespace ProjectBoat_bae
-{
-    internal static class ExtentionBoat
-    {
-        // Разделитель для записи информации по объекту в файл
-        private static readonly char _separatorForObject = ':';
-
-        // Создание объекта из строки
-        public static Drawningboat? CreateDrawningBoat(this string info, char _separatorForObject, int _pictureWidth, int _pictureHeight)
-        {
-            string[] strs = info.Split(_separatorForObject);
-            if (strs.Length == 3)
-            {
-                return new Drawningboat(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]), _pictureWidth, _pictureHeight);
-            }
-            if (strs.Length == 7)
-            {
-                return new DrawningMotorBoat(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]),
-                Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
-               Convert.ToBoolean(strs[5]), _pictureWidth, _pictureHeight);
-            }
-            return null;
-        }
-
-        // Получение данных для сохранения в файл
-        public static string GetDataForSave(this Drawningboat drawningBoat, char _separatorForObject)
-        {
-            var boat = drawningBoat.EntityBoat;
-            var str =
-           $"{boat.Speed}{_separatorForObject}{boat.Weight}{_separatorForObject}{boat.BodyColor.Name}";
-            if (boat is not EntityMotorBoat motorBoat)
-            {
-                return str;
-            }
-            return
-           $"{str}{_separatorForObject}{motorBoat.AdditionalColor.Name}{_separatorForObject}{motorBoat.Body}{_separatorForObject}{motorBoat.Wing}{_separatorForObject}";
-        }
-
-    }
-}
-

ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.Designer.cs

@@ -37,23 +37,14 @@
             ButtonRemoveBoat = new Button();
             ButtonRefreshCollection = new Button();
             textBoxBoat = new TextBox();
-            menuStrip1 = new MenuStrip();
-            файлToolStripMenuItem = new ToolStripMenuItem();
-            SaveToolStripMenuItem = new ToolStripMenuItem();
-            LoadToolStripMenuItem = new ToolStripMenuItem();
-            openFileDialog = new OpenFileDialog();
-            saveFileDialog = new SaveFileDialog();
-            ButtonSortByType = new Button();
-            ButtonSortByColor = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
-            menuStrip1.SuspendLayout();
             SuspendLayout();
             // 
             // pictureBoxCollection
             // 
             pictureBoxCollection.Location = new Point(0, 0);
             pictureBoxCollection.Name = "pictureBoxCollection";
-            pictureBoxCollection.Size = new Size(784, 647);
+            pictureBoxCollection.Size = new Size(929, 647);
             pictureBoxCollection.TabIndex = 0;
             pictureBoxCollection.TabStop = false;
             // 
@@ -61,16 +52,16 @@
             // 
             listBoxStorages.FormattingEnabled = true;
             listBoxStorages.ItemHeight = 25;
-            listBoxStorages.Location = new Point(935, 130);
+            listBoxStorages.Location = new Point(935, 146);
             listBoxStorages.Name = "listBoxStorages";
-            listBoxStorages.Size = new Size(231, 79);
+            listBoxStorages.Size = new Size(231, 129);
             listBoxStorages.TabIndex = 1;
             listBoxStorages.SelectedIndexChanged += listBoxStorages_SelectedIndexChanged;
             // 
             // ButtonAddObject
             // 
             ButtonAddObject.BackColor = SystemColors.ButtonHighlight;
-            ButtonAddObject.Location = new Point(935, 86);
+            ButtonAddObject.Location = new Point(935, 102);
             ButtonAddObject.Name = "ButtonAddObject";
             ButtonAddObject.Size = new Size(231, 38);
             ButtonAddObject.TabIndex = 2;
@@ -80,7 +71,7 @@
             // 
             // textBoxStorageName
             // 
-            textBoxStorageName.Location = new Point(935, 49);
+            textBoxStorageName.Location = new Point(935, 65);
             textBoxStorageName.Name = "textBoxStorageName";
             textBoxStorageName.Size = new Size(231, 31);
             textBoxStorageName.TabIndex = 3;
@@ -88,7 +79,7 @@
             // ButtonDelObject
             // 
             ButtonDelObject.BackColor = SystemColors.ButtonHighlight;
-            ButtonDelObject.Location = new Point(935, 215);
+            ButtonDelObject.Location = new Point(935, 281);
             ButtonDelObject.Name = "ButtonDelObject";
             ButtonDelObject.Size = new Size(231, 34);
             ButtonDelObject.TabIndex = 4;
@@ -136,76 +127,11 @@
             textBoxBoat.Size = new Size(173, 31);
             textBoxBoat.TabIndex = 8;
             // 
-            // menuStrip1
-            // 
-            menuStrip1.ImageScalingSize = new Size(24, 24);
-            menuStrip1.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
-            menuStrip1.Location = new Point(0, 0);
-            menuStrip1.Name = "menuStrip1";
-            menuStrip1.Size = new Size(1178, 33);
-            menuStrip1.TabIndex = 9;
-            menuStrip1.Text = "menuStrip1";
-            // 
-            // файлToolStripMenuItem
-            // 
-            файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
-            файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(69, 29);
-            файлToolStripMenuItem.Text = "Файл";
-            // 
-            // SaveToolStripMenuItem
-            // 
-            SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            SaveToolStripMenuItem.Size = new Size(212, 34);
-            SaveToolStripMenuItem.Text = "Сохранение";
-            SaveToolStripMenuItem.Click += SaveToolStripMenu_Click;
-            // 
-            // LoadToolStripMenuItem
-            // 
-            LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            LoadToolStripMenuItem.Size = new Size(212, 34);
-            LoadToolStripMenuItem.Text = "Загрузка";
-            LoadToolStripMenuItem.Click += LoadToolStripMenu_Click;
-            // 
-            // openFileDialog
-            // 
-            openFileDialog.FileName = "openFileDialog1";
-            openFileDialog.Filter = "txt file | *.txt";
-            // 
-            // saveFileDialog
-            // 
-            saveFileDialog.Filter = "txt file | *.txt";
-            // 
-            // ButtonSortByType
-            // 
-            ButtonSortByType.BackColor = SystemColors.ButtonHighlight;
-            ButtonSortByType.Location = new Point(935, 284);
-            ButtonSortByType.Name = "ButtonSortByType";
-            ButtonSortByType.Size = new Size(231, 34);
-            ButtonSortByType.TabIndex = 10;
-            ButtonSortByType.Text = "Сортировать по типу";
-            ButtonSortByType.UseVisualStyleBackColor = false;
-            ButtonSortByType.Click += ButtonSortByType_Click;
-            // 
-            // ButtonSortByColor
-            // 
-            ButtonSortByColor.BackColor = SystemColors.ButtonHighlight;
-            ButtonSortByColor.Location = new Point(935, 329);
-            ButtonSortByColor.Name = "ButtonSortByColor";
-            ButtonSortByColor.Size = new Size(231, 34);
-            ButtonSortByColor.TabIndex = 11;
-            ButtonSortByColor.Text = "Сортировать по цвету";
-            ButtonSortByColor.UseVisualStyleBackColor = false;
-            ButtonSortByColor.Click += ButtonSortByColor_Click;
-            // 
             // FormBoatCollection
             // 
             AutoScaleDimensions = new SizeF(10F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1178, 644);
-            Controls.Add(ButtonSortByColor);
-            Controls.Add(ButtonSortByType);
-            Controls.Add(menuStrip1);
             Controls.Add(textBoxBoat);
             Controls.Add(ButtonRefreshCollection);
             Controls.Add(ButtonRemoveBoat);
@@ -215,12 +141,9 @@
             Controls.Add(ButtonAddObject);
             Controls.Add(listBoxStorages);
             Controls.Add(pictureBoxCollection);
-            MainMenuStrip = menuStrip1;
             Name = "FormBoatCollection";
             Text = "FormBoatCollection";
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
-            menuStrip1.ResumeLayout(false);
-            menuStrip1.PerformLayout();
             ResumeLayout(false);
             PerformLayout();
         }
@@ -236,13 +159,5 @@
         private Button ButtonRemoveBoat;
         private Button ButtonRefreshCollection;
         private TextBox textBoxBoat;
-        private MenuStrip menuStrip1;
-        private ToolStripMenuItem файлToolStripMenuItem;
-        private ToolStripMenuItem SaveToolStripMenuItem;
-        private ToolStripMenuItem LoadToolStripMenuItem;
-        private OpenFileDialog openFileDialog;
-        private SaveFileDialog saveFileDialog;
-        private Button ButtonSortByType;
-        private Button ButtonSortByColor;
     }
 }

ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging;
+using System;
-
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -12,10 +10,7 @@ using System.Windows.Forms;
 
 using ProjectBoat_bae.DrawningObjects;
 using ProjectBoat_bae.Generics;
-using ProjectBoat_bae.Exceptions;
 using ProjectBoat_bae.MovementStrategy;
-using NLog;
-using System.Numerics;
 
 namespace ProjectBoat_bae
 {
@@ -24,15 +19,10 @@ namespace ProjectBoat_bae
         // Набор объектов
         private readonly BoatsGenericStorage _storage;
 
-        // Логер
+        public FormBoatCollection()
-        private readonly
-            Microsoft.Extensions.Logging.ILogger? _logger;
-
-        public FormBoatCollection(ILogger<FormBoatCollection> logger)
         {
             InitializeComponent();
             _storage = new BoatsGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
-            _logger = logger;
         }
 
         // Заполнение listBoxObjects
@@ -59,135 +49,105 @@ namespace ProjectBoat_bae
         // Добавление набора в коллекцию
         private void ButtonAddObject_Click_1(object sender, EventArgs e)
         {
-
             if (string.IsNullOrEmpty(textBoxStorageName.Text))
             {
-                MessageBox.Show("Input not complete", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-            _storage.AddSet(textBoxStorageName.Text.ToString());
+            _storage.AddSet(textBoxStorageName.Text);
             ReloadObjects();
-            _logger.LogInformation($"Added set: {textBoxStorageName.Text}");
         }
 
         // Удаление набора
         private void ButtonDelObject_Click(object sender, EventArgs e)
         {
-            
             if (listBoxStorages.SelectedIndex == -1)
             {
                 return;
             }
-            string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
+            if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo,
-            if (MessageBox.Show($"Delete Object {name}?", "Deleting",
+        MessageBoxIcon.Question) == DialogResult.Yes)
-                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
             {
-                _storage.DelSet(name);
+                _storage.DelSet(listBoxStorages.SelectedItem.ToString()
+                ?? string.Empty);
                 ReloadObjects();
-                _logger.LogInformation($"Deleted set: {name}");
             }
         }
 
         // Добавление объекта в набор
         private void ButtonAddBoat_Click(object sender, EventArgs e)
         {
-
+            if (listBoxStorages.SelectedIndex == -1) return;
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
             var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
+            if (obj == null) return;
-            {
+
-                return;
+            FormBoatConfig form = new FormBoatConfig();
-            }
+           
-            FormBoatConfig formPlaneConfig = new FormBoatConfig();
+            form.AddEvent(AddBoat);
-            formPlaneConfig.AddEvent(AddBoat);
+            form.Show();
-            formPlaneConfig.Show();
         }
 
         private void AddBoat(Drawningboat boat)
         {
-            
+            boat._pictureWidth = pictureBoxCollection.Width;
-            if (listBoxStorages.SelectedIndex == -1)
+            boat._pictureHeight = pictureBoxCollection.Height;
-            {
+            if (listBoxStorages.SelectedIndex == -1) return;
-                return;
-            }
             var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
+            if (obj == null) return;
+
+            if (obj + boat)
             {
-                _logger.LogWarning("Добавление пустого объекта");
-                return;
-            }
-            try
-            {
-                _ = obj + boat;
                 MessageBox.Show("Объект добавлен");
                 pictureBoxCollection.Image = obj.ShowBoats();
-                _logger.LogInformation($"plane added in set {listBoxStorages.SelectedItem.ToString()}");
             }
-            catch (Exception ex)
+            else
             {
-                MessageBox.Show(ex.Message);
+                MessageBox.Show("Не удалось добавить объект");
-                _logger.LogWarning($"plane not added in set {listBoxStorages.SelectedItem.ToString()}");
             }
-
         }
 
         //удаление объекта
         private void ButtonRemoveBoat_Click(object sender, EventArgs e)
         {
-
             if (listBoxStorages.SelectedIndex == -1)
             {
                 return;
             }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
+            string.Empty];
             if (obj == null)
             {
                 return;
             }
-            if (MessageBox.Show("Delete Object?", "Delete", MessageBoxButtons.YesNo,
+            if (MessageBox.Show("Удалить объект?", "Удаление",
-                    MessageBoxIcon.Question) == DialogResult.No)
+            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
                 return;
             }
-            try
+            int pos = 0;
-            {
+            if (textBoxBoat != null)
-                int pos = Convert.ToInt32(textBoxBoat.Text);
+                pos = Convert.ToInt32(textBoxBoat.Text);
             if (obj - pos != null)
             {
-                    MessageBox.Show("Object deleted");
+                MessageBox.Show("Объект удален");
                 pictureBoxCollection.Image = obj.ShowBoats();
-                    _logger.LogInformation($"plane deleted in set {listBoxStorages.SelectedItem.ToString()}");
             }
             else
             {
-                    MessageBox.Show("Object not deleted");
+                MessageBox.Show("Не удалось удалить объект");
-                    _logger.LogWarning($"plane not deleted in set {listBoxStorages.SelectedItem.ToString()}");
-                }
-            }
-            catch (BoatNotFoundException ex)
-            {
-                MessageBox.Show(ex.Message);
-                _logger.LogWarning($"PlaneNotFound: {ex.Message} in set {listBoxStorages.SelectedItem.ToString()}");
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Not input");
-                _logger.LogWarning("Not input");
             }
         }
 
         // Обновление
         private void ButtonRefreshCollection_Click(object sender, EventArgs e)
         {
-
             if (listBoxStorages.SelectedIndex == -1)
             {
                 return;
             }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
+            string.Empty];
             if (obj == null)
             {
                 return;
@@ -201,63 +161,5 @@ namespace ProjectBoat_bae
             pictureBoxCollection.Image =
             _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBoats();
         }
-
-        //сохранение
-        private void SaveToolStripMenu_Click(object sender, EventArgs e)
-        {
-
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _storage.SaveData(saveFileDialog.FileName);
-                    MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogWarning($"Файл {saveFileDialog.FileName} успешно сохранен");
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning("Не удалось сохранить");
-                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
-
-                }
-            }
-        }
-
-        //загрузка
-        private void LoadToolStripMenu_Click(object sender, EventArgs args)
-        {
-
-
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _storage.LoadData(openFileDialog.FileName);
-                    _logger.LogInformation($"Данные загружены из файла {openFileDialog.FileName}");
-                    ReloadObjects();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    _logger.LogWarning($"Не удалось загрузить информацию из файла: {ex.Message}");
-                }
-            }
-        }
-
-        private void ButtonSortByType_Click(object sender, EventArgs e) => CompareBoats(new BoatCompareByType());
-
-        public void CompareBoats(IComparer<Drawningboat?> comparer)
-        {
-            if (listBoxStorages.SelectedIndex == -1) return;
-
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null) return;
-
-            obj.Sort(comparer);
-            pictureBoxCollection.Image = obj.ShowBoats();
-        }
-
-        private void ButtonSortByColor_Click(object sender, EventArgs e) => CompareBoats(new BoatCompareByColor());
-
     }
 }

ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.resx

@@ -117,16 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>176, 16</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>363, 21</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>91</value>
-  </metadata>
 </root>

ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs

@@ -64,9 +64,9 @@
             // 
             // pictureBoxObject
             // 
-            pictureBoxObject.Location = new Point(38, 30);
+            pictureBoxObject.Location = new Point(38, 76);
             pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(388, 328);
+            pictureBoxObject.Size = new Size(388, 282);
             pictureBoxObject.TabIndex = 0;
             pictureBoxObject.TabStop = false;
             // 
@@ -241,6 +241,7 @@
             checkBoxBoat.TabIndex = 6;
             checkBoxBoat.Text = "Признак наличия кресел";
             checkBoxBoat.UseVisualStyleBackColor = true;
+            //checkBoxBoat.CheckedChanged += checkBoxBoat_CheckedChanged;
             // 
             // Weight
             // 
@@ -279,7 +280,7 @@
             LabelAdditionalColor.AllowDrop = true;
             LabelAdditionalColor.AutoSize = true;
             LabelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            LabelAdditionalColor.Location = new Point(333, 0);
+            LabelAdditionalColor.Location = new Point(333, 38);
             LabelAdditionalColor.Name = "LabelAdditionalColor";
             LabelAdditionalColor.Size = new Size(93, 27);
             LabelAdditionalColor.TabIndex = 1;
@@ -292,7 +293,7 @@
             LabelColor.AllowDrop = true;
             LabelColor.AutoSize = true;
             LabelColor.BorderStyle = BorderStyle.FixedSingle;
-            LabelColor.Location = new Point(38, 0);
+            LabelColor.Location = new Point(38, 38);
             LabelColor.Name = "LabelColor";
             LabelColor.Size = new Size(53, 27);
             LabelColor.TabIndex = 0;

ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs

@@ -10,10 +10,6 @@ using System.Windows.Forms;
 
 using ProjectBoat_bae.DrawningObjects;
 using ProjectBoat_bae.Entities;
-
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-
 namespace ProjectBoat_bae
 {
     public partial class FormBoatConfig : Form
@@ -87,17 +83,18 @@ namespace ProjectBoat_bae
         // Действия при приеме перетаскиваемой информации
         private void PanelObject_DragDrop(object sender, DragEventArgs e)
         {
-
-            ILogger<FormBoatCollection> logger = new NullLogger<FormBoatCollection>();
             switch (e.Data?.GetData(DataFormats.Text).ToString())
             {
                 case "labelSimpleObject":
                     _boat = new Drawningboat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height);
                     break;
                 case "labelModifiedObject":
-                    _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxBoat.Checked, checkBoxBoat2.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
+                    _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+                        checkBoxBoat.Checked, checkBoxBoat2.Checked, pictureBoxObject.Width, pictureBoxObject.Height);
                     break;
             }
+            LabelColor.BackColor = Color.Empty;
+            LabelAdditionalColor.BackColor = Color.Empty;
             DrawBoat();
         }
 
@@ -107,7 +104,7 @@ namespace ProjectBoat_bae
             (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor,
                 DragDropEffects.Move | DragDropEffects.Copy);
         }
-
+        //действия при приеме перетаскиваемой информации
         private void LabelColor_DragDrop(object sender, DragEventArgs e)
         {
             if (_boat == null)
@@ -126,7 +123,7 @@ namespace ProjectBoat_bae
             }
             DrawBoat();
         }
-
+        //проверка информации
         private void LabelColor_DragEnter(object sender, DragEventArgs e)
         {
             if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
@@ -153,7 +150,7 @@ namespace ProjectBoat_bae
         private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e)
         {
             var color = (Color)e.Data.GetData(typeof(Color));
-            //Приведение к EntityTrolleybus для замены доп. цвета
+            //Приведение для замены доп. цвета
             EntityMotorBoat? _motorboat = _boat.EntityBoat as EntityMotorBoat;
             _motorboat.setAdditionalColor(color);
             DrawBoat();

ProjectBoat_base/ProjectBoat_bae/Generics/BoatCompareByColor.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using ProjectBoat_bae.DrawningObjects;
-using ProjectBoat_bae.Entities;
-
-namespace ProjectBoat_bae.Generics
-{
-    internal class BoatCompareByColor : IComparer<Drawningboat?>
-    {
-        public int Compare(Drawningboat? x, Drawningboat? y)
-        {
-
-            if (x == null || x.EntityBoat == null)
-                throw new NotImplementedException(nameof(x));
-
-            if (y == null || y.EntityBoat == null)
-                throw new NotImplementedException(nameof(y));
-
-            var bodyColor = x.EntityBoat.BodyColor.Name.CompareTo(y.EntityBoat.BodyColor.Name);
-
-            if (bodyColor != 0) return bodyColor;
-
-            if (x.EntityBoat is EntityMotorBoat &&
-                y.EntityBoat is EntityMotorBoat)
-            {
-                var addcolor = (x.EntityBoat as EntityMotorBoat).AdditionalColor.Name.CompareTo((y.EntityBoat
-                    as EntityMotorBoat).AdditionalColor.Name);
-                if (addcolor != 0) return addcolor;
-            }
-            return 1;
-        }
-    }
-}

ProjectBoat_base/ProjectBoat_bae/Generics/BoatCompareByType.cs

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

ProjectBoat_base/ProjectBoat_bae/Generics/BoatsCollectionInfo.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectBoat_bae.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)
-                throw new NotImplementedException(nameof(Name));
-            return true;
-        }
-
-        public override int GetHashCode()
-        {
-            return Name.GetHashCode();
-        }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-    }
-}

ProjectBoat_base/ProjectBoat_bae/Generics/BoatsGenericCollection.cs

@@ -20,10 +20,10 @@ namespace ProjectBoat_bae.Generics
         /// <summary>
         /// Размер занимаемого объектом места (ширина)
         /// </summary>
-        private readonly int _placeSizeWidth = 200;
+        private readonly int _placeSizeWidth = 150;
 
         // Размер занимаемого объектом места (высота)
-        private readonly int _placeSizeHeight = 200;
+        private readonly int _placeSizeHeight = 150;
 
         // Набор объектов
         private readonly SetGeneric<T> _collection;
@@ -45,7 +45,7 @@ namespace ProjectBoat_bae.Generics
             {
                 return false;
             }
-            return collect._collection.Insert(obj, new DrawingBoatEqutables());
+            return (bool)collect._collection.Insert(obj);
         }
 
         // Перегрузка оператора вычитания
@@ -108,9 +108,5 @@ namespace ProjectBoat_bae.Generics
                 }
             }
         }
-
-        // Получение объектов коллекции
-        public IEnumerable<T?> GetBoats => _collection.GetBoats();
-        public void Sort(IComparer<T?> comparer) => _collection.SortSet(comparer);
     }
 }

ProjectBoat_base/ProjectBoat_bae/Generics/BoatsGenericStorage.cs

@@ -1,21 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.DirectoryServices.ActiveDirectory;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 using ProjectBoat_bae.DrawningObjects;
 using ProjectBoat_bae.MovementStrategy;
-using ProjectBoat_bae.Entities;
-using ProjectBoat_bae.Exceptions;
 
 namespace ProjectBoat_bae.Generics
 {
     internal class BoatsGenericStorage
     {
         readonly Dictionary<string, BoatsGenericCollection<Drawningboat, DrawningObjectBoat>> _boatStorages;
-
         public List<string> Keys => _boatStorages.Keys.ToList();
 
         private readonly int _pictureWidth;
@@ -28,7 +24,6 @@ namespace ProjectBoat_bae.Generics
         }
         public void AddSet(string name)
         {
-            
             if (_boatStorages.ContainsKey(name)) return;
             _boatStorages[name] = new BoatsGenericCollection<Drawningboat, DrawningObjectBoat>(_pictureWidth, _pictureHeight);
         }
@@ -48,103 +43,5 @@ namespace ProjectBoat_bae.Generics
                 return null;
             }
         }
-
-        private static readonly char _separatorForKeyValue = '|';
-        private readonly char _separatorRecords = ';';
-        private static readonly char _separatorForObject = ':';
-
-        public void SaveData(string filename)
-        {
-
-            if (File.Exists(filename))
-            {
-                File.Delete(filename);
-            }
-            StringBuilder data = new();
-            foreach (KeyValuePair<string,
-            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}");
-            }
-            if (data.Length == 0)
-            {
-                throw new Exception("Невалидная операция, нет данных для сохранения");
-            }
-            using FileStream fs = new(filename, FileMode.Create);
-            byte[] info = new
-            UTF8Encoding(true).GetBytes($"BoatStorage{Environment.NewLine}{data}");
-            fs.Write(info, 0, info.Length);
-            return;
-
-        }
-
-        public void LoadData(string filename)
-        {
-            
-            if (!File.Exists(filename))
-            {
-                throw new FileNotFoundException("Файл не найден");
-            }
-
-            using (StreamReader fs = File.OpenText(filename))
-            {
-                string str = fs.ReadLine();
-                if (str == null || str.Length == 0)
-                {
-                    throw new ArgumentException("Нет объекта для добавления");
-                }
-                if (str.StartsWith("BoatsStorage"))
-                {
-                    throw new InvalidDataException("Неверный формат данных");
-                }
-
-                _boatStorages.Clear();
-                string strs = "";
-
-                while ((strs = fs.ReadLine()) != null)
-                {
-                    if (strs == null)
-                    {
-                        return;
-                    }
-
-                    string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                    if (record.Length != 2)
-                    {
-                        continue;
-                    }
-                    BoatsGenericCollection<Drawningboat, DrawningObjectBoat> collection = new(_pictureWidth, _pictureHeight);
-                    string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
-                    foreach (string elem in set)
-                    {
-                        Drawningboat? boat = elem?.CreateDrawningBoat(_separatorForObject, _pictureWidth, _pictureHeight);
-                        if (boat != null)
-                        {
-                            if (!(collection + boat))
-                            {
-                                try
-                                {
-                                    _ = collection + boat;
-                                }
-                                catch (BoatNotFoundException e)
-                                {
-                                    throw e;
-                                }
-                                catch (StorageOverflowException e)
-                                {
-                                    throw e;
-                                }
-                            }
-                        }
-                    }
-                    _boatStorages.Add(record[0], collection);
-                }
-            }
-        }
     }
 }

ProjectBoat_base/ProjectBoat_bae/Generics/DrawingBoatEqutables.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ProjectBoat_bae.DrawningObjects;
-using ProjectBoat_bae.Entities;
-
-namespace ProjectBoat_bae.Generics
-{
-    internal class DrawingBoatEqutables : 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;
-            // to do logic for "сравнения" additional parameters :)
-            if (x is DrawningMotorBoat && y is DrawningMotorBoat)
-            {
-                if ((x.EntityBoat as EntityMotorBoat).AdditionalColor != (y.EntityBoat as EntityMotorBoat).AdditionalColor)
-                {
-                    return false;
-                }
-                if ((x.EntityBoat as EntityMotorBoat).Body != (y.EntityBoat as EntityMotorBoat).Body)
-                {
-                    return false;
-                }
-                if ((x.EntityBoat as EntityMotorBoat).Wing != (y.EntityBoat as EntityMotorBoat).Wing)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        public int GetHashCode([DisallowNull] Drawningboat obj)
-        {
-            return obj.GetHashCode();
-        }
-    }
-}
-

ProjectBoat_base/ProjectBoat_bae/Generics/SetGeneric.cs

@@ -4,8 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using ProjectBoat_bae.Exceptions;
-
 namespace ProjectBoat_bae.Generics
 {
     internal class SetGeneric<T> where T : class
@@ -16,8 +14,6 @@ namespace ProjectBoat_bae.Generics
         // Максимальное количество объектов в списке
         private readonly int _maxCount;
 
-        public void SortSet(IComparer<T?> comparer) => _places.Sort(comparer);
-
         // Конструктор
         public SetGeneric(int count)
         {
@@ -25,47 +21,27 @@ namespace ProjectBoat_bae.Generics
             _places = new List<T?>(_maxCount);
         }
 
-        public bool Insert(T boat, IEqualityComparer<T?>? equal = null)
+        public bool Insert(T boat)
         {
-            if (equal != null)
-            {
-                foreach (var secondBoat in _places)
-                {
-                    if (equal.Equals(boat, secondBoat))
-                    {
-                        throw new Exception("Такой объект уже есть в коллекции");
-                    }
-                }
-            }
             return Insert(boat, 0);
         }
-        public bool Insert(T boat, int position, IEqualityComparer<T?>? equal = null)
+        public bool Insert(T boat, int position)
         {
             if (position < 0 || position >= _maxCount)
-                throw new StorageOverflowException("Impossible to insert");
+                return false;
 
             if (Count >= _maxCount)
-                throw new StorageOverflowException(_maxCount);
+                return false;
-            if (equal != null)
+            _places.Insert(0, boat);
-            {
-                foreach (var secondBoat in _places)
-                {
-                    if (equal.Equals(boat, secondBoat))
-                    {
-                        throw new ApplicationException("Такой объект уже есть в коллекции");
-                    }
-                }
-            }
-            _places.Insert(position, boat);
             return true;
         }
 
         public bool Remove(int position)
         {
-            if (position >= Count || position < 0)
+            if (position < 0 || position > _maxCount)
-                throw new BoatNotFoundException("Invalid operation");
+                return false;
-            if (_places[position] == null)
+            if (position >= Count)
-                throw new BoatNotFoundException(position);
+                return false;
             _places.RemoveAt(position);
             return true;
         }

ProjectBoat_base/ProjectBoat_bae/Program.cs

@@ -1,12 +1,3 @@
-//using NLog;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.VisualBasic.ApplicationServices;
-using NLog.Extensions.Logging;
-using Serilog;
-
-
 namespace ProjectBoat_bae
 {
     internal static class Program
@@ -20,34 +11,7 @@ namespace ProjectBoat_bae
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
+            Application.Run(new FormBoatCollection());
-            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] + "\\";
-                }
-                //используется для создания исходных текстов конфигурации для приложени
-                //SetBasePath Задает базовый путь для файла конфигурации к текущему каталогу приложения.
-                // файл JSON в качестве источника конфигурации. 
-                var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: $"{pathNeed}appsettings.json", optional: false, reloadOnChange: true).Build();
-                //настроить формат записи логов
-                //используется для настройки регистратора Serilog.
-                var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
-                option.SetMinimumLevel(LogLevel.Information);
-                option.AddSerilog(logger);
-            });
         }
     }
 }

ProjectBoat_base/ProjectBoat_bae/ProjectBoat_bae.csproj

@@ -8,28 +8,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="appSettings.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" 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.5" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="appSettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -45,10 +23,4 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="nlog.config.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

ProjectBoat_base/ProjectBoat_bae/appSettings.json

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

ProjectBoat_base/ProjectBoat_bae/nlog.config.xml

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

ProjectBoat_base/ProjectBoat_base.sln

@@ -3,12 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34031.279
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectBoat_bae", "ProjectBoat_bae\ProjectBoat_bae.csproj", "{D8469CDA-6475-44BF-BCDE-A69B80397FE3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectBoat_bae", "ProjectBoat_bae\ProjectBoat_bae.csproj", "{D8469CDA-6475-44BF-BCDE-A69B80397FE3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9D03BD00-51B0-4389-84FD-8FF17153F0BE}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution