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

ProjectAirbus/ProjectAirbus/Drawnings/DirectionType.cs

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

ProjectAirbus/ProjectAirbus/Drawnings/DrawingShip.cs

@@ -32,11 +32,28 @@ public class DrawingShip
     /// <summary>
     /// Ширина прорисовки корабля
     /// </summary>
-    private readonly int _drawningLinkorWidth = 95;
+    private readonly int _drawningShipWidth = 95;
     /// <summary>
     /// Высота прорисовки корабля
     /// </summary>
-    private readonly int _drawningLinkorHeight = 40;
+    private readonly int _drawningShipHeight = 40;
+
+    /// <summary>
+    /// Координата X объекта
+    /// </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>
     /// Пустой конструктор
@@ -66,8 +83,8 @@ public class DrawingShip
     /// <param name="drawningLinkorHeight">Высота прорисовки корабля</param>
     protected DrawingShip(int drawningLinkorWidth, int drawningLinkorHeight) : this()
     {
-        _drawningLinkorWidth = drawningLinkorWidth;
+        _drawningShipWidth = drawningLinkorWidth;
-        _drawningLinkorHeight = drawningLinkorHeight;
+        _drawningShipHeight = drawningLinkorHeight;
     }
     /// <summary>
     /// Установка границ поля
@@ -80,7 +97,7 @@ public class DrawingShip
         // TODO проверка, что объект "влезает" в размеры поля
         // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена
 
-        if (width > _drawningLinkorWidth && height > _drawningLinkorHeight)
+        if (width > _drawningShipWidth && height > _drawningShipHeight)
         {
             _pictureWidth = width;
             _pictureHeight = height;
@@ -89,13 +106,13 @@ public class DrawingShip
             {
                 if (_startPosX.Value < 0) _startPosX = 0;
                 if (_startPosY.Value < 0) _startPosY = 0;
-                if (_startPosX.Value + _drawningLinkorWidth > _pictureWidth)
+                if (_startPosX.Value + _drawningShipWidth > _pictureWidth)
                 {
-                    _startPosX = _pictureWidth - _drawningLinkorWidth;
+                    _startPosX = _pictureWidth - _drawningShipWidth;
                 }
-                if (_startPosY.Value + _drawningLinkorHeight > _pictureHeight)
+                if (_startPosY.Value + _drawningShipHeight > _pictureHeight)
                 {
-                    _startPosY = _pictureHeight - _drawningLinkorHeight;
+                    _startPosY = _pictureHeight - _drawningShipHeight;
                 }
             }
 
@@ -124,13 +141,13 @@ public class DrawingShip
 
             if (_startPosX.Value < 0) _startPosX = 0;
             if (_startPosY.Value < 0) _startPosY = 0;
-            if (_startPosX.Value + _drawningLinkorWidth > _pictureWidth)
+            if (_startPosX.Value + _drawningShipWidth > _pictureWidth)
             {
-                _startPosX = _pictureWidth - _drawningLinkorWidth;
+                _startPosX = _pictureWidth - _drawningShipWidth;
             }
-            if (_startPosY.Value + _drawningLinkorHeight > _pictureHeight)
+            if (_startPosY.Value + _drawningShipHeight > _pictureHeight)
             {
-                _startPosY = _pictureHeight - _drawningLinkorHeight;
+                _startPosY = _pictureHeight - _drawningShipHeight;
             }
 
         }
@@ -167,14 +184,14 @@ public class DrawingShip
                 return true;
             // вправо
             case DirectionType.Right:
-                if (_startPosX.Value + _drawningLinkorWidth + EntityShip.Step < _pictureWidth)
+                if (_startPosX.Value + _drawningShipWidth + EntityShip.Step < _pictureWidth)
                 {
                     _startPosX += (int)EntityShip.Step;
                 }
                 return true;
             //вниз
             case DirectionType.Down:
-                if (_startPosY.Value + _drawningLinkorHeight + EntityShip.Step < _pictureHeight)
+                if (_startPosY.Value + _drawningShipHeight + EntityShip.Step < _pictureHeight)
                 {
                     _startPosY += (int)EntityShip.Step;
                 }

ProjectAirbus/ProjectAirbus/FormLinkor.Designer.cs

@@ -35,6 +35,8 @@
             buttonDown = new Button();
             buttonUp = new Button();
             buttonCreateShip = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
             ((System.ComponentModel.ISupportInitialize)pictureBoxLinkor).BeginInit();
             SuspendLayout();
             // 
@@ -117,11 +119,33 @@
             buttonCreateShip.UseVisualStyleBackColor = true;
             buttonCreateShip.Click += ButtonCreateShip_Click;
             // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(606, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(182, 33);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(676, 51);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(112, 34);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
             // FormLinkor
             // 
             AutoScaleDimensions = new SizeF(10F, 25F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 414);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
             Controls.Add(buttonCreateShip);
             Controls.Add(buttonUp);
             Controls.Add(buttonDown);
@@ -146,5 +170,7 @@
         private Button buttonDown;
         private Button buttonUp;
         private Button buttonCreateShip;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
     }
 }

ProjectAirbus/ProjectAirbus/FormLinkor.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ProjectLinkor.Drawnings;
+using ProjectLinkor.MovementStrategy;
 
 namespace ProjectLinkor
 {
@@ -15,9 +16,15 @@ namespace ProjectLinkor
     {
         private DrawingShip? _drawingShip;
 
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
         public FormLinkor()
         {
             InitializeComponent();
+            _strategy = null;
         }
 
 
@@ -54,6 +61,8 @@ namespace ProjectLinkor
             }
             _drawingShip.SetPictureSize(pictureBoxLinkor.Width, pictureBoxLinkor.Height);
             _drawingShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            _strategy = null;
+            comboBoxStrategy.Enabled = true;
             Draw();
         }
         /// <summary>
@@ -106,7 +115,6 @@ namespace ProjectLinkor
 
         }
 
-
         private void FormLinkor_SizeChanged(object sender, EventArgs e)
         {
             if (_drawingShip == null)
@@ -118,7 +126,47 @@ namespace ProjectLinkor
                 Draw();
             }
         }
+        /*
+        private void pictureBoxLinkor_Click(object sender, EventArgs e)
+        {
 
+        }
+        */
+
+        private void ButtonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawingShip == null)
+            {
+                return;
+            }
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableShip(_drawingShip),
+                pictureBoxLinkor.Width, pictureBoxLinkor.Height);
+            }
+            if (_strategy == null)
+            {
+                return;
+            }
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
 
         }
     }
+}

ProjectAirbus/ProjectAirbus/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLinkor.MovementStrategy;
+
+public abstract class AbstractStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObject? _moveableObject;
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    private StrategyStatus _state = StrategyStatus.NotInit;
+    /// <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.NotInit;
+            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 ObjectParametrs? 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;
+        }
+
+}

ProjectAirbus/ProjectAirbus/MovementStrategy/IMoveableObject.cs

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

ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToBorder.cs

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

ProjectAirbus/ProjectAirbus/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLinkor.MovementStrategy;
+
+public class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParametrs? 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()
+    {
+        ObjectParametrs? 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();
+            }
+        }
+    }
+}

ProjectAirbus/ProjectAirbus/MovementStrategy/MoveableShip.cs

@@ -0,0 +1,66 @@
+using ProjectLinkor.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLinkor.MovementStrategy;
+/// <summary>
+/// Класс-реализация IMoveableObject с использованием DrawingShip
+/// </summary>
+public class MoveableShip : IMoveableObject 
+{
+    /// <summary>
+    /// Поле-объект класса DrawningCar или его наследника
+    /// </summary>
+    private readonly DrawingShip? _ship = null;
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="car">Объект класса DrawningCar</param>
+    public MoveableShip(DrawingShip ship)
+    {
+        _ship = ship;
+    }
+
+    public ObjectParametrs? GetObjectPosition
+    {
+        get
+        {
+            if (_ship == null || _ship.EntityShip == null ||
+            !_ship.GetPosX.HasValue || !_ship.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParametrs(_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,
+        };
+    }
+}

ProjectAirbus/ProjectAirbus/MovementStrategy/MovementDirection.cs

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

ProjectAirbus/ProjectAirbus/MovementStrategy/ObjectParametrs.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLinkor.MovementStrategy;
+
+public class ObjectParametrs
+{
+    /// <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 ObjectParametrs(int x, int y, int width, int height)
+    {
+        _x = x;
+        _y = y;
+        _width = width;
+        _height = height;
+    }
+}

ProjectAirbus/ProjectAirbus/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectLinkor.MovementStrategy;
+public enum StrategyStatus
+{
+    //всё готово к началу
+    NotInit,
+    //выполняется
+    InProgress,
+    //завершено
+    Finish
+}