40 changed files with 69 additions and 2681 deletions
--- a/ProjectCar/ProjectGasMachine.sln
+++ b/ProjectCar/ProjectGasMachine.sln
@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34309.116
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectGasMachine", "ProjectCar\ProjectGasMachine.csproj", "{0BAD5252-A074-4558-8F3E-7CDB84331644}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectCar", "ProjectCar\ProjectCar.csproj", "{0BAD5252-A074-4558-8F3E-7CDB84331644}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/ProjectCar/ProjectCar/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectCar/ProjectCar/CollectionGenericObjects/AbstractCompany.cs
@ -1,123 +0,0 @@
 using ProjectGasMachine.Drawnings;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace ProjectGasMachine.CollectionGenericObjects;
 /// <summary>
 /// Абстракция компании, хранящий коллекцию автомобилей
 /// </summary>
 public abstract class AbstractCompany
 {
    /// <summary>
    /// Размер места (ширина)
    /// </summary>
    protected readonly int _placeSizeWidth = 280;
    /// <summary>
    /// Размер места (высота)
    /// </summary>
    protected readonly int _placeSizeHeight = 80;
    /// <summary>
    /// Ширина окна
    /// </summary>
    protected readonly int _pictureWidth;
    /// <summary>
    /// Высота окна
    /// </summary>
    protected readonly int _pictureHeight;
    /// <summary>
    /// Коллекция автомобилей
    /// </summary>
    protected ICollectionGenericObjects<DrawningMachine>? _collection = null;
    /// <summary>
    /// Вычисление максимального количества элементов, который можно разместить в окне
    /// </summary>
    private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
    /// <summary>
    /// Конструктор
    /// </summary>
    /// <param name="picWidth">Ширина окна</param>
    /// <param name="picHeight">Высота окна</param>
    /// <param name="collection">Коллекция автомобилей</param>
    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningMachine> collection)
    {
        _pictureWidth = picWidth;
        _pictureHeight = picHeight;
        _collection = collection;
        _collection.SetMaxCount = GetMaxCount;
    }
    /// <summary>
    /// Перегрузка оператора сложения для класса
    /// </summary>
    /// <param name="company">Компания</param>
    /// <param name="machine">Добавляемый объект</param>
    /// <returns></returns>
    public static int operator +(AbstractCompany company, DrawningMachine machine)
    {
        return company._collection.Insert(machine, 0);
    }
    /// <summary>
    /// Перегрузка оператора удаления для класса
    /// </summary>
    /// <param name="company">Компания</param>
    /// <param name="position">Номер удаляемого объекта</param>
    /// <returns></returns>
    public static DrawningMachine? operator -(AbstractCompany company, int position)
    {
        return company._collection?.Remove(position);
    }
    /// <summary>
    /// Получение случайного объекта из коллекции
    /// </summary>
    /// <returns></returns>
    public DrawningMachine? GetRandomObject()
    {
        Random rnd = new();
        return _collection?.Get(rnd.Next(GetMaxCount));
    }
    /// <summary>
    /// Вывод всей коллекции
    /// </summary>
    /// <returns></returns>
    public Bitmap? Show()
    {
        Bitmap bitmap = new(_pictureWidth, _pictureHeight);
        Graphics graphics = Graphics.FromImage(bitmap);
        DrawBackground(graphics);
        SetObjectsPosition();
        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
        {
            DrawningMachine? obj = _collection?.Get(i);
            obj?.DrawTransport(graphics);
        }
        return bitmap;
    }
    /// <summary>
    /// Вывод заднего фона
    /// </summary>
    /// <param name="g"></param>
    protected abstract void DrawBackground(Graphics g);
    /// <summary>
    /// Расстановка объектов
    /// </summary>
    protected abstract void SetObjectsPosition();
 }
--- a/ProjectCar/ProjectCar/CollectionGenericObjects/Autopark.cs
+++ b/ProjectCar/ProjectCar/CollectionGenericObjects/Autopark.cs
@ -1,62 +0,0 @@
 using ProjectGasMachine.Drawnings;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace ProjectGasMachine.CollectionGenericObjects;
 public class Autopark : AbstractCompany
 {
    public Autopark(int picWidth, int picHeight, ICollectionGenericObjects<DrawningMachine> collection) : base(picWidth, picHeight, collection)
    {
    }
    protected override void DrawBackground(Graphics g)
    {
        Pen pen = new(Color.Black, 2);
        Pen Pen2 = new(Color.Black, 3);
        for (int i = 0; i < _pictureHeight / _placeSizeHeight; i++)
        {
            int y = _placeSizeHeight;
            y *= i;
            for (int j = 0; j <= _pictureWidth / _placeSizeWidth; j++)
            {
                int x = _placeSizeWidth;
                x *= j;
                g.DrawLine(Pen2, x, y, x + _placeSizeWidth / 2, y);
                g.DrawLine(Pen2, x, y + _placeSizeHeight - 10, x + _placeSizeWidth / 2, y + _placeSizeHeight - 10);
                g.DrawLine(pen, x, y, x, y + _placeSizeHeight - 10);
            }
        }
    }
    protected override void SetObjectsPosition()
    {
        int n = 0;
        int m = 0;
        for (int i = 0; i < (_collection?.Count ?? 0); i++)
        {
            if (_collection?.Get(i) != null)
            {
                int x = 5 + _placeSizeWidth * n;
                int y = (-3 + _placeSizeHeight * (_pictureHeight / _placeSizeHeight - 1)) - _placeSizeHeight * m;
                _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
                _collection?.Get(i)?.SetPosition(x, y);
            }
            if (n < _pictureWidth / _placeSizeWidth)
                n++;
            else
            {
                n = 0;
                m++;
            }
        }
    }
 }
--- a/ProjectCar/ProjectCar/CollectionGenericObjects/CollectionType.cs
+++ b/ProjectCar/ProjectCar/CollectionGenericObjects/CollectionType.cs
@ -1,21 +0,0 @@
 namespace ProjectGasMachine.CollectionGenericObjects;
 /// <summary>
 /// тип коллекции
 /// </summary>
 public enum CollectionType
 {
    /// <summary>
    /// неопределено
    /// </summary>
    None = 0,
    /// <summary>
    /// массив
    /// </summary>
    Massive = 1,
    /// <summary>
    /// список
    /// </summary>
    List = 2
 }
--- a/ProjectCar/ProjectCar/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectCar/ProjectCar/CollectionGenericObjects/ICollectionGenericObjects.cs
@ -1,54 +0,0 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace ProjectGasMachine;
 /// <summary>
 /// Интерфейс описания действий для набора хранимых объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public interface ICollectionGenericObjects<T>
    where T : class
 {
    /// <summary>
    /// Количество объектов в коллекции
    /// </summary>
    int Count { get; }
    /// <summary>
    /// Установка максимального количества элементов
    /// </summary>
    int SetMaxCount { set; }
    /// <summary>
    /// Добавление объекта в коллекцию
    /// </summary>
    /// <param name="obj">Добавляемый объект</param>
    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
    int Insert(T obj);
    /// <summary>
    /// Добавление объекта в коллекцию на конкретную позицию
    /// </summary>
    /// <param name="obj">Добавляемый объект</param>
    /// <param name="position">Позиция</param>
    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
    int Insert(T obj, int position);
    /// <summary>
    /// Удаление объекта из коллекции с конкретной позиции
    /// </summary>
    /// <param name="position">Позиция</param>
    /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
    T? Remove(int position);
    /// <summary>
    /// Получение объекта по позиции
    /// </summary>
    /// <param name="position">Позиция</param>
    /// <returns>Объект</returns>
    T? Get(int position);
 }
--- a/ProjectCar/ProjectCar/CollectionGenericObjects/ListGenericObjects.cs
+++ b/ProjectCar/ProjectCar/CollectionGenericObjects/ListGenericObjects.cs
@ -1,76 +0,0 @@
 namespace ProjectGasMachine.CollectionGenericObjects;
 /// <summary>
 /// Параметризованный набор объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public class ListGenericObjects<T> : ICollectionGenericObjects<T>
    where T : class
 {
    /// <summary>
    /// Список объектов, которые храним
    /// </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; } } }
    /// <summary>
    /// Конструктор
    /// </summary>
    public ListGenericObjects()
    {
        _collection = new();
    }
    public T? Get(int position)
    {
        if (position < 0 || position >= Count)
        {
            return null;
        }
        return _collection[position];
    }
    public int Insert(T obj)
    {
        if (Count == _maxCount)
        {
            return -1;
        }
        _collection.Add(obj);
        return _collection.Count;
    }
    public int Insert(T obj, int position)
    {
        if (Count == _maxCount || position < 0 || position > Count)
        {
            return -1;
        }
        _collection.Insert(position, obj);
        return position;
    }
    public T? Remove(int position)
    {
        if (position < 0 || position > Count)
        {
            return null;
        }
        T? obj = _collection[position];
        _collection.RemoveAt(position);
        return obj;
    }
 }
--- a/ProjectCar/ProjectCar/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectCar/ProjectCar/CollectionGenericObjects/MassiveGenericObjects.cs
@ -1,113 +0,0 @@
 namespace ProjectGasMachine.CollectionGenericObjects;
 /// <summary>
 /// Параметризованный набор объектов
 /// </summary>
 /// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
 public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
    where T : class
 {
    /// <summary>
    /// массив объектов, которые храним
    /// </summary>
    private T?[] _collection;
    public int Count => _collection.Length;
    public int SetMaxCount
    {
        set
        {
            if (value > 0)
            {
                if (_collection.Length > 0)
                {
                    Array.Resize(ref _collection, value);
                }
                else
                {
                    _collection = new T?[value];
                }
            }
        }
    }
    /// <summary>
    /// конструктор
    /// </summary>
    public MassiveGenericObjects() 
    {
        _collection = Array.Empty<T?>();
    }
    public T? Get(int position)
    {
        if (position < 0 || position > Count)
        {
            return null;
        }
        return _collection[position];
    }
    public int Insert(T obj)
    {
        // TODO вставка в свободное место набора
        for (int i = 0; i < Count; i++)
        {
            if (_collection[i] == null)
            {
                _collection[i] = obj;
                return i;
            }
        }
        return -1;
    }
    public int Insert(T obj, int position)
    {
        if (position < 0 || position > Count)
        {
            return -1;
        }
        if (_collection[position] == null)
        {
            _collection[position] = obj;
            return position;
        }
        for (int i = position + 1; i < Count; i++)
        {
            if (_collection[i] == null)
            {
                _collection[i] = obj;
                return position;
            }
        }
        for (int i = position - 1; i >= 0; i--)
        {
            if (_collection[i] == null)
            {
                _collection[i] = obj;
                return position;
            }
        }
        return -1;
    }
    public T? Remove(int position)
    {
        if (position < 0 || position > Count || _collection[position] == null)
        {
            return null;
        }
        T? obj = _collection[position];
        _collection[position] = null;
        return obj;
    }
 }
--- a/ProjectCar/ProjectCar/CollectionGenericObjects/StorageCollection.cs
+++ b/ProjectCar/ProjectCar/CollectionGenericObjects/StorageCollection.cs
@ -1,83 +0,0 @@
 namespace ProjectGasMachine.CollectionGenericObjects;
 /// <summary>
 /// класс-хранилище
 /// </summary>
 /// <typeparam name="T"></typeparam>
 public class StorageCollection<T>
    where T : class
 {
    /// <summary>
    /// словарь (хранилище) с коллекциями
    /// </summary>
    private Dictionary<string, ICollectionGenericObjects<T>> _storages;
    /// <summary>
    /// Возвращение списка названий коллекций
    /// </summary>
    public List<string> Keys => _storages.Keys.ToList();
    /// <summary>
    /// конструктор
    /// </summary>
    public StorageCollection() 
    {
        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
    }
    /// <summary>
    /// добваление коллекции в хранилище
    /// </summary>
    /// <param name="name">название коллекции</param>
    /// <param name="collectionType">тип коллекции</param>
    public void AddCollection(string name, CollectionType collectionType) 
    {
        if (name == null || _storages.ContainsKey(name)) 
        {
            return;
        }
        if (collectionType == CollectionType.Massive)
        {
            _storages.Add(name, new MassiveGenericObjects<T>());
        }
        if (collectionType == CollectionType.List)
        {
            _storages.Add(name, new ListGenericObjects<T>());
        }
    }
    /// <summary>
    /// Удаление коллекции
    /// </summary>
    /// <param name="name"></param>
    public void DelCollection(string name) 
    {
        if (name == null || !_storages.ContainsKey(name)) 
        {
            return;
        }
        _storages.Remove(name);
    }
    /// <summary>
    /// Доступ к коллекции
    /// </summary>
    /// <param name="name">Название коллекции</param>
    /// <returns></returns>
    public ICollectionGenericObjects<T>? this[string name] 
    {
        get 
        {
            if (_storages.ContainsKey(name)) 
            {
                return _storages[name];
            }
            return null;
        }
    }
 }
--- a/ProjectCar/ProjectCar/Drawnings/DirectionType.cs
+++ b/ProjectCar/ProjectCar/Drawnings/DirectionType.cs
@ -1,27 +0,0 @@
 namespace ProjectGasMachine.Drawnings;
 /// <summary>
 /// Направление перемещения
 /// </summary>
 public enum DirectionType
 {
    /// <summary>
    /// неизвестное направление
    /// </summary>
    Unknow = -1,
    /// <summary>
    /// Вверх
    /// </summary>
    Up = 1,
    /// <summary>
    /// Вниз
    /// </summary>
    Down = 2,
    /// <summary>
    /// Влево
    /// </summary>
    Left = 3,
    /// <summary>
    /// Вправо
    /// </summary>
    Right = 4
 }
--- a/ProjectCar/ProjectCar/Drawnings/DrawningGasMachine.cs
+++ b/ProjectCar/ProjectCar/Drawnings/DrawningGasMachine.cs
@ -1,61 +0,0 @@
 using ProjectGasMachine.Entities;
 namespace ProjectGasMachine.Drawnings;
 /// <summary>
 /// 
 /// </summary>
 public class DrawningGasMachine : DrawningMachine
 {
    /// <summary>
    /// конструктор
    /// </summary>
    /// <param name="speed">Скорость</param>
    /// <param name="weight">Вес машины</param>
    /// <param name="bodyColor">Основной цвет</param>
    /// <param name="additionalColor">Дополнительный цвет</param>
    /// <param name="gas">Признак наличия бака для бензина</param>
    /// <param name="beacon">Признак наличия маяка</param>
    public DrawningGasMachine(int speed, double weight, Color bodyColor, Color additionalColor, bool gas, bool beacon) : base(115, 70)
    {
        EntityGas = new EntityMachine(speed, weight, bodyColor, additionalColor, gas, beacon);
    }
    public override void DrawTransport(Graphics g)
    {
        if (EntityGas == null || EntityGas is not EntityMachine gasmachine || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return;
        }
        Pen pen = new(Color.Black);
        Brush additionalBrush = new SolidBrush(gasmachine.AdditionalColor);
        //маяк сигнальный
        if (gasmachine.Beacon)
        {
            g.DrawRectangle(pen, _startPosX.Value + 95, _startPosY.Value, 10, 10);
            g.FillRectangle(additionalBrush, _startPosX.Value + 95, _startPosY.Value, 10, 10);
        }
        //бак с газом
        if (gasmachine.Gas)
        {
            g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 10, 80, 30);
            g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value + 10, 80, 30);
        }
        _startPosX += 5;
        base.DrawTransport(g);
        _startPosX -= 5;
    }
 }
--- a/ProjectCar/ProjectCar/Drawnings/DrawningMachine.cs
+++ b/ProjectCar/ProjectCar/Drawnings/DrawningMachine.cs
@ -1,246 +0,0 @@
 using ProjectGasMachine.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace ProjectGasMachine.Drawnings;
 public class DrawningMachine
 {
    /// <summary>
    /// Класс-сущность
    /// </summary>
    public EntityGas? EntityGas { get; protected set; }
    /// <summary>
    /// Ширина окна
    /// </summary>
    private int? _pictureWidth;
    /// <summary>
    /// Высота окна
    /// </summary>
    private int? _pictureHeight;
    /// <summary>
    /// Левая координата прорисовки газ автомобиля
    /// </summary>
    protected int? _startPosX;
    /// <summary>
    /// Верхняя координата прорисовки газ автомобиля
    /// </summary>
    protected int? _startPosY;
    /// <summary>
    /// Ширина прорисовки газ автомобиля
    /// </summary>
    private readonly int _drawningMachineWidth = 110;
    /// <summary>
    /// Высота прорисовки газ автомобиля
    /// </summary>
    private readonly int _drawningMachineHeight = 70;
    /// <summary>
    /// координата X объекта
    /// </summary>
    public int? GetPosX => _startPosX;
    /// <summary>
    /// координата Y объекта
    /// </summary>
    public int? GetPosY => _startPosY;
    /// <summary>
    /// ширина объекта
    /// </summary>
    public int GetWidth => _drawningMachineWidth;
    /// <summary>
    /// высота объекта
    /// </summary>
    public int GetHeight => _drawningMachineHeight;
    /// <summary>
    /// пустой конструктор
    /// </summary>
    private DrawningMachine()
    {
        _pictureWidth = null;
        _pictureHeight = null;
        _startPosX = null;
        _startPosY = null;
    }
    /// <summary>
    /// Конструктор
    /// </summary>
    /// <param name="speed">Скорость</param>
    /// <param name="weight">Вес машины</param>
    /// <param name="bodyColor">Основной цвет</param>
    public DrawningMachine(int speed, double weight, Color bodyColor) : this()
    {
        EntityGas = new EntityGas(speed, weight, bodyColor);
    }
    /// <summary>
    /// Конструктор для наследников
    /// </summary>
    /// <param name="drawningMachineWidth">Ширина прорисовки газ автомобиля</param>
    /// <param name="drawningMachineHeight">Высота прорисовки газ автомобиля</param>
    protected DrawningMachine(int drawningMachineWidth, int drawningMachineHeight) : this()
    {
        _drawningMachineWidth = drawningMachineWidth;
        _pictureHeight = drawningMachineHeight;
    }
    /// <summary>
    /// Установка границ поля 
    /// </summary>
    /// <param name="width">Ширина поля</param>
    /// <param name="height">Высота поля</param>
    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих границах</returns>
    public bool SetPictureSize(int width, int height)
    {
        if (EntityGas == null)
        {
            return false;
        }
        if (width >= _drawningMachineWidth && height >= _drawningMachineHeight)
        {
            _pictureWidth = width;
            _pictureHeight = height;
            if (_startPosX.HasValue && _startPosY.HasValue)
            {
                if (_startPosX + _drawningMachineWidth > _pictureWidth)
                {
                    _startPosX = _pictureWidth - _drawningMachineWidth;
                }
                if (_startPosY + _drawningMachineHeight > _pictureHeight)
                {
                    _startPosY = _pictureHeight - _drawningMachineHeight;
                }
            }
            return true;
        }
        return false;
    }
    /// <summary>
    /// Установка позиции
    /// </summary>
    /// <param name="x">Координата X</param>
    /// <param name="y">Координата Y</param>
    public void SetPosition(int x, int y)
    {
        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
        {
            return;
        }
        _startPosX = x;
        _startPosY = y;
        if (x < 0)
        {
            _startPosX = 0;
        }
        if (y < 0)
        {
            _startPosY = 0;
        }
        if (x + _drawningMachineWidth > _pictureWidth)
        {
            _startPosX = _pictureWidth - _drawningMachineWidth;
        }
        if (y + _drawningMachineHeight > _pictureHeight)
        {
            _startPosY = _pictureHeight - _drawningMachineHeight;
        }
    }
    public bool MoveTransport(DirectionType direction)
    {
        if (EntityGas == null || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return false;
        }
        switch (direction)
        {
            case DirectionType.Left:
                if (_startPosX.Value - EntityGas.Step > 0)
                {
                    _startPosX -= (int)EntityGas.Step;
                }
                return true;
            case DirectionType.Up:
                if (_startPosY.Value - EntityGas.Step > 0)
                {
                    _startPosY -= (int)EntityGas.Step;
                }
                return true;
            case DirectionType.Right:
                if (_startPosX.Value + EntityGas.Step + _drawningMachineWidth < _pictureWidth)
                {
                    _startPosX += (int)EntityGas.Step;
                }
                return true;
            case DirectionType.Down:
                if (_startPosY.Value + EntityGas.Step + _drawningMachineHeight < _pictureHeight)
                {
                    _startPosY += (int)EntityGas.Step;
                }
                return true;
            default:
                return false;
        }
    }
    /// <summary>
    /// Прорисовка объекта
    /// </summary>
    /// <param name="g"></param>
    public virtual void DrawTransport(Graphics g)
    {
        if (EntityGas == null || !_startPosX.HasValue || !_startPosY.HasValue)
        {
            return;
        }
        Pen pen = new(Color.Black);
        //границы автомобиля
        g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 40, 110, 10);
        g.DrawRectangle(pen, _startPosX.Value +  76, _startPosY.Value + 10, 30, 30);
        //кузов
        Brush br = new SolidBrush(EntityGas.BodyColor);
        g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 40, 110, 10);
        //кабина
        g.FillRectangle(br, _startPosX.Value + 76, _startPosY.Value + 10, 30, 30);
        //колеса
        g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 50, 20, 20);
        g.FillEllipse(br, _startPosX.Value + 10, _startPosY.Value + 50, 20, 20);
        g.DrawEllipse(pen, _startPosX.Value + 85, _startPosY.Value + 50, 20, 20);
        g.FillEllipse(br, _startPosX.Value + 85, _startPosY.Value + 50, 20, 20);
    }
 }
--- a/ProjectCar/ProjectCar/Entities/EntityGas.cs
+++ b/ProjectCar/ProjectCar/Entities/EntityGas.cs
@ -1,45 +0,0 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace ProjectGasMachine.Entities;
 /// <summary>
 /// Класс-сущность "машина для перевозки газа"
 /// </summary>
 public class EntityGas
 {
    /// <summary>
    /// Скорость
    /// </summary>
    public int Speed { get; private set; }
    /// <summary>
    /// Вес 
    /// </summary>
    public double Weight { get; private set; }
    /// <summary>
    /// Основной цвет 
    /// </summary>
    public Color BodyColor { get; private set; }
    /// <summary>
    /// Шаг перемещения машины
    /// </summary>
    public double Step => Speed * 100 / Weight;
    /// <summary>
    /// Конструктор сущности
    /// </summary>
    /// <param name="speed">Скорость</param>
    /// <param name="weight">Вес машины</param>
    /// <param name="bodyColor">Основной цвет</param>
    public EntityGas(int speed, double weight, Color bodyColor)
    {
        Speed = speed;
        Weight = weight;
        BodyColor = bodyColor;
    }
 }
--- a/ProjectCar/ProjectCar/Entities/EntityMachine.cs
+++ b/ProjectCar/ProjectCar/Entities/EntityMachine.cs
@ -1,30 +0,0 @@
 namespace ProjectGasMachine.Entities;
 /// <summary>
 /// Класс-сущность "бензовоз"
 /// </summary>
 public class EntityMachine : EntityGas
 {
    public Color AdditionalColor { get; private set; }
    /// <summary>
    /// Признак (опция) наличия бака для бензина
    /// </summary>
    public bool Gas { get; private set; }
    /// <summary>
    /// Признак (опция) наличия маяка
    /// </summary>
    public bool Beacon { get; private set; }
    /// <summary>
    /// 
    /// </summary>
    /// <param name="additionalColor">Дополнительный цвет</param>
    /// <param name="gas">Признак наличия бака для бензина</param>
    /// <param name="beacon">Признак наличия маяка</param>
    public EntityMachine(int speed, double weight, Color bodyColor, Color additionalColor, bool gas, bool beacon) : base(speed, weight, bodyColor)
    {
        AdditionalColor = additionalColor;
        Gas = gas;
        Beacon = beacon;
    }
 }
--- a/ProjectCar/ProjectCar/Form1.Designer.cs
+++ b/ProjectCar/ProjectCar/Form1.Designer.cs
@ -0,0 +1,45 @@
 namespace ProjectCar
 {
    partial class Form1
    {
        /// <summary>
        ///  Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        ///  Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        ///  Required method for Designer support - do not modify
        ///  the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            SuspendLayout();
            // 
            // Form1
            // 
            AutoScaleDimensions = new SizeF(7F, 15F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(750, 209);
            Name = "Form1";
            Text = "Form1";
            ResumeLayout(false);
        }
        #endregion
    }
 }
--- a/ProjectCar/ProjectCar/Form1.cs
+++ b/ProjectCar/ProjectCar/Form1.cs
@ -0,0 +1,10 @@
 namespace ProjectCar
 {
    public partial class Form1 : Form
    {
        public Form1()
        {
            InitializeComponent();
        }
    }
 }
--- a/ProjectCar/ProjectCar/FormGasMachine.resx
+++ b/ProjectCar/ProjectCar/FormGasMachine.resx
--- a/ProjectCar/ProjectCar/FormGasMachine.Designer.cs
+++ b/ProjectCar/ProjectCar/FormGasMachine.Designer.cs
@ -1,145 +0,0 @@
 namespace ProjectGasMachine
 {
    partial class FormGasMachine
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            buttonLeft = new Button();
            buttonRight = new Button();
            buttonUp = new Button();
            buttonDown = new Button();
            pictureBoxGasMachine = new PictureBox();
            comboBoxStrategy = new ComboBox();
            buttonStrategyStep = new Button();
            ((System.ComponentModel.ISupportInitialize)pictureBoxGasMachine).BeginInit();
            SuspendLayout();
            // 
            // buttonLeft
            // 
            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
            buttonLeft.BackgroundImage = Properties.Resources.влево;
            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
            buttonLeft.Location = new Point(862, 481);
            buttonLeft.Name = "buttonLeft";
            buttonLeft.Size = new Size(35, 35);
            buttonLeft.TabIndex = 2;
            buttonLeft.UseVisualStyleBackColor = true;
            buttonLeft.Click += ButtonMove_Click;
            // 
            // buttonRight
            // 
            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
            buttonRight.BackgroundImage = Properties.Resources.вправо;
            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
            buttonRight.Location = new Point(944, 481);
            buttonRight.Name = "buttonRight";
            buttonRight.Size = new Size(35, 35);
            buttonRight.TabIndex = 3;
            buttonRight.UseVisualStyleBackColor = true;
            buttonRight.Click += ButtonMove_Click;
            // 
            // buttonUp
            // 
            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
            buttonUp.BackgroundImage = Properties.Resources.вверх;
            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
            buttonUp.Location = new Point(903, 440);
            buttonUp.Name = "buttonUp";
            buttonUp.Size = new Size(35, 35);
            buttonUp.TabIndex = 4;
            buttonUp.UseVisualStyleBackColor = true;
            buttonUp.Click += ButtonMove_Click;
            // 
            // buttonDown
            // 
            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
            buttonDown.BackgroundImage = Properties.Resources.вниз;
            buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
            buttonDown.Location = new Point(903, 481);
            buttonDown.Name = "buttonDown";
            buttonDown.Size = new Size(35, 35);
            buttonDown.TabIndex = 5;
            buttonDown.UseVisualStyleBackColor = true;
            buttonDown.Click += ButtonMove_Click;
            // 
            // pictureBoxGasMachine
            // 
            pictureBoxGasMachine.Dock = DockStyle.Fill;
            pictureBoxGasMachine.Location = new Point(0, 0);
            pictureBoxGasMachine.Name = "pictureBoxGasMachine";
            pictureBoxGasMachine.Size = new Size(988, 528);
            pictureBoxGasMachine.TabIndex = 0;
            pictureBoxGasMachine.TabStop = false;
            // 
            // comboBoxStrategy
            // 
            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxStrategy.FormattingEnabled = true;
            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
            comboBoxStrategy.Location = new Point(858, 12);
            comboBoxStrategy.Name = "comboBoxStrategy";
            comboBoxStrategy.Size = new Size(121, 23);
            comboBoxStrategy.TabIndex = 7;
            // 
            // buttonStrategyStep
            // 
            buttonStrategyStep.Location = new Point(901, 41);
            buttonStrategyStep.Name = "buttonStrategyStep";
            buttonStrategyStep.Size = new Size(75, 23);
            buttonStrategyStep.TabIndex = 8;
            buttonStrategyStep.Text = "Шаг";
            buttonStrategyStep.UseVisualStyleBackColor = true;
            buttonStrategyStep.Click += ButtonStrategyStep_Click;
            // 
            // FormGasMachine
            // 
            AutoScaleDimensions = new SizeF(7F, 15F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(988, 528);
            Controls.Add(buttonStrategyStep);
            Controls.Add(comboBoxStrategy);
            Controls.Add(buttonDown);
            Controls.Add(buttonUp);
            Controls.Add(buttonRight);
            Controls.Add(buttonLeft);
            Controls.Add(pictureBoxGasMachine);
            Name = "FormGasMachine";
            Text = "Газовоз";
            ((System.ComponentModel.ISupportInitialize)pictureBoxGasMachine).EndInit();
            ResumeLayout(false);
        }
        #endregion
        private Button buttonLeft;
        private Button buttonRight;
        private Button buttonUp;
        private Button buttonDown;
        private PictureBox pictureBoxGasMachine;
        private ComboBox comboBoxStrategy;
        private Button buttonStrategyStep;
    }
 }
--- a/ProjectCar/ProjectCar/FormGasMachine.cs
+++ b/ProjectCar/ProjectCar/FormGasMachine.cs
@ -1,137 +0,0 @@
 using ProjectGasMachine.Drawnings;
 using ProjectGasMachine.MovementStrategy;
 namespace ProjectGasMachine;
 public partial class FormGasMachine : Form
 {
    /// <summary>
    /// поле-объект для прорисовки объекта
    /// </summary>
    private DrawningMachine? _drawningMachine;
    /// <summary>
    /// стратегия перемещения
    /// </summary>
    private AbstractStrategy? _strategy;
    public DrawningMachine SetMachine 
    {
        set 
        {
            _drawningMachine = value;
            _drawningMachine.SetPictureSize(pictureBoxGasMachine.Height, pictureBoxGasMachine.Width);
            comboBoxStrategy.Enabled = true;
            _strategy = null;
            Draw();
        }
    }
    /// <summary>
    /// конструктор формы
    /// </summary>
    public FormGasMachine()
    {
        InitializeComponent();
        _strategy = null;
    }
    /// <summary>
    /// метод прорисовки машины
    /// </summary>
    private void Draw()
    {
        if (_drawningMachine == null)
        {
            return;
        }
        Bitmap bmp = new(pictureBoxGasMachine.Width, pictureBoxGasMachine.Height);
        Graphics gr = Graphics.FromImage(bmp);
        _drawningMachine.DrawTransport(gr);
        pictureBoxGasMachine.Image = bmp;
    }
    /// <summary>
    /// перемещение объекта по форме
    /// </summary>
    /// <param name="sender"></param>
    /// <param name="e"></param>
    private void ButtonMove_Click(object sender, EventArgs e)
    {
        if (_drawningMachine == null)
        {
            return;
        }
        string name = ((Button)sender)?.Name ?? string.Empty;
        bool result = false;
        switch (name)
        {
            case "buttonUp":
                result = _drawningMachine.MoveTransport(DirectionType.Up);
                break;
            case "buttonDown":
                result = _drawningMachine.MoveTransport(DirectionType.Down);
                break;
            case "buttonRight":
                result = _drawningMachine.MoveTransport(DirectionType.Right);
                break;
            case "buttonLeft":
                result = _drawningMachine.MoveTransport(DirectionType.Left);
                break;
        }
        if (result)
        {
            Draw();
        }
    }
    private void ButtonStrategyStep_Click(object sender, EventArgs e)
    {
        if (_drawningMachine == null) 
        {
            return;
        }
        if (comboBoxStrategy.Enabled) 
        {
            _strategy = comboBoxStrategy.SelectedIndex switch
            {
                0 => new MoveToCenter(),
                1 => new MoveToBorder(),
                _ => null,
            };
            if (_strategy == null) 
            {
                return;
            }
            _strategy.SetData(new MoveableMachine(_drawningMachine), pictureBoxGasMachine.Width, pictureBoxGasMachine.Height);     
        }
        if (_strategy == null)
        {
            return;
        }
        comboBoxStrategy.Enabled = false;
        _strategy.MakeStep();
        Draw();
        if (_strategy.GetStatus() == StrategyStatus.Finish) 
        {
            comboBoxStrategy.Enabled = true;
            _strategy = null;
        }
    }
 }
--- a/ProjectCar/ProjectCar/FormGasMachineCollection.Designer.cs
+++ b/ProjectCar/ProjectCar/FormGasMachineCollection.Designer.cs
@ -1,302 +0,0 @@
 namespace ProjectGasMachine
 {
    partial class FormGasMachineCollection
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            groupBoxTools = new GroupBox();
            buttonCreateCompany = new Button();
            panelStorage = new Panel();
            buttonCollectionDel = new Button();
            listBoxCollection = new ListBox();
            buttonCollectionAdd = new Button();
            radioButtonList = new RadioButton();
            radioButtonMassive = new RadioButton();
            textBoxCollectionName = new TextBox();
            labelCollectionName = new Label();
            buttonRefresh = new Button();
            buttonGoToCheck = new Button();
            buttonRemoveMachine = new Button();
            maskedTextBoxPosition = new MaskedTextBox();
            buttonAddMachine = new Button();
            buttonAddGasMachine = new Button();
            comboBoxSelectorCompany = new ComboBox();
            pictureBox = new PictureBox();
            panelCompanyTools = new Panel();
            groupBoxTools.SuspendLayout();
            panelStorage.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
            panelCompanyTools.SuspendLayout();
            SuspendLayout();
            // 
            // groupBoxTools
            // 
            groupBoxTools.Controls.Add(panelCompanyTools);
            groupBoxTools.Controls.Add(buttonCreateCompany);
            groupBoxTools.Controls.Add(panelStorage);
            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
            groupBoxTools.Dock = DockStyle.Right;
            groupBoxTools.Location = new Point(727, 0);
            groupBoxTools.Name = "groupBoxTools";
            groupBoxTools.Size = new Size(196, 543);
            groupBoxTools.TabIndex = 0;
            groupBoxTools.TabStop = false;
            groupBoxTools.Text = "Инструменты";
            // 
            // buttonCreateCompany
            // 
            buttonCreateCompany.Location = new Point(6, 294);
            buttonCreateCompany.Name = "buttonCreateCompany";
            buttonCreateCompany.Size = new Size(184, 23);
            buttonCreateCompany.TabIndex = 7;
            buttonCreateCompany.Text = "Создать компанию";
            buttonCreateCompany.UseVisualStyleBackColor = true;
            buttonCreateCompany.Click += ButtonCreateCompany_Click;
            // 
            // panelStorage
            // 
            panelStorage.Controls.Add(buttonCollectionDel);
            panelStorage.Controls.Add(listBoxCollection);
            panelStorage.Controls.Add(buttonCollectionAdd);
            panelStorage.Controls.Add(radioButtonList);
            panelStorage.Controls.Add(radioButtonMassive);
            panelStorage.Controls.Add(textBoxCollectionName);
            panelStorage.Controls.Add(labelCollectionName);
            panelStorage.Dock = DockStyle.Top;
            panelStorage.Location = new Point(3, 19);
            panelStorage.Name = "panelStorage";
            panelStorage.Size = new Size(190, 239);
            panelStorage.TabIndex = 8;
            // 
            // buttonCollectionDel
            // 
            buttonCollectionDel.Location = new Point(3, 206);
            buttonCollectionDel.Name = "buttonCollectionDel";
            buttonCollectionDel.Size = new Size(184, 23);
            buttonCollectionDel.TabIndex = 6;
            buttonCollectionDel.Text = "Удалить коллекцию";
            buttonCollectionDel.UseVisualStyleBackColor = true;
            buttonCollectionDel.Click += ButtonCollectionDel_Click;
            // 
            // listBoxCollection
            // 
            listBoxCollection.FormattingEnabled = true;
            listBoxCollection.ItemHeight = 15;
            listBoxCollection.Location = new Point(3, 106);
            listBoxCollection.Name = "listBoxCollection";
            listBoxCollection.Size = new Size(184, 94);
            listBoxCollection.TabIndex = 5;
            // 
            // buttonCollectionAdd
            // 
            buttonCollectionAdd.Location = new Point(3, 77);
            buttonCollectionAdd.Name = "buttonCollectionAdd";
            buttonCollectionAdd.Size = new Size(184, 23);
            buttonCollectionAdd.TabIndex = 4;
            buttonCollectionAdd.Text = "Добавить коллекцию";
            buttonCollectionAdd.UseVisualStyleBackColor = true;
            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
            // 
            // radioButtonList
            // 
            radioButtonList.AutoSize = true;
            radioButtonList.Location = new Point(115, 52);
            radioButtonList.Name = "radioButtonList";
            radioButtonList.Size = new Size(66, 19);
            radioButtonList.TabIndex = 3;
            radioButtonList.TabStop = true;
            radioButtonList.Text = "Список";
            radioButtonList.UseVisualStyleBackColor = true;
            // 
            // radioButtonMassive
            // 
            radioButtonMassive.AutoSize = true;
            radioButtonMassive.Location = new Point(16, 52);
            radioButtonMassive.Name = "radioButtonMassive";
            radioButtonMassive.Size = new Size(67, 19);
            radioButtonMassive.TabIndex = 2;
            radioButtonMassive.TabStop = true;
            radioButtonMassive.Text = "Массив";
            radioButtonMassive.UseVisualStyleBackColor = true;
            // 
            // textBoxCollectionName
            // 
            textBoxCollectionName.Location = new Point(3, 18);
            textBoxCollectionName.Name = "textBoxCollectionName";
            textBoxCollectionName.Size = new Size(184, 23);
            textBoxCollectionName.TabIndex = 1;
            // 
            // labelCollectionName
            // 
            labelCollectionName.AutoSize = true;
            labelCollectionName.Location = new Point(34, 0);
            labelCollectionName.Name = "labelCollectionName";
            labelCollectionName.Size = new Size(125, 15);
            labelCollectionName.TabIndex = 0;
            labelCollectionName.Text = "Название коллекции:";
            // 
            // buttonRefresh
            // 
            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonRefresh.Location = new Point(10, 185);
            buttonRefresh.Name = "buttonRefresh";
            buttonRefresh.Size = new Size(174, 32);
            buttonRefresh.TabIndex = 7;
            buttonRefresh.Text = "Обновить";
            buttonRefresh.UseVisualStyleBackColor = true;
            buttonRefresh.Click += ButtonRefresh_Click;
            // 
            // buttonGoToCheck
            // 
            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonGoToCheck.Location = new Point(10, 150);
            buttonGoToCheck.Name = "buttonGoToCheck";
            buttonGoToCheck.Size = new Size(174, 29);
            buttonGoToCheck.TabIndex = 6;
            buttonGoToCheck.Text = "Передать на тесты";
            buttonGoToCheck.UseVisualStyleBackColor = true;
            buttonGoToCheck.Click += ButtonGoToCheck_Click;
            // 
            // buttonRemoveMachine
            // 
            buttonRemoveMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonRemoveMachine.Location = new Point(10, 112);
            buttonRemoveMachine.Name = "buttonRemoveMachine";
            buttonRemoveMachine.Size = new Size(174, 32);
            buttonRemoveMachine.TabIndex = 5;
            buttonRemoveMachine.Text = "Удалить газовоз";
            buttonRemoveMachine.UseVisualStyleBackColor = true;
            buttonRemoveMachine.Click += ButtonRemoveMachine_Click;
            // 
            // maskedTextBoxPosition
            // 
            maskedTextBoxPosition.Location = new Point(3, 83);
            maskedTextBoxPosition.Mask = "00";
            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
            maskedTextBoxPosition.Size = new Size(184, 23);
            maskedTextBoxPosition.TabIndex = 4;
            maskedTextBoxPosition.ValidatingType = typeof(int);
            // 
            // buttonAddMachine
            // 
            buttonAddMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonAddMachine.Location = new Point(10, 44);
            buttonAddMachine.Name = "buttonAddMachine";
            buttonAddMachine.Size = new Size(174, 33);
            buttonAddMachine.TabIndex = 2;
            buttonAddMachine.Text = "Добавление грузовика";
            buttonAddMachine.UseVisualStyleBackColor = true;
            buttonAddMachine.Click += ButtonAddMachine_Click;
            // 
            // buttonAddGasMachine
            // 
            buttonAddGasMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            buttonAddGasMachine.Location = new Point(10, 3);
            buttonAddGasMachine.Name = "buttonAddGasMachine";
            buttonAddGasMachine.Size = new Size(174, 35);
            buttonAddGasMachine.TabIndex = 1;
            buttonAddGasMachine.Text = "Добавление газовоза";
            buttonAddGasMachine.UseVisualStyleBackColor = true;
            buttonAddGasMachine.Click += ButtonAddGasMachine_Click;
            // 
            // comboBoxSelectorCompany
            // 
            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxSelectorCompany.FormattingEnabled = true;
            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
            comboBoxSelectorCompany.Location = new Point(6, 265);
            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
            comboBoxSelectorCompany.Size = new Size(184, 23);
            comboBoxSelectorCompany.TabIndex = 0;
            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
            // 
            // pictureBox
            // 
            pictureBox.Dock = DockStyle.Fill;
            pictureBox.Location = new Point(0, 0);
            pictureBox.Name = "pictureBox";
            pictureBox.Size = new Size(727, 543);
            pictureBox.TabIndex = 3;
            pictureBox.TabStop = false;
            // 
            // panelCompanyTools
            // 
            panelCompanyTools.Controls.Add(buttonAddGasMachine);
            panelCompanyTools.Controls.Add(buttonAddMachine);
            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
            panelCompanyTools.Controls.Add(buttonRefresh);
            panelCompanyTools.Controls.Add(buttonRemoveMachine);
            panelCompanyTools.Controls.Add(buttonGoToCheck);
            panelCompanyTools.Dock = DockStyle.Bottom;
            panelCompanyTools.Enabled = false;
            panelCompanyTools.Location = new Point(3, 323);
            panelCompanyTools.Name = "panelCompanyTools";
            panelCompanyTools.Size = new Size(190, 217);
            panelCompanyTools.TabIndex = 9;
            // 
            // FormGasMachineCollection
            // 
            AutoScaleDimensions = new SizeF(7F, 15F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(923, 543);
            Controls.Add(pictureBox);
            Controls.Add(groupBoxTools);
            Name = "FormGasMachineCollection";
            Text = "Коллекция газовозов";
            groupBoxTools.ResumeLayout(false);
            panelStorage.ResumeLayout(false);
            panelStorage.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
            panelCompanyTools.ResumeLayout(false);
            panelCompanyTools.PerformLayout();
            ResumeLayout(false);
        }
        #endregion
        private GroupBox groupBoxTools;
        private ComboBox comboBoxSelectorCompany;
        private Button buttonAddMachine;
        private Button buttonAddGasMachine;
        private Button buttonRemoveMachine;
        private MaskedTextBox maskedTextBoxPosition;
        private PictureBox pictureBox;
        private Button buttonRefresh;
        private Button buttonGoToCheck;
        private Panel panelStorage;
        private Label labelCollectionName;
        private Button buttonCollectionAdd;
        private RadioButton radioButtonList;
        private RadioButton radioButtonMassive;
        private TextBox textBoxCollectionName;
        private Button buttonCreateCompany;
        private Button buttonCollectionDel;
        private ListBox listBoxCollection;
        private Panel panelCompanyTools;
    }
 }
--- a/ProjectCar/ProjectCar/FormGasMachineCollection.cs
+++ b/ProjectCar/ProjectCar/FormGasMachineCollection.cs
@ -1,282 +0,0 @@
 using ProjectGasMachine.CollectionGenericObjects;
 using ProjectGasMachine.Drawnings;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar;
 namespace ProjectGasMachine
 {
    /// <summary>
    /// Форма работы с компанией и ее коллекцией
    /// </summary>
    public partial class FormGasMachineCollection : Form
    {
        /// <summary>
        /// хранение коллекций
        /// </summary>
        private readonly StorageCollection<DrawningMachine> _storageCollection;
        /// <summary>
        /// Компания
        /// </summary>
        private AbstractCompany? _company = null;
        /// <summary>
        /// конструктор
        /// </summary>
        public FormGasMachineCollection()
        {
            InitializeComponent();
            _storageCollection = new();
        }
        /// <summary>
        /// Выбор компании
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
        {
            panelCompanyTools.Enabled = false;
        }
        /// <summary>
        /// Создание объекта класса-перемещения
        /// </summary>
        /// <param name="type"></param>
        private void CreateObject(string type)
        {
            if (_company == null)
            {
                return;
            }
            Random random = new();
            DrawningMachine drawningMachine;
            switch (type)
            {
                case nameof(DrawningMachine):
                    drawningMachine = new DrawningMachine(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
                    break;
                case nameof(DrawningGasMachine):
                    drawningMachine = new DrawningGasMachine(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random),
                Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
                    break;
                default:
                    return;
            }
            if (_company + drawningMachine != -1)
            {
                MessageBox.Show("Объект добавлен");
                pictureBox.Image = _company.Show();
            }
            else
            {
                MessageBox.Show("Не удалось добавить объект");
            }
        }
        /// <summary>
        /// Получение цыета
        /// </summary>
        /// <param name="random">генератор случайных чисел</param>
        /// <returns></returns>
        private static Color GetColor(Random random)
        {
            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
            ColorDialog dialog = new();
            if (dialog.ShowDialog() == DialogResult.OK)
            {
                color = dialog.Color;
            }
            return color;
        }
        /// <summary>
        /// добавление газовоза
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonAddGasMachine_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningGasMachine));
        /// <summary>
        /// добавление грузовика
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonAddMachine_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMachine));
        /// <summary>
        /// удаление объекта
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonRemoveMachine_Click(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
            {
                return;
            }
            if (MessageBox.Show("Удалить объект", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
            {
                return;
            }
            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
            if (_company - pos != null)
            {
                MessageBox.Show("Объект удален");
                pictureBox.Image = _company.Show();
            }
            else
            {
                MessageBox.Show("Не удалось удалить объект");
            }
        }
        /// <summary>
        /// Передача объекта в другую форму
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonGoToCheck_Click(object sender, EventArgs e)
        {
            if (_company == null)
            {
                return;
            }
            DrawningMachine? machine = null;
            int counter = 100;
            while (machine == null)
            {
                machine = _company.GetRandomObject();
                counter--;
                if (counter <= 0)
                {
                    break;
                }
            }
            if (machine == null)
            {
                return;
            }
            FormGasMachine form = new()
            {
                SetMachine = machine
            };
            form.ShowDialog();
        }
        /// <summary>
        /// Перерисовка коллекции
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonRefresh_Click(object sender, EventArgs e)
        {
            if (_company == null)
            {
                return;
            }
            pictureBox.Image = _company.Show();
        }
        /// <summary>
        /// Добавление коллекции
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonCollectionAdd_Click(object sender, EventArgs e)
        {
            if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
            {
                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                return;
            }
            CollectionType collectionType = CollectionType.None;
            if (radioButtonMassive.Checked)
            {
                collectionType = CollectionType.Massive;
            }
            else if (radioButtonList.Checked)
            {
                collectionType = CollectionType.List;
            }
            _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
            RerfreshListBoxItems();
        }
        /// <summary>
        /// Удаление коллекции
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonCollectionDel_Click(object sender, EventArgs e)
        {
            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
            {
                MessageBox.Show("Коллекция не выбрана");
                return;
            }
            if (MessageBox.Show("Вы уверены, что хотите удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
            {
                return;
            }
            _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
            RerfreshListBoxItems();
        }
        /// <summary>
        /// Обновление списка в listBoxCollection
        /// </summary>
        private void RerfreshListBoxItems()
        {
            listBoxCollection.Items.Clear();
            for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
            {
                string? colName = _storageCollection.Keys?[i];
                if (!string.IsNullOrEmpty(colName))
                {
                    listBoxCollection.Items.Add(colName);
                }
            }
        }
        /// <summary>
        /// Создание компании
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ButtonCreateCompany_Click(object sender, EventArgs e)
        {
            if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
            {
                MessageBox.Show("Коллекция не выбрана");
                return;
            }
            ICollectionGenericObjects<DrawningMachine>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
            if (collection == null)
            {
                MessageBox.Show("Коллекция не проинициализирована");
                return;
            }
            switch (comboBoxSelectorCompany.Text)
            {
                case "Хранилище":
                    _company = new Autopark(pictureBox.Width, pictureBox.Height, collection);
                    break;
            }
            panelCompanyTools.Enabled = true;
            RerfreshListBoxItems();
        }
    }
 }
--- a/ProjectCar/ProjectCar/FormGasMachineCollection.resx
+++ b/ProjectCar/ProjectCar/FormGasMachineCollection.resx
@ -1,120 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
  <!--
    Microsoft ResX Schema 
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
 </root>
--- a/ProjectCar/ProjectCar/MovementStrategy/AbstractStrategy.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/AbstractStrategy.cs
@ -1,136 +0,0 @@
 namespace ProjectGasMachine.MovementStrategy;
 /// <summary>
 /// класс-стратегия перемещения объекта
 /// </summary>
 public abstract class AbstractStrategy
 {
    /// <summary>
    /// перемещаемый объект
    /// </summary>
    private IMoveableObjects? _moveableObject;
    /// <summary>
    /// статус перемещения
    /// </summary>
    private StrategyStatus _state = StrategyStatus.NotInit;
    /// <summary>
    /// ширина поля
    /// </summary>
    protected int FieldWidth { get; private set; }
    /// <summary>
    /// высота поля
    /// </summary>
    protected int FieldHeight { get; private set; }
    /// <summary>
    /// статус перемещения
    /// </summary>
    public StrategyStatus GetStatus() { return _state; }
    /// <summary>
    /// установка данных
    /// </summary>
    /// <param name="moveableObject">перемещаемый объект</param>
    /// <param name="width">ширина</param>
    /// <param name="height">высота</param>
    public void SetData(IMoveableObjects moveableObject, int width, int height) 
    {
        if (moveableObject == null) 
        {
            _state = StrategyStatus.NotInit;
            return;
        }
        _state  = StrategyStatus.InProgress;
        _moveableObject = moveableObject;
        FieldWidth = width;
        FieldHeight = height;
    }
    public void MakeStep() 
    {
        if (_state != StrategyStatus.InProgress) 
        {
            return;
        }
        if (IsTargetDestination()) 
        {
            _state = StrategyStatus.Finish;
            return;
        }
        MoveToTarget();
    }
    /// <summary>
    /// Перемещение влево
    /// </summary>
    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
    /// <summary>
    /// Перемещение вправо
    /// </summary>
    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
    protected bool MoveRight() => MoveTo(MovementDirection.Right);
    /// <summary>
    /// Перемещение вверх
    /// </summary>
    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
    protected bool MoveUp() => MoveTo(MovementDirection.Up);
    /// <summary>
    /// Перемещение вниз
    /// </summary>
    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
    protected bool MoveDown() => MoveTo(MovementDirection.Down);
    /// <summary>
    /// Параметры объекта
    /// </summary>
    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
    /// <summary>
    /// Шаг объекта
    /// </summary>
    /// <returns></returns>
    protected int? GetStep()
    {
        if (_state != StrategyStatus.InProgress)
        {
            return null;
        }
        return _moveableObject?.GetStep;
    }
    /// <summary>
    /// Перемещение к цели
    /// </summary>
    protected abstract void MoveToTarget();
    /// <summary>
    /// Достигнута ли цель
    /// </summary>
    /// <returns></returns>
    protected abstract bool IsTargetDestination();
    /// <summary>
    /// Попытка перемещения в требуемом направлении
    /// </summary>
    /// <param name="movementDirection">Направление</param>
    /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
    private bool MoveTo(MovementDirection movementDirection)
    {
        if (_state != StrategyStatus.InProgress)
        {
            return false;
        }
        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
    }
 }
--- a/ProjectCar/ProjectCar/MovementStrategy/IMoveableObjects.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/IMoveableObjects.cs
@ -1,24 +0,0 @@
 namespace ProjectGasMachine.MovementStrategy;
 /// <summary>
 /// интерфейс для работы с перемещаемым объектом
 /// </summary>
 public interface IMoveableObjects
 {
    /// <summary>
    /// получение координаты объекта
    /// </summary>
    ObjectParameters? GetObjectPosition { get; }
    /// <summary>
    /// шаг объекта
    /// </summary>
    int GetStep { get; }
    /// <summary>
    /// попытка переместить объект в указанном направлении
    /// </summary>
    /// <param name="direction"></param>
    /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
    bool TryMoveObject(MovementDirection direction);
 }
--- a/ProjectCar/ProjectCar/MovementStrategy/MoveToBorder.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/MoveToBorder.cs
@ -1,52 +0,0 @@
 namespace ProjectGasMachine.MovementStrategy;
 /// <summary>
 /// Стратегия перемещения объекта к краю
 /// </summary>
 public class MoveToBorder : AbstractStrategy
 {
    protected override bool IsTargetDestination()
    {
        ObjectParameters? objParams = GetObjectParameters;
        if (objParams == null)
        {
            return false;
        }
        return objParams.RightBorder - GetStep() <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
            objParams.DownBorder - GetStep() <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
    }
    protected override void MoveToTarget()
    {
        ObjectParameters? objParams = GetObjectParameters;
        if (objParams == null)
        {
            return;
        }
        int diffX = objParams.RightBorder - FieldWidth;
        if (Math.Abs(diffX) > GetStep())
        {
            if (diffX > 0)
            {
                MoveLeft();
            }
            else
            {
                MoveRight();
            }
        }
        int diffY = objParams.DownBorder - FieldHeight;
        if (Math.Abs(diffY) > GetStep())
        {
            if (diffY > 0)
            {
                MoveUp();
            }
            else
            {
                MoveDown();
            }
        }
    }
 }
--- a/ProjectCar/ProjectCar/MovementStrategy/MoveToCenter.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/MoveToCenter.cs
@ -1,48 +0,0 @@
 namespace ProjectGasMachine.MovementStrategy;
 internal class MoveToCenter : AbstractStrategy
 {
    protected override bool IsTargetDestination()
    {
        ObjectParameters? objParams = GetObjectParameters;
        if (objParams == null)
        {
            return false;
        }
        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
    }
    protected override void MoveToTarget()
    {
        ObjectParameters? objParams = GetObjectParameters;
        if (objParams == null)
        {
            return;
        }
        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
        if (Math.Abs(diffX) > GetStep())
        {
            if (diffX > 0)
            {
                MoveLeft();
            }
            else
            {
                MoveRight();
            }
        }
        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
        if (Math.Abs(diffY) > GetStep())
        {
            if (diffY > 0)
            {
                MoveUp();
            }
            else
            {
                MoveDown();
            }
        }
    }
 }
--- a/ProjectCar/ProjectCar/MovementStrategy/MoveableMachine.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/MoveableMachine.cs
@ -1,70 +0,0 @@
 using ProjectGasMachine.Drawnings;
 using System.Reflection.PortableExecutable;
 namespace ProjectGasMachine.MovementStrategy;
 /// <summary>
 /// класс-реализация IMoveableObjects с использованием DrawningMachine
 /// </summary>
 public class MoveableMachine : IMoveableObjects
 {
    /// <summary>
    /// поле-объект класса DrawningMachine или его наследника
    /// </summary>
    private readonly DrawningMachine? _machine = null;
    /// <summary>
    /// конструктор
    /// </summary>
    /// <param name="machine">объект класса DrawningMachine</param>
    public MoveableMachine(DrawningMachine machine)
    {
        _machine = machine;
    }
    public ObjectParameters? GetObjectPosition 
    {
        get 
        {
            if (_machine == null || _machine.EntityGas == null || !_machine.GetPosX.HasValue || !_machine.GetPosY.HasValue)
            {
                return null;
            }
            return new ObjectParameters(_machine.GetPosX.Value, _machine.GetPosY.Value, _machine.GetWidth, _machine.GetHeight);
        }
    }
    public int GetStep => (int)(_machine?.EntityGas?.Step ?? 0);
    public bool TryMoveObject(MovementDirection direction)
    {
        if (_machine == null || _machine.EntityGas == null) 
        {
            return false;
        }
        return _machine.MoveTransport(GetDirectionType(direction));
    }
    /// <summary>
    /// конвертация из MovementDirection в DirectionType
    /// </summary>
    /// <param name="direction">MovementDirection</param>
    /// <returns>DirectionType</returns>
    private static DirectionType GetDirectionType(MovementDirection direction) 
    {
        return direction switch
        {
            MovementDirection.Left => DirectionType.Left,
            MovementDirection.Right => DirectionType.Right,
            MovementDirection.Up => DirectionType.Up,
            MovementDirection.Down => DirectionType.Down,
            _ => DirectionType.Unknow,
        };
    }
 }
--- a/ProjectCar/ProjectCar/MovementStrategy/MovementDirection.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/MovementDirection.cs
@ -1,21 +0,0 @@
 namespace ProjectGasMachine.MovementStrategy;
 public enum MovementDirection
 {
    /// <summary>
    /// Вверх
    /// </summary>
    Up = 1,
    /// <summary>
    /// Вниз
    /// </summary>
    Down = 2,
    /// <summary>
    /// Влево
    /// </summary>
    Left = 3,
    /// <summary>
    /// Вправо
    /// </summary>
    Right = 4
 }
--- a/ProjectCar/ProjectCar/MovementStrategy/ObjectParameters.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/ObjectParameters.cs
@ -1,72 +0,0 @@
 namespace ProjectGasMachine.MovementStrategy;
 public class ObjectParameters
 {
    /// <summary>
    /// координата x
    /// </summary>
    private readonly int _x;
    /// <summary>
    /// координата y
    /// </summary>
    private readonly int _y;
    /// <summary>
    /// ширина объекта
    /// </summary>
    private readonly int _width;
    /// <summary>
    /// высота объекта
    /// </summary>
    private readonly int _height;
    /// <summary>
    /// левая граница
    /// </summary>
    public int LeftBorder => _x;
    /// <summary>
    /// верхняя граница
    /// </summary>
    public int TopBorder => _y;
    /// <summary>
    /// правая граница
    /// </summary>
    public int RightBorder => _x + _width;
    /// <summary>
    /// нижняя граница
    /// </summary>
    public int DownBorder => _y + _height;
    /// <summary>
    /// середина объекта
    /// </summary>
    public int ObjectMiddleHorizontal => _x + _width/2;
    /// <summary>
    /// середина объекта
    /// </summary>
    public int ObjectMiddleVertical => _y + _height / 2;
    /// <summary>
    /// конструктор
    /// </summary>
    /// <param name="x">координата x</param>
    /// <param name="y">координата y</param>
    /// <param name="width">ширина объекта</param>
    /// <param name="height">высота объекта</param>
    public ObjectParameters(int x, int y, int width, int height)
    {
        _x = x;
        _y = y;
        _width = width;
        _height = height;
    }
 }
--- a/ProjectCar/ProjectCar/MovementStrategy/StrategyStatus.cs
+++ b/ProjectCar/ProjectCar/MovementStrategy/StrategyStatus.cs
@ -1,22 +0,0 @@
 namespace ProjectGasMachine.MovementStrategy;
 /// <summary>
 /// статус выполнения операции перемещения
 /// </summary>
 public enum StrategyStatus
 {
    /// <summary>
    /// все готово к началу
    /// </summary>
    NotInit,
    /// <summary>
    /// выполняется
    /// </summary>
    InProgress,
    /// <summary>
    /// завершено
    /// </summary>
    Finish
 }
--- a/ProjectCar/ProjectCar/Program.cs
+++ b/ProjectCar/ProjectCar/Program.cs
@ -1,4 +1,4 @@
-namespace ProjectGasMachine
+namespace ProjectCar
 {
    internal static class Program
    {
@ -11,7 +11,7 @@ namespace ProjectGasMachine
            // To customize application configuration such as set high DPI settings or default font,
            // see https://aka.ms/applicationconfiguration.
            ApplicationConfiguration.Initialize();
-            Application.Run(new FormGasMachineCollection());
+            Application.Run(new Form1());
        }
    }
 }
--- a/ProjectCar/ProjectCar/ProjectCar
+++ b/ProjectCar/ProjectCar/ProjectCar
@ -1,26 +0,0 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
    <TargetFramework>net8.0-windows</TargetFramework>
    <Nullable>enable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Update="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
 </Project>
--- a/ProjectCar/ProjectCar/ProjectCar.csproj
+++ b/ProjectCar/ProjectCar/ProjectCar.csproj
@ -0,0 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
    <TargetFramework>net8.0-windows</TargetFramework>
    <Nullable>enable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
 </Project>
--- a/ProjectCar/ProjectCar/ProjectGasMachine.csproj
+++ b/ProjectCar/ProjectCar/ProjectGasMachine.csproj
@ -1,31 +0,0 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
    <TargetFramework>net8.0-windows</TargetFramework>
    <Nullable>enable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
  <ItemGroup>
    <None Include="ProjectGasMachine.csproj" />
    <None Include="ProjectGasMachine.csproj.user" />
  </ItemGroup>
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Update="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
 </Project>
--- a/ProjectCar/ProjectCar/Properties/Resources.Designer.cs
+++ b/ProjectCar/ProjectCar/Properties/Resources.Designer.cs
@ -1,113 +0,0 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
 //     Исполняемая версия:4.0.30319.42000
 //
 //     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
 //     повторной генерации кода.
 // </auto-generated>
 //------------------------------------------------------------------------------
 namespace ProjectGasMachine.Properties {
    using System;
    /// <summary>
    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
    /// </summary>
    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
    // с помощью такого средства, как ResGen или Visual Studio.
    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
    // с параметром /str или перестройте свой проект VS.
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
        private static global::System.Resources.ResourceManager resourceMan;
        private static global::System.Globalization.CultureInfo resourceCulture;
        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
        internal Resources() {
        }
        /// <summary>
        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Resources.ResourceManager ResourceManager {
            get {
                if (object.ReferenceEquals(resourceMan, null)) {
                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectGasMachine.Properties.Resources", typeof(Resources).Assembly);
                    resourceMan = temp;
                }
                return resourceMan;
            }
        }
        /// <summary>
        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
            get {
                return resourceCulture;
            }
            set {
                resourceCulture = value;
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap free_icon_left_arrow_10696518 {
            get {
                object obj = ResourceManager.GetObject("free-icon-left-arrow-10696518", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap вверх {
            get {
                object obj = ResourceManager.GetObject("вверх", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap влево {
            get {
                object obj = ResourceManager.GetObject("влево", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap вниз {
            get {
                object obj = ResourceManager.GetObject("вниз", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
        /// </summary>
        internal static System.Drawing.Bitmap вправо {
            get {
                object obj = ResourceManager.GetObject("вправо", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
    }
 }
--- a/ProjectCar/ProjectCar/Properties/Resources.resx
+++ b/ProjectCar/ProjectCar/Properties/Resources.resx
@ -1,136 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
    Version 2.0
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple 
    name/value pairs.
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 
    mimetype set.
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="free-icon-left-arrow-10696518" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\free-icon-left-arrow-10696518.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="вверх" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\вверх.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="влево" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\влево.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="вниз" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\вниз.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="вправо" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\вправо.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/ProjectCar/ProjectCar/Resources/free-icon-left-arrow-10696518.png
+++ b/ProjectCar/ProjectCar/Resources/free-icon-left-arrow-10696518.png
--- a/ProjectCar/ProjectCar/Resources/вверх.jpg
+++ b/ProjectCar/ProjectCar/Resources/вверх.jpg
--- a/ProjectCar/ProjectCar/Resources/влево.jpg
+++ b/ProjectCar/ProjectCar/Resources/влево.jpg
--- a/ProjectCar/ProjectCar/Resources/вниз.jpg
+++ b/ProjectCar/ProjectCar/Resources/вниз.jpg
--- a/ProjectCar/ProjectCar/Resources/вправо.jpg
+++ b/ProjectCar/ProjectCar/Resources/вправо.jpg