Merge pull request 'Mochalov D.V Lab_work1' (#1) from LabWork01 into master

Reviewed-on: http://student.git.athene.tech/Danila_Mochalov/PIbd-23_Mochalov_D.V._Locomotive_Base/pulls/1

Locomotive/Locomotive/AbstractMap.cs

@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawningObject _drawningObject = null;
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-        public Bitmap CreateMap(int width, int height, IDrawningObject
-       drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawningObject = drawningObject;
-            GenerateMap(); // abstract void
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            bool isFree = true;
-
-            int startPosX = (int)(_drawningObject.GetCurrentPosition().Left / _size_x);
-            int startPosY = (int)(_drawningObject.GetCurrentPosition().Top / _size_y);
-
-            int objectWidth = (int)(_drawningObject.GetCurrentPosition().Right / _size_x);
-            int objectHeight = (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y);
-
-            switch (direction)
-            {
-                case Direction.Right:
-                    for (int i = objectWidth; i <= objectWidth + (int)(_drawningObject.Step / _size_x); i++)
-                    {
-                        for (int j = startPosY; j <= objectHeight; j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-
-                case Direction.Left:
-                    for (int i = startPosX; i >= (int)(_drawningObject.Step / _size_x); i--)
-                    {
-                        for (int j = startPosY; j <= objectHeight; j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-
-                case Direction.Up:
-                    for (int i = startPosX; i <= objectWidth; i++)
-                    {
-                        for (int j = startPosY; j >= (int)(_drawningObject.Step / _size_y); j--)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-
-                case Direction.Down:
-                    for (int i = startPosX; i <= objectWidth; i++)
-                    {
-                        for (int j = objectHeight; j <= objectHeight + (int)(_drawningObject.Step / _size_y); j++)
-                        {
-                            if (_map[i, j] == _barrier)
-                            {
-                                isFree = false;
-                                break;
-                            }
-                        }
-                    }
-                    break;
-            }
-            if (isFree)
-                {
-                    _drawningObject.MoveObject(direction);
-                }
-            return DrawMapWithObject();
-        }
-
-        private bool SetObjectOnMap()
-        {
-            if (_drawningObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawningObject.SetObject(x, y, _width, _height);
-
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (i * _size_x >= x && j * _size_y >= y && 
-                        i * _size_x <= x + _drawningObject.GetCurrentPosition().Right && 
-                        j * _size_y <= j + _drawningObject.GetCurrentPosition().Bottom)
-                    {
-                        if (_map[i,j] == _barrier)
-                        {
-                            return false;
-                        }
-                    } 
-                }
-            }
-
-            return true;
-        }
-
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawningObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawningObject.DrawningObject(gr);
-            return bmp;
-        }
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-
-    }
-}

Locomotive/Locomotive/Direction.cs

@@ -7,9 +7,8 @@ using System.Threading.Tasks;
 namespace Locomotive
 {
     //Направление перемещения
-    public enum Direction
+    internal enum Direction
     {
-        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

Locomotive/Locomotive/DrawningLocomotive.cs

@@ -7,14 +7,14 @@ using System.Threading.Tasks;
 namespace Locomotive
 {
     //Класс, отвечающий за отрисовку 
-    public class DrawningLocomotive
+    internal class DrawningLocomotive
     {
         /// Класс-сущность
-        public EntityLocomotive Locomotive { get; protected set; }
+        public EntityLocomotive Locomotive { get; private set; }
         /// Левая координата отрисовки локомотива
-        protected float _startPosX;
+        private float _startPosX;
         /// Верхняя координата отрисовки локомотива
-        protected float _startPosY;
+        private float _startPosY;
         /// Ширина окна отрисовки
         private int? _pictureWidth = null;
         /// Высота окна отрисовки
@@ -25,19 +25,11 @@ namespace Locomotive
         private readonly int _locomotiveHeight = 50;
 
         /// Инициализация свойств
-        public DrawningLocomotive(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor, EntityLocomotive entity)
         {
-            Locomotive = new EntityLocomotive(speed, weight, bodyColor);
+            Locomotive = entity;
+            Locomotive.Init(speed, weight, bodyColor);
         }
-
-        // Новый конструктор
-        protected DrawningLocomotive (int speed, float weight, Color bodyColor, int locomotiveWidth, int locomotiveHeight) 
-            : this (speed, weight, bodyColor)
-        {
-            _locomotiveWidth = locomotiveWidth;
-            _locomotiveHeight = locomotiveHeight;
-        }
-
         /// Установка позиции локомотива
         public void SetPosition(int x, int y, int width, int height)
         {
@@ -98,7 +90,7 @@ namespace Locomotive
             }
         }
 
-        public virtual void DrawTransport(Graphics g)
+        public void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                     || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -107,18 +99,18 @@ namespace Locomotive
             }
             Pen pen = new(Color.Black);
             //тело
-            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Brown), _startPosX , _startPosY, 110 - 10, 50 - 10);
+            g.DrawRectangle(pen, _startPosX , _startPosY, _locomotiveWidth - 10, _locomotiveHeight - 10);
             //окна
-            g.FillRectangle(new SolidBrush(Color.Blue), _startPosX + 10, _startPosY + 10, 10, 10);
+            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Black), _startPosX + 10, _startPosY + 10, 10, 10);
-            g.FillRectangle(new SolidBrush(Color.Blue), _startPosX + 30, _startPosY + 10, 10, 10);
+            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Black), _startPosX + 30, _startPosY + 10, 10, 10);
-            g.FillRectangle(new SolidBrush(Color.Blue), _startPosX + 80, _startPosY + 10, 10, 10);
+            g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Black), _startPosX + 80, _startPosY + 10, 10, 10);
             //дверь
             g.DrawRectangle(pen, _startPosX + 50, _startPosY + 10, 10, 20);
             //колеса
-            g.FillEllipse(new SolidBrush(Color.Black), _startPosX, _startPosY + 40, 10, 10);
+            g.DrawEllipse(pen, _startPosX, _startPosY + 40, 10, 10);
-            g.FillEllipse(new SolidBrush(Color.Black), _startPosX + 20, _startPosY + 40, 10, 10);
+            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 40, 10, 10);
-            g.FillEllipse(new SolidBrush(Color.Black), _startPosX + 70, _startPosY + 40, 10, 10);
+            g.DrawEllipse(pen, _startPosX + 70, _startPosY + 40, 10, 10);
-            g.FillEllipse(new SolidBrush(Color.Black), _startPosX + 90, _startPosY + 40, 10, 10);
+            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 40, 10, 10);
             //черный прямоугольник
             g.FillRectangle(new SolidBrush(Locomotive?.BodyColor ?? Color.Black), _startPosX + 100, _startPosY + 10, 10, 30);
         }
@@ -142,10 +134,5 @@ namespace Locomotive
                 _startPosY = _pictureHeight.Value - _locomotiveHeight;
             }
         }
-        // Получение текущей позиции объекта
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosX + _locomotiveWidth, _startPosY, _startPosY + _locomotiveHeight);
-        }
     }
 }

Locomotive/Locomotive/DrawningObjectLocomotive.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class DrawningObjectLocomotive : IDrawningObject
-    {
-        private DrawningLocomotive _locomotive = null;
-
-        public DrawningObjectLocomotive(DrawningLocomotive locomotive)
-        {
-            _locomotive = locomotive;
-        }
-
-        public float Step => _locomotive?.Locomotive?.Step ?? 0;
-
-        public void DrawningObject(Graphics g)
-        {
-            _locomotive?.DrawTransport(g);
-        }
-
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _locomotive?.GetCurrentPosition() ?? default;
-        }
-
-        public void MoveObject(Direction direction)
-        {
-            _locomotive?.MoveTransport(direction);
-        }
-
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _locomotive?.SetPosition(x, y, width, height);   
-        }
-
-    }
-}

Locomotive/Locomotive/DrawningWarmlyLocomotive.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class DrawningWarmlyLocomotive : DrawningLocomotive
-    {
-        public DrawningWarmlyLocomotive(int speed, float weight, Color bodyColor, Color extraColor, bool pipe, bool storage) 
-            : base(speed, weight, bodyColor, locomotiveWidth: 130, locomotiveHeight: 70)
-        {
-            Locomotive = new EntityWarmlyLocomotive(speed, weight, bodyColor, extraColor, pipe, storage);
-        }
-
-        public override void DrawTransport(Graphics g)
-        {
-            if (Locomotive is not EntityWarmlyLocomotive warmlyLocomotive)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black);
-            Brush extraBrush = new SolidBrush(warmlyLocomotive.ExtraColor);
-            
-
-            if (warmlyLocomotive.FuelStorage)
-            {
-                g.FillRectangle(extraBrush, _startPosX + 10, _startPosY, 30, 20);
-                g.FillRectangle(extraBrush, _startPosX + 60, _startPosY, 20, 20);
-                g.FillRectangle(extraBrush, _startPosX + 60, _startPosY + 10, 30, 10);
-            }
-
-            if (warmlyLocomotive.Pipe)
-            {
-                g.FillRectangle(extraBrush, _startPosX + 110, _startPosY + 10, 10, 50);
-                g.FillRectangle(extraBrush, _startPosX + 110, _startPosY + 40, 20, 20);
-                g.FillRectangle(extraBrush, _startPosX + 100, _startPosY, 30, 10);
-            }
-
-            _startPosY += 20;
-
-            base.DrawTransport(g);
-
-            _startPosY -= 20;
-
-
-        }
-
-    }
-}

Locomotive/Locomotive/EntityElectroLocomotive.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class EntityWarmlyLocomotive : EntityLocomotive
-    {
-        //доп. цвет
-        public Color ExtraColor { get; private set; }
-        //признак наличия трубы
-        public bool Pipe { get; private set; }
-        //признак наличия отсека под топливо
-        public bool FuelStorage { get; private set; }
-
-        public EntityWarmlyLocomotive (int speed, float weight, Color bodyColor, Color extraColor, bool pipe, bool fuelStorage) 
-            : base(speed, weight, bodyColor)
-        {
-            ExtraColor = extraColor;
-            Pipe = pipe;
-            FuelStorage = fuelStorage;
-        }
-
-
-    }
-}

Locomotive/Locomotive/EntityLocomotive.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Locomotive
 {
-    public class EntityLocomotive
+    internal class EntityLocomotive
     {
         /// Скорость
         public int Speed { get; private set; }
@@ -17,7 +17,7 @@ namespace Locomotive
         /// Шаг перемещения локомотива
         public float Step => Speed * 100 / Weight;
 
-        public EntityLocomotive(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

Locomotive/Locomotive/FormLocomotive.Designer.cs

@@ -38,8 +38,6 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonCreateModified = new System.Windows.Forms.Button();
-            this.buttonSelectLocomotive = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -53,6 +51,7 @@
             this.pictureBoxLocomotive.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxLocomotive.TabIndex = 0;
             this.pictureBoxLocomotive.TabStop = false;
+            
             this.pictureBoxLocomotive.Resize += new System.EventHandler(this.pictureBoxLocomotive_Resize);
             // 
             // statusStrip1
@@ -145,33 +144,11 @@
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonCreateModified
-            // 
-            this.buttonCreateModified.Location = new System.Drawing.Point(112, 377);
-            this.buttonCreateModified.Name = "buttonCreateModified";
-            this.buttonCreateModified.Size = new System.Drawing.Size(94, 29);
-            this.buttonCreateModified.TabIndex = 7;
-            this.buttonCreateModified.Text = "Modified";
-            this.buttonCreateModified.UseVisualStyleBackColor = true;
-            this.buttonCreateModified.Click += new System.EventHandler(this.buttonCreateModified_Click);
-            // 
-            // buttonSelectLocomotive
-            // 
-            this.buttonSelectLocomotive.Location = new System.Drawing.Point(507, 377);
-            this.buttonSelectLocomotive.Name = "buttonSelectLocomotive";
-            this.buttonSelectLocomotive.Size = new System.Drawing.Size(105, 29);
-            this.buttonSelectLocomotive.TabIndex = 8;
-            this.buttonSelectLocomotive.Text = "Select";
-            this.buttonSelectLocomotive.UseVisualStyleBackColor = true;
-            this.buttonSelectLocomotive.Click += new System.EventHandler(this.buttonSelectLocomotive_Click);
-            // 
             // FormLocomotive
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(778, 442);
-            this.Controls.Add(this.buttonSelectLocomotive);
-            this.Controls.Add(this.buttonCreateModified);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -201,7 +178,5 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
-        private Button buttonCreateModified;
-        private Button buttonSelectLocomotive;
     }
 }

Locomotive/Locomotive/FormLocomotive.cs

@@ -3,8 +3,7 @@ namespace Locomotive
     public partial class FormLocomotive : Form
     {
         private DrawningLocomotive _locomotive;
-
+        private EntityLocomotive _entity;
-        public DrawningLocomotive SelectedLocomotive { get; private set; }
 
         public FormLocomotive()
         {
@@ -20,25 +19,16 @@ namespace Locomotive
             pictureBoxLocomotive.Image = bmp;
         }
 
-        private void SetData()
-        {
-            toolStripStatusLabelSpeed.Text = $"Speed: {_locomotive.Locomotive.Speed}";
-            toolStripStatusLabelWeight.Text = $"Weight: {_locomotive.Locomotive.Weight}";
-            toolStripStatusLabelColor.Text = $"Color: {_locomotive.Locomotive.BodyColor.Name}";
-        }
-
         private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),rnd.Next(0, 256));
+            _locomotive = new DrawningLocomotive();
-            ColorDialog dialog = new();
+            _entity = new EntityLocomotive();
-            if (dialog.ShowDialog() == DialogResult.OK)
+            _locomotive.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), _entity);
-            {
-                color = dialog.Color;
-            }
-            _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
             _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
-            SetData();
+            toolStripStatusLabelSpeed.Text = $"Speed: {_locomotive.Locomotive.Speed}";
+            toolStripStatusLabelWeight.Text = $"Weight: {_locomotive.Locomotive.Weight}";
+            toolStripStatusLabelColor.Text = $"Color: {_locomotive.Locomotive.BodyColor.Name}";
             Draw();
         }
 
@@ -69,39 +59,5 @@ namespace Locomotive
             _locomotive?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
             Draw();
         }
-
-        private void buttonCreateModified_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-
-            _locomotive = new DrawningWarmlyLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000), 
-                color, 
-                dopColor,
-                Convert.ToBoolean(rnd.Next(0, 2)),
-                Convert.ToBoolean(rnd.Next(0, 2)));
-
-            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height);
-            SetData();
-            Draw();
-        }
-
-        private void buttonSelectLocomotive_Click(object sender, EventArgs e)
-        {
-            SelectedLocomotive = _locomotive;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

Locomotive/Locomotive/FormMapWithSetLocomotives.Designer.cs

@@ -1,212 +0,0 @@
-namespace Locomotive
-{
-    partial class FormMapWithSetLocomotives
-    {
-        /// <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.groupBoxTools = new System.Windows.Forms.GroupBox();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonShowStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveLocomotive = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddLocomotive = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBoxTools.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxTools
-            // 
-            this.groupBoxTools.Controls.Add(this.buttonLeft);
-            this.groupBoxTools.Controls.Add(this.buttonRight);
-            this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.buttonUp);
-            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonShowStorage);
-            this.groupBoxTools.Controls.Add(this.buttonRemoveLocomotive);
-            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonAddLocomotive);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(580, 0);
-            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(220, 504);
-            this.groupBoxTools.TabIndex = 0;
-            this.groupBoxTools.TabStop = false;
-            this.groupBoxTools.Text = "Tools";
-            // 
-            // buttonLeft
-            // 
-            this.buttonLeft.BackgroundImage = global::Locomotive.Properties.Resources.left_arrow;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(42, 446);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(40, 40);
-            this.buttonLeft.TabIndex = 7;
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
-            // buttonRight
-            // 
-            this.buttonRight.BackgroundImage = global::Locomotive.Properties.Resources.right_arrow;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(134, 446);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(40, 40);
-            this.buttonRight.TabIndex = 7;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.BackgroundImage = global::Locomotive.Properties.Resources.down_arrow;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(88, 446);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(40, 40);
-            this.buttonDown.TabIndex = 7;
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.BackgroundImage = global::Locomotive.Properties.Resources.up_arrow;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(88, 400);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(40, 40);
-            this.buttonUp.TabIndex = 6;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(7, 282);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(207, 29);
-            this.buttonShowOnMap.TabIndex = 5;
-            this.buttonShowOnMap.Text = "Show on Map";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click);
-            // 
-            // buttonShowStorage
-            // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(7, 247);
-            this.buttonShowStorage.Name = "buttonShowStorage";
-            this.buttonShowStorage.Size = new System.Drawing.Size(207, 29);
-            this.buttonShowStorage.TabIndex = 4;
-            this.buttonShowStorage.Text = "Show Storage";
-            this.buttonShowStorage.UseVisualStyleBackColor = true;
-            this.buttonShowStorage.Click += new System.EventHandler(this.buttonShowStorage_Click);
-            // 
-            // buttonRemoveLocomotive
-            // 
-            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(7, 211);
-            this.buttonRemoveLocomotive.Name = "buttonRemoveLocomotive";
-            this.buttonRemoveLocomotive.Size = new System.Drawing.Size(207, 30);
-            this.buttonRemoveLocomotive.TabIndex = 3;
-            this.buttonRemoveLocomotive.Text = "Remove Locomotive";
-            this.buttonRemoveLocomotive.UseVisualStyleBackColor = true;
-            this.buttonRemoveLocomotive.Click += new System.EventHandler(this.buttonRemoveLocomotive_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 159);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(208, 27);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            // 
-            // buttonAddLocomotive
-            // 
-            this.buttonAddLocomotive.Location = new System.Drawing.Point(6, 96);
-            this.buttonAddLocomotive.Name = "buttonAddLocomotive";
-            this.buttonAddLocomotive.Size = new System.Drawing.Size(208, 29);
-            this.buttonAddLocomotive.TabIndex = 1;
-            this.buttonAddLocomotive.Text = "Add Locomotive";
-            this.buttonAddLocomotive.UseVisualStyleBackColor = true;
-            this.buttonAddLocomotive.Click += new System.EventHandler(this.buttonAddLocomotive_Click);
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Simple Map",
-            "Spike Map",
-            "Rail Map"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 39);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(208, 28);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(580, 504);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetLocomotives
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 504);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBoxTools);
-            this.Name = "FormMapWithSetLocomotives";
-            this.Text = "FormMapWithSetLocomotives";
-            this.groupBoxTools.ResumeLayout(false);
-            this.groupBoxTools.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxTools;
-        private PictureBox pictureBox;
-        private ComboBox comboBoxSelectorMap;
-        private Button buttonAddLocomotive;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonRemoveLocomotive;
-        private Button buttonShowStorage;
-        private Button buttonShowOnMap;
-        private Button buttonUp;
-        private Button buttonDown;
-        private Button buttonRight;
-        private Button buttonLeft;
-    }
-}

Locomotive/Locomotive/FormMapWithSetLocomotives.cs

@@ -1,137 +0,0 @@
-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 Locomotive
-{
-    public partial class FormMapWithSetLocomotives : Form
-    {
-        /// Объект от класса карты с набором объектов
-        private MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> _mapLocomotivesCollectionGeneric;
-        public FormMapWithSetLocomotives()
-        {
-            InitializeComponent();
-        }
-        /// Выбор карты
-        private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Simple Map":
-                    map = new SimpleMap();
-                    break;
-                case "Spike Map":
-                    map = new SpikeMap();
-                    break;
-                case "Rail Map":
-                    map = new RailroadMap();
-                    break;
-            }
-            if (map != null)
-            {
-                _mapLocomotivesCollectionGeneric = new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>
-                    (pictureBox.Width, pictureBox.Height, map);
-            }
-            else
-            {
-                _mapLocomotivesCollectionGeneric = null;
-            }
-        }
-        /// Добавление объекта
-        private void buttonAddLocomotive_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            FormLocomotive form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawningObjectLocomotive locomotive = new(form.SelectedLocomotive);
-                if (_mapLocomotivesCollectionGeneric + locomotive != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        /// Удаление объекта
-        private void buttonRemoveLocomotive_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapLocomotivesCollectionGeneric - pos is not null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        /// Вывод набора
-        private void buttonShowStorage_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowSet();
-        }
-        /// Вывод карты
-        private void buttonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            pictureBox.Image = _mapLocomotivesCollectionGeneric.ShowOnMap();
-        }
-        /// Перемещение
-        private void buttonMove_Click(object sender, EventArgs e)
-        {
-            if (_mapLocomotivesCollectionGeneric == null)
-            {
-                return;
-            }
-            //получаем имя кнопки
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            Direction dir = Direction.None;
-            switch (name)
-            {
-                case "buttonUp":
-                    dir = Direction.Up;
-                    break;
-                case "buttonDown":
-                    dir = Direction.Down;
-                    break;
-                case "buttonLeft":
-                    dir = Direction.Left;
-                    break;
-                case "buttonRight":
-                    dir = Direction.Right;
-                    break;
-            }
-            pictureBox.Image = _mapLocomotivesCollectionGeneric.MoveObject(dir);
-        }
-    }
-}

Locomotive/Locomotive/FormMapWithSetLocomotives.resx

@@ -1,60 +0,0 @@
-<root>
-  <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>

Locomotive/Locomotive/IDrawningObject.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal interface IDrawningObject
-    {
-        /// Шаг перемещения объекта
-        public float Step { get; }
-        /// Установка позиции объекта
-        void SetObject(int x, int y, int width, int height);
-        /// Изменение направления перемещения объекта
-        void MoveObject(Direction direction);
-        /// Отрисовка объекта
-        void DrawningObject(Graphics g);
-        /// Получение текущей позиции объекта
-        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-
-    }
-}

Locomotive/Locomotive/MapWithSetLocomotivesGeneric.cs

@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class MapWithSetLocomotivesGeneric <T, U>
-        where T : class, IDrawningObject
-        where U : AbstractMap
-    {
-        /// Ширина окна отрисовки
-        private readonly int _pictureWidth;
-        /// Высота окна отрисовки
-        private readonly int _pictureHeight;
-        /// Размер занимаемого объектом места (ширина)
-        private readonly int _placeSizeWidth = 210;
-        /// Размер занимаемого объектом места (высота)
-        private readonly int _placeSizeHeight = 90;
-        /// Набор объектов
-        private readonly SetLocomotivesGeneric<T> _setLocomotives;
-        /// Карта
-        private readonly U _map;
-        /// Конструктор
-        public MapWithSetLocomotivesGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setLocomotives = new SetLocomotivesGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        /// Перегрузка оператора сложения
-        public static int operator +(MapWithSetLocomotivesGeneric<T, U> map, T locomotive)
-        {
-            return map._setLocomotives.Insert(locomotive);
-        }
-        /// Перегрузка оператора вычитания
-        public static T operator -(MapWithSetLocomotivesGeneric<T, U> map, int position)
-        {
-            return map._setLocomotives.Remove(position);
-        }
-        /// Вывод всего набора объектов
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawLocomotives(gr);
-            return bmp;
-        }
-        /// Просмотр объекта на карте
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setLocomotives.Count; i++)
-            {
-                var locomotive = _setLocomotives.Get(i);
-                if (locomotive != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// Перемещение объекта по крате
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        private void Shaking()
-        {
-            int j = _setLocomotives.Count - 1;
-            for (int i = 0; i < _setLocomotives.Count; i++)
-            {
-                if (_setLocomotives.Get(i) == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var locomotive = _setLocomotives.Get(j);
-                        if (locomotive != null)
-                        {
-                            _setLocomotives.Insert(locomotive, i);
-                            _setLocomotives.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// Метод отрисовки фона
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen;
-
-            for (int j = _placeSizeHeight; j < _pictureHeight; j+= _placeSizeHeight)
-            {
-                //нижняя линия рельс
-                pen = new(Color.Black, 5);
-
-                g.DrawLine(pen, 0, j, _pictureWidth, j);
-                for (int i = 0; i < _pictureWidth; i+=20)
-                {
-                    g.DrawLine(pen, i, j, i, j + 10);
-                }
-                g.DrawLine(pen, 0, j + 10, _pictureWidth, j + 10);
-
-                //верхняя линия рельс
-                
-                pen = new(Color.DarkGray, 4);
-
-                g.DrawLine(pen, 0, j - 20, _pictureWidth, j - 20);
-                for (int i = 0; i < _pictureWidth; i += 20)
-                {
-                    g.DrawLine(pen, i, j - 20, i, j - 10);
-                }
-                g.DrawLine(pen, 0, j - 10, _pictureWidth, j - 10);
-
-                //фонари
-                for (int i = _placeSizeWidth; i < _pictureWidth; i += _placeSizeWidth)
-                {
-                    pen = new(Color.Black, 10);
-                    g.DrawLine(pen, i, j - _placeSizeHeight + 20, i, j);
-                    pen = new(Color.Yellow, 20);
-                    g.DrawLine(pen, i, j - _placeSizeHeight + 18, i, j - _placeSizeHeight + 38);
-                }
-            }
-        }
-
-
-        /// Метод прорисовки объектов
-        private void DrawLocomotives(Graphics g)
-        {
-            int width = _pictureWidth / _placeSizeWidth;
-            int height = _pictureHeight / _placeSizeHeight;
-
-            int curWidth = 0;
-            int curHeight = 0;
-
-            for (int i = 0; i < _setLocomotives.Count; i++)
-            {
-                // установка позиции
-                _setLocomotives.Get(i)?.SetObject(curWidth * _placeSizeWidth + 10, curHeight * _placeSizeHeight + 15, _pictureWidth, _pictureHeight);
-                _setLocomotives.Get(i)?.DrawningObject(g);
-                if (curWidth < width) curWidth++;
-                else
-                {
-                    curWidth = 0;
-                    curHeight++;
-                }
-            }
-        }
-
-    }
-}

Locomotive/Locomotive/Program.cs

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

Locomotive/Locomotive/RailroadMap.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class RailroadMap : AbstractMap
-    {
-        /// Цвет участка закрытого
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// Цвет участка открытого
-        private readonly Brush roadColor = new SolidBrush(Color.Pink);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x +
-           1), j * (_size_y + 1));
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x +
-           1), j * (_size_y + 1));
-        }
-
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 1)
-            {
-                int y = _random.Next(0, 95);
-                
-                for(int x = 0; x < 99; x++)
-                {
-                    _map[x, y] = _barrier;
-                    _map[x, y + 5] = _barrier;
-
-                    if (x % 5 == 0)
-                    {
-                        _map[x, y + 1] = _barrier;
-                        _map[x, y + 2] = _barrier;
-                        _map[x, y + 3] = _barrier;
-                        _map[x, y + 4] = _barrier;
-                    }
-                }
-                counter += 1;
-            }
-        }
-    }
-}

Locomotive/Locomotive/SetLocomotivesGeneric.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class SetLocomotivesGeneric <T> 
-        where T : class
-    {
-        private readonly T[] _places;
-
-        /// Количество объектов в массиве
-        public int Count => _places.Length;
-        /// Конструктор
-        public SetLocomotivesGeneric(int count)
-        {
-            _places = new T[count];
-        }
-        /// Добавление объекта в набор
-        public int Insert(T locomotive)
-        {
-            return Insert(locomotive, 0);
-        }
-        /// Добавление объекта в набор на конкретную позицию
-        public int Insert(T locomotive, int position)
-        {
-            if (position >= _places.Length|| position < 0) return -1;
-
-            if (_places[position] == null)
-            {
-                _places[position] = locomotive;
-                return position;
-            }
-
-            int emptyEl = -1;
-
-            for (int i = position + 1; i < Count; i++)
-            {
-                if (_places[i] == null)
-                {
-                    emptyEl = i;
-                    break;
-                }
-            }
-
-            if (emptyEl == -1)
-            {
-                return -1;
-            }
-
-            for (int i = emptyEl; i > position; i--)
-            {
-                _places[i] = _places[i - 1];
-            }
-            _places[position] = locomotive;
-            return position;
-        }
-        /// Удаление объекта из набора с конкретной позиции
-        public T Remove(int position)
-        {
-            if (position >= _places.Length || position < 0) return null;
-            T result = _places[position];
-            _places[position] = null;
-            return result;
-        }
-        /// Получение объекта из набора по позиции
-        public T Get(int position)
-        {
-            if (position >= _places.Length || position < 0)
-            {
-                return null;
-            }
-            return _places[position];
-        }
-    }
-}

Locomotive/Locomotive/SimpleMap.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class SimpleMap : AbstractMap
-    {
-        /// Цвет участка закрытого
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// Цвет участка открытого
-        private readonly Brush roadColor = new SolidBrush(Color.Gray);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x +
-           1), j * (_size_y + 1));
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x +
-           1), j * (_size_y + 1));
-        }
-
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 50)
-            {
-                int x = _random.Next(0, 100);
-                int y = _random.Next(0, 100);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-                    counter++;
-                }
-            }
-        }
-
-    }
-}

Locomotive/Locomotive/SpikeMap.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Locomotive
-{
-    internal class SpikeMap : AbstractMap
-    {
-        /// Цвет участка закрытого
-        private readonly Brush barrierColor = new SolidBrush(Color.Black);
-        /// Цвет участка открытого
-        private readonly Brush roadColor = new SolidBrush(Color.Green);
-
-        protected override void DrawBarrierPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x +
-           1), j * (_size_y + 1));
-        }
-
-        protected override void DrawRoadPart(Graphics g, int i, int j)
-        {
-            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x +
-           1), j * (_size_y + 1));
-        }
-
-        protected override void GenerateMap()
-        {
-            _map = new int[100, 100];
-            _size_x = (float)_width / _map.GetLength(0);
-            _size_y = (float)_height / _map.GetLength(1);
-            int counter = 0;
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    _map[i, j] = _freeRoad;
-                }
-            }
-            while (counter < 15)
-            {
-                int x = _random.Next(1, 99);
-                int y = _random.Next(1, 99);
-                if (_map[x, y] == _freeRoad)
-                {
-                    _map[x, y] = _barrier;
-
-                    if (_map[x + 1, y] == _freeRoad) _map[x + 1, y] = _barrier;
-                    if (_map[x - 1, y] == _freeRoad) _map[x - 1, y] = _barrier;
-                    if (_map[x, y + 1] == _freeRoad) _map[x, y + 1] = _barrier;
-                    if (_map[x, y - 1] == _freeRoad) _map[x, y - 1] = _barrier;
-
-                    counter++;
-                }
-            }
-        }
-    }
-}