From f184b9cdc6cefc05f634c27e9d10a5759c4b0b94 Mon Sep 17 00:00:00 2001 From: Esenia12 <148366616+Esenia12@users.noreply.github.com> Date: Sun, 3 Mar 2024 23:15:54 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DrawningDumpTrack.cs | 45 +------------------ .../MovementStrategy/AbstractStrategy.cs | 3 +- .../MovementStrategy/IMoveableObjects.cs | 3 +- .../MovementStrategy/MoveToBorder.cs | 6 +-- .../MovementStrategy/MoveToCenter.cs | 6 +-- .../MovementStrategy/MoveableTrack.cs | 6 +-- ProjectDumpTruck/ProjectDumpTruck/Program.cs | 8 +--- 7 files changed, 7 insertions(+), 70 deletions(-) diff --git a/ProjectDumpTruck/ProjectDumpTruck/Drawnings/DrawningDumpTrack.cs b/ProjectDumpTruck/ProjectDumpTruck/Drawnings/DrawningDumpTrack.cs index da00f4b..b86d1ce 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/Drawnings/DrawningDumpTrack.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/Drawnings/DrawningDumpTrack.cs @@ -6,50 +6,7 @@ namespace ProjectDumpTrack.Drawnings; /// public class DrawningDumpTrack : DrawningTrack { - ////2 задание - //public override bool MoveTransport(DirectionType direction) - //{ - // if (EntityTrack == null || !_startPosX.HasValue || !_startPosY.HasValue) - // { - // return false; - // } - - // switch (direction) - // { - // //влево - // case DirectionType.Left: - // if (_startPosX.Value - EntityTrack.Step > 0) - // { - // _startPosX -= (int)EntityTrack.Step; - // } - // return true; - - // //вверх - // case DirectionType.Up: - // if (_startPosY.Value - EntityTrack.Step > 0) - // { - // _startPosY -= (int)EntityTrack.Step; - // } - // return true; - - // //вправо - // case DirectionType.Right: - // if (_startPosX.Value + EntityTrack.Step + _drawningTrackWidth < _pictureWidth) - // { - // _startPosX += (int)EntityTrack.Step; - // } - // return true; - - // //вниз - // case DirectionType.Down: - // if (_startPosY.Value + EntityTrack.Step + _drawningTrackHeight < _pictureHeight) - // { - // _startPosY += (int)EntityTrack.Step; - // } - // return true; - // default: - // return false; - // } + //} diff --git a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/AbstractStrategy.cs b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/AbstractStrategy.cs index 06e3938..7fbbf85 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/AbstractStrategy.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/AbstractStrategy.cs @@ -6,8 +6,7 @@ namespace ProjectDumpTruck.MovementStrategy; /// public abstract class AbstractStrategy { - ////Абстрактный метод 3 задание - //public abstract void MyAbstractMethod(); + /// /// Перемещаемый объект diff --git a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/IMoveableObjects.cs b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/IMoveableObjects.cs index ab6199f..8e13f17 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/IMoveableObjects.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/IMoveableObjects.cs @@ -23,6 +23,5 @@ public interface IMoveableObject /// true - объект перемещен, false - перемещение невозможно bool TryMoveObject(MovementDirection direction); - ////Интерфейс - задание 1 - //void MyMethod(); + } diff --git a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToBorder.cs b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToBorder.cs index d807325..f53a927 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToBorder.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToBorder.cs @@ -3,11 +3,7 @@ namespace ProjectDumpTruck.MovementStrategy; public class MoveToBorder : AbstractStrategy { - ////Абстрактный метод 3 задание - //public override void MyAbstractMethod() - //{ - // Console.WriteLine("Implementation of abstract method in derived class"); - //} + protected override bool IsTargetDestinaion() { ObjectParameters? objParams = GetObjectParameters; diff --git a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToCenter.cs b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToCenter.cs index b0db1d8..7705de4 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToCenter.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveToCenter.cs @@ -6,11 +6,7 @@ namespace ProjectDumpTruck.MovementStrategy; /// public class MoveToCenter : AbstractStrategy { - ////Абстрактный метод 3 задание - //public override void MyAbstractMethod() - //{ - // Console.WriteLine("Implementation of abstract method in derived class"); - //} + protected override bool IsTargetDestinaion() { ObjectParameters? objParams = GetObjectParameters; diff --git a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveableTrack.cs b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveableTrack.cs index d54ce02..9110d47 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveableTrack.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/MovementStrategy/MoveableTrack.cs @@ -8,11 +8,7 @@ namespace ProjectDumpTruck.MovementStrategy; /// public class MoveableTrack : IMoveableObject { - ////Интерфейс-задание 1 - //public void MyMethod() - //{ - - //} + diff --git a/ProjectDumpTruck/ProjectDumpTruck/Program.cs b/ProjectDumpTruck/ProjectDumpTruck/Program.cs index 99f3436..e696463 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/Program.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/Program.cs @@ -17,13 +17,7 @@ namespace ProjectDumpTruck - //// 3 - //AbstractStrategy myObject1 = new MoveToBorder(); - //myObject1.MyAbstractMethod(); - - //AbstractStrategy myObject2 = new MoveToCenter(); - //myObject2.MyAbstractMethod(); - + } } } \ No newline at end of file