lab8-ready

ProjectElectroTrans/CollectionGenericObjects/AbstractCompany.cs

@@ -1,4 +1,5 @@
 using ProjectElectroTrans.Drawnings;
+using ProjectElectroTrans.Exceptions;
 
 namespace ProjectElectroTrans.CollectionGenericObjects;
 
@@ -35,7 +36,8 @@ public abstract class AbstractCompany
     /// <summary>
     /// Вычисление максимального количества элементов, который можно разместить в окне
     /// </summary>
-	private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+    private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight);
+    // private int GetMaxCount => (_pictureWidth * _pictureHeight) / (_placeSizeWidth * _placeSizeHeight);
 
     /// <summary>
     /// Конструктор
@@ -48,7 +50,7 @@ public abstract class AbstractCompany
         _pictureWidth = picWidth;
         _pictureHeight = picHeight;
         _collection = collection;
-		_collection.SetMaxCount = GetMaxCount;
+        _collection.MaxCount = GetMaxCount;
     }
 
     /// <summary>
@@ -59,7 +61,8 @@ public abstract class AbstractCompany
     /// <returns></returns>
     public static int operator +(AbstractCompany company, DrawingTrans trans)
     {
-		return company._collection.Insert(trans);
+        return company._collection?.Insert(trans, new DrawingTransEquitables()) ??
+               throw new DrawingEquitablesException();
     }
 
     /// <summary>
@@ -73,6 +76,13 @@ public abstract class AbstractCompany
         return company._collection?.Remove(position);
     }
 
+    /// <summary>
+    /// Сортировка
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    public void Sort(IComparer<DrawingTrans?> comparer) =>
+        _collection?.CollectionSort(comparer);
+
     /// <summary>
     /// Получение случайного объекта из коллекции
     /// </summary>
@@ -95,10 +105,21 @@ public abstract class AbstractCompany
 
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            try
             {
                 DrawingTrans? obj = _collection?.Get(i);
                 obj?.DrawTransport(graphics);
             }
+            catch (ObjectNotFoundException e)
+            {
+                // Relax Man ;)
+            }
+            catch (PositionOutOfCollectionException e)
+            {
+                // Relax Man ;)
+            }
+        }
 
         return bitmap;
     }

ProjectElectroTrans/CollectionGenericObjects/CollectionInfo.cs

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

ProjectElectroTrans/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,6 +1,4 @@
-using ProjectElectroTrans.Drawnings;
-
-namespace ProjectElectroTrans.CollectionGenericObjects;
+namespace ProjectElectroTrans.CollectionGenericObjects;
 
 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
@@ -17,14 +15,14 @@ public interface ICollectionGenericObjects<T>
 	/// <summary>
 	/// Установка максимального количества элементов
 	/// </summary>
-	int SetMaxCount { set; }
+	int MaxCount { get; set; }
 
 	/// <summary>
 	/// Добавление объекта в коллекцию
 	/// </summary>
 	/// <param name="obj">Добавляемый объект</param>
 	/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-	int Insert(T obj);
+	int Insert(T obj, IEqualityComparer<T?>? comparer = null);
 
 	/// <summary>
 	/// Добавление объекта в коллекцию на конкретную позицию
@@ -32,14 +30,14 @@ public interface ICollectionGenericObjects<T>
 	/// <param name="obj">Добавляемый объект</param>
 	/// <param name="position">Позиция</param>
 	/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
-	int Insert(T obj, int position);
+	int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null);
 
 	/// <summary>
 	/// Удаление объекта из коллекции с конкретной позиции
 	/// </summary>
 	/// <param name="position">Позиция</param>
 	/// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
-	T? Remove(int position);
+	T Remove(int position);
 
 	/// <summary>
 	/// Получение объекта по позиции
@@ -47,4 +45,22 @@ public interface ICollectionGenericObjects<T>
 	/// <param name="position">Позиция</param>
 	/// <returns>Объект</returns>
 	T? Get(int position);
+
+	/// <summary>
+	/// Получение типа коллекции
+	/// </summary>
+	CollectionType GetCollectionType { get; }
+
+	/// <summary>
+	/// Получение объектов коллекции по одному
+	/// </summary>
+	/// <returns>Поэлементый вывод элементов коллекции</returns>
+	IEnumerable<T?> GetItems();
+	
+	/// <summary>
+	/// Сортировка коллекции
+	/// </summary>
+	/// <param name="comparer">Сравнитель объектов</param>
+	void CollectionSort(IComparer<T?> comparer);
+
 }

ProjectElectroTrans/CollectionGenericObjects/ListGenericObjects.cs

@@ -1,4 +1,6 @@
-namespace ProjectElectroTrans.CollectionGenericObjects;
+using ProjectElectroTrans.Exceptions;
+
+namespace ProjectElectroTrans.CollectionGenericObjects;
 
 /// <summary>
 /// Параметризованный набор объектов
@@ -11,13 +13,27 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
     /// Список объектов, которые храним
     /// </summary>
     private readonly List<T?> _collection;
+
     /// <summary>
     /// Максимально допустимое число объектов в списке
     /// </summary>
     private int _maxCount;
+
     public int Count => _collection.Count;
 
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    public int MaxCount
+    {
+        get { return Count; }
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
 
     /// <summary>
     /// Конструктор
@@ -27,43 +43,68 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
         _collection = new();
     }
 
-    public T? Get(int position)
+    public T Get(int position)
     {
-
-        if (position < 0 || position > _collection.Count - 1)
-        {
-            return null;
-        }
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
         return _collection[position];
     }
 
-    public int Insert(T obj)
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
     {
-        if (_collection.Count + 1 > _maxCount) { return 0; }
+        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        if (comparer != null)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
+            }
+        }
+
         _collection.Add(obj);
-
-        return 1;
+        return Count;
     }
 
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
-        if (_collection.Count + 1 < _maxCount) { return 0; }
-        if (position > _collection.Count || position < 0)
+        if (Count == _maxCount) throw new CollectionOverflowException(Count);
+        if (position >= Count || position < 0) throw new PositionOutOfCollectionException(position);
+
+        if (comparer != null)
         {
-            return 0;
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
                 }
+            }
+        }
+
         _collection.Insert(position, obj);
-        return 1;
+        return position;
     }
 
     public T Remove(int position)
     {
-        if (position > _collection.Count || position < 0)
-        {
-            return null;
-        }
-        T temp = _collection[position];
+        if (position >= _collection.Count || position < 0) throw new PositionOutOfCollectionException(position);
+        T obj = _collection[position];
         _collection.RemoveAt(position);
-        return temp;
+        return obj;
+    }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        _collection.Sort(comparer);
     }
 }

ProjectElectroTrans/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -1,5 +1,5 @@
-using System.Runtime.Remoting;
-using ProjectElectroTrans.Drawnings;
+using ProjectElectroTrans.Exceptions;
+using System.Collections.Generic;
 
 namespace ProjectElectroTrans.CollectionGenericObjects;
 
@@ -17,8 +17,9 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Length;
 
-    public int SetMaxCount
+    public int MaxCount
     {
+        get { return _collection.Length; }
         set
         {
             if (value > 0)
@@ -35,6 +36,8 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
         }
     }
 
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -45,16 +48,25 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
     public T? Get(int position)
     {
-        if (position >= 0 && position < Count)
-        {
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
         return _collection[position];
     }
 
-        return null;
+    public int Insert(T obj, IEqualityComparer<T?>? comparer = null)
+    {
+        if (comparer != null)
+        {
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
+            }
         }
 
-    public int Insert(T obj)
-    {
+
         // вставка в свободное место набора
         for (int i = 0; i < Count; i++)
         {
@@ -65,20 +77,25 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
             }
         }
 
-        return -1;
+        throw new CollectionOverflowException(Count);
     }
 
-    public int Insert(T obj, int position)
+    public int Insert(T obj, int position, IEqualityComparer<T?>? comparer = null)
     {
         // проверка позиции
-        if (position < 0 || position >= Count)
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
+
+        if (comparer != null)
         {
-            return -1;
+            for (int i = 0; i < Count; i++)
+            {
+                if (comparer.Equals(_collection[i], obj))
+                {
+                    throw new CollectionInsertException(obj);
+                }
+            }
         }
 
-        // проверка, что элемент массива по этой позиции пустой, если нет, то
-        //		ищется свободное место после этой позиции и идет вставка туда
-        //		если нет после, ищем до
         if (_collection[position] != null)
         {
             bool pushed = false;
@@ -107,11 +124,10 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
 
             if (!pushed)
             {
-                return position;
+                throw new CollectionOverflowException(Count);
             }
         }
 
-        // вставка
         _collection[position] = obj;
         return position;
     }
@@ -119,15 +135,30 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     public T? Remove(int position)
     {
         //  проверка позиции
-        if (position < 0 || position >= Count)
-        {
-            return null;
-        }
+        if (position < 0 || position >= Count) throw new PositionOutOfCollectionException(position);
 
-        if (_collection[position] == null) return null;
+        if (_collection[position] == null) throw new ObjectNotFoundException(position);
 
         T? temp = _collection[position];
         _collection[position] = null;
         return temp;
     }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+
+    public void CollectionSort(IComparer<T?> comparer)
+    {
+        List<T?> lst = [.._collection];
+        lst.Sort(comparer.Compare);
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            _collection[i] = lst[i];
+        }
+    }
 }

ProjectElectroTrans/CollectionGenericObjects/StorageCollection.cs

@@ -1,61 +1,75 @@
-namespace ProjectElectroTrans.CollectionGenericObjects;
+using ProjectElectroTrans.Drawnings;
+using System.Text;
+using ProjectElectroTrans.CollectionGenericObjects;
+using ProjectElectroTrans.Exceptions;
+using FileFormatException = ProjectElectroTrans.Exceptions.FileFormatException;
+using FileNotFoundException = ProjectElectroTrans.Exceptions.FileNotFoundException;
+
+namespace ProjectElectroTrans.CollectionGenericObjects;
 
 /// <summary>
 /// Класс-хранилище коллекций
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
-    where T : class
+    where T : DrawingTrans
 {
     /// <summary>
     /// Словарь (хранилище) с коллекциями
     /// </summary>
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    readonly Dictionary<CollectionInfo, ICollectionGenericObjects<T>> _storages;
 
     /// <summary>
     /// Возвращение списка названий коллекций
     /// </summary>
-    public List<string> Keys => _storages.Keys.ToList();
+    public List<CollectionInfo> Keys => _storages.Keys.ToList();
+
+    /// <summary>
+    /// Ключевое слово, с которого должен начинаться файл
+    /// </summary>
+    private readonly string _collectionKey = "CollectionsStorage";
+
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
+    private readonly string _separatorForKeyValue = "|";
+
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
 
     /// <summary>
     /// Конструктор
     /// </summary>
     public StorageCollection()
     {
-        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+        _storages = new Dictionary<CollectionInfo, ICollectionGenericObjects<T>>();
     }
 
     /// <summary>
     /// Добавление коллекции в хранилище
     /// </summary>
-    /// <param name="name">Название коллекции</param>
-    /// <param name="collectionType">тип коллекции</param>
-    public void AddCollection(string name, CollectionType collectionType)
+    /// <param name="collectionInfo">тип коллекции</param>
+    public void AddCollection(CollectionInfo collectionInfo)
     {
-        if (name == null || _storages.ContainsKey(name)) { return; }
-        switch (collectionType)
-
-        {
-            case CollectionType.None:
-                return;
-            case CollectionType.Massive:
-                _storages.Add(name, new MassiveGenericObjects<T> { });
-                return;
-            case CollectionType.List:
-                _storages.Add(name, new ListGenericObjects<T> { });
-                return;
-        }
-
+        if (_storages.ContainsKey(collectionInfo)) throw new CollectionAlreadyExistsException(collectionInfo);
+        if (collectionInfo.CollectionType == CollectionType.None)
+            throw new CollectionTypeException("Пустой тип коллекции");
+        if (collectionInfo.CollectionType == CollectionType.Massive)
+            _storages[collectionInfo] = new MassiveGenericObjects<T>();
+        else if (collectionInfo.CollectionType == CollectionType.List)
+            _storages[collectionInfo] = new ListGenericObjects<T>();
     }
 
     /// <summary>
     /// Удаление коллекции
     /// </summary>
-    /// <param name="name">Название коллекции</param>
-    public void DelCollection(string name)
+    /// <param name="collectionInfo">тип коллекции</param>
+    public void DelCollection(CollectionInfo collectionInfo)
     {
-        if (name == null || !_storages.ContainsKey(name)) { return; }
-        _storages.Remove(name);
+        if (_storages.ContainsKey(collectionInfo))
+            _storages.Remove(collectionInfo);
     }
 
     /// <summary>
@@ -63,12 +77,145 @@ public class StorageCollection<T>
     /// </summary>
     /// <param name="name">Название коллекции</param>
     /// <returns></returns>
-    public ICollectionGenericObjects<T>? this[string name]
+    public ICollectionGenericObjects<T>? this[CollectionInfo collectionInfo]
     {
         get
         {
-            if (name == null || !_storages.ContainsKey(name)) { return null; }
-            return _storages[name];
+            if (_storages.ContainsKey(collectionInfo))
+                return _storages[collectionInfo];
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Сохранение информации по автомобилям в хранилище в файл
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
+    public void SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            throw new EmptyFileExeption();
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        using (StreamWriter writer = new StreamWriter(filename))
+        {
+            writer.Write(_collectionKey);
+            foreach (KeyValuePair<CollectionInfo, ICollectionGenericObjects<T>> value in _storages)
+            {
+                StringBuilder sb = new();
+                sb.Append(Environment.NewLine);
+                // не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
+                {
+                    continue;
+                }
+
+                sb.Append(value.Key);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(value.Value.MaxCount);
+                sb.Append(_separatorForKeyValue);
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+
+                    sb.Append(data);
+                    sb.Append(_separatorItems);
+                }
+
+                writer.Write(sb);
             }
         }
     }
+
+    /// <summary>
+    /// Загрузка информации по автомобилям в хранилище из файла
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
+    public void LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            throw new FileNotFoundException(filename);
+        }
+
+        using (StreamReader fs = File.OpenText(filename))
+        {
+            string str = fs.ReadLine();
+            if (string.IsNullOrEmpty(str))
+            {
+                throw new EmptyFileExeption(filename);
+            }
+
+            if (!str.StartsWith(_collectionKey))
+            {
+                throw new FileFormatException(filename);
+            }
+
+            _storages.Clear();
+            string strs = "";
+            while ((strs = fs.ReadLine()) != null)
+            {
+                string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 3)
+                {
+                    continue;
+                }
+
+                CollectionInfo? collectionInfo =
+                    CollectionInfo.GetCollectionInfo(record[0]) ??
+                    throw new CollectionInfoException("Не удалось определить информацию коллекции:" + record[0]);
+
+                ICollectionGenericObjects<T>? collection =
+                    StorageCollection<T>.CreateCollection(collectionInfo.CollectionType) ??
+                    throw new CollectionTypeException("Не удалось определить тип коллекции:" + record[1]);
+                collection.MaxCount = Convert.ToInt32(record[1]);
+
+                string[] set = record[2].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawningTrans() is T ship)
+                    {
+                        try
+                        {
+                            collection.Insert(ship);
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new FileFormatException(filename, ex);
+                        }
+                    }
+                }
+
+                _storages.Add(collectionInfo, collection);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Создание коллекции по типу
+    /// </summary>
+    /// <param name="collectionType"></param>
+    /// <returns></returns>
+    private static ICollectionGenericObjects<T>?
+        CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
+}

ProjectElectroTrans/CollectionGenericObjects/TransDepoService.cs

@@ -1,6 +1,7 @@
 using ProjectElectroTrans.Drawnings;
 using ProjectElectroTrans.Entities;
 using System;
+using ProjectElectroTrans.Exceptions;
 
 namespace ProjectElectroTrans.CollectionGenericObjects;
 
@@ -15,7 +16,8 @@ public class TransDepoService : AbstractCompany
     /// <param name="picWidth"></param>
     /// <param name="picHeight"></param>
     /// <param name="collection"></param>
-	public TransDepoService(int picWidth, int picHeight, ICollectionGenericObjects<DrawingTrans> collection) : base(picWidth, picHeight, collection)
+    public TransDepoService(int picWidth, int picHeight, ICollectionGenericObjects<DrawingTrans> collection) : base(
+        picWidth, picHeight, collection)
     {
     }
 
@@ -26,13 +28,15 @@ public class TransDepoService : AbstractCompany
         {
             for (int j = 0; j < _pictureHeight / _placeSizeHeight; j++)
             {
-				g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * j), new((int)(_placeSizeWidth * (i + 0.5f)), _placeSizeHeight * j));
-				g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * j), new(_placeSizeWidth * i, _placeSizeHeight * (j + 1)));
-			}
-            g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * (_pictureHeight / _placeSizeHeight)), new((int)(_placeSizeWidth * (i + 0.5f)), _placeSizeHeight * (_pictureHeight / _placeSizeHeight)));
+                g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * j),
+                    new((int)(_placeSizeWidth * (i + 0.5f)), _placeSizeHeight * j));
+                g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * j),
+                    new(_placeSizeWidth * i, _placeSizeHeight * (j + 1)));
             }
 
-        
+            g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * (_pictureHeight / _placeSizeHeight)),
+                new((int)(_placeSizeWidth * (i + 0.5f)), _placeSizeHeight * (_pictureHeight / _placeSizeHeight)));
+        }
     }
 
     protected override void SetObjectsPosition()
@@ -41,15 +45,27 @@ public class TransDepoService : AbstractCompany
         for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
         {
             for (int j = 0; j < _pictureHeight / _placeSizeHeight; j++)
+            {
+                try
                 {
                     DrawingTrans? drawingTrans = _collection?.Get(n);
-				n++;
                     if (drawingTrans != null)
                     {
                         drawingTrans.SetPictureSize(_pictureWidth, _pictureHeight);
                         drawingTrans.SetPosition(i * _placeSizeWidth + 5, j * _placeSizeHeight + 5);
                     }
                 }
+                catch (ObjectNotFoundException e)
+                {
+                    // Relax Man ;)
+                }
+                catch (PositionOutOfCollectionException e)
+                {
+                    // Relax Man ;)
+                }
+
+                n++;
+            }
         }
     }
 }

ProjectElectroTrans/Drawnings/DrawingElectroTrans.cs

@@ -22,6 +22,15 @@ public class DrawingElectroTrans : DrawingTrans
     {
        EntityTrans = new EntityElectroTrans(speed, weight, bodyColor, additionalColor, horns, battery);
     }
+    
+    public DrawingElectroTrans(EntityTrans trans) : base(110, 60)
+{
+    if (trans != null && trans is EntityElectroTrans electroTrans)
+    {
+        EntityTrans = new EntityElectroTrans(electroTrans.Speed, electroTrans.Weight, electroTrans.BodyColor, electroTrans.AdditionalColor, electroTrans.Horns, electroTrans.Battery);
+    }
+}
+    
     public override void DrawTransport(Graphics g)
     {
         if (EntityTrans == null || EntityTrans is not EntityElectroTrans electroTrans ||

ProjectElectroTrans/Drawnings/DrawingTrans.cs

@@ -76,6 +76,19 @@ public class DrawingTrans
     {
         EntityTrans = new EntityTrans(speed, weight, bodyColor);
     }
+    
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="car">Класс-сущность</param>
+    public DrawingTrans(EntityTrans trans) : this()
+{
+    if (trans != null)
+    {
+        EntityTrans = new EntityTrans(trans.Speed, trans.Weight, trans.BodyColor);
+    }
+}
+    
     /// <summary>
     /// Конструктор для наследников
     /// </summary>

ProjectElectroTrans/Drawnings/DrawingTransCompareByColor.cs

@@ -0,0 +1,35 @@
+namespace ProjectElectroTrans.Drawnings;
+
+public class DrawingTransCompareByColor : IComparer<DrawingTrans?>
+{
+    public int Compare(DrawingTrans? x, DrawingTrans? y)
+    {
+        if (x == null && y == null) return 0;
+        if (x == null || x.EntityTrans == null)
+        {
+            return 1;
+        }
+
+        if (y == null || y.EntityTrans == null)
+        {
+            return -1;
+        }
+
+        if (ToHex(x.EntityTrans.BodyColor) != ToHex(y.EntityTrans.BodyColor))
+        {
+            return String.Compare(ToHex(x.EntityTrans.BodyColor), ToHex(y.EntityTrans.BodyColor),
+                StringComparison.Ordinal);
+        }
+
+        var speedCompare = x.EntityTrans.Speed.CompareTo(y.EntityTrans.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+
+        return x.EntityTrans.Weight.CompareTo(y.EntityTrans.Weight);
+    }
+
+    private static String ToHex(Color c)
+        => $"#{c.R:X2}{c.G:X2}{c.B:X2}";
+}

ProjectElectroTrans/Drawnings/DrawingTransCompareByType.cs

@@ -0,0 +1,31 @@
+namespace ProjectElectroTrans.Drawnings;
+
+public class DrawingTransCompareByType : IComparer<DrawingTrans?>
+{
+    public int Compare(DrawingTrans? x, DrawingTrans? y)
+    {
+        if (x == null && y == null) return 0;
+        if (x == null || x.EntityTrans == null)
+        {
+            return 1;
+        }
+        
+        if (y == null || y.EntityTrans == null)
+        {
+            return -1;
+        }
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return x.GetType().Name.CompareTo(y.GetType().Name);
+        }
+        
+        var speedCompare = x.EntityTrans.Speed.CompareTo(y.EntityTrans.Speed);
+        if (speedCompare != 0)
+        {
+            return speedCompare;
+        }
+        
+        return x.EntityTrans.Weight.CompareTo(y.EntityTrans.Weight);
+    }
+}

ProjectElectroTrans/Drawnings/DrawingTransEquitables.cs

@@ -0,0 +1,59 @@
+using System.Diagnostics.CodeAnalysis;
+using ProjectElectroTrans.Entities;
+
+namespace ProjectElectroTrans.Drawnings;
+
+public class DrawingTransEquitables : IEqualityComparer<DrawingTrans?>
+{
+    public bool Equals(DrawingTrans? x, DrawingTrans? y)
+    {
+        if (ReferenceEquals(x, null)) return false;
+        if (ReferenceEquals(y, null)) return false;
+        if (x.GetType() != y.GetType()) return false;
+
+        if (x.GetType().Name != y.GetType().Name)
+        {
+            return false;
+        }
+
+        if (x.EntityTrans != null && y.EntityTrans != null && x.EntityTrans.Speed != y.EntityTrans.Speed)
+        {
+            return false;
+        }
+
+        if (x.EntityTrans.Weight != y.EntityTrans.Weight)
+        {
+            return false;
+        }
+
+        if (x.EntityTrans.BodyColor != y.EntityTrans.BodyColor)
+        {
+            return false;
+        }
+        if (x is DrawingElectroTrans && y is DrawingElectroTrans)
+        {
+            if (((EntityElectroTrans)x.EntityTrans).AdditionalColor !=
+                ((EntityElectroTrans)y.EntityTrans).AdditionalColor)
+            {
+                return false;
+            }
+            if (((EntityElectroTrans)x.EntityTrans).Battery!=
+                ((EntityElectroTrans)y.EntityTrans).Battery)
+            {
+                return false;
+            }
+            if (((EntityElectroTrans)x.EntityTrans).Horns!=
+                ((EntityElectroTrans)y.EntityTrans).Horns)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public int GetHashCode([DisallowNull] DrawingTrans obj)
+    {
+        return obj.GetHashCode();
+    }
+}

ProjectElectroTrans/Drawnings/ExtentionDrawningTrans.cs

@@ -0,0 +1,53 @@
+using ProjectElectroTrans.Drawnings;
+using ProjectElectroTrans.Entities;
+
+namespace ProjectElectroTrans;
+
+public static class ExtentionDrawningTrans
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawingTrans? CreateDrawningTrans(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityTrans? airplan = EntityElectroTrans.CreateEntityElectroTrans(strs);
+        if (airplan != null)
+        {
+            return new DrawingElectroTrans((EntityElectroTrans)airplan);
+        }
+
+        airplan = EntityTrans.CreateEntityTrans(strs);
+        if (airplan != null)
+        {
+            return new DrawingTrans(airplan);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="DrawingTrans">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawingTrans DrawingTrans)
+    {
+        string[]? array = DrawingTrans?.EntityTrans?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+
+}

ProjectElectroTrans/Entities/EntityElectroTrans.cs

@@ -48,4 +48,34 @@ internal class EntityElectroTrans : EntityTrans
         Horns = horns;
         Battery = battery;
     }
+
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public override string[] GetStringRepresentation()
+    {
+        return new[]
+        {
+            nameof(EntityElectroTrans), Speed.ToString(),
+            Weight.ToString(), BodyColor.Name, AdditionalColor.Name, Horns.ToString(), Battery.ToString()
+        };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityTrans? CreateEntityElectroTrans(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntityElectroTrans))
+        {
+            return null;
+        }
+
+        return new EntityElectroTrans(Convert.ToInt32(strs[1]),
+            Convert.ToDouble(strs[2]), Color.FromName(strs[3]),
+            Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[5]));
+    }
 }

ProjectElectroTrans/Entities/EntityTrans.cs

@@ -44,4 +44,29 @@ public class EntityTrans
         BodyColor = bodyColor;
     }
     
+    /// <summary>
+    /// Получение строк со значениями свойств объекта класса-сущности
+    /// </summary>
+    /// <returns></returns>
+    public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityTrans), Speed.ToString(),
+            Weight.ToString(), BodyColor.Name };
+    }
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityTrans? CreateEntityTrans(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityTrans))
+        {
+            return null;
+        }
+        return new EntityTrans(Convert.ToInt32(strs[1]),
+            Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
+
+
 }

ProjectElectroTrans/Exceptions/CollectionAlreadyExistsException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+using ProjectElectroTrans.CollectionGenericObjects;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class CollectionAlreadyExistsException : Exception
+{
+    public CollectionAlreadyExistsException() : base() { }
+    public CollectionAlreadyExistsException(CollectionInfo collectionInfo) : base($"Коллекция {collectionInfo} уже существует!") { }
+    public CollectionAlreadyExistsException(string name, Exception exception) :
+        base($"Коллекция {name} уже существует!", exception) { }
+    protected CollectionAlreadyExistsException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/CollectionInfoException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class CollectionInfoException : Exception
+{
+    public CollectionInfoException() : base() { }
+    public CollectionInfoException(string message) : base(message) { }
+    public CollectionInfoException(string message, Exception exception) :
+        base(message, exception) { }
+    protected CollectionInfoException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/CollectionInsertException.cs

@@ -0,0 +1,15 @@
+using System.Runtime.Serialization;
+using ProjectElectroTrans.Drawnings;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class CollectionInsertException : Exception
+{
+    public CollectionInsertException(object obj) : base($"Объект {obj} не удволетворяет уникальности") { }
+    public CollectionInsertException() : base() { }
+    public CollectionInsertException(string message) : base(message) { }
+    public CollectionInsertException(string message, Exception exception) :
+        base(message, exception) { }
+    protected CollectionInsertException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,31 @@
+using System.Runtime.Serialization;
+
+
+namespace ProjectElectroTrans.Exceptions
+{
+    [Serializable]
+    internal class CollectionOverflowException : ApplicationException
+    {
+        public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество: " + count)
+        {
+        }
+
+        public CollectionOverflowException() : base()
+        {
+        }
+
+        public CollectionOverflowException(string message) : base(message)
+        {
+        }
+
+        public CollectionOverflowException(string message, Exception exception) :
+            base(message, exception)
+        {
+        }
+
+        protected CollectionOverflowException(SerializationInfo info,
+            StreamingContext contex) : base(info, contex)
+        {
+        }
+    }
+}

ProjectElectroTrans/Exceptions/CollectionTypeException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+using ProjectElectroTrans.CollectionGenericObjects;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class CollectionTypeException : Exception
+{
+    public CollectionTypeException() : base() { }
+    public CollectionTypeException(string message) : base(message) { }
+    public CollectionTypeException(string message, Exception exception) :
+        base(message, exception) { }
+    protected CollectionTypeException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/DrawingEquitablesException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class DrawingEquitablesException : Exception
+{
+    public DrawingEquitablesException() : base("Объекты прорисовки одинаковые") { }
+    public DrawingEquitablesException(string message) : base(message) { }
+    public DrawingEquitablesException(string message, Exception exception) :
+        base(message, exception) { }
+    protected DrawingEquitablesException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/EmptyFileExeption.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class EmptyFileExeption : Exception
+{
+    public EmptyFileExeption(string name) : base($"Файл {name} пустой ") { }
+    public EmptyFileExeption() : base("В хранилище отсутствуют коллекции для сохранения") { }
+    public EmptyFileExeption(string name, string message) : base(message) { }
+    public EmptyFileExeption(string name, string message, Exception exception) :
+        base(message, exception) { }
+    protected EmptyFileExeption(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/EmptyStorageException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class EmptyStorageException : Exception
+{
+    public EmptyStorageException() : base() { }
+    public EmptyStorageException(string message) : base(message) { }
+    public EmptyStorageException(string message, Exception exception) :
+        base(message, exception) { }
+    protected EmptyStorageException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/FileFormatException.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class FileFormatException : Exception
+{
+    public FileFormatException() : base() { }
+    public FileFormatException(string message) : base(message) { }
+    public FileFormatException(string name, Exception exception) :
+        base($"Файл {name} имеет неверный формат. Ошибка: {exception.Message}", exception) { }
+    protected FileFormatException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/FileNotFoundException.cs

@@ -0,0 +1,14 @@
+using System.Runtime.Serialization;
+
+namespace ProjectElectroTrans.Exceptions;
+
+public class FileNotFoundException : Exception
+{
+    public FileNotFoundException(string name) : base($"Файл {name} не существует ") { }
+    public FileNotFoundException() : base() { }
+    public FileNotFoundException(string name, string message) : base(message) { }
+    public FileNotFoundException(string name, string message, Exception exception) :
+        base(message, exception) { }
+    protected FileNotFoundException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,15 @@
+using System.Runtime.Serialization;
+
+namespace ProjectElectroTrans.Exceptions;
+
+[Serializable]
+internal class ObjectNotFoundException : ApplicationException
+{
+    public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { }
+    public ObjectNotFoundException() : base() { }
+    public ObjectNotFoundException(string message) : base(message) { }
+    public ObjectNotFoundException(string message, Exception exception) :
+        base(message, exception) { }
+    protected ObjectNotFoundException(SerializationInfo info, StreamingContext
+        contex) : base(info, contex) { }
+}

ProjectElectroTrans/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,27 @@
+using System.Runtime.Serialization;
+
+[Serializable]
+internal class PositionOutOfCollectionException : ApplicationException
+{
+    public PositionOutOfCollectionException(int i) : base("Выход за границы коллекции. Позиция " + i)
+    {
+    }
+
+    public PositionOutOfCollectionException() : base()
+    {
+    }
+
+    public PositionOutOfCollectionException(string message) : base(message)
+    {
+    }
+
+    public PositionOutOfCollectionException(string message, Exception
+        exception) : base(message, exception)
+    {
+    }
+
+    protected PositionOutOfCollectionException(SerializationInfo info,
+        StreamingContext contex) : base(info, contex)
+    {
+    }
+}

ProjectElectroTrans/FormTransCollection.Designer.cs

@@ -33,6 +33,14 @@ namespace ProjectElectroTrans
 	private void InitializeComponent()
 	{
 		groupBoxTools = new GroupBox();
+			panelCompanyTools = new Panel();
+			buttonSortByColor = new Button();
+			buttonSortByType = new Button();
+			buttonAddCar = new Button();
+			maskedTextBoxPosition = new MaskedTextBox();
+			buttonRefresh = new Button();
+			buttonRemoveCar = new Button();
+			buttonGoToCheck = new Button();
 			buttonCreateCompany = new Button();
 			panelStorage = new Panel();
 			buttonCollectionDel = new Button();
@@ -42,18 +50,19 @@ namespace ProjectElectroTrans
 			radioButtonMassive = new RadioButton();
 			textBoxCollectionName = new TextBox();
 			labelCollectionName = new Label();
-            buttonRefresh = new Button();
-            buttonGoToCheck = new Button();
-            buttonRemoveTrans = new Button();
-            maskedTextBoxPosition = new MaskedTextBox();
-            buttonAddTrans = new Button();
 			comboBoxSelectorCompany = new ComboBox();
 			pictureBox = new PictureBox();
-            panelCompanyTools = new Panel();
+			menuStrip = new MenuStrip();
+			файлToolStripMenuItem = new ToolStripMenuItem();
+			saveToolStripMenuItem = new ToolStripMenuItem();
+			loadToolStripMenuItem = new ToolStripMenuItem();
+			saveFileDialog = new SaveFileDialog();
+			openFileDialog = new OpenFileDialog();
 			groupBoxTools.SuspendLayout();
+			panelCompanyTools.SuspendLayout();
 			panelStorage.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
-            panelCompanyTools.SuspendLayout();
+			menuStrip.SuspendLayout();
 			SuspendLayout();
 			// 
 			// groupBoxTools
@@ -63,13 +72,104 @@ namespace ProjectElectroTrans
 			groupBoxTools.Controls.Add(panelStorage);
 			groupBoxTools.Controls.Add(comboBoxSelectorCompany);
 			groupBoxTools.Dock = DockStyle.Right;
-            groupBoxTools.Location = new Point(783, 0);
+			groupBoxTools.Location = new Point(783, 24);
 			groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(179, 616);
+			groupBoxTools.Size = new Size(179, 657);
 			groupBoxTools.TabIndex = 0;
 			groupBoxTools.TabStop = false;
 			groupBoxTools.Text = "Инструменты";
 			// 
+			// panelCompanyTools
+			// 
+			panelCompanyTools.Controls.Add(buttonSortByColor);
+			panelCompanyTools.Controls.Add(buttonSortByType);
+			panelCompanyTools.Controls.Add(buttonAddCar);
+			panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+			panelCompanyTools.Controls.Add(buttonRefresh);
+			panelCompanyTools.Controls.Add(buttonRemoveCar);
+			panelCompanyTools.Controls.Add(buttonGoToCheck);
+			panelCompanyTools.Dock = DockStyle.Bottom;
+			panelCompanyTools.Enabled = false;
+			panelCompanyTools.Location = new Point(3, 355);
+			panelCompanyTools.Name = "panelCompanyTools";
+			panelCompanyTools.Size = new Size(173, 299);
+			panelCompanyTools.TabIndex = 9;
+			// 
+			// buttonSortByColor
+			// 
+			buttonSortByColor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			buttonSortByColor.Location = new Point(3, 250);
+			buttonSortByColor.Name = "buttonSortByColor";
+			buttonSortByColor.Size = new Size(167, 40);
+			buttonSortByColor.TabIndex = 8;
+			buttonSortByColor.Text = "Сортировка по цвету";
+			buttonSortByColor.UseVisualStyleBackColor = true;
+			buttonSortByColor.Click += ButtonSortByColor_Click;
+			// 
+			// buttonSortByType
+			// 
+			buttonSortByType.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			buttonSortByType.Location = new Point(3, 210);
+			buttonSortByType.Name = "buttonSortByType";
+			buttonSortByType.Size = new Size(167, 40);
+			buttonSortByType.TabIndex = 7;
+			buttonSortByType.Text = "Сортировка по типу";
+			buttonSortByType.UseVisualStyleBackColor = true;
+			buttonSortByType.Click += ButtonSortByType_Click;
+			// 
+			// buttonAddCar
+			// 
+			buttonAddCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			buttonAddCar.Location = new Point(3, 3);
+			buttonAddCar.Name = "buttonAddCar";
+			buttonAddCar.Size = new Size(167, 40);
+			buttonAddCar.TabIndex = 1;
+			buttonAddCar.Text = "Добавление поезда";
+			buttonAddCar.UseVisualStyleBackColor = true;
+			buttonAddCar.Click += ButtonAddTrans_Click;
+			// 
+			// maskedTextBoxPosition
+			// 
+			maskedTextBoxPosition.Location = new Point(3, 49);
+			maskedTextBoxPosition.Mask = "00";
+			maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+			maskedTextBoxPosition.Size = new Size(167, 23);
+			maskedTextBoxPosition.TabIndex = 3;
+			maskedTextBoxPosition.ValidatingType = typeof(int);
+			// 
+			// buttonRefresh
+			// 
+			buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			buttonRefresh.Location = new Point(3, 164);
+			buttonRefresh.Name = "buttonRefresh";
+			buttonRefresh.Size = new Size(167, 40);
+			buttonRefresh.TabIndex = 6;
+			buttonRefresh.Text = "Обновить";
+			buttonRefresh.UseVisualStyleBackColor = true;
+			buttonRefresh.Click += ButtonRefresh_Click;
+			// 
+			// buttonRemoveCar
+			// 
+			buttonRemoveCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			buttonRemoveCar.Location = new Point(3, 78);
+			buttonRemoveCar.Name = "buttonRemoveCar";
+			buttonRemoveCar.Size = new Size(167, 40);
+			buttonRemoveCar.TabIndex = 4;
+			buttonRemoveCar.Text = "Удалить поезд";
+			buttonRemoveCar.UseVisualStyleBackColor = true;
+			buttonRemoveCar.Click += ButtonRemoveTrans_Click;
+			// 
+			// buttonGoToCheck
+			// 
+			buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			buttonGoToCheck.Location = new Point(3, 124);
+			buttonGoToCheck.Name = "buttonGoToCheck";
+			buttonGoToCheck.Size = new Size(167, 40);
+			buttonGoToCheck.TabIndex = 5;
+			buttonGoToCheck.Text = "Передать на тесты";
+			buttonGoToCheck.UseVisualStyleBackColor = true;
+			buttonGoToCheck.Click += ButtonGoToCheck_Click;
+			// 
 			// buttonCreateCompany
 			// 
 			buttonCreateCompany.Location = new Point(6, 320);
@@ -162,58 +262,6 @@ namespace ProjectElectroTrans
 			labelCollectionName.TabIndex = 0;
 			labelCollectionName.Text = "Название коллекции:";
 			// 
-            // buttonRefresh
-            // 
-            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(3, 210);
-            buttonRefresh.Name = "buttonRefresh";
-            buttonRefresh.Size = new Size(167, 40);
-            buttonRefresh.TabIndex = 6;
-            buttonRefresh.Text = "Обновить";
-            buttonRefresh.UseVisualStyleBackColor = true;
-            buttonRefresh.Click += ButtonRefresh_Click;
-            // 
-            // buttonGoToCheck
-            // 
-            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(3, 170);
-            buttonGoToCheck.Name = "buttonGoToCheck";
-            buttonGoToCheck.Size = new Size(167, 40);
-            buttonGoToCheck.TabIndex = 5;
-            buttonGoToCheck.Text = "Передать на тесты";
-            buttonGoToCheck.UseVisualStyleBackColor = true;
-            buttonGoToCheck.Click += ButtonGoToCheck_Click;
-            // 
-            // buttonRemoveTrans
-            // 
-            buttonRemoveTrans.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveTrans.Location = new Point(3, 124);
-            buttonRemoveTrans.Name = "buttonRemoveTrans";
-            buttonRemoveTrans.Size = new Size(167, 40);
-            buttonRemoveTrans.TabIndex = 4;
-            buttonRemoveTrans.Text = "Удалить поезд";
-            buttonRemoveTrans.UseVisualStyleBackColor = true;
-            buttonRemoveTrans.Click += ButtonRemoveTrans_Click;
-            // 
-            // maskedTextBoxPosition
-            // 
-            maskedTextBoxPosition.Location = new Point(3, 95);
-            maskedTextBoxPosition.Mask = "00";
-            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            maskedTextBoxPosition.Size = new Size(167, 23);
-            maskedTextBoxPosition.TabIndex = 3;
-            maskedTextBoxPosition.ValidatingType = typeof(int);
-            // buttonAddTrans
-            // 
-            buttonAddTrans.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonAddTrans.Location = new Point(3, 3);
-            buttonAddTrans.Name = "buttonAddTrans";
-            buttonAddTrans.Size = new Size(167, 40);
-            buttonAddTrans.TabIndex = 1;
-            buttonAddTrans.Text = "Добавление поезд";
-            buttonAddTrans.UseVisualStyleBackColor = true;
-            buttonAddTrans.Click += ButtonAddTrans_Click;
-            // 
 			// comboBoxSelectorCompany
 			// 
 			comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -229,50 +277,81 @@ namespace ProjectElectroTrans
 			// pictureBox
 			// 
 			pictureBox.Dock = DockStyle.Fill;
-            pictureBox.Location = new Point(0, 0);
+			pictureBox.Location = new Point(0, 24);
 			pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(783, 616);
+			pictureBox.Size = new Size(783, 657);
 			pictureBox.TabIndex = 1;
 			pictureBox.TabStop = false;
 			// 
-            // panelCompanyTools
+			// menuStrip
 			// 
-            panelCompanyTools.Controls.Add(buttonAddTrans);
-            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
-            panelCompanyTools.Controls.Add(buttonRefresh);
-            panelCompanyTools.Controls.Add(buttonRemoveTrans);
-            panelCompanyTools.Controls.Add(buttonGoToCheck);
-            panelCompanyTools.Dock = DockStyle.Bottom;
-            panelCompanyTools.Enabled = false;
-            panelCompanyTools.Location = new Point(3, 360);
-            panelCompanyTools.Name = "panelCompanyTools";
-            panelCompanyTools.Size = new Size(173, 253);
-            panelCompanyTools.TabIndex = 9;
+			menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
+			menuStrip.Location = new Point(0, 0);
+			menuStrip.Name = "menuStrip";
+			menuStrip.Size = new Size(962, 24);
+			menuStrip.TabIndex = 2;
+			menuStrip.Text = "menuStrip";
 			// 
-            // FormTransCollection
+			// файлToolStripMenuItem
+			// 
+			файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+			файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+			файлToolStripMenuItem.Size = new Size(48, 20);
+			файлToolStripMenuItem.Text = "Файл";
+			// 
+			// saveToolStripMenuItem
+			// 
+			saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+			saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
+			saveToolStripMenuItem.Size = new Size(181, 22);
+			saveToolStripMenuItem.Text = "Сохранение";
+			saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+			// 
+			// loadToolStripMenuItem
+			// 
+			loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+			loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
+			loadToolStripMenuItem.Size = new Size(181, 22);
+			loadToolStripMenuItem.Text = "Загрузка";
+			loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+			// 
+			// saveFileDialog
+			// 
+			saveFileDialog.Filter = "txt file | *.txt";
+			// 
+			// openFileDialog
+			// 
+			openFileDialog.Filter = "txt file | *.txt";
+			// 
+			// FormCarCollection
 			// 
 			AutoScaleDimensions = new SizeF(7F, 15F);
 			AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(962, 616);
+			ClientSize = new Size(962, 681);
 			Controls.Add(pictureBox);
 			Controls.Add(groupBoxTools);
+			Controls.Add(menuStrip);
+			MainMenuStrip = menuStrip;
 			Name = "FormTransCollection";
-            Text = "Коллекция поездов";
+			Text = "Коллекция электропоездов";
 			groupBoxTools.ResumeLayout(false);
+			panelCompanyTools.ResumeLayout(false);
+			panelCompanyTools.PerformLayout();
 			panelStorage.ResumeLayout(false);
 			panelStorage.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
-            panelCompanyTools.ResumeLayout(false);
-            panelCompanyTools.PerformLayout();
+			menuStrip.ResumeLayout(false);
+			menuStrip.PerformLayout();
 			ResumeLayout(false);
+			PerformLayout();
 	}
 
 	#endregion
 
 	private GroupBox groupBoxTools;
 	private ComboBox comboBoxSelectorCompany;
-        private Button buttonAddTrans;
-        private Button buttonRemoveTrans;
+	private Button buttonAddCar;
+	private Button buttonRemoveCar;
 	private MaskedTextBox maskedTextBoxPosition;
 	private PictureBox pictureBox;
 	private Button buttonGoToCheck;
@@ -287,5 +366,13 @@ namespace ProjectElectroTrans
 	private Button buttonCollectionDel;
 	private Button buttonCreateCompany;
 	private Panel panelCompanyTools;
+	private MenuStrip menuStrip;
+	private ToolStripMenuItem файлToolStripMenuItem;
+	private ToolStripMenuItem saveToolStripMenuItem;
+	private ToolStripMenuItem loadToolStripMenuItem;
+	private SaveFileDialog saveFileDialog;
+	private OpenFileDialog openFileDialog;
+	private Button buttonSortByColor;
+	private Button buttonSortByType;
     }
 }

ProjectElectroTrans/FormTransCollection.cs

@@ -1,6 +1,7 @@
 using ProjectElectroTrans.CollectionGenericObjects;
 using ProjectElectroTrans.Drawnings;
-using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
+using ProjectElectroTrans.Exceptions;
 
 namespace ProjectElectroTrans;
 
@@ -19,13 +20,19 @@ public partial class FormTransCollection : Form
     /// </summary>
     private AbstractCompany? _company = null;
 
+    /// <summary>
+    /// Логер
+    /// </summary>
+    private readonly ILogger _logger;
+
     /// <summary>
     /// Конструктор
     /// </summary>
-    public FormTransCollection()
+    public FormTransCollection(ILogger<FormTransCollection> logger)
     {
         InitializeComponent();
         _storageCollection = new();
+        _logger = logger;
     }
 
     /// <summary>
@@ -63,14 +70,18 @@ public partial class FormTransCollection : Form
             return;
         }
 
-        if (_company + drawingTrans != -1)
+        try
         {
+            var res = _company + drawingTrans;
             MessageBox.Show("Объект добавлен");
+            _logger.LogInformation($"Объект добавлен под индексом {res}");
             pictureBox.Image = _company.Show();
         }
-        else
+        catch (Exception ex)
         {
-            _ = MessageBox.Show(drawingTrans.ToString());
+            MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
@@ -93,14 +104,18 @@ public partial class FormTransCollection : Form
         }
 
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-        if (_company - pos != null)
+        try
         {
+            var res = _company - pos;
             MessageBox.Show("Объект удален");
+            _logger.LogInformation($"Объект удален под индексом {pos}");
             pictureBox.Image = _company.Show();
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("Не удалось удалить объект");
+            MessageBox.Show(ex.Message, "Не удалось удалить объект",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
         }
     }
 
@@ -179,9 +194,18 @@ public partial class FormTransCollection : Form
             collectionType = CollectionType.List;
         }
 
-        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        try
+        {
+            _storageCollection.AddCollection(new CollectionInfo(textBoxCollectionName.Text, collectionType, "ХЗ"));
+            _logger.LogInformation("Добавление коллекции");
             RerfreshListBoxItems();
         }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+        }
+    }
 
     /// <summary>
     /// Удаление коллекции
@@ -202,7 +226,9 @@ public partial class FormTransCollection : Form
             return;
         }
 
-        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        CollectionInfo? collectionInfo = CollectionInfo.GetCollectionInfo(listBoxCollection.SelectedItem.ToString()!);
+        _storageCollection.DelCollection(collectionInfo!);
+        _logger.LogInformation("Коллекция удалена");
         RerfreshListBoxItems();
     }
 
@@ -214,10 +240,10 @@ public partial class FormTransCollection : Form
         listBoxCollection.Items.Clear();
         for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
         {
-            string? colName = _storageCollection.Keys?[i];
-            if (!string.IsNullOrEmpty(colName))
+            CollectionInfo? col = _storageCollection.Keys?[i];
+            if (!col!.IsEmpty())
             {
-                listBoxCollection.Items.Add(colName);
+                listBoxCollection.Items.Add(col);
             }
         }
     }
@@ -236,7 +262,9 @@ public partial class FormTransCollection : Form
         }
 
         ICollectionGenericObjects<DrawingTrans>? collection =
-            _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+            _storageCollection[
+                CollectionInfo.GetCollectionInfo(listBoxCollection.SelectedItem.ToString()!) ??
+                new CollectionInfo("", CollectionType.None, "")];
         if (collection == null)
         {
             MessageBox.Show("Коллекция не проинициализирована");
@@ -247,10 +275,99 @@ public partial class FormTransCollection : Form
         {
             case "Хранилище":
                 _company = new TransDepoService(pictureBox.Width, pictureBox.Height, collection);
+                _logger.LogInformation("Компания создана");
                 break;
         }
 
         panelCompanyTools.Enabled = true;
         RerfreshListBoxItems();
     }
+
+    /// <summary>
+    /// Обработка нажатия "Сохранение"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (saveFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.SaveData(saveFileDialog.FileName);
+                MessageBox.Show("Сохранение прошло успешно",
+                    "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Сохранение в файл: {filename}",
+                    saveFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Результат",
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError($"Ошибка: {ex.Message}", ex.Message);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Обработка нажатия "Загрузка"
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (openFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.LoadData(openFileDialog.FileName);
+                MessageBox.Show("Загрузка прошла успешно",
+                    "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation($"Загрузка прошла успешно в {openFileDialog.FileName}");
+
+                RerfreshListBoxItems();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Сортировка по типу
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonSortByType_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawingTransCompareByType());
+    }
+
+    /// <summary>
+    /// Сортировка по цвету
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonSortByColor_Click(object sender, EventArgs e)
+    {
+        CompareCars(new DrawingTransCompareByColor());
+    }
+
+    /// <summary>
+    /// Сортировка по сравнителю
+    /// </summary>
+    /// <param name="comparer">Сравнитель объектов</param>
+    private void CompareCars(IComparer<DrawingTrans?> comparer)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        _company.Sort(comparer);
+        pictureBox.Image = _company.Show();
+    }
 }

ProjectElectroTrans/FormTransConfig.Designer.cs

@@ -43,7 +43,6 @@
             panelRed = new Panel();
             checkBoxBulldozerDump = new CheckBox();
             checkBoxSupport = new CheckBox();
-            checkBoxBucket = new CheckBox();
             numericUpDownWeight = new NumericUpDown();
             numericUpDownSpeed = new NumericUpDown();
             labelWeight = new Label();
@@ -73,7 +72,6 @@
             groupBoxConfig.Controls.Add(groupBoxColors);
             groupBoxConfig.Controls.Add(checkBoxBulldozerDump);
             groupBoxConfig.Controls.Add(checkBoxSupport);
-            groupBoxConfig.Controls.Add(checkBoxBucket);
             groupBoxConfig.Controls.Add(numericUpDownWeight);
             groupBoxConfig.Controls.Add(numericUpDownSpeed);
             groupBoxConfig.Controls.Add(labelWeight);
@@ -377,7 +375,6 @@
         private Label labelSpeed;
         private CheckBox checkBoxBulldozerDump;
         private CheckBox checkBoxSupport;
-        private CheckBox checkBoxBucket;
         private GroupBox groupBoxColors;
         private Panel panelPurple;
         private Panel panelYellow;

ProjectElectroTrans/FormTransConfig.cs

@@ -102,7 +102,7 @@ namespace ProjectElectroTrans
                 case "labelModifiedObject":
                     _trans = new DrawingElectroTrans((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value,
                     Color.White,
-                    Color.Black, checkBoxBucket.Checked,
+                    Color.Black, checkBoxBulldozerDump.Checked,
                     checkBoxSupport.Checked);
                     break;
             }

ProjectElectroTrans/Program.cs

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

ProjectElectroTrans/ProjectElectroTrans.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -23,4 +23,14 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0-preview.3.24172.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.3.24172.9" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.3.24172.9" />
+    <PackageReference Include="Serilog" Version="4.0.0-dev-02160" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.1-dev-10389" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1-dev-00582" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00972" />
+  </ItemGroup>
+
 </Project>

ProjectElectroTrans/serilogConfig.json

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