Merge pull request 'PIbd-22 Chubykina P.P. LabWork_01' (#1) from LabWork_01 into main

Reviewed-on: http://student.git.athene.tech/chubykina_polina/PIbd-22_Chubykina_P.P._Sailboat_Base/pulls/1

Sailboat/Sailboat/AbstractStrategy.cs

@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Sailboat.DrawingObjects;
-namespace Sailboat.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)
-        {
-            if (moveableObject == null)
-            {
-                _state = Status.NotInit;
-                return;
-            }
-            _state = Status.InProgress;
-            _moveableObject = moveableObject;
-            FieldWidth = width;
-            FieldHeight = height;
-        }
-        /// <summary>
-        /// Шаг перемещения
-        /// </summary>
-        public void MakeStep()
-        {
-            if (_state != Status.InProgress)
-            {
-                return;
-            }
-            if (IsTargetDestinaion())
-            {
-                _state = Status.Finish;
-                return;
-            }
-            MoveToTarget();
-        }
-        /// <summary>
-        /// Перемещение влево
-        /// </summary>
-        /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
-        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)
-            {
-                return null;
-            }
-            return _moveableObject?.GetStep;
-        }
-        /// <summary>
-        /// Перемещение к цели
-        /// </summary>
-        protected abstract void MoveToTarget();
-        /// <summary>
-        /// Достигнута ли цель
-        /// </summary>
-        /// <returns></returns>
-        protected abstract bool IsTargetDestinaion();
-        /// <summary>
-        /// Попытка перемещения в требуемом направлении
-        /// </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)
-            {
-                _moveableObject.MoveObject(directionType);
-                return true;
-            }
-            return false;
-        }
-    }
-}

Sailboat/Sailboat/BoatsGenericCollection.cs

@@ -1,148 +0,0 @@
-using Sailboat.DrawingObjects;
-using Sailboat.MovementStrategy;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Sailboat.DrawingObjects;
-using Sailboat.MovementStrategy;
-
-namespace Sailboat.Generics
-{
-    /// <summary>
-    /// Параметризованный класс для набора объектов DrawingBoat
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="U"></typeparam>
-    internal class BoatsGenericCollection<T, U>
-        where T : DrawingBoat
-        where U : IMoveableObject
-    {
-        /// <summary>
-        /// Ширина окна прорисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна прорисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 160;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 160;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetGeneric<T> _collection;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        public BoatsGenericCollection(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 +(BoatsGenericCollection<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 -(BoatsGenericCollection<T, U> collect, int
-        pos)
-        {
-            T? obj = collect._collection.Get(pos);
-            if (obj != null)
-            {
-                collect._collection.Remove(pos);
-            }
-            return false;
-        }
-        /// <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 ShowBoats()
-        {
-            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)
-        {
-            for (int i = 0; i < _collection.Count; i++)
-            {
-                DrawingBoat boat = _collection.Get(i);
-
-                if (boat != null)
-                {
-                    int width = _pictureWidth / _placeSizeWidth;
-                    boat.SetPosition(i % width * _placeSizeWidth, i / width * _placeSizeHeight);
-                    boat.DrawTransport(g);
-                }
-            }
-        }
-
-    }
-}

Sailboat/Sailboat/DrawingBoat.cs

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Sailboat.Entities;
-using Sailboat.MovementStrategy;
-
-namespace Sailboat.DrawingObjects
-{
-    public class DrawingBoat
-    {
-        public EntityBoat? EntityBoat { get; protected set; }
-        private int _pictureWidth;
-        private int _pictureHeight;
-        protected int _startPosX;
-        protected int _startPosY;
-        private readonly int _boatWidth = 160;
-        private readonly int _boatHeight = 160;
-        public int GetPosX => _startPosX;
-        public int GetPosY => _startPosY;
-        public int GetWidth => _boatWidth;
-        public int GetHeight => _boatHeight;
-        public IMoveableObject GetMoveableObject => new DrawingObjectBoat(this);
-        public DrawingBoat(int speed, double weight, Color bodyColor, int width, int height)
-        {
-            if (width < _boatWidth || height < _boatHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            EntityBoat = new EntityBoat(speed, weight, bodyColor);
-        }
-
-        protected DrawingBoat(int speed, double weight, Color bodyColor, int width, int height, int boatWidth, int boatHeight)
-        {
-            if (width < _boatWidth || height < _boatHeight)
-            {
-                return;
-            }
-            _pictureWidth = width;
-            _pictureHeight = height;
-            _boatWidth = boatWidth;
-            _boatHeight = boatHeight;
-            EntityBoat = new EntityBoat(speed, weight, bodyColor);
-        }
-        public void SetPosition(int x, int y)
-        {
-            if (x < 0 || x + _boatWidth > _pictureWidth)
-            {
-                x = 0;
-            }
-            if (y < 0 || y + _boatHeight > _pictureHeight)
-            {
-                y = 0;
-            }
-            _startPosX = x;
-            _startPosY = y;
-        }
-        public bool CanMove(DirectionType direction)
-        {
-            if (EntityBoat == null)
-            {
-                return false;
-            }
-            return direction switch
-            {
-                //влево
-                DirectionType.Left => _startPosX - EntityBoat.Step > 0,
-                //вверх
-                DirectionType.Up => _startPosY - EntityBoat.Step > 0,
-                // вправо
-                DirectionType.Right => _startPosX + EntityBoat.Step < _pictureWidth,
-                //вниз
-                DirectionType.Down => _startPosY + EntityBoat.Step < _pictureHeight,
-                _ => false
-            };
-        }
-        public void MoveTransport(DirectionType direction)
-        {
-            if (!CanMove(direction) || EntityBoat == null)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                case DirectionType.Left:
-                    if (_startPosX - EntityBoat.Step > 0)
-                    {
-                        _startPosX -= (int)EntityBoat.Step;
-                    }
-                    break;
-                case DirectionType.Up:
-                    if (_startPosY - EntityBoat.Step > 0)
-                    {
-                        _startPosY -= (int)EntityBoat.Step;
-                    }
-                    break;
-                case DirectionType.Right:
-                    if (_startPosX + EntityBoat.Step + _boatWidth < _pictureWidth)
-                    {
-                        _startPosX += (int)EntityBoat.Step;
-                    }
-                    break;
-                case DirectionType.Down:
-                    if (_startPosY + EntityBoat.Step + _boatHeight < _pictureHeight)
-                    {
-                        _startPosY += (int)EntityBoat.Step;
-                    }
-                    break;
-            }
-        }
-        public virtual void DrawTransport(Graphics g)
-        {
-            if (EntityBoat == null)
-            {
-                return;
-            }
-            Pen pen = new(Color.Black);
-            Brush additionalBrush = new
-            SolidBrush(EntityBoat.BodyColor);
-
-            //основной корпус парусника 
-            Brush Brush = new
-            SolidBrush(EntityBoat.BodyColor);
-
-            Point[] hull = new Point[]
-            {
-                new Point(_startPosX + 10, _startPosY + 90),
-                new Point(_startPosX + 110, _startPosY + 90),
-                new Point(_startPosX + 140, _startPosY + 120),
-                new Point(_startPosX + 110, _startPosY + 150),
-                new Point(_startPosX + 10, _startPosY + 150)
-            };
-            g.FillPolygon(Brush, hull);
-            g.DrawPolygon(pen, hull);
-
-            Brush addBrush = new
-            SolidBrush(Color.Green);
-
-            g.FillEllipse(addBrush, _startPosX + 20, _startPosY + 100, 90, 40);
-            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 100, 90, 40);
-
-            }
-        }
-    }
-

Sailboat/Sailboat/DrawingObjectBoat.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Sailboat.DrawingObjects;
-
-namespace Sailboat.MovementStrategy
-{
-    public class DrawingObjectBoat : IMoveableObject
-    {
-        private readonly DrawingBoat? _drawingBoat = null;
-        public DrawingObjectBoat(DrawingBoat drawingBoat)
-        {
-            _drawingBoat = drawingBoat;
-        }
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawingBoat == null || _drawingBoat.EntityBoat ==
-                null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawingBoat.GetPosX, _drawingBoat.GetPosY, _drawingBoat.GetWidth, _drawingBoat.GetHeight);
-            }
-        }
-        public int GetStep => (int)(_drawingBoat?.EntityBoat?.Step ?? 0);
-        public bool CheckCanMove(DirectionType direction) =>
-        _drawingBoat?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) =>
-        _drawingBoat?.MoveTransport(direction);
-
-    }
-}

Sailboat/Sailboat/DrawingSailboat.cs

@@ -1,37 +1,91 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using Sailboat.Entities;
-
-namespace Sailboat.DrawingObjects
+namespace Sailboat
 {
-    public class DrawingSailboat : DrawingBoat
+    public class DrawingSailboat
     {
-        public DrawingSailboat(int speed, double weight, Color bodyColor, Color additionalColor, bool hull, bool sail, int width, int height) :
- base(speed, weight, bodyColor, width, height, 160, 160)
+        public EntitySailboat? EntitySailboat { get; private set; }
+        private int _pictureWidth;
+        private int _pictureHeight;
+        private int _startPosX;
+        private int _startPosY;
+        private readonly int _boatWidth = 160;
+        private readonly int _boatHeight = 160;
+        public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool hull, bool sail, int width, int height)
         {
-            if (EntityBoat != null)
+            if (width < _boatWidth || height < _boatHeight)
             {
-                EntityBoat = new EntitySailboat(speed, weight, bodyColor,
-                additionalColor, hull, sail);
+                return false;
             }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            EntitySailboat = new EntitySailboat();
+            EntitySailboat.Init(speed, weight, bodyColor, additionalColor, hull, sail);
+            return true;
         }
-        public override void DrawTransport(Graphics g)
+        public void SetPosition(int x, int y)
         {
-            if (EntityBoat is not EntitySailboat sailboat)
+            if (x < 0 || x + _boatWidth > _pictureWidth)
+            {
+                x = 0;
+            }
+            if (y < 0 || y + _boatHeight > _pictureHeight)
+            {
+                y = 0;
+            }
+            _startPosX = x;
+            _startPosY = y;
+        }
+        public void MoveTransport(DirectionType direction)
+        {
+            if (EntitySailboat == null)
             {
                 return;
             }
-            Pen pen = new(Color.Black);
+            switch (direction)
+            {
+                case DirectionType.Left:
+                    if (_startPosX - EntitySailboat.Step > 0)
+                    {
+                        _startPosX -= (int)EntitySailboat.Step;
+                    }
+                    break;
+                case DirectionType.Up:
+                    if (_startPosY - EntitySailboat.Step > 0)
+                    {
+                        _startPosY -= (int)EntitySailboat.Step;
+                    }
+                    break;
+                case DirectionType.Right:
+                    if (_startPosX + EntitySailboat.Step + _boatWidth < _pictureWidth)
+                    {
+                        _startPosX += (int)EntitySailboat.Step;
+                    }
+                    break;
+                case DirectionType.Down:
+                    if (_startPosY + EntitySailboat.Step + _boatHeight < _pictureHeight)
+                    {
+                        _startPosY += (int)EntitySailboat.Step;
+                    }
+                    break;
+            }
+        }
+        public void DrawTransport(Graphics g)
+        {
+            if (EntitySailboat == null)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black, 4);
             Brush additionalBrush = new
-            SolidBrush(sailboat.AdditionalColor);
-
+            SolidBrush(EntitySailboat.AdditionalColor);
+         
             //усиленный корпус парусника
-            if (sailboat.Hull)
+            if (EntitySailboat.Hull)
             {
                 Point[] hullCooler = new Point[]
                 {
@@ -44,14 +98,34 @@ namespace Sailboat.DrawingObjects
                 g.FillPolygon(additionalBrush, hullCooler);
                 g.DrawPolygon(pen, hullCooler);
             }
+            
 
-            base.DrawTransport(g);
+            //основной корпус парусника 
+            Brush Brush = new
+            SolidBrush(EntitySailboat.BodyColor);
+
+            Point[] hull = new Point[]
+            {
+                new Point(_startPosX + 10, _startPosY + 90),
+                new Point(_startPosX + 110, _startPosY + 90),
+                new Point(_startPosX + 140, _startPosY + 120),
+                new Point(_startPosX + 110, _startPosY + 150),
+                new Point(_startPosX + 10, _startPosY + 150)
+            };
+            g.FillPolygon(Brush, hull);
+            g.DrawPolygon(pen, hull);
+
+            Brush addBrush = new
+            SolidBrush(Color.Green);
+
+            g.FillEllipse(addBrush, _startPosX + 20, _startPosY + 100, 90, 40);
+            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 100, 90, 40);
 
             //парус
-            if (sailboat.Sail)
+            if (EntitySailboat.Sail)
             {
                 Brush sailBrush = new
-                SolidBrush(sailboat.AdditionalColor);
+                SolidBrush(EntitySailboat.AdditionalColor);
 
                 Point[] sail = new Point[]
                 {

Sailboat/Sailboat/EntityBoat.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.Entities
-{
-    public class EntityBoat
-    {
-        public int Speed { get; private set; }
-        public double Weight { get; private set; }
-        public Color BodyColor { get; private set; }
-        public double Step => (double)Speed * 100 / Weight;
-        public EntityBoat(int speed, double weight, Color bodyColor)
-        {
-            Speed = speed;
-            Weight = weight;
-            BodyColor = bodyColor;
-        }
-    }
-}

Sailboat/Sailboat/EntitySailboat.cs

@@ -4,16 +4,53 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Sailboat.Entities
+namespace Sailboat
 {
-    public class EntitySailboat : EntityBoat
+    public class EntitySailboat
     {
+        /// <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 Color AdditionalColor { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличия усиленного корпуса
+        /// </summary>
         public bool Hull { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличия паруса
+        /// </summary>
         public bool Sail { get; private set; }
-        public EntitySailboat(int speed, double weight, Color bodyColor, Color
-        additionalColor, bool hull, bool sail) : base (speed, weight, bodyColor)
+        /// <summary>
+        /// Шаг перемещения автомобиля
+        /// </summary>
+        public double Step => (double)Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса спортивного автомобиля
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="hull">Признак наличия усиленного корпуса</param>
+        /// <param name="sail">Признак наличия паруса</param>
+        public void Init(int speed, double weight, Color bodyColor, Color
+        additionalColor, bool hull, bool sail)
         {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
             AdditionalColor = additionalColor;
             Hull = hull;
             Sail = sail;

Sailboat/Sailboat/FormBoatCollection.Designer.cs

@@ -1,125 +0,0 @@
-namespace Sailboat
-{
-    partial class FormBoatCollection
-    {
-        /// <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.pictureBoxCollection = new System.Windows.Forms.PictureBox();
-            this.panelTools = new System.Windows.Forms.Panel();
-            this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox();
-            this.buttonRefreshCollection = new System.Windows.Forms.Button();
-            this.buttonRemoveBoat = new System.Windows.Forms.Button();
-            this.buttonAddBoat = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit();
-            this.panelTools.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxCollection
-            // 
-            this.pictureBoxCollection.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxCollection.Name = "pictureBoxCollection";
-            this.pictureBoxCollection.Size = new System.Drawing.Size(750, 450);
-            this.pictureBoxCollection.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxCollection.TabIndex = 0;
-            this.pictureBoxCollection.TabStop = false;
-            // 
-            // panelTools
-            // 
-            this.panelTools.BackColor = System.Drawing.SystemColors.ScrollBar;
-            this.panelTools.Controls.Add(this.maskedTextBoxNumber);
-            this.panelTools.Controls.Add(this.buttonRefreshCollection);
-            this.panelTools.Controls.Add(this.buttonRemoveBoat);
-            this.panelTools.Controls.Add(this.buttonAddBoat);
-            this.panelTools.Location = new System.Drawing.Point(756, 12);
-            this.panelTools.Name = "panelTools";
-            this.panelTools.Size = new System.Drawing.Size(209, 426);
-            this.panelTools.TabIndex = 1;
-            // 
-            // maskedTextBoxNumber
-            // 
-            this.maskedTextBoxNumber.Location = new System.Drawing.Point(40, 87);
-            this.maskedTextBoxNumber.Name = "maskedTextBoxNumber";
-            this.maskedTextBoxNumber.Size = new System.Drawing.Size(125, 27);
-            this.maskedTextBoxNumber.TabIndex = 3;
-            // 
-            // buttonRefreshCollection
-            // 
-            this.buttonRefreshCollection.Location = new System.Drawing.Point(16, 210);
-            this.buttonRefreshCollection.Name = "buttonRefreshCollection";
-            this.buttonRefreshCollection.Size = new System.Drawing.Size(180, 34);
-            this.buttonRefreshCollection.TabIndex = 2;
-            this.buttonRefreshCollection.Text = "Обновить коллекцию";
-            this.buttonRefreshCollection.UseVisualStyleBackColor = true;
-            this.buttonRefreshCollection.Click += new System.EventHandler(this.buttonRefreshCollection_Click);
-            // 
-            // buttonRemoveBoat
-            // 
-            this.buttonRemoveBoat.Location = new System.Drawing.Point(16, 159);
-            this.buttonRemoveBoat.Name = "buttonRemoveBoat";
-            this.buttonRemoveBoat.Size = new System.Drawing.Size(180, 34);
-            this.buttonRemoveBoat.TabIndex = 1;
-            this.buttonRemoveBoat.Text = "Удалить лодку";
-            this.buttonRemoveBoat.UseVisualStyleBackColor = true;
-            this.buttonRemoveBoat.Click += new System.EventHandler(this.buttonRemoveBoat_Click);
-            // 
-            // buttonAddBoat
-            // 
-            this.buttonAddBoat.Location = new System.Drawing.Point(16, 14);
-            this.buttonAddBoat.Name = "buttonAddBoat";
-            this.buttonAddBoat.Size = new System.Drawing.Size(180, 34);
-            this.buttonAddBoat.TabIndex = 0;
-            this.buttonAddBoat.Text = "Добавить лодку";
-            this.buttonAddBoat.UseVisualStyleBackColor = true;
-            this.buttonAddBoat.Click += new System.EventHandler(this.buttonAddBoat_Click);
-            // 
-            // FormBoatCollection
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(969, 450);
-            this.Controls.Add(this.panelTools);
-            this.Controls.Add(this.pictureBoxCollection);
-            this.Name = "FormBoatCollection";
-            this.Text = "FormBoatCollection";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit();
-            this.panelTools.ResumeLayout(false);
-            this.panelTools.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private PictureBox pictureBoxCollection;
-        private Panel panelTools;
-        private Button buttonRefreshCollection;
-        private Button buttonRemoveBoat;
-        private Button buttonAddBoat;
-        private MaskedTextBox maskedTextBoxNumber;
-    }
-}

Sailboat/Sailboat/FormBoatCollection.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-using Sailboat.DrawingObjects;
-using Sailboat.Generics;
-using Sailboat.MovementStrategy;
-
-
-namespace Sailboat
-{
-    public partial class FormBoatCollection : Form
-    {
-        private readonly BoatsGenericCollection<DrawingBoat, DrawingObjectBoat> _boats;
-        public FormBoatCollection()
-        {
-            InitializeComponent();
-            _boats = new BoatsGenericCollection<DrawingBoat, DrawingObjectBoat>(pictureBoxCollection.Width, pictureBoxCollection.Height);
-        }
-
-        private void buttonAddBoat_Click(object sender, EventArgs e)
-        {
-            FormSailboat form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (_boats + form.SelectedBoat != -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBoxCollection.Image = _boats.ShowBoats();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-
-        private void buttonRemoveBoat_Click(object sender, EventArgs e)
-        {
-            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
-            if (_boats - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxCollection.Image = _boats.ShowBoats();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-
-        }
-
-        private void buttonRefreshCollection_Click(object sender, EventArgs e)
-        {
-            pictureBoxCollection.Image = _boats.ShowBoats();
-        }
-    }
-}

Sailboat/Sailboat/FormBoatCollection.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>

Sailboat/Sailboat/FormSailboat.Designer.cs

@@ -30,15 +30,11 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormSailboat));
             this.pictureBoxSailboat = new System.Windows.Forms.PictureBox();
-            this.buttonCreateBoat = new System.Windows.Forms.Button();
+            this.buttonCreate = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonCreateSailboat = new System.Windows.Forms.Button();
-            this.comboBoxStrategy = new System.Windows.Forms.ComboBox();
-            this.buttonStep = new System.Windows.Forms.Button();
-            this.buttonSelectBoat = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSailboat)).BeginInit();
             this.SuspendLayout();
             // 
@@ -52,16 +48,16 @@
             this.pictureBoxSailboat.TabIndex = 0;
             this.pictureBoxSailboat.TabStop = false;
             // 
-            // buttonCreateBoat
+            // buttonCreate
             // 
-            this.buttonCreateBoat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateBoat.Location = new System.Drawing.Point(12, 385);
-            this.buttonCreateBoat.Name = "buttonCreateBoat";
-            this.buttonCreateBoat.Size = new System.Drawing.Size(127, 56);
-            this.buttonCreateBoat.TabIndex = 1;
-            this.buttonCreateBoat.Text = "Создать лодку";
-            this.buttonCreateBoat.UseVisualStyleBackColor = true;
-            this.buttonCreateBoat.Click += new System.EventHandler(this.buttonCreateBoat_Click);
+            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreate.Location = new System.Drawing.Point(12, 395);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(127, 46);
+            this.buttonCreate.TabIndex = 1;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
             // 
             // buttonLeft
             // 
@@ -111,65 +107,16 @@
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
             // 
-            // buttonCreateSailboat
-            // 
-            this.buttonCreateSailboat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreateSailboat.Location = new System.Drawing.Point(175, 385);
-            this.buttonCreateSailboat.Name = "buttonCreateSailboat";
-            this.buttonCreateSailboat.Size = new System.Drawing.Size(127, 56);
-            this.buttonCreateSailboat.TabIndex = 6;
-            this.buttonCreateSailboat.Text = "Создать парусник";
-            this.buttonCreateSailboat.UseVisualStyleBackColor = true;
-            this.buttonCreateSailboat.Click += new System.EventHandler(this.buttonCreateSailboat_Click);
-            // 
-            // comboBoxStrategy
-            // 
-            this.comboBoxStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxStrategy.FormattingEnabled = true;
-            this.comboBoxStrategy.Items.AddRange(new object[] {
-            "До центра",
-            "До края"});
-            this.comboBoxStrategy.Location = new System.Drawing.Point(688, 12);
-            this.comboBoxStrategy.Name = "comboBoxStrategy";
-            this.comboBoxStrategy.Size = new System.Drawing.Size(151, 28);
-            this.comboBoxStrategy.TabIndex = 7;
-            // 
-            // buttonStep
-            // 
-            this.buttonStep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonStep.Location = new System.Drawing.Point(688, 46);
-            this.buttonStep.Name = "buttonStep";
-            this.buttonStep.Size = new System.Drawing.Size(149, 32);
-            this.buttonStep.TabIndex = 8;
-            this.buttonStep.Text = "Шаг";
-            this.buttonStep.UseVisualStyleBackColor = true;
-            this.buttonStep.Click += new System.EventHandler(this.buttonStep_Click);
-            // 
-            // buttonSelectBoat
-            // 
-            this.buttonSelectBoat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonSelectBoat.Location = new System.Drawing.Point(688, 97);
-            this.buttonSelectBoat.Name = "buttonSelectBoat";
-            this.buttonSelectBoat.Size = new System.Drawing.Size(149, 33);
-            this.buttonSelectBoat.TabIndex = 9;
-            this.buttonSelectBoat.Text = "Выбрать лодку";
-            this.buttonSelectBoat.UseVisualStyleBackColor = true;
-            this.buttonSelectBoat.Click += new System.EventHandler(this.buttonSelectBoat_Click);
-            // 
             // FormSailboat
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(882, 453);
-            this.Controls.Add(this.buttonSelectBoat);
-            this.Controls.Add(this.buttonStep);
-            this.Controls.Add(this.comboBoxStrategy);
-            this.Controls.Add(this.buttonCreateSailboat);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonCreateBoat);
+            this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.pictureBoxSailboat);
             this.Name = "FormSailboat";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -183,14 +130,10 @@
         #endregion
 
         private PictureBox pictureBoxSailboat;
-        private Button buttonCreateBoat;
+        private Button buttonCreate;
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonRight;
         private Button buttonDown;
-        private Button buttonCreateSailboat;
-        private ComboBox comboBoxStrategy;
-        private Button buttonStep;
-        private Button buttonSelectBoat;
     }
 }

Sailboat/Sailboat/FormSailboat.cs

@@ -1,72 +1,37 @@
-using Sailboat.Entities;
-using Sailboat.DrawingObjects;
-using Sailboat.MovementStrategy;
-
 namespace Sailboat
 {
     public partial class FormSailboat : Form
     {
-        private DrawingBoat? _drawingBoat;
-        private AbstractStrategy? _abstractStrategy;
-        public DrawingBoat? SelectedBoat { get; private set; }
+        private DrawingSailboat? _drawingSailboat;
         public FormSailboat()
         {
             InitializeComponent();
-            _abstractStrategy = null;
-            SelectedBoat = null;
         }
         private void Draw()
         {
-            if (_drawingBoat == null)
+            if (_drawingSailboat == null)
             {
                 return;
             }
             Bitmap bmp = new(pictureBoxSailboat.Width,
             pictureBoxSailboat.Height);
             Graphics gr = Graphics.FromImage(bmp);
-            _drawingBoat.DrawTransport(gr);
+            _drawingSailboat.DrawTransport(gr);
             pictureBoxSailboat.Image = bmp;
         }
-        private void buttonCreateBoat_Click(object sender, EventArgs e)
+        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));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            _drawingBoat = new DrawingBoat(random.Next(100, 300), random.Next(1000, 3000), color, pictureBoxSailboat.Width, pictureBoxSailboat.Height);
-            _drawingBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
-            Draw();
-        }
-        private void buttonCreateSailboat_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-
-            Color dopColor = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialog.Color;
-            }
-
-            _drawingBoat = new DrawingSailboat(random.Next(100, 300),
-            random.Next(1000, 3000), color, dopColor, Convert.ToBoolean(random.Next(0, 2)),
+            _drawingSailboat = new DrawingSailboat();
+            _drawingSailboat.Init(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)),
-            pictureBoxSailboat.Width, pictureBoxSailboat.Height);
-            _drawingBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Convert.ToBoolean(random.Next(0, 2)), pictureBoxSailboat.Width, pictureBoxSailboat.Height);
+            _drawingSailboat.SetPosition(random.Next(10, 100), random.Next(10, 100));
             Draw();
         }
         private void buttonMove_Click(object sender, EventArgs e)
         {
-            if (_drawingBoat == null)
+            if (_drawingSailboat == null)
             {
                 return;
             }
@@ -74,61 +39,20 @@ namespace Sailboat
             switch (name)
             {
                 case "buttonUp":
-                    _drawingBoat.MoveTransport(DirectionType.Up);
+                    _drawingSailboat.MoveTransport(DirectionType.Up);
                     break;
                 case "buttonDown":
-                    _drawingBoat.MoveTransport(DirectionType.Down);
+                    _drawingSailboat.MoveTransport(DirectionType.Down);
                     break;
                 case "buttonLeft":
-                    _drawingBoat.MoveTransport(DirectionType.Left);
+                    _drawingSailboat.MoveTransport(DirectionType.Left);
                     break;
                 case "buttonRight":
-                    _drawingBoat.MoveTransport(DirectionType.Right);
+                    _drawingSailboat.MoveTransport(DirectionType.Right);
                     break;
             }
             Draw();
-        }
-        private void buttonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawingBoat == null)
-            {
-                return;
-            }
-            if (comboBoxStrategy.Enabled)
-            {
-                _abstractStrategy = comboBoxStrategy.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToBorder(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(_drawingBoat.GetMoveableObject, pictureBoxSailboat.Width,
-                pictureBoxSailboat.Height);
-                comboBoxStrategy.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            comboBoxStrategy.Enabled = false;
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBoxStrategy.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }
 
-        private void buttonSelectBoat_Click(object sender, EventArgs e)
-        {
-            SelectedBoat = _drawingBoat;
-            DialogResult = DialogResult.OK;
         }
     }
 } 

Sailboat/Sailboat/IMoveableObject.cs

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

Sailboat/Sailboat/MoveToBorder.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.MovementStrategy
-{
-    public class MoveToBorder : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.RightBorder <= FieldWidth &&
-                objParams.RightBorder + GetStep() >= FieldWidth &&
-                objParams.DownBorder <= FieldHeight &&
-                objParams.DownBorder + GetStep() >= FieldHeight;
-
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.RightBorder - FieldWidth;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.DownBorder - FieldHeight;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}

Sailboat/Sailboat/MoveToCenter.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.MovementStrategy
-{
-    public class MoveToCenter : AbstractStrategy
-    {
-        protected override bool IsTargetDestinaion()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return false;
-            }
-            return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
-            objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
-            objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
-            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
-        }
-        protected override void MoveToTarget()
-        {
-            var objParams = GetObjectParameters;
-            if (objParams == null)
-            {
-                return;
-            }
-            var diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
-            if (Math.Abs(diffX) > GetStep())
-            {
-                if (diffX > 0)
-                {
-                    MoveLeft();
-                }
-                else
-                {
-                    MoveRight();
-                }
-            }
-            var diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
-            if (Math.Abs(diffY) > GetStep())
-            {
-                if (diffY > 0)
-                {
-                    MoveUp();
-                }
-                else
-                {
-                    MoveDown();
-                }
-            }
-        }
-    }
-}

Sailboat/Sailboat/ObjectParameters.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.MovementStrategy
-{
-    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;
-            _y = y;
-            _width = width;
-            _height = height;
-        }
-    }
-}

Sailboat/Sailboat/Program.cs

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

Sailboat/Sailboat/SetGeneric.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.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 SetGeneric(int count)
-        {
-            _places = new T?[count];
-        }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="boat">Добавляемая лодка</param>
-        /// <returns></returns>
-        public int Insert(T boat)
-        {
-            return Insert(boat, 0);
-        }
-        /// <summary>
-        /// Добавление объекта в набор на конкретную позицию
-        /// </summary>
-        /// <param name="boat">Добавляемая лодка</param>
-        /// <param name="position">Позиция</param>
-        /// <returns></returns>
-        public int Insert(T boat, int position)
-        {
-            int nullIndex = -1, i;
-
-            if (position < 0 || position >= Count)
-            {
-                return -1;
-            }
-
-            for (i = position; i < Count; i++)
-            {
-                if (_places[i] == null)
-                {
-                    nullIndex = i;
-                    break;
-                }
-            }
-
-            if (nullIndex < 0)
-            {
-                return -1;
-            }
-
-            for (i = nullIndex; i > position; i--)
-            {
-                _places[i] = _places[i - 1];
-            }
-
-            _places[position] = boat;
-            return position;
-        }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public bool Remove(int position)
-        {
-            if (position < 0 || position >= Count)
-            {
-                return false;
-            }
-
-            _places[position] = null;
-            return true;
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T? Get(int position)
-        {
-            if (position < 0 || position >= Count)
-            {
-                return null;
-            }
-            return _places[position];
-        }
-    }
-}

Sailboat/Sailboat/Status.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sailboat.MovementStrategy
-{
-    /// <summary>
-    /// Статус выполнения операции перемещения
-    /// </summary>
-    public enum Status
-    {
-        NotInit,
-        InProgress,
-        Finish
-    }
-}