Чистка кода

ProjectElectricLocomotive/ProjectElectricLocomotive/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,116 @@
+using ProjectElectricLocomotive.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.CollectionGenericObjects;
+
+public abstract class AbstractCompany
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 147;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 64;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Коллекция автомобилей
+    /// </summary>
+    protected ICollectionGenericObjects<DrawningLocomotive>? _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<DrawningLocomotive> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.SetMaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="car">Добавляемый объект</param>
+    /// <returns></returns>
+    public static int operator +(AbstractCompany company, DrawningLocomotive truck)
+    {
+        return company._collection.Insert(truck);
+    }
+
+    // <summary>
+    // Перегрузка оператора удаления для класса
+    // </summary>
+    // <param name = "company" > Компания </ param >
+    // < param name="position">Номер удаляемого объекта</param>
+    // <returns></returns>
+    public static DrawningLocomotive operator -(AbstractCompany company, int position)
+    {
+        return company._collection.Remove(position);
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningLocomotive? 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);
+        DrawBackgound(graphics);
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            DrawningLocomotive? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackgound(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.CollectionGenericObjects;
+
+/// <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>
+    /// Добавление объекта в коллекцию на конкретную позицию
+    /// /// <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);
+
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/CollectionGenericObjects/LocomotiveDepot.cs

@@ -0,0 +1,75 @@
+using ProjectElectricLocomotive.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.CollectionGenericObjects;
+
+public class LocomotiveDepot : AbstractCompany
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина</param>
+    /// <param name="picHeight">Высота</param>
+    /// <param name="collection">Коллекция</param>
+    public LocomotiveDepot(int picWidth, int picHeight, ICollectionGenericObjects<DrawningLocomotive> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+
+    protected override void DrawBackgound(Graphics g)
+    {
+
+        int count_width = _pictureWidth / _placeSizeWidth; // кол-во мест в ширину
+        int count_height = _pictureHeight / _placeSizeHeight; // кол-во мест в длинну
+        Pen pen = new(Color.Black, 3);
+        for (int i = 0; i < count_width; i++)
+        {
+            for (int j = 0; j < count_height + 1; ++j)
+            {
+                g.DrawLine(pen, i * _placeSizeWidth + 10, j * _placeSizeHeight + 1, i * _placeSizeWidth + _placeSizeWidth - 50, j * _placeSizeHeight+1); 
+                g.DrawLine(pen, i * _placeSizeWidth + 10, j * _placeSizeHeight, i * _placeSizeWidth + 10, j * _placeSizeHeight + _placeSizeHeight);
+            }
+        }
+    }
+
+    protected override void SetObjectsPosition()
+    {
+
+        int width = _pictureWidth / _placeSizeWidth;
+        int height = _pictureHeight / _placeSizeHeight;
+        int positionWidth = 0;
+        int positionHeight = height - 1;
+
+        if (_collection?.Count != null)
+        {
+            for (int i = 0; i < (_collection.Count); i++)
+            {
+                if (_collection.Get(i) != null)
+                {
+                    _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+                    _collection.Get(i).SetPosition(_placeSizeWidth * positionWidth + 25, positionHeight * _placeSizeHeight + 10);
+                }
+
+                if (positionWidth < width - 1)
+                {
+                    positionWidth++;
+                }
+
+                else
+                {
+                    positionWidth = 0;
+                    positionHeight--;
+                }
+                if (positionHeight < 0)
+                {
+                    return;
+                }
+            }
+        }
+
+    }
+
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.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) { _collection = new T?[value]; } } }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public MassiveGenericObjects()
+    {
+        _collection = Array.Empty<T?>();
+    }
+
+
+    public T? Get(int position)
+    {
+        // проверка позиции
+        if (position >= Count || position < 0)
+        {
+            return null;
+        }
+        return _collection[position];
+    }
+    public int Insert(T obj)
+    {
+        // вставка в свободное место набора
+        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 >= Count || position < 0)
+        {
+            return -1;
+        }
+
+        if (_collection[position] == null)
+        {
+            _collection[position] = obj;
+            return position;
+        }
+        else
+        {
+            for (int i = 1; i < Count; ++i)
+            {
+                if (_collection[position + i] == null)
+                {
+                    _collection[position + i] = obj;
+                    return position + i;
+                }
+                for (i = position - 1; i >= 0; i--)
+                {
+                    if (_collection[i] == null)
+                    {
+                        _collection[i] = obj;
+                        return i;
+                    }
+                }
+            }
+        }
+        return -1;
+
+    }
+    public T? Remove(int position)
+    {
+        //// проверка позиции
+        //// удаление объекта из массива, присвоив элементу массива значение null
+
+        if (position >= Count || position < 0 || _collection[position] == null) return null;
+        T removedObject = _collection[position];
+        _collection[position] = null;
+        return removedObject;
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Drawnings/DirectionType.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.Drawnings;
+
+public enum DirectionType
+{
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
+
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Drawnings/DrawningElectricLocomotive.cs

@@ -0,0 +1,74 @@
+
+using ProjectElectricLocomotive.Entities;
+
+namespace ProjectElectricLocomotive.Drawnings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта - сущности
+/// </summary>
+public class DrawningElectricLocomotive : DrawningLocomotive
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed"></param>
+    /// <param name="weight"></param>
+    /// <param name="bodyColor"></param>
+    /// <param name="additionalColor"></param>
+    /// <param name="electricHorns"></param>
+    /// <param name="batteryPlacement"></param>
+    public DrawningElectricLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, bool electricHorns, bool batteryPlacement) : base(83,45)
+    {
+        EntityLocomotive = new EntityElectricLocomotive(speed, weight, bodyColor, additionalColor, electricHorns, batteryPlacement);
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityLocomotive == null || EntityLocomotive is not EntityElectricLocomotive electricLocomotive ||  !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        //Создание перьев и кистей для прорисовки электровоза
+        Brush blackBrush = new SolidBrush(Color.Black);
+        Pen penSolid = new(electricLocomotive.AdditionalColor, 2);
+        Pen penSolidYellow = new(Color.Yellow, 0.5f);
+        Brush additionalBrush = new SolidBrush(electricLocomotive.AdditionalColor);
+
+        //Прорисовка дополнительного элемента (рогов)
+        if (electricLocomotive.ElectricHorns)
+        {
+
+            //Инициализация опорных точек для прорисовки "рогов"
+            Point pointHorns1 = new Point(_startPosX.Value + 13, _startPosY.Value + 5);
+            Point pointHorns2 = new Point(_startPosX.Value + 16, _startPosY.Value + 2);
+            Point pointHorns3 = new Point(_startPosX.Value + 11, _startPosY.Value);
+
+            //Прорисовка "рогов" электровоза
+            g.DrawLine(penSolid, pointHorns1, pointHorns2);
+            g.DrawLine(penSolid, pointHorns2, pointHorns3);
+        }
+        //Прорисовка дополнительного элемента (места под батарею)
+        if (electricLocomotive.BatteryPlacement)
+        {
+            //Инициализация опорных точек для прорисовки молнии на хранилище батарей
+            Point pointLightning1 = new Point(_startPosX.Value + 39, _startPosY.Value + 37);
+            Point pointLightning2 = new Point(_startPosX.Value + 37, _startPosY.Value + 39);
+            Point pointLightning3 = new Point(_startPosX.Value + 39, _startPosY.Value + 40);
+            Point pointLightning4 = new Point(_startPosX.Value + 37, _startPosY.Value + 41);
+
+            //Прорисовка "хранилища батарей" электровоза
+            g.FillRectangle(additionalBrush, _startPosX.Value + 36, _startPosY.Value + 37, 8, 4.5f);
+            g.DrawLine(penSolidYellow, pointLightning1, pointLightning2);
+            g.DrawLine(penSolidYellow, pointLightning2, pointLightning3);
+            g.DrawLine(penSolidYellow, pointLightning3, pointLightning4);
+
+        }
+
+        _startPosY += 5;
+        base.DrawTransport(g);
+        _startPosY -= 5;
+
+    }
+
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Drawnings/DrawningLocomotive.cs

@@ -0,0 +1,314 @@
+using ProjectElectricLocomotive.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.Drawnings;
+
+public class DrawningLocomotive
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityLocomotive? EntityLocomotive { 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 _drawningLocomotiveWidth = 83;
+
+
+    /// <summary>
+    /// Высота прорисовки локомотива
+    /// </summary>
+    private readonly int _drawningLocomotiveHeight = 40;
+
+    /// <summary>
+    /// Координата X объекта
+    /// </summary>
+    public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningLocomotiveWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningLocomotiveHeight;
+
+    /// <summary>
+    /// Пустой конструктор
+    /// </summary>
+    private DrawningLocomotive()
+    {
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed"></param>
+    /// <param name="weight"></param>
+    /// <param name="bodyColor"></param>
+    public DrawningLocomotive(int speed, double weight, Color bodyColor) : this()
+    {
+        EntityLocomotive = new EntityLocomotive(speed, weight, bodyColor);
+    }
+
+    /// <summary>
+    /// Конструктор для наследников
+    /// </summary>
+    /// <param name="drawningLocomotiveWidth">Ширина прорисовки локомотива</param>
+    /// <param name="drawningLocomotiveHeight">Высота прорисовки локомотива</param>
+    protected DrawningLocomotive(int drawningLocomotiveWidth, int drawningLocomotiveHeight) : this()
+    {
+        _drawningLocomotiveWidth = drawningLocomotiveWidth;
+        _drawningLocomotiveHeight = drawningLocomotiveHeight;
+    }
+
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width"></param>
+    /// <param name="height"></param>
+    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+    public bool SetPictureSize(int width, int height)
+    {
+        if (_drawningLocomotiveHeight > height || _drawningLocomotiveWidth > width)
+        {
+            return false;
+        }
+        _pictureWidth = width;
+        _pictureHeight = height;
+        if (_startPosY.HasValue && _startPosY + _drawningLocomotiveHeight < _pictureHeight)
+        {
+            _startPosY = _pictureHeight - _drawningLocomotiveHeight;
+        }
+        if (_startPosX.HasValue && _startPosX + _drawningLocomotiveWidth < _pictureWidth)
+        {
+            _startPosX = _pictureWidth - _drawningLocomotiveWidth;
+        }
+        return true;
+    }
+
+    /// <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 (_drawningLocomotiveHeight + y > _pictureHeight)
+        {
+            _startPosY = _pictureHeight - _drawningLocomotiveHeight;
+        }
+        if (_drawningLocomotiveWidth + x > _pictureWidth)
+        {
+            _startPosX = _pictureWidth - _drawningLocomotiveWidth;
+        }
+        if (x < 0)
+        {
+            _startPosX = 0;
+
+        }
+        if (y < 0)
+        {
+            _startPosY = 0;
+
+        }
+
+    }
+
+    /// <summary>
+    /// Изменение направления перемещения
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - перемещение выполнено, false - перемещение невозможно</returns>
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityLocomotive == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return false;
+        }
+
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityLocomotive.Step > 0)
+                {
+                    _startPosX -= (int)EntityLocomotive.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityLocomotive.Step > 0)
+                {
+                    _startPosY -= (int)EntityLocomotive.Step;
+                }
+                return true;
+            //вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + _drawningLocomotiveWidth + EntityLocomotive.Step < _pictureWidth)
+                {
+                    _startPosX += (int)EntityLocomotive.Step;
+                }
+                return true;
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + _drawningLocomotiveHeight + EntityLocomotive.Step < _pictureHeight)
+                {
+                    _startPosY += (int)EntityLocomotive.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+    public virtual void DrawTransport(Graphics g)
+    {
+        if (EntityLocomotive == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        //Создание перьев и кистей для прорисовки электровоза
+        Pen pen = new(Color.Black);
+        Pen penSolid = new(Color.Black, 2);
+        Pen penSolidYellow = new(Color.Yellow, 0.5f);
+        Pen windowPen = new(Color.DeepSkyBlue);
+        Brush blackBrush = new SolidBrush(Color.Black);
+        Brush whiteBrush = new SolidBrush(Color.White);
+        Brush additionalBrush = new SolidBrush(EntityLocomotive.BodyColor);
+
+        //Инициализация опорных точек для прорисовки корпуса
+        Point pointStart = new Point(_startPosX.Value + 75, _startPosY.Value + 15);
+        Point point1 = new Point(_startPosX.Value + 75, _startPosY.Value);
+        Point point2 = new Point(_startPosX.Value + 10, _startPosY.Value);
+        Point pointFinish = new Point(_startPosX.Value + 5, _startPosY.Value + 15);
+
+        //Инициализация опорных точек для прорисовки первой "юбки"
+        Point point3 = new Point(_startPosX.Value + 7, _startPosY.Value + 32);
+        Point point4 = new Point(_startPosX.Value, _startPosY.Value + 32 + 6);
+        Point point5 = new Point(_startPosX.Value + 7, _startPosY.Value + 32 + 6);
+
+        //Инициализация опорных точек для прорисовки второй "юбки"
+        Point point6 = new Point(_startPosX.Value + 69, _startPosY.Value + 32);
+        Point point7 = new Point(_startPosX.Value + 75 + 7, _startPosY.Value + 32 + 6);
+        Point point8 = new Point(_startPosX.Value + 69, _startPosY.Value + 32 + 6);
+
+        //Совокупность точек полигона уголка первой "юбки"
+        Point[] firstTrianglePoints =
+             {
+
+                 point3,
+                 point4,
+                 point5,
+
+             };
+        //Совокупность точек полигона уголка второй "юбки"
+        Point[] secondTrianglePoints =
+             {
+
+                 point6,
+                 point7,
+                 point8,
+
+             };
+
+        // Прорисовка уголков "юбок"
+        g.FillPolygon(blackBrush, firstTrianglePoints);
+        g.FillPolygon(blackBrush, secondTrianglePoints);
+
+        //Прорисовка корпуса
+        g.DrawRectangle(pen, _startPosX.Value + 5, _startPosY.Value + 15, 70, 17);
+        g.DrawLine(pen, point3, point4);
+
+        g.DrawLine(pen, pointStart, point1);
+        g.DrawLine(pen, point1, point2);
+        g.DrawLine(pen, point2, pointFinish);
+
+
+        Brush brWhite = new SolidBrush(Color.White);
+        g.DrawRectangle(windowPen, _startPosX.Value + 24.3f, _startPosY.Value + 4, 8, 8);
+
+        g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 9, 8, 12);
+
+        g.FillRectangle(brWhite, _startPosX.Value + 36, _startPosY.Value + 11, 7, 10);
+
+        //Прорисовка передней и задней "юбки"
+        g.FillRectangle(blackBrush, _startPosX.Value + 7, _startPosY.Value + 32, 25, 5.3f);
+        g.FillRectangle(blackBrush, _startPosX.Value + 47, _startPosY.Value + 32, 22, 5.3f);
+
+        //Прорисовка двух передних колёс
+        g.FillEllipse(whiteBrush, _startPosX.Value + 6.3f, _startPosY.Value + 32, 10, 10);
+        g.DrawEllipse(penSolid, _startPosX.Value + 9, _startPosY.Value + 32, 8, 8);
+        g.DrawEllipse(penSolid, _startPosX.Value + 24, _startPosY.Value + 32, 8, 8);
+
+
+        //Прорисовка двух задних колёс
+        g.FillEllipse(whiteBrush, _startPosX.Value + 25 + 38, _startPosY.Value + 32, 10, 10);
+        g.DrawEllipse(penSolid, _startPosX.Value + 25 + 26, _startPosY.Value + 32, 8, 8);
+        g.DrawEllipse(penSolid, _startPosX.Value + 25 + 37, _startPosY.Value + 32, 8, 8);
+
+        //Прорисовка заднего "шлюза"
+        g.FillRectangle(blackBrush, _startPosX.Value + 75, _startPosY.Value + 4, 5.7f, 27.4f);
+
+        //Прорисовка первого и третьего окна
+        g.DrawRectangle(windowPen, _startPosX.Value + 12, _startPosY.Value + 4, 8, 8);
+        g.DrawRectangle(windowPen, _startPosX.Value + 63, _startPosY.Value + 4, 8, 8);
+
+        //Опциональная прорисовка цвета передних колёс
+        g.FillEllipse(additionalBrush, _startPosX.Value + 9, _startPosY.Value + 32, 8, 8);
+        g.FillEllipse(additionalBrush, _startPosX.Value + 24, _startPosY.Value + 32, 8, 8);
+
+        //Опциональная прорисовка цвета задних колёс
+        g.FillEllipse(additionalBrush, _startPosX.Value + 25 + 26, _startPosY.Value + 32, 8, 8);
+        g.FillEllipse(additionalBrush, _startPosX.Value + 25 + 37, _startPosY.Value + 32, 8, 8);
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs

@@ -0,0 +1,40 @@
+
+namespace ProjectElectricLocomotive.Entities;
+
+/// <summary>
+/// Класс-сущность "Электровоз"
+/// </summary>
+public class EntityElectricLocomotive : EntityLocomotive
+{
+    /// <summary>
+    /// Дополнительный цвет (для дополнительных элементов)
+    /// </summary>
+    public Color AdditionalColor { get; private set; }
+
+    /// <summary>
+    /// Признак (опция) наличия "корпус"
+    /// </summary>
+    public bool ElectricHorns { get; private set; }
+
+    /// <summary>
+    /// Признак (опция) наличия места под батарею
+    /// </summary>
+    public bool BatteryPlacement { get; private set; }
+
+    /// <summary>
+    /// Инициализация полей объекта-класса тепловоза
+    /// </summary>
+    /// <param name="speed"></param>
+    /// <param name="weight"></param>
+    /// <param name="bodycolor"></param>
+    /// <param name="additionalcolor"></param>
+    /// <param name="electrichorns"></param>
+    /// <param name="batteryplacement"></param>
+
+    public EntityElectricLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, bool electricHorns, bool batteryPlacement) : base(speed, weight, bodyColor)
+    {
+        AdditionalColor = additionalColor;
+        ElectricHorns = electricHorns;
+        BatteryPlacement = batteryPlacement;
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityLocomotive.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.Entities;
+/// <summary>
+/// Класс-сущность "Локомотив"
+/// </summary>
+public class EntityLocomotive
+{
+    /// <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 EntityLocomotive(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Form1.Designer.cs

@@ -1,39 +0,0 @@
-namespace ProjectElectricLocomotive
-{
-    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()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "Form1";
-        }
-
-        #endregion
-    }
-}

ProjectElectricLocomotive/ProjectElectricLocomotive/Form1.cs

@@ -1,10 +0,0 @@
-namespace ProjectElectricLocomotive
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

ProjectElectricLocomotive/ProjectElectricLocomotive/FormElectricLocomotive.Designer.cs

@@ -0,0 +1,150 @@
+namespace ProjectElectricLocomotive
+{
+    partial class FormElectricLocomotive
+    {
+        /// <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()
+        {
+            pictureBoxElectricLocomotive = new PictureBox();
+            buttonLeft = new Button();
+            buttonDown = new Button();
+            buttonRight = new Button();
+            buttonUp = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxElectricLocomotive).BeginInit();
+            SuspendLayout();
+            // 
+            // pictureBoxElectricLocomotive
+            // 
+            pictureBoxElectricLocomotive.Dock = DockStyle.Fill;
+            pictureBoxElectricLocomotive.Location = new Point(0, 0);
+            pictureBoxElectricLocomotive.Name = "pictureBoxElectricLocomotive";
+            pictureBoxElectricLocomotive.Size = new Size(866, 479);
+            pictureBoxElectricLocomotive.TabIndex = 0;
+            pictureBoxElectricLocomotive.TabStop = false;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackColor = Color.Snow;
+            buttonLeft.BackgroundImage = Properties.Resources.buttonLeft;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonLeft.Location = new Point(695, 405);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(45, 45);
+            buttonLeft.TabIndex = 2;
+            buttonLeft.UseVisualStyleBackColor = false;
+            buttonLeft.Click += ButtonMove_Click;
+            // 
+            // buttonDown
+            // 
+            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonDown.BackColor = Color.Snow;
+            buttonDown.BackgroundImage = Properties.Resources.buttonDown;
+            buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonDown.Location = new Point(746, 405);
+            buttonDown.Name = "buttonDown";
+            buttonDown.Size = new Size(45, 45);
+            buttonDown.TabIndex = 3;
+            buttonDown.UseVisualStyleBackColor = false;
+            buttonDown.Click += ButtonMove_Click;
+            // 
+            // buttonRight
+            // 
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackColor = Color.Snow;
+            buttonRight.BackgroundImage = Properties.Resources.buttonRight;
+            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonRight.Location = new Point(795, 405);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(45, 45);
+            buttonRight.TabIndex = 4;
+            buttonRight.UseVisualStyleBackColor = false;
+            buttonRight.Click += ButtonMove_Click;
+            // 
+            // buttonUp
+            // 
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackColor = Color.Snow;
+            buttonUp.BackgroundImage = Properties.Resources.buttonUp;
+            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonUp.Location = new Point(746, 354);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(45, 45);
+            buttonUp.TabIndex = 5;
+            buttonUp.UseVisualStyleBackColor = false;
+            buttonUp.Click += ButtonMove_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(733, 24);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(764, 72);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(90, 33);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
+            // FormElectricLocomotive
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(866, 479);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonUp);
+            Controls.Add(buttonRight);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonLeft);
+            Controls.Add(pictureBoxElectricLocomotive);
+            Name = "FormElectricLocomotive";
+            Text = "Электровоз";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxElectricLocomotive).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxElectricLocomotive;
+        private Button buttonLeft;
+        private Button buttonDown;
+        private Button buttonRight;
+        private Button buttonUp;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/FormElectricLocomotive.cs

@@ -0,0 +1,137 @@
+using ProjectElectricLocomotive.Drawnings;
+using ProjectElectricLocomotive.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectElectricLocomotive;
+
+public partial class FormElectricLocomotive : Form
+{
+    /// <summary>
+    /// Поле-объект для прорисовки объекта
+    /// </summary>
+    private DrawningLocomotive? _drawningLocomotive;
+
+    private AbstractStrategy? _strategy;
+
+
+    /// <summary>
+    /// Получение объекта
+    /// </summary>
+    public DrawningLocomotive SetLocomotive
+    {
+        set
+        {
+            _drawningLocomotive = value;
+            _drawningLocomotive.SetPictureSize(pictureBoxElectricLocomotive.Width, pictureBoxElectricLocomotive.Height);
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+            Draw();
+        }
+    }
+
+    /// <summary>
+    /// Конструктор формы
+    /// </summary>
+    public FormElectricLocomotive()
+    {
+        InitializeComponent();
+        _strategy = null;
+    }
+
+    /// <summary>
+    /// Метод прорисовки электровоза
+    /// </summary>
+    private void Draw()
+    {
+        if (_drawningLocomotive == null)
+        {
+            return;
+        }
+        Bitmap bmp = new(pictureBoxElectricLocomotive.Width,
+        pictureBoxElectricLocomotive.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _drawningLocomotive.DrawTransport(gr);
+        pictureBoxElectricLocomotive.Image = bmp;
+    }
+
+    /// <summary>
+    /// Перемещение объекта по форме (нажатие кнопок навигации)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonMove_Click(object sender, EventArgs e)
+    {
+        if (_drawningLocomotive == null)
+        {
+            return;
+        }
+        string name = ((Button)sender)?.Name ?? string.Empty;
+        bool result = false;
+        switch (name)
+        {
+            case "buttonUp":
+                result =
+                _drawningLocomotive.MoveTransport(DirectionType.Up);
+                break;
+            case "buttonDown":
+                result =
+                _drawningLocomotive.MoveTransport(DirectionType.Down);
+                break;
+            case "buttonLeft":
+                result =
+                _drawningLocomotive.MoveTransport(DirectionType.Left);
+                break;
+            case "buttonRight":
+                result =
+                _drawningLocomotive.MoveTransport(DirectionType.Right);
+                break;
+        }
+        if (result)
+        {
+            Draw();
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonStrategyStep_Click(object sender, EventArgs e)
+    {
+        if (_drawningLocomotive == null) return;
+        if (comboBoxStrategy.Enabled)
+        {
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null) return;
+            _strategy.SetData(new MoveableLocomotive(_drawningLocomotive), pictureBoxElectricLocomotive.Width, pictureBoxElectricLocomotive.Height);
+        }
+        if (_strategy == null) return;
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
+
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+        }
+    }
+ 
+}
+
+
+

ProjectElectricLocomotive/ProjectElectricLocomotive/FormElectricLocomotive.resx

@@ -1,17 +1,17 @@
 <?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 
+
+    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>
@@ -26,36 +26,36 @@
         <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 
+
+    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 
+
+    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 
+
+    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 
+
+    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 
+    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 
+    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 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs

@@ -0,0 +1,171 @@
+namespace ProjectElectricLocomotive
+{
+    partial class FormLocomotiveCollection
+    {
+        /// <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();
+            buttonRefresh = new Button();
+            buttonGoToCheck = new Button();
+            buttonRemoveLocomotive = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonAddElectricLocomotiv = new Button();
+            buttonAddLocomotive = new Button();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            colorDialog1 = new ColorDialog();
+            groupBoxTools.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonRemoveLocomotive);
+            groupBoxTools.Controls.Add(maskedTextBoxPosition);
+            groupBoxTools.Controls.Add(buttonAddElectricLocomotiv);
+            groupBoxTools.Controls.Add(buttonAddLocomotive);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(600, 0);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(200, 450);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Location = new Point(6, 336);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(188, 32);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Location = new Point(6, 265);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(188, 32);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Поставить на пути";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonRemoveLocomotive
+            // 
+            buttonRemoveLocomotive.Location = new Point(6, 193);
+            buttonRemoveLocomotive.Name = "buttonRemoveLocomotive";
+            buttonRemoveLocomotive.Size = new Size(188, 32);
+            buttonRemoveLocomotive.TabIndex = 4;
+            buttonRemoveLocomotive.Text = "Удалить локомотив";
+            buttonRemoveLocomotive.UseVisualStyleBackColor = true;
+            buttonRemoveLocomotive.Click += ButtonRemoveLocomotive_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(6, 164);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(188, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonAddElectricLocomotiv
+            // 
+            buttonAddElectricLocomotiv.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddElectricLocomotiv.Location = new Point(6, 104);
+            buttonAddElectricLocomotiv.Name = "buttonAddElectricLocomotiv";
+            buttonAddElectricLocomotiv.Size = new Size(188, 32);
+            buttonAddElectricLocomotiv.TabIndex = 2;
+            buttonAddElectricLocomotiv.Text = "Добавить электровоз";
+            buttonAddElectricLocomotiv.UseVisualStyleBackColor = true;
+            buttonAddElectricLocomotiv.Click += ButtonAddElectricLocomotive_Click;
+            // 
+            // buttonAddLocomotive
+            // 
+            buttonAddLocomotive.Location = new Point(6, 66);
+            buttonAddLocomotive.Name = "buttonAddLocomotive";
+            buttonAddLocomotive.Size = new Size(188, 32);
+            buttonAddLocomotive.TabIndex = 1;
+            buttonAddLocomotive.Text = "Добавить локомотив";
+            buttonAddLocomotive.UseVisualStyleBackColor = true;
+            buttonAddLocomotive.Click += ButtonAddLocomotive_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, 22);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(188, 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(600, 450);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // FormLocomotiveCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 450);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Name = "FormLocomotiveCollection";
+            Text = "FormLocomotiveCollection";
+            groupBoxTools.ResumeLayout(false);
+            groupBoxTools.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddLocomotive;
+        private Button buttonRemoveLocomotive;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddElectricLocomotiv;
+        private PictureBox pictureBox;
+        private Button buttonGoToCheck;
+        private Button buttonRefresh;
+        private ColorDialog colorDialog1;
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.cs

@@ -0,0 +1,184 @@
+using ProjectElectricLocomotive.CollectionGenericObjects;
+using ProjectElectricLocomotive.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectElectricLocomotive;
+
+public partial class FormLocomotiveCollection : Form
+{
+
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormLocomotiveCollection()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new LocomotiveDepot(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningLocomotive>());
+                break;
+        }
+    }
+    /// <summary>
+    /// Добавление грузовика
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLocomotive));
+    /// <summary>
+    /// Добавление бензовоза
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddElectricLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningElectricLocomotive));
+
+    /// <summary>
+    /// Создание объекта класса-перемещения
+    /// </summary>
+    /// <param name="type">Тип создаваемого объекта</param>
+    private void CreateObject(string type)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        Random random = new();
+        DrawningLocomotive DrawningLocomotive;
+        switch (type)
+        {
+            case nameof(DrawningLocomotive):
+                DrawningLocomotive = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+                break;
+            case nameof(DrawningElectricLocomotive):
+                DrawningLocomotive = new DrawningElectricLocomotive(random.Next(100, 300), random.Next(1000, 5000), GetColor(random), GetColor(random),
+                 Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+                break;
+            default:
+                return;
+        }
+        if (_company + DrawningLocomotive != -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 ButtonRemoveLocomotive_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 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 ButtonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+        DrawningLocomotive? locomotive = null;
+        int counter = 100;
+        while (locomotive == null)
+        {
+            locomotive = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+        if (locomotive == null)
+        {
+            return;
+        }
+        FormElectricLocomotive form = new()
+        {
+            SetLocomotive = locomotive
+        };
+        form.ShowDialog();
+    }
+
+   
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.resx

@@ -0,0 +1,123 @@
+<?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>
+  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public abstract class AbstractStrategy
+{
+
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObject? _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(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return;
+        }
+        if (IsTargetDestinaion())
+        {
+            _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 IsTargetDestinaion();
+
+    /// <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;
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координат объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep { get; }
+
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>True - объект перемещен, false - перемещение невозможно</returns>
+    bool TryMoveObject(MovementDirection direction);
+
+    /// <summary>
+    /// Метод интерфейса для доп.задания
+    /// </summary>
+    /// <returns></returns>
+
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MovableLocomotive.cs

@@ -0,0 +1,68 @@
+using ProjectElectricLocomotive.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+/// <summary>
+/// Класс-реализация IMoveableObject  c использованием DrawningLocomotive
+/// </summary>
+public class MoveableLocomotive : IMoveableObject 
+{
+    /// <summary>
+    /// Поле-объект класса DrawningLocomotive или его наследника
+    /// </summary>
+    private  readonly DrawningLocomotive? _locomotive = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="locomotive">Объект класса DrawningLocomotive</param>
+    public MoveableLocomotive(DrawningLocomotive locomotive)
+    {
+        _locomotive = locomotive;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_locomotive == null || _locomotive.EntityLocomotive == null || !_locomotive.GetPosX.HasValue || !_locomotive.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_locomotive.GetPosX.Value, _locomotive.GetPosY.Value, _locomotive.GetWidth, _locomotive.GetHeight);
+        }
+    }
+
+    public int GetStep => (int)(_locomotive?.EntityLocomotive?.Step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_locomotive == null || _locomotive.EntityLocomotive == null)
+        {
+            return false;
+        }
+        return _locomotive.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,
+        };
+    }
+
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.RightBorder + GetStep() >= FieldWidth && 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();
+        }
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        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();
+        }
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Right = 4,
+
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/ObjectParameters.cs

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

ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive.MovementStrategy;
+
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Всё готово к началу
+    /// </summary>
+    NotInit,
+
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+
+
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Program.cs

@@ -11,7 +11,7 @@ namespace ProjectElectricLocomotive
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new Form1());
+            Application.Run(new FormLocomotiveCollection());
         }
     }
 }

ProjectElectricLocomotive/ProjectElectricLocomotive/ProjectElectricLocomotive.csproj

@@ -8,4 +8,19 @@
     <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>

ProjectElectricLocomotive/ProjectElectricLocomotive/Properties/Resources.Designer.cs

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ProjectElectricLocomotive.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("ProjectElectricLocomotive.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 buttonDown {
+            get {
+                object obj = ResourceManager.GetObject("buttonDown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap buttonLeft {
+            get {
+                object obj = ResourceManager.GetObject("buttonLeft", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap buttonRight {
+            get {
+                object obj = ResourceManager.GetObject("buttonRight", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap buttonUp {
+            get {
+                object obj = ResourceManager.GetObject("buttonUp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

ProjectElectricLocomotive/ProjectElectricLocomotive/Properties/Resources.resx

@@ -0,0 +1,133 @@
+<?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="buttonLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\buttonLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="buttonDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\buttonDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="buttonUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\buttonUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="buttonRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\buttonRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>