Добавление стратегии

Battleship/Battleship/Drawnings/DirectionType.cs

@@ -10,6 +10,10 @@ namespace Battleship.Drawnings;
 /// </summary>
 public enum DirectionType
 {   
+    /// <summary>
+    /// Неизвестное направление
+    /// </summary>
+    Unknow = -1,
     /// <summary>
     /// Вверх
     /// </summary>

Battleship/Battleship/Drawnings/DrawningShip.cs

@@ -38,6 +38,23 @@ namespace Battleship.Drawnings
         /// </summary>
 
         private readonly int _drawningShipHeight = 70;
+        /// <summary>
+        /// Координата Х объекта
+        /// </summary>
+        public int? GetPosX => _startPosX;
+        /// <summary>
+        /// Координата Y объекта
+        /// </summary>
+        public int? GetPosY => _startPosY;
+        /// <summary>
+        /// Ширина объекта
+        /// </summary>
+        public int GetWidth => _drawningShipWidth;
+        /// <summary>
+        /// Высота объекта
+        /// </summary>
+        public int GetHeight => _drawningShipHeight;
+
         /// <summary>
         /// Пустой конструктор
         /// </summary>

Battleship/Battleship/FormBattleship.Designer.cs

@@ -35,6 +35,8 @@
             buttonDown = new Button();
             button_Create = new Button();
             button1 = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxBattleship).BeginInit();
             SuspendLayout();
             // 
@@ -117,11 +119,33 @@
             button1.UseVisualStyleBackColor = true;
             button1.Click += button1_Click_1;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(765, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 8;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(811, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(75, 23);
+            buttonStrategyStep.TabIndex = 9;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += buttonStrategyStep_Click;
+            // 
             // FormBattleship
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(898, 537);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(button1);
             Controls.Add(button_Create);
             Controls.Add(buttonDown);
@@ -144,5 +168,7 @@
         private Button buttonDown;
         private Button button_Create;
         private Button button1;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

Battleship/Battleship/FormBattleship.cs

@@ -1,4 +1,5 @@
 using Battleship.Drawnings;
+using Battleship.MovementStrategy;
 
 namespace Battleship;
 /// <summary>
@@ -13,6 +14,11 @@ public partial class FormBattleship : Form
 
     private DrawningShip? _drawningShip;
 
+    /// <summary>
+    /// Стратегия перемещения
+    /// </summary>
+    private AbstructStrategy? _strategy;
+
     /// <summary>
     /// Конструкторр формы
     /// </summary>
@@ -20,6 +26,7 @@ public partial class FormBattleship : Form
     public FormBattleship()
     {
         InitializeComponent();
+        _strategy = null;
     }
 
     /// <summary>
@@ -70,7 +77,10 @@ public partial class FormBattleship : Form
         _drawningShip.SetPictureSize(pictureBoxBattleship.Width,
        pictureBoxBattleship.Height);
         _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
+        _strategy = null;
+        comboBoxStrategy.Enabled = true;
         Draw();
+
     }
 
 
@@ -125,8 +135,43 @@ public partial class FormBattleship : Form
             Draw();
         }
     }
-
+    /// <summary>
-   
+    /// 
-
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void buttonStrategyStep_Click(object sender, EventArgs e)
+    {
+        if (_drawningShip == null)
+        {
+            return;
+        }
+        if (comboBoxStrategy.Enabled)
+        {
+            _strategy = comboBoxStrategy.SelectedIndex switch
+            {
+                0 => new MoveToCenter(),
+                1 => new MoveToBorder(),
+                _ => null,
+            };
+            if (_strategy == null)
+            {
+                return;
+            }
+            _strategy.SetData(new MoveableShip(_drawningShip), pictureBoxBattleship.Width, pictureBoxBattleship.Height);
+        }
+        if (_strategy == null)
+        {
+            return;
+        }
+        comboBoxStrategy.Enabled = false;
+        _strategy.MakeStep();
+        Draw();
+        if (_strategy.GetStatus() == StrategyStatus.Finish)
+        {
+            comboBoxStrategy.Enabled = true;
+            _strategy = null;
+        }
+    }
 }
 

Battleship/Battleship/MovementStrategy/AbstructStrategy.cs

@@ -0,0 +1,123 @@
+namespace Battleship.MovementStrategy;
+
+public abstract class AbstructStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObject? _moveableObject;
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    private StrategyStatus _state = StrategyStatus.NoInit;
+    /// <summary>
+    /// Ширина поля
+    /// </summary>
+    protected int FieldWidth { get; private set; }
+    /// <summary>
+    /// Высота поля
+    /// </summary>
+    protected int FieldHeight { get; private set; }
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    public StrategyStatus GetStatus() { return _state; }
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObject">Перемещаемый объект</param>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    public void SetData(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NoInit;
+            return;
+        }
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return;
+        }
+        if (IsTargetDestinaion())
+        {
+            _state = StrategyStatus.Finish;
+            return;
+        }
+        MoveToTarget();
+    }
+    /// <summary>
+    /// Перемещение влево
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false -
+    ///неудача)</returns>
+    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+    /// <summary>
+    /// Перемещение вправо
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false -
+    ///неудача)</returns>
+    protected bool MoveRight() => MoveTo(MovementDirection.Right);
+    /// <summary>
+    /// Перемещение вверх
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false -
+    ///неудача)</returns>
+    protected bool MoveUp() => MoveTo(MovementDirection.Up);
+    /// <summary>
+    /// Перемещение вниз
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false -
+    ///неудача)</returns>
+    protected bool MoveDown() => MoveTo(MovementDirection.Down);
+    /// <summary>
+    /// Параметры объекта
+    /// </summary>
+    protected ObjectParameters? GetObjectParameters =>
+    _moveableObject?.GetObjectPosition;
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    /// <returns></returns>
+    protected int? GetStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return null;
+        }
+        return _moveableObject?.GetStep;
+    }
+    /// <summary>
+    /// Перемещение к цели
+    /// </summary>
+    protected abstract void MoveToTarget();
+    /// <summary>
+    /// Достигнута ли цель
+    /// </summary>
+    /// <returns></returns>
+    protected abstract bool IsTargetDestinaion();
+    /// <summary>
+    /// Попытка перемещения в требуемом направлении
+    /// </summary>
+    /// <param name="movementDirection">Направление</param>
+    /// <returns>Результат попытки (true - удалось переместиться, false -
+    ///неудача)</returns>
+    private bool MoveTo(MovementDirection movementDirection)
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return false;
+        }
+        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+    }
+}

Battleship/Battleship/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,20 @@
+namespace Battleship.MovementStrategy;
+
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep { get; }
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - объект перемещен, false - перемещение
+    ///невозможно</returns>
+    bool TryMoveObject(MovementDirection direction);
+}

Battleship/Battleship/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,49 @@
+namespace Battleship.MovementStrategy;
+
+public class MoveToBorder : AbstructStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.RightBorder - GetStep() <= FieldWidth
+        && objParams.RightBorder + GetStep() >= FieldWidth &&
+        objParams.DownBorder - GetStep() <= FieldHeight
+        && objParams.DownBorder + GetStep() >= FieldHeight;
+    }
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        int diffX = objParams.RightBorder - FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.DownBorder - FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

Battleship/Battleship/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,49 @@
+namespace Battleship.MovementStrategy;
+
+public class MoveToCenter : AbstructStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2
+        && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+        objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2
+        && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+    }
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

Battleship/Battleship/MovementStrategy/MoveableShip.cs

@@ -0,0 +1,59 @@
+using Battleship.Drawnings;
+
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Класс-реализации
+/// </summary>
+public class MoveableShip : IMoveableObject
+{
+    /// <summary>
+    /// Поле-объект класса DrawningShip или его наследника
+    /// </summary>
+    private readonly DrawningShip? _ship = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="ship"></param>
+    public MoveableShip(DrawningShip ship)
+    {
+        _ship = ship;
+    }
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_ship == null || _ship.EntityShip == null ||
+            !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_ship.GetPosX.Value,
+            _ship.GetPosY.Value, _ship.GetWidth, _ship.GetHeight);
+        }
+    }
+    public int GetStep => (int)(_ship?.EntityShip?.Step ?? 0);
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_ship == null || _ship.EntityShip == null)
+        {
+            return false;
+        }
+        return _ship.MoveTransport(GetDirectionType(direction));
+    }
+    /// <summary>
+    /// Конвертация из MovementDirection в DirectionType
+    /// </summary>
+    /// <param name="direction">MovementDirection</param>
+    /// <returns>DirectionType</returns>
+    private static DirectionType GetDirectionType(MovementDirection direction)
+    {
+        return direction switch
+        {
+            MovementDirection.Left => DirectionType.Left,
+            MovementDirection.Right => DirectionType.Right,
+            MovementDirection.Up => DirectionType.Up,
+            MovementDirection.Down => DirectionType.Down,
+            _ => DirectionType.Unknow,
+        };
+    }
+}

Battleship/Battleship/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,25 @@
+namespace Battleship.MovementStrategy;
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    ///<summary>
+    ///Вверх
+    ///</summary>
+    Up = 1,
+    ///<summary>
+    ///Вниз
+    ///</summary>
+    Down = 2,
+    ///<summary>
+    ///Влево
+    ///</summary>
+    Left = 3,
+    ///<summary>
+    ///Вправо
+    ///</summary>
+    Right = 4
+
+
+}

Battleship/Battleship/MovementStrategy/ObjectParameters.cs

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

Battleship/Battleship/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,22 @@
+namespace Battleship.MovementStrategy;
+
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово  к началу
+    /// </summary>
+    NoInit,
+
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    /// 
+    InProgress,
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}