Изменен тип возвращаемого значения для операций сложения и

вычитания

AccordionBus/AccordionBus/AbstractMap.cs

@@ -0,0 +1,162 @@
+using AccordionBus;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    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();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            bool free = true;
+            int startPosX = (int)(_drawningObject.GetCurrentPosition().Left / _size_x);
+            int startPosY = (int)(_drawningObject.GetCurrentPosition().Right / _size_y);
+            int busWidth = (int)(_drawningObject.GetCurrentPosition().Top / _size_x);
+            int busHeight = (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y);
+            switch (direction)
+            {
+                // вправо
+                case Direction.Right:
+                    for (int i = busWidth; i <= busWidth + (int)(_drawningObject.Step / _size_x); ++i)
+                    {
+                        for (int j = startPosY; j <= busHeight; ++j)
+                        {
+                            if (_map[i, j] == _barrier)
+                            {
+                                free = false;
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    for (int i = startPosX; i >= (int)(_drawningObject.Step / _size_x); --i)
+                    {
+                        for (int j = startPosY; j <= busHeight; ++j)
+                        {
+                            if (_map[i, j] == _barrier)
+                            {
+                                free = false;
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    for (int i = startPosX; i <= busWidth; ++i)
+                    {
+                        for (int j = startPosY; j >= (int)(_drawningObject.Step / _size_y); --j)
+                        {
+                            if (_map[i, j] == _barrier)
+                            {
+                                free = false;
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    for (int i = startPosX; i <= busWidth; ++i)
+                    {
+                        for (int j = busHeight; j <= busHeight + (int)(_drawningObject.Step / _size_y); ++j)
+                        {
+                            if (_map[i, j] == _barrier)
+                            {
+                                free = false;
+                                break;
+                            }
+                        }
+                    }
+                    break;
+            }
+            if (free)
+            {
+                _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);
+
+            int startPosX = (int)(_drawningObject.GetCurrentPosition().Left / _size_x);
+            int startPosY = (int)(_drawningObject.GetCurrentPosition().Right / _size_y);
+            int busWidth = (int)(_drawningObject.GetCurrentPosition().Top / _size_x);
+            int busHeight = (int)(_drawningObject.GetCurrentPosition().Bottom / _size_y);
+            for (int i = startPosX; i <= busWidth; ++i)
+            {
+                for (int j = startPosY; j <= busHeight; ++j)
+                {
+                    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);
+    }
+}

AccordionBus/AccordionBus/Direction.cs

@@ -9,8 +9,9 @@ namespace AccordionBus
     /// <summary>
     /// Направление перемещения
     /// </summary>
-    internal enum Direction
+    public enum Direction
     {
+        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

AccordionBus/AccordionBus/DrawningAccordionBus.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    /// <summary>
+    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+    /// </summary>
+    internal class DrawningAccordionBus : DrawningBus
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автобуса</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="compartment">Признак наличия отсека</param>
+        /// <param name="rearviewMirror">Признак наличия зеркала заднего вида</param>
+        /// <param name="busNumber">Признак наличия номера автобуса</param>
+        public DrawningAccordionBus(int speed, float weight, Color bodyColor, Color dopColor, bool compartment, bool rearviewMirror, bool busNumber) :
+            base(speed, weight, bodyColor, 300, 70)
+        {
+            Bus = new EntityAccordionBus(speed, weight, bodyColor, dopColor, compartment, rearviewMirror, busNumber);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (Bus is not EntityAccordionBus accordionBus)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Brush dopBrush = new SolidBrush(accordionBus.DopColor);
+
+            if (accordionBus.Compartment)
+            {
+                //кузов
+                g.FillRectangle(dopBrush, _startPosX + 10, _startPosY + 10, 110, 50);
+
+                //границы отсека
+                g.DrawRectangle(pen, _startPosX + 10, _startPosY + 10, 110, 50);
+
+                //колесо
+                Brush brBlack = new SolidBrush(Color.Black);
+                g.FillEllipse(brBlack, _startPosX + 35, _startPosY + 50, 20, 20);
+                Brush brGray = new SolidBrush(Color.Gray);
+                g.FillEllipse(brGray, _startPosX + 40, _startPosY + 55, 10, 10);
+
+                //стекла
+                Brush brBlue = new SolidBrush(Color.LightBlue);
+                g.FillRectangle(brBlue, _startPosX + 10, _startPosY + 20, 10, 20);
+                g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 10, 20);
+                g.FillRectangle(brBlue, _startPosX + 30, _startPosY + 20, 30, 20);
+                g.DrawRectangle(pen, _startPosX + 30, _startPosY + 20, 30, 20);
+                g.FillRectangle(brBlue, _startPosX + 110, _startPosY + 20, 10, 20);
+                g.DrawRectangle(pen, _startPosX + 110, _startPosY + 20, 10, 20);
+                g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 20, 15, 40);
+                g.DrawRectangle(pen, _startPosX + 70, _startPosY + 20, 15, 40);
+                g.FillRectangle(brBlue, _startPosX + 85, _startPosY + 20, 15, 40);
+                g.DrawRectangle(pen, _startPosX + 85, _startPosY + 20, 15, 40);
+
+                //гармошка
+                g.FillRectangle(brGray, _startPosX + 120, _startPosY + 10, 20, 50);
+                g.DrawRectangle(pen, _startPosX + 120, _startPosY + 10, 20, 50);
+                g.DrawRectangle(pen, _startPosX + 122, _startPosY + 10, 16, 50);
+                g.DrawRectangle(pen, _startPosX + 124, _startPosY + 10, 12, 50);
+                g.DrawRectangle(pen, _startPosX + 126, _startPosY + 10, 8, 50);
+                g.DrawRectangle(pen, _startPosX + 128, _startPosY + 10, 4, 50);
+                g.DrawLine(pen, _startPosX + 130, _startPosY + 10, _startPosX + 130, _startPosY + 60);
+            }
+
+            _startPosX += 130;
+            base.DrawTransport(g);
+            _startPosX -= 130;
+
+            if (accordionBus.RearviewMirror)
+            {
+                g.FillRectangle(dopBrush, _startPosX + 285, _startPosY + 14, 15, 2);
+                g.FillRectangle(dopBrush, _startPosX + 298, _startPosY + 14, 2, 16);
+                g.FillRectangle(dopBrush, _startPosX + 295, _startPosY + 20, 5, 10);
+            }
+
+            if (accordionBus.BusNumber)
+            {
+                //табличка
+                g.FillRectangle(dopBrush, _startPosX + 205, _startPosY + 10, 20, 10);
+                g.DrawRectangle(pen, _startPosX + 205, _startPosY + 10, 20, 10);
+
+                //цифры
+                //1
+                g.DrawLine(pen, _startPosX + 210, _startPosY + 12, _startPosX + 210, _startPosY + 18);
+                //0
+                g.DrawRectangle(pen, _startPosX + 220, _startPosY + 12, 3, 6);
+                //7
+                g.DrawLine(pen, _startPosX + 214, _startPosY + 12, _startPosX + 216, _startPosY + 12); 
+                g.DrawLine(pen, _startPosX + 216, _startPosY + 12, _startPosX + 216, _startPosY + 18);
+            }
+        }
+    }
+}

AccordionBus/AccordionBus/DrawningBus.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection.Metadata.Ecma335;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -10,20 +11,20 @@ namespace AccordionBus
     /// <summary>
     /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
     /// </summary>
-    internal class DrawningBus
+    public class DrawningBus
     {
         /// <summary>
         /// Класс-сущность
         /// </summary>
-        public EntityBus Bus { get; private set; }
+        public EntityBus Bus { get; protected set; }
         /// <summary>
         /// Левая координата отрисовки автобуса
         /// </summary>
-        private float _startPosX;
+        protected float _startPosX;
         /// <summary>
         /// Верхняя кооридната отрисовки автобуса
         /// </summary>
-        private float _startPosY;
+        protected float _startPosY;
         /// <summary>
         /// Ширина окна отрисовки
         /// </summary>
@@ -46,10 +47,23 @@ namespace AccordionBus
         /// <param name="speed">Скорость</param>
         /// <param name="weight">Вес автобуса</param>
         /// <param name="bodyColor">Цвет кузова</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public DrawningBus(int speed, float weight, Color bodyColor)
         {
-            Bus = new EntityBus();
-            Bus.Init(speed, weight, bodyColor);
+            Bus = new EntityBus(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автобуса</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="busWidth">Ширина отрисовки автобуса</param>
+        /// <param name="busHeight">Высота отрисовки автобуса</param>
+        protected DrawningBus(int speed, float weight, Color bodyColor, int busWidth, int busHeight) :
+            this(speed, weight, bodyColor)
+        {
+            _busWidth = busWidth;
+            _busHeight = busHeight;
         }
         /// <summary>
         /// Установка позиции автобуса
@@ -115,7 +129,7 @@ namespace AccordionBus
         /// Отрисовка автобуса
         /// </summary>
         /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -177,5 +191,13 @@ namespace AccordionBus
                 _startPosY = _pictureHeight.Value - _busHeight;
             }
         }
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _busWidth, _startPosY + _busHeight);
+        }
     }
 }

AccordionBus/AccordionBus/DrawningObjectBus.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    internal class DrawningObjectBus : IDrawningObject
+    {
+        public DrawningBus _bus = null;
+
+        public DrawningObjectBus(DrawningBus bus)
+        {
+            _bus = bus;
+        }
+        public float Step => _bus?.Bus?.Step ?? 0;
+
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return _bus?.GetCurrentPosition() ?? default;
+        }
+
+        public void MoveObject(Direction direction)
+        {
+            _bus?.MoveTransport(direction);
+        }
+
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _bus.SetPosition(x, y, width, height);
+        }
+
+        void IDrawningObject.DrawningObject(Graphics g)
+        {
+            _bus?.DrawTransport(g);
+        }
+    }
+}

AccordionBus/AccordionBus/EntityAccordionBus.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    /// <summary>
+    /// Класс-сущность "Автобус с гармошкой"
+    /// </summary>
+    internal class EntityAccordionBus : EntityBus
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color DopColor { get; private set; }
+        /// <summary>
+        /// Признак наличия отсека
+        /// </summary>
+        public bool Compartment { get; private set; }
+        /// <summary>
+        /// Признак наличия зеркала заднего вида
+        /// </summary>
+        public bool RearviewMirror { get; private set; }
+        /// <summary>
+        /// Признак наличия номера автобуса
+        /// </summary>
+        public bool BusNumber { get; private set; }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автобуса</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="compartment">Признак наличия отсека</param>
+        /// <param name="rearviewMirror">Признак наличия зеркала заднего вида</param>
+        /// <param name="busNumber">Признак наличия номера автобуса</param>
+        public EntityAccordionBus(int speed, float weight, Color bodyColor, Color dopColor, bool compartment, bool rearviewMirror, bool busNumber) :
+            base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            Compartment = compartment;
+            RearviewMirror = rearviewMirror;
+            BusNumber = busNumber;
+        }
+    }
+}

AccordionBus/AccordionBus/EntityBus.cs

@@ -9,7 +9,7 @@ namespace AccordionBus
     /// <summary>
     /// Класс-сущность "Автобус"
     /// </summary>
-    internal class EntityBus
+    public class EntityBus
     {
         /// <summary>
         /// Скорость
@@ -34,7 +34,7 @@ namespace AccordionBus
         /// <param name="weight"></param>
         /// <param name="bodyColor"></param>
         /// <returns></returns>
-        public void Init(int speed, float weight, Color bodyColor)
+        public EntityBus(int speed, float weight, Color bodyColor)
         {
             Random rnd = new();
             Speed = speed <= 0 ? rnd.Next(50, 150) : speed;

AccordionBus/AccordionBus/FormBus.Designer.cs

@@ -38,6 +38,8 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectBus = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
             this.statusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -142,11 +144,35 @@
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreateModif.Location = new System.Drawing.Point(123, 382);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(117, 29);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // buttonSelectBus
+            // 
+            this.buttonSelectBus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSelectBus.Location = new System.Drawing.Point(563, 382);
+            this.buttonSelectBus.Name = "buttonSelectBus";
+            this.buttonSelectBus.Size = new System.Drawing.Size(94, 29);
+            this.buttonSelectBus.TabIndex = 8;
+            this.buttonSelectBus.Text = "Выбрать";
+            this.buttonSelectBus.UseVisualStyleBackColor = true;
+            this.buttonSelectBus.Click += new System.EventHandler(this.ButtonSelectBus_Click);
+            // 
             // FormBus
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.buttonSelectBus);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
@@ -176,5 +202,7 @@
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
+        private Button buttonCreateModif;
+        private Button buttonSelectBus;
     }
 }

AccordionBus/AccordionBus/FormBus.cs

@@ -5,6 +5,10 @@ namespace AccordionBus
     public partial class FormBus : Form
     {
         private DrawningBus _bus;
+        /// <summary>
+        /// Âűáđŕííűé îáúĺęň
+        /// </summary>
+        public DrawningBus SelectedBus { get; private set; }
         public FormBus()
         {
             InitializeComponent();
@@ -19,6 +23,17 @@ namespace AccordionBus
             _bus?.DrawTransport(gr);
             pictureBoxBus.Image = bmp;
         }
+        /// <summary>
+		/// Ěĺňîä óńňŕíîâęč äŕííűő
+		/// </summary>
+		private void SetData()
+        {
+            Random rnd = new();
+            _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height);
+            toolStripStatusLabelSpeed.Text = $"Ńęîđîńňü: {_bus.Bus.Speed}";
+            toolStripStatusLabelWeight.Text = $"Âĺń: {_bus.Bus.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâĺň: {_bus.Bus.BodyColor.Name}";
+        }
         /// <summary>
         /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ñîçäàòü"
         /// </summary>
@@ -27,12 +42,14 @@ namespace AccordionBus
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _bus = new DrawningBus();
-            _bus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _bus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxBus.Width, pictureBoxBus.Height);
-            toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_bus.Bus.Speed}";
-            toolStripStatusLabelWeight.Text = $"Âåñ: {_bus.Bus.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_bus.Bus.BodyColor.Name}";
+            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;
+            }
+            _bus = new DrawningBus(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
+            SetData();
             Draw();
         }
         /// <summary>
@@ -71,5 +88,36 @@ namespace AccordionBus
             _bus?.ChangeBorders(pictureBoxBus.Width, pictureBoxBus.Height);
             Draw();
         }
+        /// <summary>
+        /// Îáđŕáîňęŕ íŕćŕňč˙ ęíîďęč "Ěîäčôčęŕöč˙"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonCreateModif_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;
+            }
+            _bus = new DrawningAccordionBus(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor,
+                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
+
+        private void ButtonSelectBus_Click(object sender, EventArgs e)
+        {
+            SelectedBus = _bus;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

AccordionBus/AccordionBus/FormMapWithSetBuses.Designer.cs

@@ -0,0 +1,216 @@
+namespace AccordionBus
+{
+    partial class FormMapWithSetBuses
+    {
+        /// <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.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemoveBus = new System.Windows.Forms.Button();
+            this.buttonAddBus = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.buttonRight);
+            this.groupBox1.Controls.Add(this.buttonDown);
+            this.groupBox1.Controls.Add(this.buttonLeft);
+            this.groupBox1.Controls.Add(this.buttonUp);
+            this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox1.Controls.Add(this.buttonShowOnMap);
+            this.groupBox1.Controls.Add(this.buttonShowStorage);
+            this.groupBox1.Controls.Add(this.buttonRemoveBus);
+            this.groupBox1.Controls.Add(this.buttonAddBus);
+            this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox1.Location = new System.Drawing.Point(832, 0);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(250, 553);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Инструменты";
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::AccordionBus.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(151, 480);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 10;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::AccordionBus.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(115, 480);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 9;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::AccordionBus.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(79, 480);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 8;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::AccordionBus.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(115, 444);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 7;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(22, 157);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(207, 27);
+            this.maskedTextBoxPosition.TabIndex = 6;
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(22, 353);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(207, 29);
+            this.buttonShowOnMap.TabIndex = 5;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(22, 272);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(207, 29);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemoveBus
+            // 
+            this.buttonRemoveBus.Location = new System.Drawing.Point(22, 190);
+            this.buttonRemoveBus.Name = "buttonRemoveBus";
+            this.buttonRemoveBus.Size = new System.Drawing.Size(207, 29);
+            this.buttonRemoveBus.TabIndex = 3;
+            this.buttonRemoveBus.Text = "Удалить автомобиль";
+            this.buttonRemoveBus.UseVisualStyleBackColor = true;
+            this.buttonRemoveBus.Click += new System.EventHandler(this.ButtonRemoveBus_Click);
+            // 
+            // buttonAddBus
+            // 
+            this.buttonAddBus.Location = new System.Drawing.Point(22, 106);
+            this.buttonAddBus.Name = "buttonAddBus";
+            this.buttonAddBus.Size = new System.Drawing.Size(207, 29);
+            this.buttonAddBus.TabIndex = 1;
+            this.buttonAddBus.Text = "Добавить автомобиль";
+            this.buttonAddBus.UseVisualStyleBackColor = true;
+            this.buttonAddBus.Click += new System.EventHandler(this.ButtonAddBus_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Карта подземного туннеля"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(22, 26);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(207, 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(832, 553);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetBuses
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1082, 553);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "FormMapWithSetBuses";
+            this.Text = "Карта с набором объектов";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private PictureBox pictureBox;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonShowOnMap;
+        private Button buttonShowStorage;
+        private Button buttonRemoveBus;
+        private Button buttonAddBus;
+        private ComboBox comboBoxSelectorMap;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonUp;
+    }
+}

AccordionBus/AccordionBus/FormMapWithSetBuses.cs

@@ -0,0 +1,163 @@
+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 AccordionBus
+{
+    public partial class FormMapWithSetBuses : Form
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetBusesGeneric<DrawningObjectBus, AbstractMap> _mapBusesCollectionGeneric;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetBuses()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Карта подземного туннеля":
+                    map = new UndergroundTunnelMap();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapBusesCollectionGeneric = new MapWithSetBusesGeneric<DrawningObjectBus, AbstractMap>(
+                    pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapBusesCollectionGeneric = null;
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddBus_Click(object sender, EventArgs e)
+        {
+            if (_mapBusesCollectionGeneric == null)
+            {
+                return;
+            }
+            FormBus form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectBus bus = new(form.SelectedBus);
+                if (form.SelectedBus == null || (_mapBusesCollectionGeneric + bus == -1))
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+                else
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapBusesCollectionGeneric.ShowSet();
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonRemoveBus_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 (_mapBusesCollectionGeneric - pos != -1)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapBusesCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapBusesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBusesCollectionGeneric.ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapBusesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapBusesCollectionGeneric.ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapBusesCollectionGeneric == 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 = _mapBusesCollectionGeneric.MoveObject(dir);
+        }
+    }
+}

AccordionBus/AccordionBus/FormMapWithSetBuses.resx

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

AccordionBus/AccordionBus/IDrawningObject.cs

@@ -0,0 +1,44 @@
+using AccordionBus;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    /// <summary>
+    /// Интерфейс для работы с объектом, прорисовываемым на форме
+    /// </summary>
+    internal interface IDrawningObject
+    {
+        /// <summary>
+        /// Шаг перемещения объекта
+        /// </summary>
+        public float Step { get; }
+        /// <summary>
+        /// Установка позиции объекта
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина полотна</param>
+        /// <param name="height">Высота полотна</param>
+        void SetObject(int x, int y, int width, int height);
+        /// <summary>
+        /// Изменение направления перемещения объекта
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        /// <returns></returns>
+        void MoveObject(Direction direction);
+        /// <summary>
+        /// Отрисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        void DrawningObject(Graphics g);
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+    }
+}

AccordionBus/AccordionBus/MapWithSetBusesGeneric.cs

@@ -0,0 +1,182 @@
+using AccordionBus;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    /// <summary>
+    /// Карта с набором объектов под нее
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="U"></typeparam>
+    internal class MapWithSetBusesGeneric<T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 350;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 80;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetBusesGeneric<T> _setBuses;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetBusesGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setBuses = new SetBusesGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="bus"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetBusesGeneric<T, U> map, T bus)
+        {
+            return map._setBuses.Insert(bus);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static int operator -(MapWithSetBusesGeneric<T, U> map, int position)
+        {
+            return map._setBuses.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawBuses(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setBuses.Count; i++)
+            {
+                var bus = _setBuses.Get(i);
+                if (bus != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, bus);
+                }
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// Перемещение объекта по карте
+        /// </summary>
+        /// <param name="direction"></param>
+        /// <returns></returns>
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        /// <summary>
+        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
+        /// </summary>
+        private void Shaking()
+        {
+            int j = _setBuses.Count - 1;
+            for (int i = 0; i < _setBuses.Count; i++)
+            {
+                if (_setBuses.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var bus = _setBuses.Get(j);
+                        if (bus != null)
+                        {
+                            _setBuses.Insert(bus, i);
+                            _setBuses.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.White, 3);
+            Brush brush = new SolidBrush(Color.Gray);
+            g.FillRectangle(brush, 0, 0, _pictureWidth, _pictureHeight);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; j++)
+                {
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBuses(Graphics g)
+        {
+            int numberOfSeatsInWidth = _pictureWidth / _placeSizeWidth;
+            int numberOfSeatsInHeight = _pictureHeight / _placeSizeHeight;
+            int rightLine = (numberOfSeatsInWidth - 1) * _placeSizeWidth;
+            int bottomLine = (numberOfSeatsInHeight - 1) * _placeSizeHeight;
+            for (int i = 0; i < _setBuses.Count; i++)
+            {
+                _setBuses.Get(i)?.SetObject(rightLine - i % numberOfSeatsInWidth * _placeSizeWidth, bottomLine - i / numberOfSeatsInWidth * _placeSizeHeight, _pictureWidth, _pictureHeight);
+                _setBuses.Get(i)?.DrawningObject(g);
+            }
+        }
+    }
+}

AccordionBus/AccordionBus/Program.cs

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

AccordionBus/AccordionBus/SetBusesGeneric.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    /// <summary>
+    /// Параметризованный набор объектов
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class SetBusesGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private readonly T[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
+        public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetBusesGeneric(int count)
+        {
+            _places = new T[count];
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="bus">Добавляемый автобус</param>
+        /// <returns></returns>
+        public int Insert(T bus)
+        {
+            return Insert(bus, 0);
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="bus">Добавляемый автобус</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T bus, int position)
+        {
+            //проверка позиции
+            if (position < 0 || position >= Count)
+            {
+                return -1;
+            }
+            //поиск пустой позиции
+            int positionEmpty = position;
+            for (; positionEmpty < Count; positionEmpty++)
+            {
+                if (_places[positionEmpty] == null)
+                {
+                    break;
+                }
+            }
+            if (positionEmpty == Count)
+            {
+                return -1;
+            }
+            //сдвиг вправо
+            for (; positionEmpty > position; positionEmpty--)
+            {
+                _places[positionEmpty] = _places[positionEmpty - 1];
+            }
+            _places[position] = bus;
+            return position;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public int Remove(int position)
+        {
+            if (position < 0 || position >= Count)
+            { 
+                return -1;
+            }
+            _places[position] = null;
+            return position;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Get(int position)
+        {
+            if (position < 0 || position >= Count)
+            {
+                return null;
+            }
+            return _places[position];
+        }
+    }
+}

AccordionBus/AccordionBus/SimpleMap.cs

@@ -0,0 +1,58 @@
+using AccordionBus;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    /// <summary>
+    /// Простая реализация абстрактного класса AbstractMap
+    /// </summary>
+    internal class SimpleMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        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++;
+                }
+            }
+        }
+    }
+}

AccordionBus/AccordionBus/UndergroundTunnelMap.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AccordionBus
+{
+    /// <summary>
+    /// Реализация карты подземного туннеля абстрактного класса AbstractMap
+    /// </summary>
+    internal class UndergroundTunnelMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        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;
+                }
+            }
+            int x = 0;
+            int y = 30;
+            while (counter < 50)
+            {
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+                x++;
+            }
+            counter = 0;
+            x = 50;
+            y += 30;
+            while (counter < 50)
+            {
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+                x++;
+            }
+            counter = 0;
+            x = 0;
+            y += 30;
+            while (counter < 50)
+            {
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+                x++;
+            }
+        }
+    }
+}