исправил нерабочий кал

WarmlyShip/WarmlyShip/AbstractMap.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal abstract class AbstractMap
+	internal abstract class AbstractMap : IEquatable<AbstractMap>
 	{
 		private IDrawningObject _drawningObject = null;
 
@@ -117,5 +117,26 @@ namespace WarmlyShip
 		protected abstract void GenerateMap();
 		protected abstract void DrawRoadPart(Graphics g, int i, int j);
 		protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+
+		public bool Equals(AbstractMap? other)
+		{
+			if (other == null || _map != other._map || _width != other._width ||
+				_size_x != other._size_x || _size_y != other._size_y || _height != other._height ||
+				GetType() != other.GetType() || _map.GetLength(0) != other._map.GetLength(0) || _map.GetLength(1) != other._map.GetLength(1))
+			{
+				return false;
+			}
+			for (int i = 0; i < _map.GetLength(0); i++)
+			{
+				for (int j = 0; j < _map.GetLength(1); j++)
+				{
+					if (_map[i, j] != other._map[i, j])
+					{
+						return false;
+					}
+				}
+			}
+			return true;
+		}
 	}
 }

WarmlyShip/WarmlyShip/DrawningObjectShip.cs

@@ -17,6 +17,8 @@ namespace WarmlyShip
 
 		public float Step => _warmlyShip?.warmlyShip?.Step ?? 0;
 
+		public DrawingWarmlyShip GetWarmlyShip => _warmlyShip;
+
 		public void DrawningObject(Graphics g)
 		{
 			_warmlyShip?.DrawTransport(g);
@@ -36,5 +38,59 @@ namespace WarmlyShip
 		{
 			_warmlyShip?.SetPosition(x, y, width, height);	
 		}
+
+		public string GetInfo() => _warmlyShip?.GetDataForSave();
+
+		public static IDrawningObject Create(string data) => new DrawningObjectShip(data.CreateDrawningShip());
+
+		public bool Equals(IDrawningObject? other)
+		{
+			if (other == null)
+			{
+				return false;
+			}
+			var otherShip = other as DrawningObjectShip;
+			if (otherShip == null)
+			{
+				return false;
+			}
+			var ship = _warmlyShip.warmlyShip;
+			var otherShipShip = otherShip._warmlyShip.warmlyShip;
+			if (ship.Speed != otherShipShip.Speed)
+			{
+				return false;
+			}
+			if (ship.Weight != otherShipShip.Weight)
+			{
+				return false;
+			}
+			if (ship.BodyColor != otherShipShip.BodyColor)
+			{
+				return false;
+			}
+
+			if ((ship is EntityMotorShip) && !(otherShipShip is EntityMotorShip)
+				|| !(ship is EntityMotorShip) && (otherShipShip is EntityMotorShip))
+			{
+				return false;
+			}
+
+			if (ship is EntityMotorShip motorShip && otherShipShip is EntityMotorShip otherMotorShip)
+			{
+				if (motorShip.DopColor != otherMotorShip.DopColor)
+				{
+					return false;
+				}
+				if (motorShip.Tubes != otherMotorShip.Tubes)
+				{
+					return false;
+				}
+				if (motorShip.Cistern != otherMotorShip.Cistern)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
 	}
 }

WarmlyShip/WarmlyShip/EntityWarmlyShip.cs

@@ -17,8 +17,8 @@ namespace WarmlyShip
 		public EntityWarmlyShip(int speed, float weight, Color bodyColor)
 		{
 			Random random = new Random();
-			Speed = speed <= 0 ? random.Next(100, 300) : speed;
-			Weight = weight <= 0 ? random.Next(1000, 2000) : weight;
+			Speed = speed <= 0 ? 100 : speed;
+			Weight = weight <= 0 ? 1000 : weight;
 			BodyColor = bodyColor;
 		}
 	}

WarmlyShip/WarmlyShip/ExtentionShip.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal static class ExtentionShip
+	{
+
+		private static readonly char _separatorForObject = ':';
+
+		public static DrawingWarmlyShip CreateDrawningShip(this string info)
+		{
+			string[] strs = info.Split(_separatorForObject);
+			if (strs.Length == 3)
+			{
+				return new DrawingWarmlyShip(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+			}
+			if (strs.Length == 6)
+			{
+				return new DrawningMotorShip(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]), Convert.ToBoolean(strs[5]));
+			}
+			return null;
+		}
+
+		public static string GetDataForSave(this DrawingWarmlyShip warmlyShip)
+		{
+			var ship = warmlyShip.warmlyShip;
+			var str = $"{ship.Speed}{_separatorForObject}{ship.Weight}{_separatorForObject}{ship.BodyColor.Name}";
+			if (ship is not EntityMotorShip motorShip)
+			{
+				return str;
+			}
+			return $"{str}{_separatorForObject}{motorShip.DopColor.Name}{_separatorForObject}{motorShip.Tubes}{_separatorForObject}{motorShip.Cistern}";
+		}
+	}
+}

WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs

@@ -45,13 +45,24 @@
 			this.buttonRemoveShip = new System.Windows.Forms.Button();
 			this.buttonAddShip = new System.Windows.Forms.Button();
 			this.pictureBox = new System.Windows.Forms.PictureBox();
+			this.menuStrip = new System.Windows.Forms.MenuStrip();
+			this.файлToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.buttonSortByType = new System.Windows.Forms.Button();
+			this.buttonSortByColor = new System.Windows.Forms.Button();
 			this.groupBox1.SuspendLayout();
 			this.groupBoxMaps.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+			this.menuStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// groupBox1
 			// 
+			this.groupBox1.Controls.Add(this.buttonSortByColor);
+			this.groupBox1.Controls.Add(this.buttonSortByType);
 			this.groupBox1.Controls.Add(this.groupBoxMaps);
 			this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
 			this.groupBox1.Controls.Add(this.buttonDown);
@@ -63,9 +74,9 @@
 			this.groupBox1.Controls.Add(this.buttonRemoveShip);
 			this.groupBox1.Controls.Add(this.buttonAddShip);
 			this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
-			this.groupBox1.Location = new System.Drawing.Point(815, 0);
+			this.groupBox1.Location = new System.Drawing.Point(815, 24);
 			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(200, 648);
+			this.groupBox1.Size = new System.Drawing.Size(200, 624);
 			this.groupBox1.TabIndex = 0;
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Инструменты";
@@ -132,11 +143,10 @@
 			this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
 			this.comboBoxSelectorMap.Size = new System.Drawing.Size(176, 23);
 			this.comboBoxSelectorMap.TabIndex = 0;
-			//this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
 			// 
 			// maskedTextBoxPosition
 			// 
-			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 345);
+			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 375);
 			this.maskedTextBoxPosition.Mask = "00";
 			this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
 			this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
@@ -147,7 +157,7 @@
 			this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonDown.BackgroundImage = global::WarmlyShip.Properties.Resources.todown;
 			this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonDown.Location = new System.Drawing.Point(75, 589);
+			this.buttonDown.Location = new System.Drawing.Point(75, 565);
 			this.buttonDown.Name = "buttonDown";
 			this.buttonDown.Size = new System.Drawing.Size(50, 50);
 			this.buttonDown.TabIndex = 10;
@@ -159,7 +169,7 @@
 			this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.toleft;
 			this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonLeft.Location = new System.Drawing.Point(19, 589);
+			this.buttonLeft.Location = new System.Drawing.Point(19, 565);
 			this.buttonLeft.Name = "buttonLeft";
 			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
 			this.buttonLeft.TabIndex = 9;
@@ -171,7 +181,7 @@
 			this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.totop;
 			this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonUp.Location = new System.Drawing.Point(75, 533);
+			this.buttonUp.Location = new System.Drawing.Point(75, 509);
 			this.buttonUp.Name = "buttonUp";
 			this.buttonUp.Size = new System.Drawing.Size(50, 50);
 			this.buttonUp.TabIndex = 8;
@@ -183,7 +193,7 @@
 			this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonRight.BackgroundImage = global::WarmlyShip.Properties.Resources.toright;
 			this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonRight.Location = new System.Drawing.Point(131, 589);
+			this.buttonRight.Location = new System.Drawing.Point(131, 565);
 			this.buttonRight.Name = "buttonRight";
 			this.buttonRight.Size = new System.Drawing.Size(50, 50);
 			this.buttonRight.TabIndex = 7;
@@ -192,7 +202,7 @@
 			// 
 			// buttonShowOnMap
 			// 
-			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 432);
+			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 462);
 			this.buttonShowOnMap.Name = "buttonShowOnMap";
 			this.buttonShowOnMap.Size = new System.Drawing.Size(188, 23);
 			this.buttonShowOnMap.TabIndex = 5;
@@ -202,7 +212,7 @@
 			// 
 			// buttonShowStorage
 			// 
-			this.buttonShowStorage.Location = new System.Drawing.Point(6, 403);
+			this.buttonShowStorage.Location = new System.Drawing.Point(6, 433);
 			this.buttonShowStorage.Name = "buttonShowStorage";
 			this.buttonShowStorage.Size = new System.Drawing.Size(188, 23);
 			this.buttonShowStorage.TabIndex = 4;
@@ -212,7 +222,7 @@
 			// 
 			// buttonRemoveShip
 			// 
-			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 374);
+			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 404);
 			this.buttonRemoveShip.Name = "buttonRemoveShip";
 			this.buttonRemoveShip.Size = new System.Drawing.Size(188, 23);
 			this.buttonRemoveShip.TabIndex = 3;
@@ -222,7 +232,7 @@
 			// 
 			// buttonAddShip
 			// 
-			this.buttonAddShip.Location = new System.Drawing.Point(6, 316);
+			this.buttonAddShip.Location = new System.Drawing.Point(6, 346);
 			this.buttonAddShip.Name = "buttonAddShip";
 			this.buttonAddShip.Size = new System.Drawing.Size(188, 23);
 			this.buttonAddShip.TabIndex = 1;
@@ -233,12 +243,72 @@
 			// pictureBox
 			// 
 			this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.pictureBox.Location = new System.Drawing.Point(0, 0);
+			this.pictureBox.Location = new System.Drawing.Point(0, 24);
 			this.pictureBox.Name = "pictureBox";
-			this.pictureBox.Size = new System.Drawing.Size(815, 648);
+			this.pictureBox.Size = new System.Drawing.Size(815, 624);
 			this.pictureBox.TabIndex = 1;
 			this.pictureBox.TabStop = false;
 			// 
+			// menuStrip
+			// 
+			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.файлToolStripMenuItem});
+			this.menuStrip.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip.Name = "menuStrip";
+			this.menuStrip.Size = new System.Drawing.Size(1015, 24);
+			this.menuStrip.TabIndex = 2;
+			// 
+			// файлToolStripMenuItem
+			// 
+			this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SaveToolStripMenuItem,
+            this.LoadToolStripMenuItem});
+			this.файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+			this.файлToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+			this.файлToolStripMenuItem.Text = "Файл";
+			// 
+			// SaveToolStripMenuItem
+			// 
+			this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+			this.SaveToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+			this.SaveToolStripMenuItem.Text = "Сохранение";
+			this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+			// 
+			// LoadToolStripMenuItem
+			// 
+			this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+			this.LoadToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+			this.LoadToolStripMenuItem.Text = "Загрузка";
+			this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+			// 
+			// openFileDialog
+			// 
+			this.openFileDialog.Filter = "txt file | *.txt";
+			// 
+			// saveFileDialog
+			// 
+			this.saveFileDialog.Filter = "txt file | *.txt";
+			// 
+			// buttonSortByType
+			// 
+			this.buttonSortByType.Location = new System.Drawing.Point(6, 272);
+			this.buttonSortByType.Name = "buttonSortByType";
+			this.buttonSortByType.Size = new System.Drawing.Size(188, 23);
+			this.buttonSortByType.TabIndex = 13;
+			this.buttonSortByType.Text = "Сортировка по типу";
+			this.buttonSortByType.UseVisualStyleBackColor = true;
+			this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+			// 
+			// buttonSortByColor
+			// 
+			this.buttonSortByColor.Location = new System.Drawing.Point(6, 301);
+			this.buttonSortByColor.Name = "buttonSortByColor";
+			this.buttonSortByColor.Size = new System.Drawing.Size(188, 23);
+			this.buttonSortByColor.TabIndex = 14;
+			this.buttonSortByColor.Text = "Сортировка по цвету";
+			this.buttonSortByColor.UseVisualStyleBackColor = true;
+			this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+			// 
 			// FormMapWithSetShip
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -246,6 +316,8 @@
 			this.ClientSize = new System.Drawing.Size(1015, 648);
 			this.Controls.Add(this.pictureBox);
 			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.menuStrip);
+			this.MainMenuStrip = this.menuStrip;
 			this.Name = "FormMapWithSetShip";
 			this.Text = "FormMapWithSetShip";
 			this.groupBox1.ResumeLayout(false);
@@ -253,7 +325,10 @@
 			this.groupBoxMaps.ResumeLayout(false);
 			this.groupBoxMaps.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+			this.menuStrip.ResumeLayout(false);
+			this.menuStrip.PerformLayout();
 			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
@@ -276,5 +351,13 @@
 		private ListBox listBoxMaps;
 		private Button buttonAddMap;
 		private TextBox textBoxNewMapName;
+		private MenuStrip menuStrip;
+		private ToolStripMenuItem файлToolStripMenuItem;
+		private ToolStripMenuItem SaveToolStripMenuItem;
+		private ToolStripMenuItem LoadToolStripMenuItem;
+		private OpenFileDialog openFileDialog;
+		private SaveFileDialog saveFileDialog;
+		private Button buttonSortByColor;
+		private Button buttonSortByType;
 	}
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -23,9 +24,12 @@ namespace WarmlyShip
 
 		private readonly MapsCollection _mapsCollection;
 
-		public FormMapWithSetShip()
+		private readonly ILogger _logger;
+
+		public FormMapWithSetShip(ILogger<FormMapWithSetShip> logger)
 		{
 			InitializeComponent();
+			_logger = logger;
 			_mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
 			comboBoxSelectorMap.Items.Clear();
 			foreach (var elem in _mapsDict)
@@ -66,6 +70,7 @@ namespace WarmlyShip
 			}
 			_mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
 			ReloadMaps();
+			_logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}");
 		}
 
 		private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
@@ -81,9 +86,9 @@ namespace WarmlyShip
 			}
 			if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
-				_mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ??
-			   string.Empty);
+				_mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
 				ReloadMaps();
+				_logger.LogInformation("Удалена карта {0}", listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
 			}
 		}
 
@@ -100,15 +105,25 @@ namespace WarmlyShip
 			{
 				return;
 			}
-
-			if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectShip(ship) > -1)
+			try
 			{
-				MessageBox.Show("Объект добавлен");
-				pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+				if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectShip(ship) > -1)
+				{
+					MessageBox.Show("Объект добавлен");
+					pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+					_logger.LogInformation($"Добавлен объект: {ship} на карте: {listBoxMaps.SelectedItem}");
+				}
+				else MessageBox.Show("Объект не добавлен");
 			}
-			else
+			catch (StorageOverflowException ex)
 			{
-				MessageBox.Show("Не удалось добавить объект");
+				_logger.LogWarning($"Ошибка переполнения при добавлении объекта: {ex.Message}");
+				MessageBox.Show($"Ошибка переполнения: {ex.Message}");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogWarning($"Неизвестная ошибка при добавлении объекта: {ex.Message}");
+				MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
 			}
 		}
 
@@ -127,15 +142,29 @@ namespace WarmlyShip
 				return;
 			}
 			int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-			if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+			try
 			{
-				MessageBox.Show("Объект удален");
-				pictureBox.Image =
-			   _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+				if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+				{
+					MessageBox.Show("Объект удален");
+					pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+					_logger.LogInformation($"Удален объект с позиции: [{pos}] на карте: {listBoxMaps.SelectedItem}");
+				}
 			}
-			else
+			catch (ShipNotFoundException ex)
 			{
-				MessageBox.Show("Не удалось удалить объект");
+				_logger.LogWarning($"Ошибка при удалении объекта на позиции: {ex.Message}");
+				MessageBox.Show($"Ошибка удаления: {ex.Message} ");
+			}
+			catch (StorageOverflowException ex)
+			{
+				_logger.LogWarning($"Ошибка при удалении объекта на позиции: {ex.Message}");
+				MessageBox.Show($"Превышение размерности: {ex.Message}");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogWarning($"Неизвестная ошибка при удалении объекта на позиции: {ex.Message}");
+				MessageBox.Show($"Неизвестная ошибка: {ex.Message} ");
 			}
 		}
 
@@ -146,6 +175,7 @@ namespace WarmlyShip
 				return;
 			}
 			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+			_logger.LogInformation($"Переход в хранилище: {listBoxMaps.SelectedItem}");
 		}
 
 		private void ButtonShowOnMap_Click(object sender, EventArgs e)
@@ -155,6 +185,7 @@ namespace WarmlyShip
 				return;
 			}
 			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+			_logger.LogInformation($"Переход на карту: {listBoxMaps.SelectedItem}");
 		}
 
 		private void ButtonMove_Click(object sender, EventArgs e)
@@ -183,5 +214,62 @@ namespace WarmlyShip
 			}
 			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
 		}
+
+		private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			if (saveFileDialog.ShowDialog() == DialogResult.OK)
+			{
+				try
+				{
+					_mapsCollection.SaveData(saveFileDialog.FileName);
+					_logger.LogInformation($"Карта успешно сохранена в файл: {saveFileDialog.FileName}");
+					MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				}
+				catch (Exception ex)
+				{
+					_logger.LogWarning($"Не сохранилось в файл: {saveFileDialog.FileName}");
+					MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
+
+		private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			if (openFileDialog.ShowDialog() == DialogResult.OK)
+			{
+				try
+				{
+					_mapsCollection.LoadData(openFileDialog.FileName);
+					_logger.LogInformation($"Карта успешно загружена из файла: {openFileDialog.FileName}");
+					MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+					ReloadMaps();
+				}
+				catch (Exception ex)
+				{
+					_logger.LogWarning($"Не загрузилось из файла: {openFileDialog.FileName}");
+					MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
+
+		private void ButtonSortByType_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new ShipCompareByType());
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+		}
+
+		private void ButtonSortByColor_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new ShipCompareByColor());
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+		}
 	}
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.resx

@@ -57,4 +57,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>125, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>265, 17</value>
+  </metadata>
 </root>

WarmlyShip/WarmlyShip/IDrawningObject.cs

@@ -6,12 +6,14 @@ using System.Threading.Tasks;
 
 namespace WarmlyShip
 {
-	internal interface IDrawningObject
+	internal interface IDrawningObject : IEquatable<IDrawningObject>
 	{
 		public float Step { get; }
 		void SetObject(int x, int y, int width, int height);
 		void MoveObject(Direction direction);
 		void DrawningObject(Graphics g);
 		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+
+		string GetInfo();
 	}
 }

WarmlyShip/WarmlyShip/MapWithSetShipGeneric.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace WarmlyShip
 {
 	internal class MapWithSetShipGeneric<T, U>
-		where T : class, IDrawningObject
+		where T : class, IDrawningObject, IEquatable<T>
 		where U : AbstractMap
 	{
 		private readonly int _pictureWidth;
@@ -65,6 +65,29 @@ namespace WarmlyShip
 			return new(_pictureWidth, _pictureHeight);
 		}
 
+		public string GetData(char separatorType, char separatorData)
+		{
+			string data = $"{_map.GetType().Name}{separatorType}";
+			foreach (var ship in _setShips.GetShips())
+			{
+				data += $"{ship.GetInfo()}{separatorData}";
+			}
+			return data;
+		}
+
+		public void LoadData(string[] records)
+		{
+			foreach (var rec in records)
+			{
+				_setShips.Insert(DrawningObjectShip.Create(rec) as T);
+			}
+		}
+
+		public void Sort(IComparer<T> comparer)
+		{
+			_setShips.SortSet(comparer);
+		}
+
 		private void Shaking()
 		{
 			int j = _setShips.Count - 1;
@@ -107,17 +130,6 @@ namespace WarmlyShip
 
 		private void DrawShips(Graphics g)
 		{
-			/*for (int i = 0; i < _setShips.Count; ++i)
-			{
-				if (_setShips[i] != null )
-				{
-					int temp = 0;
-					if (_setShips[i].GetCurrentPosition().Bottom - _setShips[i].GetCurrentPosition().Top < 75) temp = (int)(_setShips[i].GetCurrentPosition().Bottom - _setShips[i].GetCurrentPosition().Top);
-					_setShips[i].SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight + temp, _pictureWidth, _pictureHeight);
-					_setShips[i].DrawningObject(g);
-				}
-			}*/
-
 			int i = 0;
 			foreach (var ship in _setShips.GetShips())
 			{
@@ -131,6 +143,5 @@ namespace WarmlyShip
 				++i;
 			}
 		}
-
 	}
 }

WarmlyShip/WarmlyShip/MapsCollection.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.DirectoryServices.ActiveDirectory;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,7 +10,7 @@ namespace WarmlyShip
 {
 	internal class MapsCollection
 	{
-		readonly Dictionary<string, MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>> _mapStorages;
+		readonly Dictionary<string, MapWithSetShipGeneric<IDrawningObject, AbstractMap>> _mapStorages;
 
 		public List<string> Keys => _mapStorages.Keys.ToList();
 
@@ -17,9 +18,13 @@ namespace WarmlyShip
 
 		private readonly int _pictureHeight;
 
+		private readonly char separatorDict = '|';
+
+		private readonly char separatorData = ';';
+
 		public MapsCollection(int pictureWidth, int pictureHeight)
 		{
-			_mapStorages = new Dictionary<string, MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>>();
+			_mapStorages = new Dictionary<string, MapWithSetShipGeneric<IDrawningObject, AbstractMap>>();
 			_pictureWidth = pictureWidth;
 			_pictureHeight = pictureHeight;
 		}
@@ -27,7 +32,7 @@ namespace WarmlyShip
 		public void AddMap(string name, AbstractMap map)
 		{
 			if (_mapStorages.ContainsKey(name)) return;
-			_mapStorages.Add(name, new MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>(_pictureWidth, _pictureHeight, map));
+			_mapStorages.Add(name, new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
 		}
 
 		public void DelMap(string name)
@@ -36,7 +41,7 @@ namespace WarmlyShip
 			_mapStorages.Remove(name);
 		}
 
-		public MapWithSetShipGeneric<DrawningObjectShip, AbstractMap> this[string ind]
+		public MapWithSetShipGeneric<IDrawningObject, AbstractMap> this[string ind]
 		{
 			get
 			{
@@ -45,5 +50,68 @@ namespace WarmlyShip
 			}
 		}
 
+		public void SaveData(string filename)
+		{
+			if (File.Exists(filename))
+			{
+				File.Delete(filename);
+			}
+			using (StreamWriter sw = new(filename))
+			{
+				sw.Write($"MapsCollection{Environment.NewLine}");
+				foreach (var storage in _mapStorages)
+				{
+
+					sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
+				}
+			}
+		}
+
+		public void LoadData(string filename)
+		{
+			if (!File.Exists(filename))
+			{
+				throw new FileNotFoundException("Файл не найден");
+			}
+			using (StreamReader sr = new(filename))
+			{
+				string bufferStr;
+				bool firstIn = true;
+				while ((bufferStr = sr.ReadLine()) != null)
+				{
+					if (firstIn)
+					{
+						if (!bufferStr.Contains("MapsCollection"))
+						{
+							throw new FormatException("Формат данных в файле не правильный");
+						}
+						else
+						{
+							_mapStorages.Clear();
+						}
+						firstIn = false;
+					}
+					else
+					{
+						var elem = bufferStr.Split(separatorDict);
+						AbstractMap map = null;
+						switch (elem[1])
+						{
+							case "SimpleMap":
+								map = new SimpleMap();
+								break;
+							case "SecondMap":
+								map = new SecondMap();
+								break;
+							case "LastMap":
+								map = new LastMap();
+								break;
+						}
+						_mapStorages.Add(elem[0], new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+						_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+					}
+				}
+			}
+		}
 	}
 }

WarmlyShip/WarmlyShip/Program.cs

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

WarmlyShip/WarmlyShip/SetShipGeneric.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace WarmlyShip
 {
 	internal class SetShipGeneric<T>
-		where T : class
+		where T : class, IEquatable<T>
 	{
 		private readonly List<T> _places;
 		public int Count => _places.Count;
@@ -27,15 +27,20 @@ namespace WarmlyShip
 
 		public int Insert(T ship, int position)
 		{
-			if (position < 0 || position > Count || Count == _maxCount) return -1;
+			if (_places.Contains(ship))
+			{
+				return -1;
+			}
+			if (position < 0 || position > Count || Count == _maxCount) throw new StorageOverflowException(_maxCount);
 			_places.Insert(position, ship);
 			return position;
 		}
 
 		public T Remove(int position)
 		{
+			if (position >= _maxCount || position >= _places.Count) throw new ShipNotFoundException(position);
 			T DelElement = _places[position];
-			_places[position] = null;
+			_places.Remove(DelElement);
 			return DelElement;
 		}
 
@@ -68,5 +73,13 @@ namespace WarmlyShip
 			}
 		}
 
+		public void SortSet(IComparer<T> comparer)
+		{
+			if (comparer == null)
+			{
+				return;
+			}
+			_places.Sort(comparer);
+		}
 	}
 }

WarmlyShip/WarmlyShip/ShipCompareByColor.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class ShipCompareByColor : IComparer<IDrawningObject>
+	{
+		public int Compare(IDrawningObject? x, IDrawningObject? y)
+		{
+			if (x == null && y == null)
+			{
+				return 0;
+			}
+			if (x == null && y != null)
+			{
+				return 1;
+			}
+			if (x != null && y == null)
+			{
+				return -1;
+			}
+			var xShip = x as DrawningObjectShip;
+			var yShip = y as DrawningObjectShip;
+			if (xShip == null && yShip == null)
+			{
+				return 0;
+			}
+			if (xShip == null && yShip != null)
+			{
+				return 1;
+			}
+			if (xShip != null && yShip == null)
+			{
+				return -1;
+			}
+			string xAirplaneColor = xShip.GetWarmlyShip.warmlyShip.BodyColor.Name;
+			string yAirplaneColor = yShip.GetWarmlyShip.warmlyShip.BodyColor.Name;
+			if (xAirplaneColor != yAirplaneColor)
+			{
+				return xAirplaneColor.CompareTo(yAirplaneColor);
+			}
+			if (xShip.GetWarmlyShip.warmlyShip is EntityMotorShip xAirbus && yShip.GetWarmlyShip.warmlyShip is EntityMotorShip yAirbus)
+			{
+				string xAirplaneDopColor = xAirbus.DopColor.Name;
+				string yAirplaneDopColor = yAirbus.DopColor.Name;
+				var dopColorCompare = xAirplaneDopColor.CompareTo(yAirplaneDopColor);
+				if (dopColorCompare != 0)
+				{
+					return dopColorCompare;
+				}
+			}
+			var speedCompare = xShip.GetWarmlyShip.warmlyShip.Speed.CompareTo(yShip.GetWarmlyShip.warmlyShip.Speed);
+			if (speedCompare != 0)
+			{
+				return speedCompare;
+			}
+			return xShip.GetWarmlyShip.warmlyShip.Weight.CompareTo(yShip.GetWarmlyShip.warmlyShip.Weight);
+		}
+	}
+}

WarmlyShip/WarmlyShip/ShipCompareByType.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	internal class ShipCompareByType : IComparer<IDrawningObject>
+	{
+		public int Compare(IDrawningObject? x, IDrawningObject? y)
+		{
+			if (x == null && y == null)
+			{
+				return 0;
+			}
+			if (x == null && y != null)
+			{
+				return 1;
+			}
+			if (x != null && y == null)
+			{
+				return -1;
+			}
+			var xShip = x as DrawningObjectShip;
+			var yShip = y as DrawningObjectShip;
+			if (xShip == null && yShip == null)
+			{
+				return 0;
+			}
+			if (xShip == null && yShip != null)
+			{
+				return 1;
+			}
+			if (xShip != null && yShip == null)
+			{
+				return -1;
+			}
+			if (xShip.GetWarmlyShip.GetType().Name != yShip.GetWarmlyShip.GetType().Name)
+			{
+				if (xShip.GetWarmlyShip.GetType().Name == "DrawingWarmlyShip")
+				{
+					return -1;
+				}
+				return 1;
+			}
+			var speedCompare = xShip.GetWarmlyShip.warmlyShip.Speed.CompareTo(yShip.GetWarmlyShip.warmlyShip.Speed);
+			if (speedCompare != 0)
+			{
+				return speedCompare;
+			}
+			return xShip.GetWarmlyShip.warmlyShip.Weight.CompareTo(yShip.GetWarmlyShip.warmlyShip.Weight);
+		}
+	}
+}

WarmlyShip/WarmlyShip/ShipDelegate.cs

@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WarmlyShip
-{
-	public delegate void ShipDelegate(DrawingWarmlyShip warmlyShip);
-}

WarmlyShip/WarmlyShip/ShipNotFoundException.cs

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

WarmlyShip/WarmlyShip/StorageOverflowException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WarmlyShip
+{
+	[Serializable]
+	internal class StorageOverflowException : Exception
+	{
+		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) { }
+	}
+}

WarmlyShip/WarmlyShip/WarmlyShip.csproj

@@ -8,6 +8,30 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="serilogConfig.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="serilogConfig.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Settings.Delegates" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

WarmlyShip/WarmlyShip/serilogConfig.json

@@ -0,0 +1,16 @@
+{
+  "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}"
+        }
+      }
+    ]
+  }
+}