From 8d7bf2159a97d8c785787371ce0c09f3b84bcb50 Mon Sep 17 00:00:00 2001
From: bulatova_karina <midnight737475@gmail.com>
Date: Sat, 2 Dec 2023 20:53:19 +0300
Subject: [PATCH] fixed 4

---
 WarmlyShip/WarmlyShip/SetGeneric.cs           | 41 ++-------------
 .../WarmlyShip/ShipsGenericCollection.cs      | 50 -------------------
 WarmlyShip/WarmlyShip/ShipsGenericStorage.cs  | 30 -----------
 3 files changed, 3 insertions(+), 118 deletions(-)

diff --git a/WarmlyShip/WarmlyShip/SetGeneric.cs b/WarmlyShip/WarmlyShip/SetGeneric.cs
index 4c31c0a..7a0d008 100644
--- a/WarmlyShip/WarmlyShip/SetGeneric.cs
+++ b/WarmlyShip/WarmlyShip/SetGeneric.cs
@@ -9,32 +9,14 @@ namespace WarmlyShip.Generics
     internal class SetGeneric<T>
         where T : class
     {
-        /// <summary>
-        /// Список объектов, которые храним
-        /// </summary>
         private readonly List<T?> _places;
-        /// <summary>
-        /// Количество объектов в списке
-        /// </summary>
         public int Count => _places.Count;
-        /// <summary>
-        /// Максимальное количество объектов в списке
-        /// </summary>
         private readonly int _maxCount;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="count"></param>
         public SetGeneric(int count)
         {
             _maxCount = count;
             _places = new List<T>(count);
         }
-        /// <summary>
-        /// Добавление объекта в набор
-        /// </summary>
-        /// <param name="warmlyship">Добавляемый теплоход</param>
-        /// <returns></returns>
         public bool Insert(T warmlyship)
         {
             if (_places.Count == _maxCount)
@@ -44,12 +26,7 @@ namespace WarmlyShip.Generics
             Insert(warmlyship, 0);
             return true;
         }
-        /// <summary>
-        /// Добавление объекта в набор на конкретную позицию
-        /// </summary>
-        /// <param name="warmlyship">Добавляемый теплоход</param>
-        /// <param name="position">Позиция</param>
-        /// <returns></returns>
+
         public bool Insert(T warmlyship, int position)
         {
             if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
@@ -59,11 +36,7 @@ namespace WarmlyShip.Generics
             _places.Insert(position, warmlyship);
             return true;
         }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
+
         public bool Remove(int position)
         {
             if (position < 0 || position >= Count)
@@ -73,11 +46,7 @@ namespace WarmlyShip.Generics
             _places.RemoveAt(position);
             return true;
         }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
+
         public T? this[int position]
         {
             get
@@ -99,10 +68,6 @@ namespace WarmlyShip.Generics
                 return;
             }
         }
-        /// <summary>
-        /// Проход по списку
-        /// </summary>
-        /// <returns></returns>
         public IEnumerable<T?> GetShips(int? maxShips = null)
         {
             for (int i = 0; i < _places.Count; ++i)
diff --git a/WarmlyShip/WarmlyShip/ShipsGenericCollection.cs b/WarmlyShip/WarmlyShip/ShipsGenericCollection.cs
index 55af291..b902983 100644
--- a/WarmlyShip/WarmlyShip/ShipsGenericCollection.cs
+++ b/WarmlyShip/WarmlyShip/ShipsGenericCollection.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 
 using WarmlyShip.DrawingObjects;
 using WarmlyShip.MovementStrategy;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace WarmlyShip.Generics
 {
@@ -14,31 +13,11 @@ namespace WarmlyShip.Generics
         where T : DrawingWarmlyShip
         where U : IMoveableObject
     {
-        /// <summary>
-        /// Ширина окна прорисовки
-        /// </summary>
         private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна прорисовки
-        /// </summary>
         private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
         private readonly int _placeSizeWidth = 185;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
         private readonly int _placeSizeHeight = 185;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
         private readonly SetGeneric<T> _collection;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
         public ShipsGenericCollection(int picWidth, int picHeight)
         {
             int width = picWidth / _placeSizeWidth;
@@ -47,12 +26,6 @@ namespace WarmlyShip.Generics
             _pictureHeight = picHeight;
             _collection = new SetGeneric<T>(width * height);
         }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="obj"></param>
-        /// <returns></returns>
         public static bool operator +(ShipsGenericCollection<T, U> collect, T?
         obj)
         {
@@ -62,12 +35,6 @@ namespace WarmlyShip.Generics
             }
             return (bool)collect?._collection.Insert(obj);
         }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="collect"></param>
-        /// <param name="pos"></param>
-        /// <returns></returns>
         public static T? operator -(ShipsGenericCollection<T, U> collect, int
         pos)
         {
@@ -78,19 +45,10 @@ namespace WarmlyShip.Generics
             }
             return obj;
         }
-        /// <summary>
-        /// Получение объекта IMoveableObject
-        /// </summary>
-        /// <param name="pos"></param>
-        /// <returns></returns>
         public U? GetU(int pos)
         {
             return (U?)_collection[pos]?.GetMoveableObject;
         }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
         public Bitmap ShowShips()
         {
             Bitmap bmp = new(_pictureWidth, _pictureHeight);
@@ -99,10 +57,6 @@ namespace WarmlyShip.Generics
             DrawObjects(gr);
             return bmp;
         }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
         private void DrawBackground(Graphics g)
         {
             Pen pen = new(Color.Black, 3);
@@ -119,10 +73,6 @@ namespace WarmlyShip.Generics
                 _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
             }
         }
-        /// <summary>
-        /// /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
         private void DrawObjects(Graphics g)
         {
             int i = 0;
diff --git a/WarmlyShip/WarmlyShip/ShipsGenericStorage.cs b/WarmlyShip/WarmlyShip/ShipsGenericStorage.cs
index 8e6c2e8..dac498d 100644
--- a/WarmlyShip/WarmlyShip/ShipsGenericStorage.cs
+++ b/WarmlyShip/WarmlyShip/ShipsGenericStorage.cs
@@ -10,27 +10,10 @@ namespace WarmlyShip.Generics
 {
     internal class ShipsGenericStorage
     {
-        /// <summary>
-        /// Словарь (хранилище)
-        /// </summary>
         readonly Dictionary<string, ShipsGenericCollection<DrawingWarmlyShip, DrawingObjectShip>> _shipStorages;
-        /// <summary>
-        /// Возвращение списка названий наборов
-        /// </summary>
         public List<string> Keys => _shipStorages.Keys.ToList();
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
         private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
         private readonly int _pictureHeight;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="pictureWidth"></param>
-        /// /// <param name="pictureHeight"></param>
         public ShipsGenericStorage(int pictureWidth, int pictureHeight)
         {
             _shipStorages = new Dictionary<string,
@@ -38,10 +21,6 @@ namespace WarmlyShip.Generics
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
-        /// <summary>
-        /// Добавление набора
-        /// </summary>
-        /// <param name="name">Название набора</param>
         public void AddSet(string name)
         {
             if (_shipStorages.ContainsKey(name))
@@ -50,10 +29,6 @@ namespace WarmlyShip.Generics
             }
             _shipStorages[name] = new ShipsGenericCollection<DrawingWarmlyShip, DrawingObjectShip>(_pictureWidth, _pictureHeight);
         }
-        /// <summary>
-        /// Удаление набора
-        /// </summary>
-        /// <param name="name">Название набора</param>
         public void DelSet(string name)
         {
             if (!_shipStorages.ContainsKey(name))
@@ -63,11 +38,6 @@ namespace WarmlyShip.Generics
 
             _shipStorages.Remove(name);
         }
-        /// <summary>
-        /// Доступ к набору
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
         public ShipsGenericCollection<DrawingWarmlyShip, DrawingObjectShip>? this[string ind]
         {
             get