fix

Cruiser/Cruiser/AbstractStrategy.cs

@@ -1,42 +1,18 @@
-using Cruiser;
+using System;
-using DumpTruck.MovementStrategy;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
 namespace Cruiser.MovementStrategy
 {
     public abstract class AbstractStrategy
     {
-        /// <summary>
-        /// Перемещаемый объект
-        /// </summary>
         private IMoveableObject? _moveableObject;
-        /// <summary>
-        /// Статус перемещения
-        /// </summary>
         private Status _state = Status.NotInit;
-        /// <summary>
-        /// Ширина поля
-        /// </summary>
         protected int FieldWidth { get; private set; }
-        /// <summary>
-        /// Высота поля
-        /// </summary>
         protected int FieldHeight { get; private set; }
-        /// <summary>
-        /// Статус перемещения
-        /// </summary>
         public Status GetStatus() { return _state; }
-        /// <summary>
+ 
-        /// Установка данных
-        /// </summary>
-        /// <param name="moveableObject">Перемещаемый объект</param>
-        /// <param name="width">Ширина поля</param>
-        /// <param name="height">Высота поля</param>
         public void SetData(IMoveableObject moveableObject, int width, int
         height)
         {
@@ -50,9 +26,6 @@ namespace Cruiser.MovementStrategy
             FieldWidth = width;
             FieldHeight = height;
         }
-        /// <summary>
-        /// Шаг перемещения
-        /// </summary>
         public void MakeStep()
         {
             if (_state != Status.InProgress)
@@ -66,35 +39,12 @@ namespace Cruiser.MovementStrategy
             }
             MoveToTarget();
         }
-        /// <summary>
+        protected bool MoveLeft() => MoveTo(Direction.Left);
-        /// Перемещение влево
+        protected bool MoveRight() => MoveTo(Direction.Right);
-        /// </summary>
+        protected bool MoveUp() => MoveTo(Direction.Up);
-        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+        protected bool MoveDown() => MoveTo(Direction.Down);
-        protected bool MoveLeft() => MoveTo(DirectionType.Left);
-        /// <summary>
-        /// Перемещение вправо
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-        protected bool MoveRight() => MoveTo(DirectionType.Right);
-        /// <summary>
-        /// Перемещение вверх
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-        protected bool MoveUp() => MoveTo(DirectionType.Up);
-        /// <summary>
-        /// Перемещение вниз
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться,false - неудача)</returns>
-        protected bool MoveDown() => MoveTo(DirectionType.Down);
-        /// <summary>
-        /// Параметры объекта
-        /// </summary>
         protected ObjectParameters? GetObjectParameters =>
                _moveableObject?.GetObjectPosition;
-        /// <summary>
-        /// Шаг объекта
-        /// </summary>
-        /// <returns></returns>
         protected int? GetStep()
         {
             if (_state != Status.InProgress)
@@ -103,32 +53,20 @@ namespace Cruiser.MovementStrategy
             }
             return _moveableObject?.GetStep;
         }
-        /// <summary>
-        /// Перемещение к цели
-        /// </summary>
         protected abstract void MoveToTarget();
-        /// <summary>
-        /// Достигнута ли цель
-        /// </summary>
-        /// <returns></returns>
         protected abstract bool IsTargetDestinaion();
-        /// <summary>
+        private bool MoveTo(Direction direction)
-        /// Попытка перемещения в требуемом направлении
-        /// </summary>
-        /// <param name="directionType">Направление</param>
-        /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
-        private bool MoveTo(DirectionType directionType)
         {
             if (_state != Status.InProgress)
             {
                 return false;
             }
-            if (_moveableObject?.CheckCanMove(directionType) ?? false)
+            if (_moveableObject?.CheckCanMove(direction) ?? false)
             {
-                _moveableObject.MoveObject(directionType);
+                _moveableObject.MoveObject(direction);
                 return true;
             }
             return false;
         }
     }
-}
+}

Cruiser/Cruiser/CruiserForm.Designer.cs

@@ -1,62 +1,32 @@
 namespace Cruiser
 {
-    partial class Form1
+    partial class CruiserForm
     {
-        /// <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>
-       
-
         #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.button1 = new System.Windows.Forms.Button();
+            this.pictureBoxCruiser = new System.Windows.Forms.PictureBox();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonAdvancedCreate = new System.Windows.Forms.Button();
             this.buttonCreate = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
+            this.comboBoxCruiser = new System.Windows.Forms.ComboBox();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.ButtonStep = new System.Windows.Forms.Button();
-            this.SelectedCruiser = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
-            // 
+            // pictureBoxCruiser
-            // button1
+            this.pictureBoxCruiser.Dock = System.Windows.Forms.DockStyle.Fill;
-            // 
+            this.pictureBoxCruiser.Location = new System.Drawing.Point(0, 0);
-            this.button1.Location = new System.Drawing.Point(386, 68);
+            this.pictureBoxCruiser.Name = "pictureBoxCruiser";
-            this.button1.Name = "button1";
+            this.pictureBoxCruiser.Size = new System.Drawing.Size(667, 358);
-            this.button1.Size = new System.Drawing.Size(112, 34);
+            this.pictureBoxCruiser.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.button1.TabIndex = 0;
+            this.pictureBoxCruiser.TabIndex = 0;
-            this.button1.Text = "button1";
+            this.pictureBoxCruiser.TabStop = false;
-            this.button1.UseVisualStyleBackColor = true;
+            this.pictureBoxCruiser.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(667, 358);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            this.pictureBox1.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::Cruiser.Properties.Resources.вниз;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -66,9 +36,7 @@
             this.buttonDown.TabIndex = 1;
             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::Cruiser.Properties.Resources.влево;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -78,9 +46,7 @@
             this.buttonLeft.TabIndex = 2;
             this.buttonLeft.UseVisualStyleBackColor = true;
             this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
             // buttonRight
-            // 
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::Cruiser.Properties.Resources.вправо;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -90,9 +56,7 @@
             this.buttonRight.TabIndex = 3;
             this.buttonRight.UseVisualStyleBackColor = true;
             this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
+            // buttonUp 
-            // buttonUp
-            // 
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::Cruiser.Properties.Resources.вверх;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
@@ -102,43 +66,35 @@
             this.buttonUp.TabIndex = 4;
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
-            // 
+            // buttonAdvancedCreate
+            this.buttonAdvancedCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonAdvancedCreate.Location = new System.Drawing.Point(12, 267);
+            this.buttonAdvancedCreate.Name = "buttonAdvancedCreate";
+            this.buttonAdvancedCreate.Size = new System.Drawing.Size(210, 69);
+            this.buttonAdvancedCreate.TabIndex = 5;
+            this.buttonAdvancedCreate.Text = "Создать продвинутую версию";
+            this.buttonAdvancedCreate.UseVisualStyleBackColor = true;
+            this.buttonAdvancedCreate.Click += new System.EventHandler(this.buttonAdvancedCreate_Click);
             // buttonCreate
-            // 
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(0, 302);
+            this.buttonCreate.Location = new System.Drawing.Point(240, 267);
             this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(218, 34);
+            this.buttonCreate.Size = new System.Drawing.Size(242, 69);
-            this.buttonCreate.TabIndex = 5;
+            this.buttonCreate.TabIndex = 6;
-            this.buttonCreate.Text = "Создать простую";
+            this.buttonCreate.Text = "Создать простую версию";
             this.buttonCreate.UseVisualStyleBackColor = true;
             this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
-            // 
+            // comboBoxCruiser
-            // button2
+            this.comboBoxCruiser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            // 
+            this.comboBoxCruiser.FormattingEnabled = true;
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.comboBoxCruiser.Items.AddRange(new object[] {
-            this.button2.Location = new System.Drawing.Point(210, 301);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(251, 37);
-            this.button2.TabIndex = 6;
-            this.button2.Text = "Создать про версию";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Items.AddRange(new object[] {
             "Центр",
             "Угол"});
-            this.comboBox1.Location = new System.Drawing.Point(415, 22);
+            this.comboBoxCruiser.Location = new System.Drawing.Point(415, 22);
-            this.comboBox1.Name = "comboBox1";
+            this.comboBoxCruiser.Name = "comboBoxCruiser";
-            this.comboBox1.Size = new System.Drawing.Size(182, 33);
+            this.comboBoxCruiser.Size = new System.Drawing.Size(182, 33);
-            this.comboBox1.TabIndex = 7;
+            this.comboBoxCruiser.TabIndex = 7;
-            // 
             // ButtonStep
-            // 
             this.ButtonStep.Location = new System.Drawing.Point(485, 70);
             this.ButtonStep.Name = "ButtonStep";
             this.ButtonStep.Size = new System.Drawing.Size(112, 34);
@@ -146,50 +102,33 @@
             this.ButtonStep.Text = "Шаг";
             this.ButtonStep.UseVisualStyleBackColor = true;
             this.ButtonStep.Click += new System.EventHandler(this.ButtonStep_Click);
-            // 
-            // SelectedCruiser
-            // 
-            this.SelectedCruiser.Location = new System.Drawing.Point(210, 261);
-            this.SelectedCruiser.Name = "SelectedCruiser";
-            this.SelectedCruiser.Size = new System.Drawing.Size(112, 34);
-            this.SelectedCruiser.TabIndex = 9;
-            this.SelectedCruiser.Text = "Выбрать";
-            this.SelectedCruiser.UseVisualStyleBackColor = true;
-            this.SelectedCruiser.Click += new System.EventHandler(this.SelectedCruiser_Click);
-            // 
             // CruiserForm
-            // 
             this.ClientSize = new System.Drawing.Size(667, 358);
-            this.Controls.Add(this.SelectedCruiser);
             this.Controls.Add(this.ButtonStep);
-            this.Controls.Add(this.comboBox1);
+            this.Controls.Add(this.comboBoxCruiser);
-            this.Controls.Add(this.button2);
             this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.buttonAdvancedCreate);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.pictureBox1);
+            this.Controls.Add(this.pictureBoxCruiser);
             this.Name = "CruiserForm";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
-        /// <param name="e"></param>
-       
-#endregion
 
-private Button button1;
+        #endregion
-        private PictureBox pictureBox1;
+        private PictureBox pictureBoxCruiser;
         private Button buttonDown;
         private Button buttonLeft;
         private Button buttonRight;
         private Button buttonUp;
+        private Button buttonAdvancedCreate;
         private Button buttonCreate;
-        private Button button2;
+        private ComboBox comboBoxCruiser;
-        private ComboBox comboBox1;
         private Button ButtonStep;
-        private Button SelectedCruiser;
     }
 }

Cruiser/Cruiser/CruiserForm.cs

@@ -0,0 +1,117 @@
+using System.Windows.Forms;
+using Cruiser.DrawningObjects;
+using Cruiser.MovementStrategy;
+
+namespace Cruiser
+{
+    public partial class CruiserForm : Form
+    {
+        private DrawningCruiser? _drawningCruiser;
+        
+        private AbstractStrategy? _abstractStrategy;
+        public CruiserForm()
+        {
+            InitializeComponent();
+        }
+        private void Draw()
+        {
+            if (_drawningCruiser == null)
+            {
+                return;
+            }
+            Bitmap bmp = new Bitmap(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningCruiser.DrawTransport(gr);
+            pictureBoxCruiser.Image = bmp;
+        }
+        private void buttonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawningCruiser == null)
+            {
+                return;
+            }
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _drawningCruiser.MoveTransport(Direction.Up);
+                    break;
+                case "buttonDown":
+                    _drawningCruiser.MoveTransport(Direction.Down);
+                    break;
+                case "buttonLeft":
+                    _drawningCruiser.MoveTransport(Direction.Left);
+                    break;
+                case "buttonRight":
+                    _drawningCruiser.MoveTransport(Direction.Right);
+                    break;
+            }
+            Draw();
+        }
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawningCruiser = new DrawningCruiser(random.Next(100, 300),
+            random.Next(1000, 3000),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
+            pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
+            100));
+            Draw();
+        }
+    private void ButtonStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningCruiser == null)
+            {
+                return;
+            }
+            if (comboBoxCruiser.Enabled)
+            {
+                _abstractStrategy = comboBoxCruiser.SelectedIndex
+                switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_abstractStrategy == null)
+                {
+                    return;
+                }
+                _abstractStrategy.SetData(new DrawningObjectCruiser(_drawningCruiser), pictureBoxCruiser.Width,
+                pictureBoxCruiser.Height);
+                comboBoxCruiser.Enabled = false;
+            }
+            if (_abstractStrategy == null)
+            {
+                return;
+            }
+            _abstractStrategy.MakeStep();
+            Draw();
+            if (_abstractStrategy.GetStatus() == Status.Finish)
+            {
+                comboBoxCruiser.Enabled = true;
+                _abstractStrategy = null;
+            }
+        }
+        private void buttonAdvancedCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawningCruiser = new DrawningAdvancedCruiser(random.Next(100, 300),
+            random.Next(1000, 3000),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
+            Convert.ToBoolean(random.Next(0, 2)),
+            Convert.ToBoolean(random.Next(0, 2)),
+            Convert.ToBoolean(random.Next(0, 2)),
+
+            pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
+            100));
+            Draw();
+        }
+    }
+}

Cruiser/Cruiser/CruiserGenericCollection.cs

@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Cruiser.Generics;
-
-using Cruiser.DrawningObjects;
-using Cruiser.Entities;
-using Cruiser.MovementStrategy;
-
-namespace DumpTruck.Generics
-{
-    internal class CruiserGenericCollection<T, U>
-        where T : DrawningCar
-        where U : IMoveableObject
-    {
-        /// <summary>
-        /// Ширина окна прорисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна прорисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 210;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 90;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetGeneric<T> _collection;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        public CruiserGenericCollection(int picWidth, int picHeight)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _collection = new SetGeneric<T>(width * height);
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static int operator +(CruiserGenericCollection<T, U> collect, T?
-        obj)
-        {
-            if (obj == null)
-            {
-                return -1;
-            }
-            return collect._collection.Insert(obj) ;
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="pos"></param>
-        /// <returns></returns>
-        public static bool operator -(CruiserGenericCollection<T, U> collect, int
-        pos)
-        {
-            T? obj = collect._collection.Get(pos);
-            if (obj != null)
-            {
-                collect._collection.Remove(pos);
-            }
-            return true;
-        }
-        /// <summary>
-        /// Получение объекта IMoveableObject
-        /// </summary>
-        /// <param name="pos"></param>
-        /// <returns></returns>
-        public U? GetU(int pos)
-        {
-            return (U?)_collection.Get(pos)?.GetMoveableObject;
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowCars()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawObjects(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            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 DrawObjects(Graphics g)
-        {
-            DrawningCar car;
-            int numPlacesInRow = _pictureWidth / _placeSizeWidth;
-            for (int i = 0; i < _collection.Count; i++)
-            {
-                // TODO получение объекта
-                // TODO установка позиции
-                // TODO прорисовка объекта
-                car = _collection.Get(i);
-                if (car != null)
-                {
-                    car.SetPosition((i % numPlacesInRow) * _placeSizeWidth + _placeSizeWidth / 20, _placeSizeHeight * (i / numPlacesInRow) + _placeSizeHeight / 10);
-                    //car.SetPosition(_placeSizeWidth * (i/ numPlacesInColumn) + _placeSizeWidth / 20, (i % numPlacesInColumn ) *_placeSizeHeight + _placeSizeHeight / 10);
-                    car.DrawTransport(g);
-
-                }
-            }
-        }
-    }
-}

Cruiser/Cruiser/Direction.cs

@@ -3,28 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
 namespace Cruiser
 {
-    public enum DirectionType
+    public enum Direction
     {
-        /// Вверх
-
-        /// </summary>
         Up = 1,
-        /// <summary>
-        /// Вниз
-        /// </summary>
         Down = 2,
-        /// <summary>
-        /// Влево
-        /// </summary>
         Left = 3,
-        /// <summary>
-        /// Вправо
-        /// </summary>
         Right = 4
     }
-}
+}
-
-

Cruiser/Cruiser/DrawningAdvancedCruiser.cs

@@ -1,43 +1,32 @@
-using DumpTruck;
+using Cruiser.DrawningObjects;
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
-using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using Cruiser.Entities;
-
-
 namespace Cruiser.DrawningObjects
 {
-    public class DrawningDumpTruck : DrawningCar
+    public class DrawningAdvancedCruiser : DrawningCruiser
     {
-
+        public DrawningAdvancedCruiser(int speed, double weight, Color bodyColor, Color additionalColor, bool headlights, bool helicopterPad, bool coating, int width, int height) : base(speed, weight, bodyColor, width, height, 150, 50)
-
-        public DrawningDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent, int width, int height) : base(speed, weight, bodyColor, width, height, 110, 60)
         {
-            if (EntityCar != null)
+            if (EntityCruiser != null)
             {
-                EntityCar = new EntityAdvancedCruiser(speed, weight, bodyColor, additionalColor, bodyKit, tent);
+                EntityCruiser = new EntityAdvancedCruiser(speed, weight, bodyColor, additionalColor, headlights, helicopterPad, coating);
             }
         }
-
-
         public override void DrawTransport(Graphics g)
         {
-            if (EntityCar is not EntityAdvancedCruiser dumpTruck)
+            if (EntityCruiser is not EntityAdvancedCruiser cruiser)
             {
                 return;
             }
-
             Pen pen = new Pen(Color.Black);
-            Brush addBrush = new SolidBrush(dumpTruck.AdditionalColor);
+            Brush addBrush = new SolidBrush(cruiser.AdditionalColor);
-            Brush brush = new SolidBrush(dumpTruck.BodyColor);
+            Brush brush = new SolidBrush(cruiser.BodyColor);
-
             base.DrawTransport(g);
-            if (dumpTruck.Tent)
+            if (cruiser.Headlights)
             {
                 Brush brYellow = new SolidBrush(Color.Yellow);
                 g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
@@ -45,16 +34,15 @@ namespace Cruiser.DrawningObjects
                 g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
                 20);
             }
-
+            if (cruiser.HelicopterPad)
-            if (dumpTruck.BodyKit)
+            { 
-            {
                 g.FillEllipse(Brushes.Green, _startPosX + 90, _startPosY + 20, 20, 20);
-
             }
-
+            if (cruiser.Coating)
-            
+            {
+                g.FillEllipse(Brushes.Red, _startPosX + 80, _startPosY + 20, 20, 20);
+                g.FillEllipse(Brushes.Red, _startPosX + 60, _startPosY + 20, 20, 20);
             }
         }
     }
-
+}
-

Cruiser/Cruiser/DrawningCruiser.cs

@@ -3,18 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
 using Cruiser.Entities;
-using Cruiser.MovementStrategy;
-using Cruiser;
-
 
 namespace Cruiser.DrawningObjects
 {
     public class DrawningCruiser
     {
-        public EntityCruiser? EntityCar { get; protected set; }
 
+        public EntityCruiser ? EntityCruiser { get; protected set; }
         private int _pictureWidth;
 
         private int _pictureHeight;
@@ -23,182 +19,123 @@ namespace Cruiser.DrawningObjects
 
         protected int _startPosY;
 
-        private readonly int _carWidth = 110;
+        private readonly int _cruiserWidth = 150;
 
-        private readonly int _carHeight = 60;
+        private readonly int _cruiserHeight = 50;
-
-        /// <summary>
-        /// Координата X объекта
-        /// </summary>
         public int GetPosX => _startPosX;
-        /// <summary>
-        /// Координата Y объекта
-        /// </summary>
         public int GetPosY => _startPosY;
-        /// <summary>
+        public int GetWidth => _cruiserWidth;
-        /// Ширина объекта
+        public int GetHeight => _cruiserHeight;
-        /// </summary>
+        
-        public int GetWidth => _carWidth;
-        /// <summary>
-        /// Высота объекта
-        /// </summary>
-        public int GetHeight => _carHeight;
-
-        /// <summary>
-        /// Получение объекта IMoveableObject из объекта DrawningCar
-        /// </summary>
-        public IMoveableObject GetMoveableObject => new DrawningObjectCruiser(this);
-
         public DrawningCruiser(int speed, double weight, Color bodyColor, int width, int height)
         {
-            if (width < _carWidth || height < _carHeight)
+            if (width < _cruiserWidth || height < _cruiserHeight)
             {
                 return;
             }
             _pictureWidth = width;
             _pictureHeight = height;
-
+            EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
-            EntityCar = new EntityCruiser(speed, weight, bodyColor);
-
-
-
         }
-
         protected DrawningCruiser(int speed, double weight, Color bodyColor, int
-width, int height, int carWidth, int carHeight)
+width, int height, int cruiserWidth, int cruiserHeight)
         {
-            if (width <= _carWidth || height <= _carHeight)
+            if (width <= _cruiserWidth || height <= _cruiserHeight)
             {
                 return;
             }
             _pictureWidth = width;
             _pictureHeight = height;
-            _carWidth = carWidth;
+            _cruiserWidth = cruiserWidth;
-            _carHeight = carHeight;
+            _cruiserHeight = cruiserHeight;
-            EntityCar = new EntityCruiser(speed, weight, bodyColor);
+            EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
         }
-
         public void SetPosition(int x, int y)
         {
-            if (x < 0 || x >= _pictureWidth || y < 0 || y >= _pictureHeight)
+            if (x < 0 || x + _cruiserWidth > _pictureWidth)
             {
-                _startPosX = 0;
+                x = Math.Max(0, _pictureWidth - _cruiserWidth);
-                _startPosY = 0;
+            }
+            if (y < 0 || y + _cruiserHeight > _pictureHeight)
+            {
+                y = Math.Max(0, _pictureHeight - _cruiserHeight);
             }
             _startPosX = x;
             _startPosY = y;
         }
-
+        public void MoveTransport(Direction direction)
-        public void MoveTransport(DirectionType direction)
         {
-            if (!CanMove(direction) || EntityCar == null)
+            if (!CanMove(direction) || EntityCruiser == null)
             {
                 return;
             }
             switch (direction)
             {
-                //влево
+                case Direction.Left:
-                case DirectionType.Left:
+                    _startPosX -= (int)EntityCruiser.Step;
-                    _startPosX -= (int)EntityCar.Step;
                     break;
-                //вверх
+                case Direction.Up:
-                case DirectionType.Up:
+                    _startPosY -= (int)EntityCruiser.Step;
-                    _startPosY -= (int)EntityCar.Step;
                     break;
-                // вправо
+                case Direction.Right:
-                case DirectionType.Right:
+                    _startPosX += (int)EntityCruiser.Step;
-                    _startPosX += (int)EntityCar.Step;
                     break;
-                //вниз
+                case Direction.Down:
-                case DirectionType.Down:
+                    _startPosY += (int)EntityCruiser.Step;
-                    _startPosY += (int)EntityCar.Step;
                     break;
             }
         }
-
+        public bool CanMove(Direction direction)
-        public bool CanMove(DirectionType direction)
         {
-            if (EntityCar == null)
+            if (EntityCruiser == null)
             {
                 return false;
             }
             return direction switch
             {
-                //влево
+                Direction.Left => _startPosX - EntityCruiser.Step > 0,
-                DirectionType.Left => _startPosX - EntityCar.Step > 0,
+                Direction.Up => _startPosY - EntityCruiser.Step > 0,
-                //вверх
+                Direction.Right => _startPosX + EntityCruiser.Step + _cruiserWidth < _pictureWidth,
-                DirectionType.Up => _startPosY - EntityCar.Step > 0,
+                Direction.Down => _startPosY + EntityCruiser.Step + _cruiserHeight < _pictureHeight,
-                // вправо
-                DirectionType.Right => _startPosX + EntityCar.Step + _carWidth < _pictureWidth,
-                //вниз
-                DirectionType.Down => _startPosY + EntityCar.Step + _carHeight < _pictureHeight,
                 _ => false,
             };
         }
-
-
         public virtual void DrawTransport(Graphics g)
         {
-            if (EntityCar == null)
+            if (EntityCruiser == null)
             {
                 return;
             }
-
             Pen pen = new Pen(Color.Black);
-            Brush brush = new SolidBrush(EntityCar.BodyColor);
+            Brush brush = new SolidBrush(EntityCruiser.BodyColor);
-
-            //границы автомобиля
-            
-            //SolidBrush(Cruiser.AdditionalColor);
-
-
-            //границы автомобиля
-
-
             g.DrawEllipse(pen, _startPosX + 15, _startPosY + 5, 20, 20);
             g.DrawEllipse(pen, _startPosX + 15, _startPosY + 35, 20, 20);
             g.DrawRectangle(pen, _startPosX + 9, _startPosY + 15, 10, 30);
             g.DrawRectangle(pen, _startPosX + 90, _startPosY + 15, 10,
            30);
             g.DrawRectangle(pen, _startPosX + 20, _startPosY + 4, 70, 52);
-
+            Brush br = new SolidBrush(EntityCruiser.BodyColor);
-            //если есть доп.фонари
-            /* if (Cruiser.Headlights)
-             {
-
-                 Brush brYellow = new SolidBrush(Color.Yellow);
-                 g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
-                 20);
-                 g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
-                 20);
-             }*/
-            //основание лодки!!!
-            Brush br = new SolidBrush(EntityCar.BodyColor);
             g.FillRectangle(br, _startPosX + 10, _startPosY + 15, 10, 30);
             g.FillRectangle(br, _startPosX + 90, _startPosY + 15, 10, 30);
             g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 70, 50);
-            Point[] points = new Point[3];// нос лодки
+            Point[] points = new Point[3];
             points[0] = new Point(_startPosX + 100, _startPosY + 5);
             points[1] = new Point(_startPosX + 100, _startPosY + 55);
             points[2] = new Point(_startPosX + 100 + 50, _startPosY + 50 / 2);
             g.FillPolygon(Brushes.Pink, points);
-            //границы носа лодки
+
-            Point[] points1 = new Point[3];// нос лодки
+            Point[] points1 = new Point[3];
             points1[0] = new Point(_startPosX + 100, _startPosY + 5);
             points1[1] = new Point(_startPosX + 100, _startPosY + 55);
             points1[2] = new Point(_startPosX + 100 + 50, _startPosY + 50 / 2);
             g.DrawPolygon(pen, points1);
             g.FillRectangle(Brushes.Black, _startPosX + 5, _startPosY + 15, 10, 10);
             g.FillRectangle(Brushes.Black, _startPosX + 5, _startPosY + 35, 10, 10);
-
-            //если есть ракетные шахты, добавить условие
             g.DrawRectangle(Pens.Black, _startPosX + 35,
                _startPosY + 23, 15, 15);
             g.DrawRectangle(Pens.Black, _startPosX + 50,
             _startPosY + 19, 30, 25);
 
-
         }
-
     }
 }

Cruiser/Cruiser/DrawningObjectCruiser.cs

@@ -3,37 +3,34 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
-using Cruiser;
 using Cruiser.DrawningObjects;
 
-
 namespace Cruiser.MovementStrategy
 {
     internal class DrawningObjectCruiser : IMoveableObject
     {
-        private readonly DrawningCruiser? _drawningCar = null;
+        private readonly DrawningCruiser? _drawningCruiser = null;
         public DrawningObjectCruiser(DrawningCruiser drawningCruiser)
         {
-            _drawningCar = drawningCruiser;
+            _drawningCruiser = drawningCruiser;
         }
         public ObjectParameters? GetObjectPosition
         {
             get
             {
-                if (_drawningCar == null || _drawningCar.EntityCar ==
+                if (_drawningCruiser == null || _drawningCruiser.EntityCruiser ==
                 null)
                 {
                     return null;
                 }
-                return new ObjectParameters(_drawningCar.GetPosX,
+                return new ObjectParameters(_drawningCruiser.GetPosX,
-                _drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight);
+                _drawningCruiser.GetPosY, _drawningCruiser.GetWidth, _drawningCruiser.GetHeight);
             }
         }
-        public int GetStep => (int)(_drawningCar?.EntityCar?.Step ?? 0);
+        public int GetStep => (int)(_drawningCruiser?.EntityCruiser?.Step ?? 0);
-        public bool CheckCanMove(DirectionType direction) =>
+        public bool CheckCanMove(Direction direction) =>
-        _drawningCar?.CanMove(direction) ?? false;
+        _drawningCruiser?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) =>
+        public void MoveObject(Direction direction) =>
-        _drawningCar?.MoveTransport(direction);
+        _drawningCruiser?.MoveTransport(direction);
     }
 }

Cruiser/Cruiser/EntityAdvancedCruiser.cs

@@ -1,42 +1,25 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
-using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using static System.Net.Mime.MediaTypeNames;
-
 namespace Cruiser.Entities
 {
     public class EntityAdvancedCruiser : EntityCruiser
     {
-
-        /// <summary>
-        /// Дополнительный цвет (для опциональных элементов)
-        /// </summary>
         public Color AdditionalColor { get; private set; }
-
+         public bool Headlights { get; private set; }
-        /// <summary>
+         public bool HelicopterPad { get; private set; }
-        /// Признак (опция) наличия кузова
+         public bool Coating { get; private set; }
-        /// </summary>
+    
-        public bool BodyKit { get; private set; }
+    public EntityAdvancedCruiser(int speed, double weight, Color bodyColor, Color
-
+   additionalColor, bool headlights, bool helicopterPad, bool coating) : base(speed, weight, bodyColor)
-        /// <summary>
+    {
-        /// Признак (опция) наличия tent
+        AdditionalColor = additionalColor;
-        /// </summary>
+        Headlights = headlights;
-        public bool Tent { get; private set; }
+        HelicopterPad = helicopterPad;
-
+        Coating = coating;
-
-        public EntityAdvancedCruiser(int speed, double weight, Color bodyColor, Color
-    additionalColor, bool bodyKit, bool tent) : base(speed, weight, bodyColor)
-        {
-
-            AdditionalColor = additionalColor;
-            BodyKit = bodyKit;
-            Tent = tent;
         }
     }
-
+}
-}
-

Cruiser/Cruiser/EntityCruiser.cs

@@ -8,28 +8,10 @@ namespace Cruiser.Entities
 {
     public class EntityCruiser
     {
-        /// <summary>
-        /// Скорость
-        /// </summary>
         public int Speed { get; private set; }
-        /// <summary>
-        /// Вес
-        /// </summary>
         public double Weight { get; private set; }
-        /// <summary>
-        /// Основной цвет
-        /// </summary>
         public Color BodyColor { get; private set; }
-        /// <summary>
-        /// Шаг перемещения автомобиля
-        /// </summary>
         public double Step => (double)Speed * 100 / Weight;
-        /// <summary>
-        /// Конструктор с параметрами
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Основной цвет</param>
         public EntityCruiser(int speed, double weight, Color bodyColor)
         {
             Speed = speed;

Cruiser/Cruiser/Form1.cs

@@ -1,161 +0,0 @@
-using System.Windows.Forms;
-using DumpTruck.DrawningObjects;
-using DumpTruck.Entities;
-
-using DumpTruck.MovementStrategy;
-
-namespace Cruiser
-{
-
-    public partial class Form1 : Form
-    {
-        private DrawningCar? _drawningCar;
-
-        private AbstractStrategy? _abstractStrategy;
-        private AbstractStrategy? _strategy;
-
-        public DrawningCar? SelectedCar { get; private set; }
-
-        public Form1()
-        {
-            InitializeComponent();
-            _strategy = null;
-            SelectedCar = null;
-        }
-        private void Draw()
-        {
-            if (_drawningCar == null)
-            {
-                return;
-            }
-            Bitmap bmp = new Bitmap(pictureBox1.Width, pictureBox1.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningCar.DrawTransport(gr);
-            pictureBox1.Image = bmp;
-        }
-        private void buttonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawningCar == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _drawningCar.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    _drawningCar.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    _drawningCar.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    _drawningCar.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            Draw();
-        }
-
-        private void button2_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-
-            Color dopColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialog.Color;
-            }
-
-            _drawningCar = new DrawningDumpTruck(random.Next(100, 300),
-            random.Next(1000, 3000),
-            color,
-            dopColor,
-            Convert.ToBoolean(random.Next(0, 2)),
-            Convert.ToBoolean(random.Next(0, 2)),
-            pictureBox1.Width, pictureBox1.Height);
-            _drawningCar.SetPosition(random.Next(10, 100), random.Next(10,
-            100));
-            Draw();
-        }
-
-
-    
-
-
-    private void ButtonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawningCar == null)
-            {
-                return;
-            }
-            if (comboBox1.Enabled)
-            {
-                _abstractStrategy = comboBox1.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(new DrawningObjectCruiser(_drawningCar), pictureBox1.Width,
-                pictureBox1.Height);
-                comboBox1.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBox1.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }
-
-        private void buttonCreate_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-
-            Color dopColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _drawningCar = new DrawningCar(random.Next(100, 300),
-            random.Next(1000, 3000),
-            color,
-            pictureBox1.Width, pictureBox1.Height);
-            _drawningCar.SetPosition(random.Next(10, 100), random.Next(10,
-            100));
-            Draw();
-        }
-
-        public void SelectedCruiser_Click(object sender, EventArgs e)
-        {
-            SelectedCar = _drawningCar;
-            DialogResult = DialogResult.OK;
-        }
-    }
-}
-
-
-
-
-
-

Cruiser/Cruiser/FormCruiserCollection.Designer.cs

@@ -1,114 +0,0 @@
-namespace Cruiser
-{
-    partial class FormCruiserCollection
-    {
-        /// <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.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.ButtonRemoveCar = new System.Windows.Forms.Button();
-            this.ButtonAddCruiser = new System.Windows.Forms.Button();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.panel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(800, 450);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.ButtonRemoveCar);
-            this.panel1.Controls.Add(this.ButtonAddCruiser);
-            this.panel1.Controls.Add(this.textBox1);
-            this.panel1.Location = new System.Drawing.Point(589, 12);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(211, 438);
-            this.panel1.TabIndex = 1;
-            // 
-            // ButtonRemoveCar
-            // 
-            this.ButtonRemoveCar.Location = new System.Drawing.Point(31, 168);
-            this.ButtonRemoveCar.Name = "ButtonRemoveCar";
-            this.ButtonRemoveCar.Size = new System.Drawing.Size(150, 34);
-            this.ButtonRemoveCar.TabIndex = 2;
-            this.ButtonRemoveCar.Text = "Удалить";
-            this.ButtonRemoveCar.UseVisualStyleBackColor = true;
-            this.ButtonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveCar_Click);
-            // 
-            // ButtonAddCruiser
-            // 
-            this.ButtonAddCruiser.Location = new System.Drawing.Point(31, 37);
-            this.ButtonAddCruiser.Name = "ButtonAddCruiser";
-            this.ButtonAddCruiser.Size = new System.Drawing.Size(150, 34);
-            this.ButtonAddCruiser.TabIndex = 3;
-            this.ButtonAddCruiser.Text = "Добавить";
-            this.ButtonAddCruiser.UseVisualStyleBackColor = true;
-            this.ButtonAddCruiser.Click += new System.EventHandler(this.ButtonAddCruiser_Click);
-            // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(31, 104);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(150, 31);
-            this.textBox1.TabIndex = 2;
-            this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
-            // 
-            // FormCruiserCollection
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.pictureBox1);
-            this.Name = "FormCruiserCollection";
-            this.Text = "FormCruiserCollection";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBox1;
-        private Panel panel1;
-        private Button ButtonRemoveCar;
-        private Button ButtonAddCruiser;
-        private TextBox textBox1;
-    }
-}

Cruiser/Cruiser/FormCruiserCollection.cs

@@ -1,99 +0,0 @@
-
-using DumpTruck.Generics;
-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;
-using Cruiser;
-using DumpTruck.DrawningObjects;
-using DumpTruck.Generics;
-using DumpTruck.MovementStrategy;
-
-
-namespace Cruiser
-{
-    public partial class FormCruiserCollection : Form
-    {
-        private readonly CruiserGenericCollection<DrawningCar, DrawningObjectCruiser> _cars;
-
-        public FormCruiserCollection()
-        {
-            InitializeComponent();
-            _cars = new CruiserGenericCollection<DrawningCar, DrawningObjectCruiser>(pictureBox1.Width, pictureBox1.Height);
-        }
-
-        private void pictureBox1_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void ButtonAddCruiser_Click(object sender, EventArgs e)
-        {
-            Form1 form = new();
-
-
-
-
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (_cars + form.SelectedCar != null)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox1.Image = _cars.ShowCars();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-
-
-        private void ButtonRemoveCar_Click(object sender, EventArgs e)
-        {
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-        MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos;
-            if (textBox1.Text == null || !int.TryParse(textBox1.Text, out pos))
-            {
-                MessageBox.Show("Введите номер парковочного места");
-                return;
-            }
-
-            if (_cars - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox1.Image = _cars.ShowCars();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-
-        }
-
-        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
-        {
-            pictureBox1.Image = _cars.ShowCars();
-        }
-
-        private void maskedTextBoxNumber_MaskInputRejected(object sender, MaskInputRejectedEventArgs e)
-        {
-
-        }
-
-        private void textBox1_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
-

Cruiser/Cruiser/FormCruiserCollection.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>

Cruiser/Cruiser/IMoveableObject.cs

@@ -1,39 +1,15 @@
-using DumpTruck;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cruiser.MovementStrategy;
-
-using Cruiser;
-
 namespace Cruiser.MovementStrategy
 {
-    /// <summary>
-    /// Интерфейс для работы с перемещаемым объектом
-    /// </summary>
     public interface IMoveableObject
     {
-        /// <summary>
-        /// Получение координаты X объекта
-        /// </summary>
         ObjectParameters? GetObjectPosition { get; }
-        /// <summary>
-        /// Шаг объекта
-        /// </summary>
         int GetStep { get; }
-        /// <summary>
+        bool CheckCanMove(Direction direction);
-        /// Проверка, можно ли переместиться по нужному направлению
+        void MoveObject(Direction direction);
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        bool CheckCanMove(DirectionType direction);
-        /// <summary>
-        /// Изменение направления пермещения объекта
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        void MoveObject(DirectionType direction);
-
     }
 }

Cruiser/Cruiser/MoveToBorder.cs

@@ -1,9 +1,9 @@
-using DumpTruck.MovementStrategy;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Cruiser.MovementStrategy;
 
 namespace Cruiser.MovementStrategy
 {
@@ -29,22 +29,32 @@ namespace Cruiser.MovementStrategy
             {
                 return;
             }
-            var diffX = FieldWidth - objParams.ObjectMiddleHorizontal;
+            var diffX = objParams.RightBorder - FieldWidth;
             if (Math.Abs(diffX) > GetStep())
             {
-
+                if (diffX > 0)
-                MoveRight();
+                {
-
+                    MoveLeft();
+                }
+                else
+                {
+                    MoveRight();
+                }
             }
-            var diffY = FieldHeight - objParams.ObjectMiddleVertical;
+            var diffY = objParams.DownBorder - FieldHeight;
             if (Math.Abs(diffY) > GetStep())
             {
-
+                if (diffY > 0)
-                MoveDown();
+                {
-
+                    MoveUp();
+                }
+                else
+                {
+                    MoveDown();
+                }
             }
+
+
         }
-
-
     }
 }

Cruiser/Cruiser/MoveToCenter.cs

@@ -1,5 +1,4 @@
-using DumpTruck.MovementStrategy;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Cruiser/Cruiser/ObjectParameters.cs

@@ -6,46 +6,18 @@ using System.Threading.Tasks;
 
 namespace Cruiser.MovementStrategy
 {
-    /// <summary>
-    /// Параметры-координаты объекта
-    /// </summary>
     public class ObjectParameters
     {
         private readonly int _x;
         private readonly int _y;
         private readonly int _width;
         private readonly int _height;
-        /// <summary>
-        /// Левая граница
-        /// </summary>
         public int LeftBorder => _x;
-        /// <summary>
-        /// Верхняя граница
-        /// </summary>
         public int TopBorder => _y;
-        /// <summary>
-        /// Правая граница
-        /// </summary>
         public int RightBorder => _x + _width;
-        /// <summary>
-        /// Нижняя граница
-        /// </summary>
         public int DownBorder => _y + _height;
-        /// <summary>
-        /// Середина объекта
-        /// </summary>
         public int ObjectMiddleHorizontal => _x + _width / 2;
-        /// <summary>
-        /// Середина объекта
-        /// </summary>
         public int ObjectMiddleVertical => _y + _height / 2;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина</param>
-        /// <param name="height">Высота</param>
         public ObjectParameters(int x, int y, int width, int height)
         {
             _x = x;

Cruiser/Cruiser/Program.cs

@@ -2,16 +2,13 @@ namespace Cruiser
 {
     internal static class Program
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
         [STAThread]
         static void Main()
         {
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormCruiserCollection());
+            Application.Run(new CruiserForm());
         }
     }
 }

Cruiser/Cruiser/SetGeneric.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Cruiser.Generics
-{
-    internal class SetGeneric<T>
-        where T : class
-    {
-        /// <summary>
-        /// Массив объектов, которые храним
-        /// </summary>
-        private readonly T?[] _places;
-        /// <summary>
-        /// Количество объектов в массиве
-        /// </summary>
-        public int Count => _places.Length;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="count"></param>
-        /// 
-        public int startPointer = 0;
-        public SetGeneric(int count)
-        {
-            _places = new T?[count];
-        }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="car">Добавляемый автомобиль</param>
-        /// <returns></returns>
-        public int Insert(T cruiser)
-        {
-            if (_places[Count - 1] != null)
-                return -1;
-            return Insert(cruiser, 0);
-        }
-        /// <summary>
-        /// Добавление объекта в набор на конкретную позицию
-        /// </summary>
-        /// <param name="car">Добавляемый автомобиль</param>
-        /// <param name="position">Позиция</param>
-        /// <returns></returns>
-        public int Insert(T cruiser, int position)
-        {
-            if (!(position >= 0 && position < Count))
-                return -1;
-            if (_places[position] != null)
-            {
-                int indexEnd = position + 1;
-                while (_places[indexEnd] != null)
-                {
-                    indexEnd++;
-                }
-                for (int i = indexEnd + 1; i > position; i--)
-                {
-                    _places[i] = _places[i - 1];
-                }
-
-            }
-            _places[position] = cruiser;
-            return position;
-        }
-        // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
-        // проверка, что после вставляемого элемента в массиве есть пустой элемент
-        // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
-        // TODO вставка по позиции
-
-
-
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public bool Remove(int position)
-        {
-            if (position < Count && position >= 0)
-            {
-                _places[position] = null;
-                return true;
-            }
-            return false;
-
-
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T? Get(int position)
-        {
-            if (position < Count && position >= 0) { return _places[position]; }
-            return null;
-
-        }
-    }
-}

Cruiser/Cruiser/Status.cs

@@ -12,4 +12,4 @@ namespace Cruiser.MovementStrategy
         InProgress,
         Finish
     }
-}
+}